@hastehaul/common 2.14.0 → 2.16.0

package/build/utils/utils.d.ts

@@ -8,11 +8,12 @@ export declare function formatDatetimeToHumanReadable(datetime: Date, format?: s
 export declare function generateIdentifier(messageContent: string): string;
 export declare function getValueFromSettings(settings: Setting[], key: string, envVar?: string, defaultValue?: any): any;
 export declare function loadAsset(relativePath: string): Promise<string | null>;
-export declare function isPointInGeoJSON(latLng: string | any[], fileName: string): Promise<{
+export declare function isPointInGeoJSON(latLng: number[], fileName: string): Promise<{
     isInside: boolean;
     properties: any;
 } | {
     isInside: null;
     properties: null;
 }>;
+export declare function clearGeoJsonCache(): void;
 export {};

package/build/utils/utils.js

@@ -19,10 +19,12 @@ exports.generateIdentifier = generateIdentifier;
 exports.getValueFromSettings = getValueFromSettings;
 exports.loadAsset = loadAsset;
 exports.isPointInGeoJSON = isPointInGeoJSON;
+exports.clearGeoJsonCache = clearGeoJsonCache;
 const boolean_point_in_polygon_1 = __importDefault(require("@turf/boolean-point-in-polygon"));
 const helpers_1 = require("@turf/helpers");
 const moment_1 = __importDefault(require("moment"));
 const fs_1 = require("fs");
+const boolean_point_on_line_1 = __importDefault(require("@turf/boolean-point-on-line"));
 function hasElapsed(expirationDate) {
     const currentDate = (0, moment_1.default)();
     const targetDate = (0, moment_1.default)(expirationDate);
@@ -59,37 +61,45 @@ function loadAsset(relativePath) {
         }
     });
 }
-// export async function isPointInGeoJSONw(latLng: string | any[], fileName: string) {
+// export async function isPointInGeoJSON(latLng: string | any[], fileName: string) {
 //   try {
-//     if(latLng.length === 0) return false
+//     if (!latLng || latLng.length === 0) return { isInside: false, properties: null };
 //     const geoJsonData = await loadAsset(fileName);
 //     const geojson = JSON.parse(geoJsonData!);
 //     const points = point([latLng[1], latLng[0]]);
-//     const isInside = geojson.features.some((feature: { geometry: any; }) => {
+//     for (const feature of geojson.features) {
 //       const geometry = feature.geometry;
 //       if (geometry.type === 'Polygon') {
-//         return booleanPointInPolygon(points, polygon(geometry.coordinates));
+//         if (booleanPointInPolygon(points, polygon(geometry.coordinates))) {
+//           return { isInside: true, properties: feature.properties };
+//         }
 //       } else if (geometry.type === 'MultiPolygon') {
-//         return geometry.coordinates.some((poly: Position[][]) => booleanPointInPolygon(points, polygon(poly)));
+//         if (geometry.coordinates.some((poly: Position[][]) => booleanPointInPolygon(points, polygon(poly)))) {
+//           return { isInside: true, properties: feature.properties };
+//         }
 //       }
-//       return false;
-//     });
-//     return isInside;
+//     }
+//     return { isInside: false, properties: null };
 //   } catch (error) {
 //     console.error(`Error checking point in GeoJSON: ${error}`);
-//     return null;
+//     return { isInside: null, properties: null };
 //   }
 // }
+let cachedGeoJsonData = null;
 function isPointInGeoJSON(latLng, fileName) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             if (!latLng || latLng.length === 0)
                 return { isInside: false, properties: null };
-            const geoJsonData = yield loadAsset(fileName);
-            const geojson = JSON.parse(geoJsonData);
+            // Load and parse GeoJSON data only if not already cached
+            if (!cachedGeoJsonData) {
+                const geoJsonData = yield loadAsset(fileName);
+                cachedGeoJsonData = JSON.parse(geoJsonData);
+            }
+            // !NB points take the form longitude, latitude
             const points = (0, helpers_1.point)([latLng[1], latLng[0]]);
-            for (const feature of geojson.features) {
-                const geometry = feature.geometry;
+            for (const feature of cachedGeoJsonData.features) {
+                const { geometry } = feature;
                 if (geometry.type === 'Polygon') {
                     if ((0, boolean_point_in_polygon_1.default)(points, (0, helpers_1.polygon)(geometry.coordinates))) {
                         return { isInside: true, properties: feature.properties };
@@ -100,6 +110,16 @@ function isPointInGeoJSON(latLng, fileName) {
                         return { isInside: true, properties: feature.properties };
                     }
                 }
+                else if (geometry.type === 'LineString') {
+                    if ((0, boolean_point_on_line_1.default)(points, (0, helpers_1.lineString)(geometry.coordinates))) {
+                        return { isInside: true, properties: feature.properties };
+                    }
+                }
+                else if (geometry.type === 'MultiLineString') {
+                    if (geometry.coordinates.some((line) => (0, boolean_point_on_line_1.default)(points, (0, helpers_1.lineString)(line)))) {
+                        return { isInside: true, properties: feature.properties };
+                    }
+                }
             }
             return { isInside: false, properties: null };
         }
@@ -109,3 +129,6 @@ function isPointInGeoJSON(latLng, fileName) {
         }
     });
 }
+function clearGeoJsonCache() {
+    cachedGeoJsonData = null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hastehaul/common",
-  "version": "2.14.0",
+  "version": "2.16.0",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -25,6 +25,11 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
+    "@turf/boolean-point-in-polygon": "^6.5.0",
+    "@turf/boolean-point-on-line": "^7.0.0",
+    "@turf/helpers": "^6.5.0",
+    "@turf/meta": "^6.5.0",
+    "@turf/points-within-polygon": "^6.5.0",
     "@vsky/accesscontrol": "^3.0.14",
     "bullmq": "^5.8.3",
     "express": "^4.18.2",
@@ -32,10 +37,6 @@
     "jsonwebtoken": "^9.0.1",
     "moment": "^2.29.4",
     "nats": "^2.17.0",
-    "socket.io": "^4.7.1",
-    "@turf/boolean-point-in-polygon": "^6.5.0",
-    "@turf/helpers": "^6.5.0",
-    "@turf/meta": "^6.5.0",
-    "@turf/points-within-polygon": "^6.5.0"
+    "socket.io": "^4.7.1"
   }
 }