@osimatic/helpers-js 1.4.15 → 1.4.16

package/location.js

@@ -441,7 +441,7 @@ class Polygon {
 		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 concise = ring0.slice(0, maxShow).map(([long,lat]) => GeographicCoordinates.format(lat, long)).join(' · ');
 		const more = ring0.length > maxShow ? ` … (+${ring0.length - maxShow} sommets)` : '';
 
 		return {
@@ -494,7 +494,7 @@ class Polygon {
 			return false;
 		}
 
-		// polygonCoords: [ [ [lon,lat], ... ] , ... ]
+		// polygonCoords: [ [ [long,lat], ... ] , ... ]
 		const rings = [];
 		for (const ring of polygonCoords) {
 			const latlngRing = [];
@@ -502,8 +502,8 @@ class Polygon {
 				if (!Array.isArray(coord) || coord.length < 2) {
 					continue;
 				}
-				const [lon, lat] = coord;
-				latlngRing.push([lat, lon]);
+				const [long, lat] = coord;
+				latlngRing.push([lat, long]);
 			}
 			if (latlngRing.length > 0) {
 				// Fermer l'anneau si nécessaire (Leaflet accepte ouvert/fermé, on nettoie par sécurité)
@@ -520,10 +520,10 @@ class Polygon {
 
 
 	// Test "sur le segment" en degrés (plan local) — suffisant pour le bord du polygone
-	static isPointOnSegmentDeg(lat, lon, A, B, EPS = 1e-12) {
-		const [x,  y ] = [lon, lat];
-		const [x1, y1] = A;       // A = [lon,lat]
-		const [x2, y2] = B;       // B = [lon,lat]
+	static isPointOnSegmentDeg(lat, long, A, B, EPS = 1e-12) {
+		const [x,  y ] = [long, lat];
+		const [x1, y1] = A;       // A = [long,lat]
+		const [x2, y2] = B;       // B = [long,lat]
 		const cross = (x - x1)*(y2 - y1) - (y - y1)*(x2 - x1);
 		if (Math.abs(cross) > EPS) {
 			return false;
@@ -538,8 +538,8 @@ class Polygon {
 		return dot - len2 <= EPS;
 	}
 
-	// Ray-casting + bords inclus pour un anneau (tableau de [lon,lat])
-	static isPointInRing(lat, lon, ring) {
+	// Ray-casting + bords inclus pour un anneau (tableau de [long,lat])
+	static isPointInRing(lat, long, ring) {
 		const n0 = ring.length;
 		if (n0 < 3) {
 			return false;
@@ -552,36 +552,36 @@ class Polygon {
 
 		// bord inclus
 		for (let i = 0; i < n - 1; i++) {
-			if (Polygon.isPointOnSegmentDeg(lat, lon, pts[i], pts[i+1])) {
+			if (Polygon.isPointOnSegmentDeg(lat, long, pts[i], pts[i+1])) {
 				return true;
 			}
 		}
 
-		// ray casting (x=lon, y=lat)
+		// ray casting (x=long, y=lat)
 		let inside = false;
 		for (let i = 0, j = n - 1; i < n; j = i++) {
 			const [xi, yi] = pts[i];
 			const [xj, yj] = pts[j];
 			const intersect = ((yi > lat) !== (yj > lat)) &&
-				(lon < ( (xj - xi) * (lat - yi) / ((yj - yi) || 1e-20) + xi ));
+				(long < ( (xj - xi) * (lat - yi) / ((yj - yi) || 1e-20) + xi ));
 			if (intersect) inside = !inside;
 		}
 		return inside;
 	}
 
 	// Polygone avec trous: inside = dans outer ET pas dans un trou
-	static isPointInPolygon(lat, lon, geoJsonPolygon) {
+	static isPointInPolygon(lat, long, geoJsonPolygon) {
 		const rings = geoJsonPolygon.coordinates;
 		if (!Array.isArray(rings) || rings.length === 0) {
 			return false;
 		}
 
-		if (!Polygon.isPointInRing(lat, lon, rings[0])) {
+		if (!Polygon.isPointInRing(lat, long, rings[0])) {
 			return false; // outer
 		}
 
 		for (let k = 1; k < rings.length; k++) {
-			if (Polygon.isPointInRing(lat, lon, rings[k])) {
+			if (Polygon.isPointInRing(lat, long, rings[k])) {
 				return false; // dans un trou
 			}
 		}
@@ -608,12 +608,12 @@ class GeographicCoordinates {
 		}
 
 		const lat = parseFloat(parts[0]);
-		const lon = parseFloat(parts[1]);
-		if (!isFinite(lat) || !isFinite(lon)) {
+		const long = parseFloat(parts[1]);
+		if (!isFinite(lat) || !isFinite(long)) {
 			return null;
 		}
 
-		return asString ? str.join(',') : [lat, lon];
+		return asString ? str.join(',') : [lat, long];
 	}
 
 	static toFixed(latOrLong, fractionDigit=6) {
@@ -644,7 +644,7 @@ class GeographicCoordinates {
 			return null;
 		}
 
-		return asString ? str.join(',') : [lat, lon];
+		return asString ? str.join(',') : [lat, long];
 	}
 
 	static getAllLatLongsFromGeoJsonList(geoJsonList) {
@@ -657,15 +657,15 @@ class GeographicCoordinates {
 			}
 
 			if (geoJsonItem.type === 'Point') {
-				const [lon, lat] = geoJsonItem.coordinates || [];
-				arr.push([lat, lon]);
+				const [long, lat] = geoJsonItem.coordinates || [];
+				arr.push([lat, long]);
 				continue;
 			}
 
 			if (geoJsonItem.type === 'Polygon') {
 				for (const ring of geoJsonItem.coordinates || []) {
-					for (const [lon,lat] of ring) {
-						arr.push([lat, lon]);
+					for (const [long,lat] of ring) {
+						arr.push([lat, long]);
 					}
 				}
 				continue;
@@ -675,7 +675,7 @@ class GeographicCoordinates {
 		return arr;
 	}
 
-	static isPointCorrespondingToLocationsList(lat, lon, locationsList, tolMeters = 1.0) {
+	static isPointCorrespondingToLocationsList(lat, long, locationsList, tolMeters = 1.0) {
 		for (const it of locationsList) {
 			if (!it) {
 				continue;
@@ -683,18 +683,18 @@ class GeographicCoordinates {
 
 			if (typeof it === 'string') {
 				const p = GeographicCoordinates.parse(it);
-				if (p && GeographicCoordinates.haversine(lat,lon,p[0],p[1]) <= tolMeters) {
+				if (p && GeographicCoordinates.haversine(lat,long,p[0],p[1]) <= tolMeters) {
 					return true;
 				}
 			}
 			else if (it.type === 'Point') {
 				const p = it.coordinates || [];
-				if (p && GeographicCoordinates.haversine(lat,lon,p[1],p[0]) <= tolMeters) {
+				if (p && GeographicCoordinates.haversine(lat,long,p[1],p[0]) <= tolMeters) {
 					return true;
 				}
 			}
 			else if (it.type === 'Polygon' && Array.isArray(it.coordinates)) {
-				if (Polygon.isPointInPolygon(lat, lon, it)) {
+				if (Polygon.isPointInPolygon(lat, long, it)) {
 					return true;
 				}
 			}

package/package.json

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