WebSVN – eFlore/Applications.cel – Diff – /branches/v3.01-serpe/widget/modules/saisie/squelettes/js/tb-geoloc/js/Geoloc.js

         });
+    }
     this.onCoordinates();
 };
 Geoloc.prototype.reSetDrawControl = function() {
     this.map.removeLayer(this.layer);
     this.map.removeControl(this.drawControl);
     this.setDrawControl(this.map);
 };
 Geoloc.prototype.formatPolyline = function (latLngs) {
     const polyline = [];
-    latLngs.forEach(coordinates => polyline.push(Object.values(coordinates)));
+    latLngs.forEach(coordinates => polyline.push(Object.values(coordinates).reverse()));
     $.ajax({
         method: "GET",
         url: url,
         data: params,
         success: function(locationData) {
+            locationData.centroid = lthis.formatPointTypeCoordinates(coordinates);
+            locationData.geojson = 'rue' === lthis.geometryFilter ? {type: 'LineString', coordinates: polyline} : locationData.centroid;
-            lthis.loadGeolocation(coordinates,locationData,polyline);
+            lthis.loadGeolocation(coordinates,locationData);
         },
         error: (err) => {
             console.warn(err);
             lthis.geolocLabel.classList.remove('loading');
+        }
     });
 };
+Geoloc.prototype.formatPointTypeCoordinates = function(coordinates) {
+    return {type : 'Point', coordinates: Object.values(coordinates).reverse()};
+};
-Geoloc.prototype.loadGeolocation = function(coordinates,locationData,polyline) {
+Geoloc.prototype.loadGeolocation = function(coordinates,locationData) {
     const lthis = this,
         query = {
             'lat': coordinates.lat,
             'lon': coordinates.lng
         method: "GET",
         url: URL_GEOLOC_SERVICE,
         data: query,
         success: function (geoLocationData) {
             lthis.triggerLocationEvent(
-                lthis.formatLocationEventObject(coordinates,geoLocationData,locationData,polyline)
+                lthis.formatLocationEventObject(locationData,geoLocationData)
             );
             lthis.geolocLabel.classList.remove('loading');
         },
         error:  (err) => {
             console.warn(err);
             lthis.geolocLabel.classList.remove('loading');
+        }
     });
 };
-Geoloc.prototype.triggerLocationEvent = function (locationDataObject) {
+Geoloc.prototype.triggerLocationEvent = function(locationDataObject) {
-    const location = new CustomEvent('location', {detail: locationDataObject});
+    const locationEvent = new CustomEvent('location', {detail: locationDataObject});
-    this.mapEl.dispatchEvent(location);
+    this.mapEl.dispatchEvent(locationEvent);
 };
-Geoloc.prototype.formatLocationEventObject = function(coordinates,geoLocationData,locationData,polyline) {
+Geoloc.prototype.formatLocationEventObject = function(locationData,geoLocationData) {
-    const detail = {
-        centroid: {
-            type: 'Point',
+    const detail = {
-            coordinates: Object.values(coordinates)
+        centroid: locationData.centroid,
-        },
+        geometry: locationData.geojson,
         elevation: geoLocationData.altitude,
         inseeData: {
             code: geoLocationData.code_zone,
             nom: geoLocationData.nom
         },
         osmCountry: locationData.address.country,
         osmCountryCode: geoLocationData.code_pays,
         osmCounty: locationData.address.county,
-        osmPostcode:locationData.address.postcode,
+        osmPostcode: locationData.address.postcode,
         locality: this.getLocalityFromData(locationData),
         locality: geoLocationData.nom,
         osmRoad: locationData.address.road,
         osmState: locationData.address.state,
-        osmId: locationData.osm_id,
-        osmPlaceId: locationData.place_id
-    };
-    if (0 < polyline.length) {
-        detail.geometry = {
-            type: 'LineString',
-            coordinates: polyline
-        };
-    } else {
+        osmId: locationData.osm_id,
-        detail.geometry = detail.centroid;
+        osmPlaceId: locationData.place_id
     };
     return detail;
 };
 Geoloc.prototype.tbPlacesCallback = function(localityData) {
     const locality = this.getLocalityFromData(localityData);
     if(!!locality) {
-        const coordinates = {
+        const coordinates = this.formatCoordinates({
             'lat' : localityData.lat,
+            'lng' : localityData.lon
+        });
+        if(!!coordinates && !!coordinates.lat && !!coordinates.lng) {
-            'lng' : localityData.lon
+            this.zoom = 20;
-        };
+            this.setMapCoordinates(coordinates);
+            if('point' === this.geometryFilter) {
+                this.map.removeControl(this.drawControl);
+                this.createDraggableMarker();
+                this.handleMarkerEvents();
+            }
+            localityData.centroid = this.formatPointTypeCoordinates(coordinates);
+            if('rue' !== this.geometryFilter && 'Polygon' === localityData.geojson.type ) {
                 localityData.geojson = localityData.centroid;
-        if ('point' === this.geometryFilter) {
-            this.map.removeControl(this.drawControl);
+            }
-        this.zoom = 18;
+            this.loadGeolocation(coordinates,localityData);
         this.handleNewLocation(coordinates);
+    }
     // reset map
     this.map = L.DomUtil.get(this.mapIdAttr);
     if (this.map != null) {
         this.map._leaflet_id = null;
+    }
-};
 };

Subversion Repositories eFlore/Applications.cel

(root)/branches/v3.01-serpe/widget/modules/saisie/squelettes/js/tb-geoloc/js/Geoloc.js – Rev 3864 → 3869