X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/journal.php?a=blobdiff_plain;f=www%2Fplugins%2Fgis%2Fsaisies%2Fcarte.html;h=9936f74463cf5d4fc40b5d2b89d200a60b249eab;hb=ebeac5db7a6b2678204355fcf4837d4986f2b2a3;hp=a58fbdf346cde49e55e0325df07cb2ff6c5272bb;hpb=0048daaa36f2abca86d683a21af54cf62f47a102;p=lhc%2Fweb%2Fclavette_www.git

diff --git a/www/plugins/gis/saisies/carte.html b/www/plugins/gis/saisies/carte.html
index a58fbdf..9936f74 100644
--- a/www/plugins/gis/saisies/carte.html
+++ b/www/plugins/gis/saisies/carte.html
@@ -42,18 +42,8 @@ var form_map,
 var geocoder;]
 
 (function($){
-	var champ_lat = $('#champ_#ENV{champ_lat,lat}'),
-		champ_lon = $('#champ_#ENV{champ_lon,lon}'),
-		champ_zoom = $('#champ_#ENV{champ_zoom,zoom}'),
-		champ_adresse = $('#champ_#ENV{champ_adresse,adresse}'),
-		champ_code_postal = $('##ENV{champ_code_postal,code_postal}'),
-		champ_ville = $('#champ_#ENV{champ_ville,ville}'),
-		champ_departement = $('#champ_#ENV{champ_departement,departement}'),
-		champ_region = $('#champ_#ENV{champ_region,region}'),
-		champ_pays = $('#champ_#ENV{champ_pays,pays}'),
-		champ_code_pays = $('#champ_#ENV{champ_code_pays,code_pays}'),
-		marker;
-
+	var marker;
+	
 	var maj_inputs = function(map,data,action) {
 		[(#GET{geocoder}|oui)
 		if (action != 'geocoding') {
@@ -65,7 +55,7 @@ var geocoder;]
 		$('#champ_#ENV{champ_zoom,zoom}').val(zoom);
 		if(action == 'click'){
 			$('#champ_#ENV{champ_lat,lat}').val(data.lat);
-			$('#champ_#ENV{champ_lon,lon}').val(data.lng); 
+			$('#champ_#ENV{champ_lon,lon}').val(data.lng);
 			annuler_geocoder = 1;
 			form_map.panTo(data);
 			marker.setLatLng(data);
@@ -86,7 +76,7 @@ var geocoder;]
 		if (!marker._map)
 			form_map.addLayer(marker);
 	}
-
+	
 	[(#GET{geocoder}|oui)
 	function geocode(query) {
 		if(! query.error){
@@ -94,7 +84,7 @@ var geocoder;]
 			$('#champ_#ENV{champ_code_postal,code_postal}').val(query.postcode);
 			$('#champ_#ENV{champ_ville,ville}').val(query.locality);
 			$('#champ_#ENV{champ_departement,departement}').val(query.departement);
-			$('#champ_#ENV{champ_region,region}').val(query.region); 
+			$('#champ_#ENV{champ_region,region}').val(query.region);
 			$('#champ_#ENV{champ_pays,pays}').val(query.country);
 			$('#champ_#ENV{champ_code_pays,code_pays}').val(query.country_code);
 			maj_inputs(form_map,query,'geocoding');
@@ -117,6 +107,7 @@ var geocoder;]
 				callback(e.target);
 			});
 		}
+		
 		form_map.attributionControl.setPrefix('');
 		
 		marker = new L.Marker(new L.LatLng(#ENV{lat,0}, #ENV{lon,0}), {draggable: true});
@@ -172,14 +163,8 @@ var geocoder;]
 					"id":"#ENV{id_gis,oui}",
 					"properties": {
 						"title":[(#ENV{titre,''}|supprimer_numero|json_encode)],
-						"description":[(#ENV{descriptif,''}|json_encode)][,(#LOGO_GIS|oui)
-						[(#SET{logo_doc,#LOGO_GIS|image_passe_partout{32,32}|image_recadre{32,32}})]
-						#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":[(#ENV{descriptif,''}|json_encode)][
+						(#LOGO_GIS|gis_icon_properties)]
 					}
 				}\]
 		}