[PLUGINS] +maj gis4

[lhc/web/www.git] / www / plugins / gis / modeles / carte_gis_preview.html

diff --git a/www/plugins/gis/modeles/carte_gis_preview.html b/www/plugins/gis/modeles/carte_gis_preview.html
index dac6e20..52f1193 100755 (executable)
--- a/www/plugins/gis/modeles/carte_gis_preview.html
+++ b/www/plugins/gis/modeles/carte_gis_preview.html
@@ -1,8 +1,8 @@
 <BOUCLE_gis(GIS){objet ?}{id_objet ?}{id_gis ?}{0,1}>\r
 <div id="map_preview" class="carte_gis" style="width: 100%; height: 150px;"></div>\r
-\r
+#SET{autocenter,''}\r
 <script type="text/javascript">\r
-<!--\r
+/*<![CDATA[*/\r
 (function($){\r
        var init_map_preview = function() {\r
                var map_preview;\r
@@ -17,7 +17,7 @@
                map_preview.addLayer(base_layer);\r
                \r
                map_preview.setView(new L.LatLng([(#LAT)],[(#LON)]),[(#ZOOM|sinon{#CONFIG{gis/zoom,0}})]);\r
-               
+
                [(#REM) On ajoute les points ou le point unique suivant les params ]\r
                <B_points>\r
                var data = {\r
@@ -29,14 +29,8 @@
                                        "id":"#ID_GIS",\r
                                        "properties": {\r
                                                "title":[(#TITRE|supprimer_numero|json_encode)],\r
-                                               "description":[(#DESCRIPTIF|json_encode)][,(#LOGO_GIS|oui)\r
-                                               [(#SET{logo_doc,#LOGO_GIS|image_passe_partout{28,28}|image_recadre{28,28}|image_recadre{32,32,center}|image_aplatir{jpg,ffffff}})]\r
-                                               #SET{icon_w,#GET{logo_doc}|extraire_attribut{src}|largeur}\r
-                                               #SET{icon_h,#GET{logo_doc}|extraire_attribut{src}|hauteur}\r
-                                               ["icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],\r
-                                               "icon_size": \[#GET{icon_w},#GET{icon_h}\],\r
-                                               "icon_anchor": \[[(#GET{icon_w}|div{2})],[(#GET{icon_h})]\],\r
-                                               "popup_anchor": \[1,[-(#GET{icon_h}|div{1.2})]\]]\r
+                                               "description":[(#DESCRIPTIF|json_encode)][\r
+                                               (#LOGO_GIS|gis_icon_properties)]\r
                                        }\r
                                }\r
                </BOUCLE_points>\r
@@ -53,14 +47,8 @@
                                        "id":"#ID_GIS",\r
                                        "properties": {\r
                                                "title":[(#TITRE|supprimer_numero|json_encode)],\r
-                                               "description":[(#DESCRIPTIF|json_encode)][,(#LOGO_GIS|oui)\r
-                                               [(#SET{logo_doc,#LOGO_GIS|image_passe_partout{28,28}|image_recadre{28,28}|image_recadre{32,32,center}|image_aplatir{jpg,ffffff}})]\r
-                                               #SET{icon_w,#GET{logo_doc}|extraire_attribut{src}|largeur}\r
-                                               #SET{icon_h,#GET{logo_doc}|extraire_attribut{src}|hauteur}\r
-                                               ["icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],\r
-                                               "icon_size": \[#GET{icon_w},#GET{icon_h}\],\r
-                                               "icon_anchor": \[[(#GET{icon_w}|div{2})],[(#GET{icon_h})]\],\r
-                                               "popup_anchor": \[1,[-(#GET{icon_h}|div{1.2})]\]]\r
+                                               "description":[(#DESCRIPTIF|json_encode)][\r
+                                               (#LOGO_GIS|gis_icon_properties)]\r
                                        }\r
                                }]\r
                };\r
@@ -87,14 +75,15 @@
                        }).addTo(map_preview);\r
                        geojson.addData(data);\r
                        [(#GET{autocenter}|oui)\r
-                       map_preview.fitBounds(geojson.getBounds());]\r
+                       if(data.features.length > 1)\r
+                               map_preview.fitBounds(geojson.getBounds());]\r
                }\r
                [(#REM) On ajoute les KML attachés à l'objet ]\r
                <BOUCLE_kml(DOCUMENTS){tous}{objet}{id_objet}{extension=kml}>\r
                map_preview.addLayer(new L.KML('[(#URL_DOCUMENT|url_absolue)]', {async: true}));\r
                </BOUCLE_kml>\r
                [(#REM) On ajoute les GPX attachés à l'objet ]\r
-               <BOUCLE_gpx(DOCUMENTS){tous}{objet}{id_objet}{extension=kml}>\r
+               <BOUCLE_gpx(DOCUMENTS){tous}{objet}{id_objet}{extension=gpx}>\r
                map_preview.addLayer(new L.GPX('[(#URL_DOCUMENT|url_absolue)]', {async: true}));\r
                </BOUCLE_gpx>\r
        }\r
@@ -107,6 +96,6 @@
        });\r
 \r
 })(jQuery);\r
--->\r
+/*]]>*/\r
 </script>\r
 </BOUCLE_gis>\r