X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=www%2Fplugins%2Fgis%2Fjson%2Fgis_rubriques.html;h=dc14b2d487f13e4e5e0bf63f6edbb591f1260f7a;hb=d24ea3eed933e1a140e426c8c4dd395f2e7b0279;hp=0c88fd1e491b073e80a938c10b0f8c98688fff9e;hpb=9bbff73a71a636a626a1be365cbf48c07f1f7220;p=lhc%2Fweb%2Fwww.git

diff --git a/www/plugins/gis/json/gis_rubriques.html b/www/plugins/gis/json/gis_rubriques.html
index 0c88fd1e..dc14b2d4 100644
--- a/www/plugins/gis/json/gis_rubriques.html
+++ b/www/plugins/gis/json/gis_rubriques.html
@@ -1,21 +1,9 @@
 		<BOUCLE_rub(RUBRIQUES){gis}{id_rubrique ?}{id_secteur ?}{id_parent?=#ENV{id_parent}}{id_mot ?}{recherche ?}{0, #ENV{limit}}{","}>
 		{"type": "Feature",
-		"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
+		["geometry": (#GEOMETRY|appliquer_filtre{wkt_to_json}|sinon{{"type": "Point", "coordinates": \[#LON, #LAT\]}}),]
 		"id":"#ID_GIS",
 		"properties": {
-			"title":[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero|json_encode)],
-			"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][(#SET{logo_doc,''})]
-			[(#LOGO_GIS|oui)
-			[(#SET{logo_doc,#LOGO_GIS|image_passe_partout{32,32}|image_recadre{32,32}})]]
-			[(#LOGO_GIS|non)
-			[(#CHEMIN{images/marker_defaut.png}|oui)
-				[(#SET{logo_doc,#CHEMIN{images/marker_defaut.png}|image_passe_partout{32,32}|image_recadre{32,32}})]
-			]]
-			[(#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":[(#URL_RUBRIQUE|extraire_multi|lien_ou_expose{[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero)]}|json_encode)],
+			"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][
+			(#LOGO_GIS|gis_icon_properties)]
 		}}</BOUCLE_rub>
\ No newline at end of file