WebSVN – eFlore/Applications.coel – Path Comparison – / – /trunk/widget/modules/carto/squelettes/ Rev 1833 and /trunk/widget/modules/carto/squelettes/ Rev 1834

Ignore whitespace Rev 1833 → Rev 1834

 /trunk/widget/modules/carto/squelettes/scripts/carto.js
 ,14 → 18,18
         layers : [coucheOSM]
 };
-var xmlHttpRequest = null,
-        nombreCollections = 0,
-        collections = new Array(),
-        structures = new Array(),
-        coucheStructures = new L.MarkerClusterGroup({
-                disableClusteringAtZoom : 10
-        }),
-        infoBulle = null,
+var xmlHttpRequest = null;
+        nombreCollections = 0;
+        collections = new Array();
+        structures = new Array();
+        if(clustering) {
+                coucheStructures = new L.MarkerClusterGroup({
+                        disableClusteringAtZoom : 10
+                });
+        } else {
+                coucheStructures = new L.FeatureGroup();
+        }
+        infoBulle = null;
         chargementEnCours = false;

/trunk/widget/modules/carto/squelettes/carto.tpl.html
22,14 → 22,15
<script type="text/javascript" src="http://resources.tela-botanica.org/jquery/jquery-ui/1.8.18/js/jquery-ui-1.8.18.custom.min.js"></script>
<script type="text/javascript" src="http://resources.tela-botanica.org/jquery/jquery-tmpl/jquery.tmpl.min.js"></script>
<script src="<?=$url_base?>modules/carto/squelettes/scripts/leaflet.markercluster.js"></script>
<script type="text/javascript" src="<?=$url_base?>modules/carto/squelettes/scripts/carto.js"></script>
<script type="text/javascript">
//<![CDATA[
var departement = '<?= $departement ?>';
var pays = '<?= $pays ?>';
var urlWebService = '<?= $url_web_service ?>';
var clustering = '<?= $clustering ?>';
//]]>
</script>
<script type="text/javascript" src="<?=$url_base?>modules/carto/squelettes/scripts/carto.js"></script>

<!-- Google Analytics -->
<script>