@hebcal/geo-sqlite 3.7.1 → 3.8.0

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v3.7.1 */
+/*! @hebcal/geo-sqlite v3.8.0 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -141,14 +141,32 @@ class GeoDb {
       fileMustExist: true
     });
     this.zipStmt = this.zipsDb.prepare(ZIPCODE_SQL);
+    /** @type {Map<string, Location>} */
+
     this.zipCache = new Map();
     this.geonamesStmt = this.geonamesDb.prepare(GEONAME_SQL);
+    /** @type {Map<number, Location>} */
+
     this.geonamesCache = new Map();
+    /** @type {Map<string, Location>} */
+
     this.legacyCities = new Map();
 
     for (const [name, id] of Object.entries(city2geonameid)) {
       this.legacyCities.set(GeoDb.munge(name), id);
     }
+
+    const stmt = this.geonamesDb.prepare(`SELECT ISO, Country FROM country WHERE Country <> ''`);
+    const rows = stmt.all();
+    const map = new Map();
+
+    for (const row of rows) {
+      map.set(row.ISO, row.Country);
+    }
+    /** @type {Map<string, string>} */
+
+
+    this.countryNames = map;
   }
   /** Closes database handles */
 
@@ -174,19 +192,20 @@ class GeoDb {
 
 
   lookupZip(zip) {
-    const found = this.zipCache.get(zip);
+    const zip5 = zip.trim().substring(0, 5);
+    const found = this.zipCache.get(zip5);
     if (typeof found !== 'undefined') return found;
-    const result = this.zipStmt.get(zip);
+    const result = this.zipStmt.get(zip5);
 
     if (!result) {
-      if (this.logger) this.logger.warn(`GeoDb: unknown zipcode=${zip}`);
-      this.zipCache.set(zip, null);
+      if (this.logger) this.logger.warn(`GeoDb: unknown zipcode=${zip5}`);
+      this.zipCache.set(zip5, null);
       return null;
     }
 
-    result.ZipCode = String(zip);
+    result.ZipCode = String(zip5);
     const location = this.makeZipLocation(result);
-    this.zipCache.set(zip, location);
+    this.zipCache.set(zip5, location);
     return location;
   }
   /**

package/dist/index.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v3.7.1 */
+/*! @hebcal/geo-sqlite v3.8.0 */
 import Database from 'better-sqlite3';
 import { Location, Locale } from '@hebcal/core';
 import pino from 'pino';
@@ -129,14 +129,32 @@ class GeoDb {
       fileMustExist: true
     });
     this.zipStmt = this.zipsDb.prepare(ZIPCODE_SQL);
+    /** @type {Map<string, Location>} */
+
     this.zipCache = new Map();
     this.geonamesStmt = this.geonamesDb.prepare(GEONAME_SQL);
+    /** @type {Map<number, Location>} */
+
     this.geonamesCache = new Map();
+    /** @type {Map<string, Location>} */
+
     this.legacyCities = new Map();
 
     for (const [name, id] of Object.entries(city2geonameid)) {
       this.legacyCities.set(GeoDb.munge(name), id);
     }
+
+    const stmt = this.geonamesDb.prepare(`SELECT ISO, Country FROM country WHERE Country <> ''`);
+    const rows = stmt.all();
+    const map = new Map();
+
+    for (const row of rows) {
+      map.set(row.ISO, row.Country);
+    }
+    /** @type {Map<string, string>} */
+
+
+    this.countryNames = map;
   }
   /** Closes database handles */
 
@@ -162,19 +180,20 @@ class GeoDb {
 
 
   lookupZip(zip) {
-    const found = this.zipCache.get(zip);
+    const zip5 = zip.trim().substring(0, 5);
+    const found = this.zipCache.get(zip5);
     if (typeof found !== 'undefined') return found;
-    const result = this.zipStmt.get(zip);
+    const result = this.zipStmt.get(zip5);
 
     if (!result) {
-      if (this.logger) this.logger.warn(`GeoDb: unknown zipcode=${zip}`);
-      this.zipCache.set(zip, null);
+      if (this.logger) this.logger.warn(`GeoDb: unknown zipcode=${zip5}`);
+      this.zipCache.set(zip5, null);
       return null;
     }
 
-    result.ZipCode = String(zip);
+    result.ZipCode = String(zip5);
     const location = this.makeZipLocation(result);
-    this.zipCache.set(zip, location);
+    this.zipCache.set(zip5, location);
     return location;
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/geo-sqlite",
-  "version": "3.7.1",
+  "version": "3.8.0",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal"
@@ -28,10 +28,10 @@
     "geo-sqlite.d.ts"
   ],
   "dependencies": {
-    "@hebcal/core": "^3.32.1",
-    "better-sqlite3": "^7.4.6",
-    "pino": "^7.6.3",
-    "pino-pretty": "^7.3.0"
+    "@hebcal/core": "^3.33.2",
+    "better-sqlite3": "^7.5.0",
+    "pino": "^7.6.4",
+    "pino-pretty": "^7.5.0"
   },
   "scripts": {
     "build": "rollup -c",
@@ -60,19 +60,19 @@
   "license": "BSD-2-Clause",
   "devDependencies": {
     "@ava/babel": "^2.0.0",
-    "@babel/core": "^7.16.7",
+    "@babel/core": "^7.16.12",
     "@babel/polyfill": "^7.12.1",
-    "@babel/preset-env": "^7.16.8",
-    "@babel/register": "^7.16.8",
+    "@babel/preset-env": "^7.16.11",
+    "@babel/register": "^7.16.9",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-commonjs": "^21.0.1",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.1.3",
     "ava": "^3.15.0",
-    "eslint": "^8.6.0",
+    "eslint": "^8.7.0",
     "eslint-config-google": "^0.14.0",
-    "jsdoc": "^3.6.7",
+    "jsdoc": "^3.6.9",
     "jsdoc-to-markdown": "^7.1.0",
-    "rollup": "^2.63.0"
+    "rollup": "^2.66.0"
   }
 }