@hastehaul/common 2.13.0 → 2.14.0

package/build/utils/utils.d.ts

@@ -8,5 +8,11 @@ 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<any>;
+export declare function isPointInGeoJSON(latLng: string | any[], fileName: string): Promise<{
+    isInside: boolean;
+    properties: any;
+} | {
+    isInside: null;
+    properties: null;
+}>;
 export {};

package/build/utils/utils.js

@@ -59,29 +59,53 @@ function loadAsset(relativePath) {
         }
     });
 }
+// export async function isPointInGeoJSONw(latLng: string | any[], fileName: string) {
+//   try {
+//     if(latLng.length === 0) return false
+//     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; }) => {
+//       const geometry = feature.geometry;
+//       if (geometry.type === 'Polygon') {
+//         return booleanPointInPolygon(points, polygon(geometry.coordinates));
+//       } else if (geometry.type === 'MultiPolygon') {
+//         return geometry.coordinates.some((poly: Position[][]) => booleanPointInPolygon(points, polygon(poly)));
+//       }
+//       return false;
+//     });
+//     return isInside;
+//   } catch (error) {
+//     console.error(`Error checking point in GeoJSON: ${error}`);
+//     return null;
+//   }
+// }
 function isPointInGeoJSON(latLng, fileName) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            if (latLng.length === 0)
-                return false;
+            if (!latLng || latLng.length === 0)
+                return { isInside: false, properties: null };
             const geoJsonData = yield loadAsset(fileName);
             const geojson = JSON.parse(geoJsonData);
             const points = (0, helpers_1.point)([latLng[1], latLng[0]]);
-            const isInside = geojson.features.some((feature) => {
+            for (const feature of geojson.features) {
                 const geometry = feature.geometry;
                 if (geometry.type === 'Polygon') {
-                    return (0, boolean_point_in_polygon_1.default)(points, (0, helpers_1.polygon)(geometry.coordinates));
+                    if ((0, boolean_point_in_polygon_1.default)(points, (0, helpers_1.polygon)(geometry.coordinates))) {
+                        return { isInside: true, properties: feature.properties };
+                    }
                 }
                 else if (geometry.type === 'MultiPolygon') {
-                    return geometry.coordinates.some((poly) => (0, boolean_point_in_polygon_1.default)(points, (0, helpers_1.polygon)(poly)));
+                    if (geometry.coordinates.some((poly) => (0, boolean_point_in_polygon_1.default)(points, (0, helpers_1.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 };
         }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hastehaul/common",
-  "version": "2.13.0",
+  "version": "2.14.0",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",