@osimatic/helpers-js 1.3.8 → 1.4.1

package/CHANGELOG

@@ -75,4 +75,7 @@ Duration.convertToDurationAsCentieme() -> Duration.convertToDurationAsHundredthO
 
 1.3.0
 HTTPRequest -> HTTPClient
+PostalAddress.setAutocomplete(input, onChange(formatted_address)) -> PostalAddress.setAutocomplete(input, onChange(place));
 
+1.4.0
+new OpenStreetMap(id) -> new OpenStreetMap(element)

package/index.js

@@ -16,7 +16,7 @@ const { DateTime, DatePeriod, TimestampUnix, SqlDate, SqlTime, SqlDateTime } = r
 const { Duration } = require('./duration');
 const { File, CSV, Img } = require('./file');
 const { FormHelper, EditValue } = require('./form_helper');
-const { Country, PostalAddress, GeographicCoordinates } = require('./location');
+const { Country, PostalAddress, GeographicCoordinates, Polygon } = require('./location');
 const { HexColor, RgbColor } = require('./draw');
 const { SocialNetwork } = require('./social_network');
 const { sleep, refresh } = require('./util');
@@ -52,7 +52,7 @@ const { WebSocket } = require('./web_socket');
 
 module.exports = {
 	Array, Object, Number, String,
-	HTTPClient, Cookie, UrlAndQueryString, IBAN, BankCard, AudioMedia, VideoMedia, UserMedia, PersonName, Email, TelephoneNumber, DateTime, DatePeriod, TimestampUnix, SqlDate, SqlTime, SqlDateTime, Duration, File, CSV, Img, FormHelper, Country, PostalAddress, GeographicCoordinates, HexColor, RgbColor, SocialNetwork, NumberFormatter, Password,
+	HTTPClient, Cookie, UrlAndQueryString, IBAN, BankCard, AudioMedia, VideoMedia, UserMedia, PersonName, Email, TelephoneNumber, DateTime, DatePeriod, TimestampUnix, SqlDate, SqlTime, SqlDateTime, Duration, File, CSV, Img, FormHelper, Country, PostalAddress, GeographicCoordinates, Polygon, HexColor, RgbColor, SocialNetwork, NumberFormatter, Password,
 	Browser, DataTable, Pagination, Navigation, DetailsSubArray, SelectAll, MultipleActionInTable, MultipleActionInDivList, MultiFilesInput, EditValue, FormDate, InputPeriod, ShoppingCart, FlashMessage, CountDown, ImportFromCsv, JwtToken, JwtSession, ApiTokenSession, ListBox, WebRTC, WebSocket, EventBus,
 	sleep, refresh, chr, ord, trim, empty,
 	Chartjs, GoogleCharts, GoogleRecaptcha, GoogleMap, OpenStreetMap

package/location.js

@@ -296,20 +296,24 @@ class Country {
 
 class PostalAddress {
 	static setAutocomplete(input, onPlaceChanged) {
-		let autocomplete = new google.maps.places.Autocomplete(
+		const autocomplete = new google.maps.places.Autocomplete(
 			input[0],
 			{types: ['geocode']}
 		);
-		//console.log(autocomplete);
 
 		// When the user selects an address from the dropdown, populate the address fields in the form.
+
+		if (typeof onPlaceChanged != 'function') {
+			return;
+		}
+
 		autocomplete.addListener('place_changed', function() {
 			let place = autocomplete.getPlace();
 			input.val('');
-			if (typeof onPlaceChanged == 'function') {
-				onPlaceChanged(place['formatted_address']);
-			}
+			onPlaceChanged(place);
 		});
+
+		return autocomplete;
 	}
 
 	static format(addressData, separator='<br/>') {
@@ -423,20 +427,104 @@ class PostalAddress {
 	}
 }
 
+class Polygon {
+	static polygonSummary(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;
+		if (ring0.length === 0) {
+			return {label:'Polygon (vide)', title:''};
+		}
+
+		const [firstLon, firstLat] = ring0[0];
+
+		const maxShow = Math.min(5, ring0.length);
+		const concise = ring0.slice(0, maxShow).map(([lon,lat]) => GeographicCoordinates.format(lat, lon)).join(' · ');
+		const more = ring0.length > maxShow ? ` … (+${ring0.length - maxShow} sommets)` : '';
+
+		return {
+			label: `Polygon • sommets: ${n} • départ: ${GeographicCoordinates.format(firstLat, firstLon)}`,
+			title: `Sommets: ${concise}${more}`
+		};
+	}
+
+	static convertToGeoJson(latlngs) {
+		let rings = [];
+		if (Array.isArray(latlngs) && Array.isArray(latlngs[0])) {
+			for (const ring of latlngs) {
+				rings.push(ring.map(ll => [Number(ll.lng), Number(ll.lat)]));
+			}
+		}
+		else {
+			rings = [latlngs.map(ll => [Number(ll.lng), Number(ll.lat)])];
+		}
+		rings = rings.map(r => {
+			if (r.length >= 3) {
+				const [lon0,lat0] = r[0];
+				const [lonL,latL] = r[r.length-1];
+				if (lon0 !== lonL || lat0 !== latL) r.push([lon0,lat0]);
+			}
+			return r;
+		});
+		return { type: 'Polygon', coordinates: rings };
+	}
+}
+
 class GeographicCoordinates {
 	static check(str) {
 		return /^[-+]?([1-8]?\d(\.\d+)?|90(\.0+)?),\s*[-+]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?)$/.test(str);
 	}
 
-	static parse(str) {
+	static parse(str, asString=false) {
 		if (null === str || '' === str || 'NaN,NaN' === str) {
 			return null;
 		}
 
-		return str.split(',').map(str => str.trim()).join(',');
+		str = (str||'').replace(';', ',').trim().replace(/\s+/g, '');
+		const parts = str.split(',');
+		if (parts.length !== 2) {
+			return null;
+		}
+
+		const lat = parseFloat(parts[0]);
+		const lon = parseFloat(parts[1]);
+		if (!isFinite(lat) || !isFinite(lon)) {
+			return null;
+		}
+
+		return asString ? str.join(',') : [lat, lon];
 	}
 
+	static toFixed(latOrLong, fractionDigit=6) {
+		return Number(latOrLong).toFixed(fractionDigit);
+	}
+
+	static format(lat, long, fractionDigit=6) {
+		return GeographicCoordinates.toFixed(lat, fractionDigit)+','+GeographicCoordinates.toFixed(long, fractionDigit);
+	}
+
+	static formatPoint(geoJsonPoint, fractionDigit=6) {
+		const [long, lat] = geoJsonPoint.coordinates || [];
+		if (typeof long == 'undefined' || typeof lat == 'undefined') {
+			return '';
+		}
+		return GeographicCoordinates.format(lat, long, fractionDigit);
+	}
+
+	static convertToGeoJson(lat, long) {
+		return { type: 'Point', coordinates: [Number(long), Number(lat)] };
+	}
+
+	static haversine(lat1, long1, lat2, long2) {
+		const R = 6371000;
+		const toRad = d => d * Math.PI / 180;
+		const dLat = toRad(lat2 - lat1);
+		const dLong = toRad(long2 - long1);
+		const d1 = toRad(lat1), d2 = toRad(lat2);
+		const a = Math.sin(dLat/2)**2 + Math.cos(d1)*Math.cos(d2)*Math.sin(dLong/2)**2;
+		return 2 * R * Math.asin(Math.min(1, Math.sqrt(a)));
+	}
 
 }
 
-module.exports = { Country, PostalAddress, GeographicCoordinates };
+module.exports = { Country, PostalAddress, GeographicCoordinates, Polygon };

package/open_street_map.js

@@ -5,7 +5,7 @@
  */
 class OpenStreetMap {
 
-	constructor(mapId, options) {
+	constructor(mapContainer, options) {
 		/*let [lat, lng] = button.data('coordinates').split(',');
 		let map = L.map('modal_map_canvas2').setView([lat, lng], 17);
 
@@ -20,18 +20,17 @@ class OpenStreetMap {
 
 		this.markers = [];
 		this.locations = [];
-		this.mapId = mapId;
 
-		if (!$('#'+mapId).length) {
+		if (!mapContainer.length) {
 			return;
 		}
 
-		let container = L.DomUtil.get(mapId);
+		const container = L.DomUtil.get(mapContainer[0]);
 		if (container != null) {
 			container._leaflet_id = null;
 		}
 
-		this.map = L.map(mapId, options || {});
+		this.map = L.map(mapContainer[0], options || {});
 
 		L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
 			attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'

package/package.json

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