[PLUGINS] +maj gis4

[lhc/web/www.git] / www / plugins / gis / json / gis_point_libre.html

diff --git a/www/plugins/gis/json/gis_point_libre.html b/www/plugins/gis/json/gis_point_libre.html
index 96edf86..8e5c3fa 100644 (file)
--- a/www/plugins/gis/json/gis_point_libre.html
+++ b/www/plugins/gis/json/gis_point_libre.html
@@ -3,17 +3,8 @@
        "geometry": {"type": "Point", "coordinates": [[(#ENV{lon})], [(#ENV{lat})]]},
        "id":"1",
        "properties": {
-               "title":[(#ENV{titre}|json_encode)],
-               "description":[(#ENV{description}|wrap{<p>}|json_encode)]
-               #SET{icone, #CHEMIN_IMAGE{#ENV*{icone,0}}|sinon{#CHEMIN{#ENV*{icone,0}}}}
-               #SET{icone_defaut, #CHEMIN{images/marker_defaut.png}}
-               #SET{logo_doc,#GET{icone}|sinon{#GET{icone_defaut}}|image_passe_partout{32,32}|image_recadre{32,32,center}|extraire_attribut{src}|url_absolue}
-               [(#GET{logo_doc}|oui)
-               #SET{icon_w,#GET{logo_doc}|extraire_attribut{src}|largeur}
-               #SET{icon_h,#GET{logo_doc}|extraire_attribut{src}|hauteur}
-               [,"icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],
-               "icon_size": \[[(#GET{icon_w})],[(#GET{icon_h})]\],
-               "icon_anchor": \[[(#GET{icon_w}|div{2})],[(#GET{icon_h})]\],
-               "popup_anchor": \[1,[-(#GET{icon_h}|div{1.2})]\]]
+               "title":[(#ENV{titre}|?{#ENV{titre},''}|json_encode)],
+               "description":[(#ENV{description}|?{#ENV{description}|wrap{<p>},''}|json_encode)][
+               (#CHEMIN_IMAGE{#ENV*{icone,0}}|sinon{#CHEMIN{#ENV*{icone,0}}}|gis_icon_properties)]
        }
 }