@osimatic/helpers-js 1.4.3 → 1.4.5

package/location.js

@@ -429,6 +429,10 @@ class PostalAddress {
 
 class Polygon {
 	static format(geoJsonPolygon) {
+		if (typeof geoJsonPolygon == 'string') {
+			geoJsonPolygon = JSON.parse(geoJsonPolygon);
+		}
+
 		const rings = geoJsonPolygon.coordinates || [];
 		const ring0 = rings[0] || [];
 		const n = ring0.length ? ring0.length - (JSON.stringify(ring0[0])===JSON.stringify(ring0[ring0.length-1]) ? 1 : 0) : 0;
@@ -504,6 +508,10 @@ class GeographicCoordinates {
 	}
 
 	static formatPoint(geoJsonPoint, fractionDigit=6) {
+		if (typeof geoJsonPoint == 'string') {
+			geoJsonPoint = JSON.parse(geoJsonPoint);
+		}
+
 		const [long, lat] = geoJsonPoint.coordinates || [];
 		if (typeof long == 'undefined' || typeof lat == 'undefined') {
 			return '';
@@ -515,6 +523,37 @@ class GeographicCoordinates {
 		return { type: 'Point', coordinates: [Number(long), Number(lat)] };
 	}
 
+	static getAllLatLongsFromGeoJsonList(geoJsonList) {
+		if (typeof geoJsonList == 'string') {
+			geoJsonList = JSON.parse(geoJsonList);
+		}
+
+		const arr = [];
+		for (const geoJsonItem of geoJsonList) {
+			if (!geoJsonItem) {
+				continue;
+			}
+
+			if (geoJsonItem.type === 'Point') {
+				const [lon, lat] = geoJsonItem.coordinates || [];
+				arr.push([lat, lon]);
+				continue;
+			}
+
+			if (geoJsonItem.type === 'Polygon') {
+				for (const ring of geoJsonItem.coordinates || []) {
+					for (const [lon,lat] of ring) {
+						arr.push([lat, lon]);
+					}
+				}
+				continue;
+			}
+		}
+
+		return arr;
+	}
+
+
 	static haversine(lat1, long1, lat2, long2) {
 		const R = 6371000;
 		const toRad = d => d * Math.PI / 180;

package/open_street_map.js

@@ -112,19 +112,43 @@ class OpenStreetMap {
 	}
 
 	centerOnFrance() {
-		this.map.setView([46.52863469527167, 2.43896484375], 6);
+		OpenStreetMap.centerOnFrance(this.map);
+	}
+
+	static centerOnFrance(map) {
+		map.setView([46.52863469527167, 2.43896484375], 6);
 	}
 
 	centerOnMarkers(padding) {
-		this.map.invalidateSize(false);
+		OpenStreetMap.centerMapToLocations(this.map, this.locations, padding);
+	}
 
-		if (this.locations.length === 0) {
+	static centerMapToLocations(map, locationsList, padding=[20,20]) {
+		if (!map || locationsList.length === 0) {
 			return;
 		}
 
-		this.map.fitBounds(new L.LatLngBounds(this.locations), {
-			padding: typeof padding != 'undefined' ? padding : [0, 0]
-		});
+		map.invalidateSize(false);
+
+		const bounds = L.latLngBounds(locationsList);
+		map.fitBounds(bounds, { padding: padding });
+		if (map.getZoom() > 18) {
+			map.setZoom(18);
+		}
+	}
+
+	static centerMapToGooglePlace(map, place) {
+		if (place?.geometry?.location) {
+			const loc = place.geometry.location;
+			OpenStreetMap.centerMapToCoordinates(map, loc.lat(), loc.lng());
+		}
+	}
+
+	static centerMapToCoordinates(map, lat, long) {
+		if (!map) {
+			return;
+		}
+		map.setView([lat, long], Math.max(map.getZoom(), 15));
 	}
 
 	connectMarkers() {
@@ -144,7 +168,6 @@ class OpenStreetMap {
 		listLineCoordinates.forEach(line => {
 			L.polyline(line, {color: '#728bec'}).addTo(this.map);
 		});
-
 	}
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"