@hastehaul/common 3.8.0 → 3.9.0

package/build/utils/utils.d.ts

@@ -10,13 +10,14 @@ 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 loadAssetStream(relativePath: string): Promise<any>;
-export declare function isPointInGeoJSON(latLng: number[], fileName: string): Promise<{
+export declare function isPointInGeoJSON(latLng: number[], cachedGeoJsonData: {
+    features: any;
+}): Promise<{
     isInside: boolean;
     properties: any;
 } | {
     isInside: null;
     properties: null;
 }>;
-export declare function clearGeoJsonCache(): void;
 export declare function generateCode<T extends Document>(model: Model<T>, filterProperty: keyof T): Promise<string>;
 export {};

package/build/utils/utils.js

@@ -20,7 +20,6 @@ exports.getValueFromSettings = getValueFromSettings;
 exports.loadAsset = loadAsset;
 exports.loadAssetStream = loadAssetStream;
 exports.isPointInGeoJSON = isPointInGeoJSON;
-exports.clearGeoJsonCache = clearGeoJsonCache;
 exports.generateCode = generateCode;
 const fs_1 = __importDefault(require("fs"));
 const boolean_point_in_polygon_1 = __importDefault(require("@turf/boolean-point-in-polygon"));
@@ -89,18 +88,11 @@ function loadAssetStream(relativePath) {
         });
     });
 }
-let cachedGeoJsonData = null;
-function isPointInGeoJSON(latLng, fileName) {
+function isPointInGeoJSON(latLng, cachedGeoJsonData) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             if (!latLng || latLng.length === 0)
                 return { isInside: false, properties: null };
-            // Load and parse GeoJSON data only if not already cached
-            if (!cachedGeoJsonData) {
-                cachedGeoJsonData = yield loadAssetStream(fileName);
-                console.log(cachedGeoJsonData);
-                // 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 cachedGeoJsonData.features) {
@@ -134,9 +126,6 @@ function isPointInGeoJSON(latLng, fileName) {
         }
     });
 }
-function clearGeoJsonCache() {
-    cachedGeoJsonData = null;
-}
 function generateCode(model, filterProperty) {
     return __awaiter(this, void 0, void 0, function* () {
         const batchSize = 10;

package/package.json

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