web_lib

commit 7e27bbaeed5190c0be5907ebfeccceff8c366243
parent c556483626ac4ab18160b419024bb80eea99da40
Author: triesap <137732411+triesap@users.noreply.github.com>
Date:   Sun,  6 Oct 2024 16:01:53 +0000

geocoder: add utils

Diffstat:
M
geocoder/src/geocoder.ts
 | 
34
+++++-----------------------------
M
geocoder/src/index.ts
 | 
2
++
A
geocoder/src/utils.ts
 | 
26
++++++++++++++++++++++++++

3 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/geocoder/src/geocoder.ts b/geocoder/src/geocoder.ts
@@ -1,6 +1,7 @@
 import type { GeolocationCoordinatesPoint } from "@radroots/utils";
-import type { Database, ParamsObject } from "sql.js";
+import type { Database } from "sql.js";
 import type { GeocoderErrorMessage, GeocoderReverseResult } from "./types";
+import { parse_geocode_reverse_result } from "./utils";
 
 export class Geocoder {
     private _db: Database | null = null;
@@ -20,36 +21,11 @@ export class Geocoder {
             this._db = new sql.Database(new Uint8Array(database_buffer));
             return true;
         } catch (e) {
-            console.log(`Error: Geocoder.connect() `, e);
+            console.log(`Error: Geocoder connect `, e);
             return `*`;
         };
     }
 
-    private parse_geocode_result(obj: ParamsObject): GeocoderReverseResult | undefined {
-        if (typeof obj !== 'object' || !obj) return undefined;
-        const { id, name, admin1_id, admin1_name, country_id, country_name, latitude, longitude } = obj;
-        if (typeof id !== "number" ||
-            typeof name !== "string" || !name ||
-            typeof admin1_id !== "number" ||
-            typeof admin1_name !== "string" || !admin1_name ||
-            typeof country_id !== "string" || !country_id ||
-            typeof country_name !== "string" || !country_name ||
-            typeof latitude !== "number" ||
-            typeof longitude !== "number") {
-            return undefined;
-        }
-        return {
-            id,
-            name,
-            admin1_id,
-            admin1_name,
-            country_id,
-            country_name,
-            latitude,
-            longitude
-        };
-    }
-
     public async reverse(opts: {
         point: GeolocationCoordinatesPoint;
     }): Promise<{ results: GeocoderReverseResult[] } | GeocoderErrorMessage> {
@@ -61,12 +37,12 @@ export class Geocoder {
             const results: GeocoderReverseResult[] = [];
             while (stmt.step()) {
                 const row = stmt.getAsObject();
-                const result = this.parse_geocode_result(row);
+                const result = parse_geocode_reverse_result(row);
                 if (result) results.push(result);
             };
             return { results };
         } catch (e) {
-            console.log(`Error: Geocoder.reverse() `, e);
+            console.log(`Error: Geocoder reverse `, e);
             return `*`;
         };
     }
diff --git a/geocoder/src/index.ts b/geocoder/src/index.ts
@@ -1,2 +1,4 @@
 export { Geocoder } from "./geocoder";
 export * from "./types";
+export * from "./utils";
+
diff --git a/geocoder/src/utils.ts b/geocoder/src/utils.ts
@@ -0,0 +1,26 @@
+import type { GeocoderReverseResult } from "./types";
+
+export const parse_geocode_reverse_result = (obj: any): GeocoderReverseResult | undefined => {
+    if (typeof obj !== 'object' || !obj) return undefined;
+    const { id, name, admin1_id, admin1_name, country_id, country_name, latitude, longitude } = obj;
+    if (typeof id !== "number" ||
+        typeof name !== "string" || !name ||
+        typeof admin1_id !== "number" ||
+        typeof admin1_name !== "string" || !admin1_name ||
+        typeof country_id !== "string" || !country_id ||
+        typeof country_name !== "string" || !country_name ||
+        typeof latitude !== "number" ||
+        typeof longitude !== "number") {
+        return undefined;
+    }
+    return {
+        id,
+        name,
+        admin1_id,
+        admin1_name,
+        country_id,
+        country_name,
+        latitude,
+        longitude
+    };
+};