X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=www%2Fplugins%2Fgis%2Fmodeles%2Fcarte_gis_preview.html;h=a6b38f83a9ec080dc1ef25d208c63691832b08f2;hb=ebeac5db7a6b2678204355fcf4837d4986f2b2a3;hp=2e9ca57ed110a39e758191537596e0e1cb139ef3;hpb=ac14f39a91006baf83ec2c1ab8adfd0d71cbb78e;p=lhc%2Fweb%2Fclavette_www.git

diff --git a/www/plugins/gis/modeles/carte_gis_preview.html b/www/plugins/gis/modeles/carte_gis_preview.html
index 2e9ca57..a6b38f8 100755
--- a/www/plugins/gis/modeles/carte_gis_preview.html
+++ b/www/plugins/gis/modeles/carte_gis_preview.html
@@ -1,6 +1,6 @@
 <BOUCLE_gis(GIS){objet ?}{id_objet ?}{id_gis ?}{0,1}>
 <div id="map_preview" class="carte_gis" style="width: 100%; height: 150px;"></div>
-
+#SET{autocenter,''}
 <script type="text/javascript">
 /*<![CDATA[*/
 (function($){
@@ -29,14 +29,8 @@
 					"id":"#ID_GIS",
 					"properties": {
 						"title":[(#TITRE|supprimer_numero|json_encode)],
-						"description":[(#DESCRIPTIF|json_encode)][,(#LOGO_GIS|oui)
-						[(#SET{logo_doc,#LOGO_GIS|image_passe_partout{28,28}|image_recadre{28,28}|image_recadre{32,32,center}|image_aplatir{jpg,ffffff}})]
-						#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})]\]]
+						"description":[(#DESCRIPTIF|json_encode)][
+						(#LOGO_GIS|gis_icon_properties)]
 					}
 				}
 		</BOUCLE_points>
@@ -53,14 +47,8 @@
 					"id":"#ID_GIS",
 					"properties": {
 						"title":[(#TITRE|supprimer_numero|json_encode)],
-						"description":[(#DESCRIPTIF|json_encode)][,(#LOGO_GIS|oui)
-						[(#SET{logo_doc,#LOGO_GIS|image_passe_partout{28,28}|image_recadre{28,28}|image_recadre{32,32,center}|image_aplatir{jpg,ffffff}})]
-						#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})]\]]
+						"description":[(#DESCRIPTIF|json_encode)][
+						(#LOGO_GIS|gis_icon_properties)]
 					}
 				}]
 		};