@hastehaul/common 2.12.0 → 2.14.0

package/build/utils/utils.d.ts

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

package/build/utils/utils.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -43,10 +20,9 @@ exports.getValueFromSettings = getValueFromSettings;
 exports.loadAsset = loadAsset;
 exports.isPointInGeoJSON = isPointInGeoJSON;
 const boolean_point_in_polygon_1 = __importDefault(require("@turf/boolean-point-in-polygon"));
-const helpers_1 = __importDefault(require("@turf/helpers"));
+const helpers_1 = require("@turf/helpers");
 const moment_1 = __importDefault(require("moment"));
 const fs_1 = require("fs");
-const path = __importStar(require("path"));
 function hasElapsed(expirationDate) {
     const currentDate = (0, moment_1.default)();
     const targetDate = (0, moment_1.default)(expirationDate);
@@ -71,11 +47,10 @@ function getValueFromSettings(settings, key, envVar, defaultValue) {
     }
     return process.env[envVar] || defaultValue;
 }
-function loadAsset(filePath) {
+function loadAsset(relativePath) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const file = path.resolve(filePath);
-            const fileContent = yield fs_1.promises.readFile(file, 'utf-8');
+            const fileContent = yield fs_1.promises.readFile(relativePath, 'utf-8');
             return fileContent;
         }
         catch (error) {
@@ -84,29 +59,53 @@ function loadAsset(filePath) {
         }
     });
 }
-function isPointInGeoJSON(latLng, filePath) {
+// 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;
-            const geoJsonData = yield loadAsset(filePath);
+            if (!latLng || latLng.length === 0)
+                return { isInside: false, properties: null };
+            const geoJsonData = yield loadAsset(fileName);
             const geojson = JSON.parse(geoJsonData);
-            const point = helpers_1.default.point([latLng[1], latLng[0]]);
-            const isInside = geojson.features.some((feature) => {
+            const points = (0, helpers_1.point)([latLng[1], latLng[0]]);
+            for (const feature of geojson.features) {
                 const geometry = feature.geometry;
                 if (geometry.type === 'Polygon') {
-                    return (0, boolean_point_in_polygon_1.default)(point, helpers_1.default.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((polygon) => (0, boolean_point_in_polygon_1.default)(point, helpers_1.default.polygon(polygon)));
+                    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.12.0",
+  "version": "2.14.0",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",