[PLUGINS] ~gis v4.41.1 --> v4.43.1

[lhc/web/www.git] / www / plugins / gis / javascript / gis.js.html

diff --git a/www/plugins/gis/javascript/gis.js.html b/www/plugins/gis/javascript/gis.js.html
index 8537b6a..c7e36a1 100644 (file)
--- a/www/plugins/gis/javascript/gis.js.html
+++ b/www/plugins/gis/javascript/gis.js.html
@@ -1,20 +1,21 @@
 #HTTP_HEADER{Content-type:text/javascript}
 
-[(#INCLURE{lib/leaflet/dist/[(#CONFIG{auto_compress_js}|=={oui}|?{'leaflet','leaflet-src'})].js})]
+[(#INCLURE{lib/leaflet/dist/leaflet-src.js})]
 
-[L.Icon.Default.imagePath = "(#CHEMIN{lib/leaflet/dist/images}|url_absolue)";]
+[(#REM) Déprécié avec Leaflet 1.0, mais nécessaire si le site utilise compresseur_embarquer_images_css ]
+[L.Icon.Default.imagePath = '(#CHEMIN{lib/leaflet/dist/images/}|url_absolue)';]
 
 (function() {
 
 L.gisConfig = {
-       "gis_layers":#EVAL{json_encode($GLOBALS['gis_layers'])},
-       "default_layer":"[(#REM|gis_layer_defaut)]",
-       "affiche_layers":[(#CONFIG{gis/layers,#ARRAY}|json_encode)]
+       'gis_layers': #EVAL{json_encode($GLOBALS['gis_layers'])},
+       'default_layer': '[(#REM|gis_layer_defaut)]',
+       'affiche_layers': [(#CONFIG{gis/layers,#ARRAY}|json_encode)]
 };
 
 L.geocoderConfig = {
-       "forwardUrl":"[(#VAL{gis_geocoder_rechercher}|generer_url_action{mode=search}|html_entity_decode)]",
-       "reverseUrl":"[(#VAL{gis_geocoder_rechercher}|generer_url_action{mode=reverse}|html_entity_decode)]"
+       'forwardUrl': '[(#VAL{gis_geocoder_rechercher}|generer_url_action{mode=search}|html_entity_decode)]',
+       'reverseUrl': '[(#VAL{gis_geocoder_rechercher}|generer_url_action{mode=reverse}|html_entity_decode)]'
 };
 
 })();
@@ -27,6 +28,8 @@ L.geocoderConfig = {
 
 [(#INCLURE{lib/leaflet/plugins/GPX.js})]
 
+[(#INCLURE{lib/leaflet/plugins/TOPOJSON.js})]
+
 [(#INCLURE{lib/leaflet/plugins/leaflet-providers.js})]
 
 [(#INCLURE{lib/leaflet/plugins/Control.FullScreen.js})]
@@ -41,7 +44,7 @@ L.geocoderConfig = {
 ]
 
 [(#LISTE{google_roadmap,google_satellite,google_terrain}|array_intersect{#GET{layers}}|count|>{0}|oui)
-[(#INCLURE{lib/leaflet/plugins/Google.js})]
+[(#INCLURE{lib/leaflet/plugins/Leaflet.GoogleMutant.js})]
 ]
 
 [(#VAL{bing_aerial}|in_array{#GET{layers}}|oui)
@@ -53,5 +56,5 @@ L.geocoderConfig = {
 [(#INCLURE{javascript/leaflet.gis.js})]
 
 [(#CONFIG{auto_compress_js}|=={oui}|oui)
-#FILTRE{compacte}
-]
+// gis.js
+#FILTRE{trim|compacte}]
\ No newline at end of file