@hebcal/geo-sqlite 3.7.0 → 3.9.0

package/dist/index.js

@@ -1,10 +1,11 @@
-/*! @hebcal/geo-sqlite v3.7.0 */
+/*! @hebcal/geo-sqlite v3.9.0 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var Database = require('better-sqlite3');
 var core = require('@hebcal/core');
+require('@hebcal/cities');
 var pino = require('pino');
 var events = require('events');
 var fs = require('fs');
@@ -141,14 +142,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 +193,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;
   }
   /**
@@ -272,6 +292,12 @@ class GeoDb {
     if (geonameid) {
       return this.lookupGeoname(geonameid);
     } else {
+      const location = core.Location.lookup(cityName);
+
+      if (location) {
+        return location;
+      }
+
       if (this.logger) this.logger.warn(`GeoDb: unknown city=${cityName}`);
       return null;
     }
@@ -306,16 +332,21 @@ class GeoDb {
 
 
   autoComplete(qraw) {
+    qraw = qraw.trim();
+
     if (qraw.length === 0) {
       return [];
     }
 
-    if (qraw.charCodeAt(0) >= 48 && qraw.charCodeAt(0) <= 57) {
+    const firstCharCode = qraw.charCodeAt(0);
+
+    if (firstCharCode >= 48 && firstCharCode <= 57) {
       if (!this.zipCompStmt) {
         this.zipCompStmt = this.zipsDb.prepare(ZIP_COMPLETE_SQL);
       }
 
-      return this.zipCompStmt.all(qraw + '%').map(GeoDb.zipResultToObj);
+      const zip5 = qraw.substring(0, 5);
+      return this.zipCompStmt.all(zip5 + '%').map(GeoDb.zipResultToObj);
     } else {
       if (!this.geonamesCompStmt) {
         this.geonamesCompStmt = this.geonamesDb.prepare(GEONAME_COMPLETE_SQL);
@@ -426,9 +457,12 @@ class GeoDb {
 async function buildGeonamesSqlite(dbFilename, countryInfotxt, cities5000txt, citiesPatch, admin1CodesASCIItxt, ILtxt) {
   const logger = pino__default["default"]({
     // level: argv.quiet ? 'warn' : 'info',
-    prettyPrint: {
-      translateTime: true,
-      ignore: 'pid,hostname'
+    transport: {
+      target: 'pino-pretty',
+      options: {
+        translateTime: 'SYS:standard',
+        ignore: 'pid,hostname'
+      }
     }
   });
   const db = new Database__default["default"](dbFilename);

package/dist/index.mjs

@@ -1,6 +1,7 @@
-/*! @hebcal/geo-sqlite v3.7.0 */
+/*! @hebcal/geo-sqlite v3.9.0 */
 import Database from 'better-sqlite3';
 import { Location, Locale } from '@hebcal/core';
+import '@hebcal/cities';
 import pino from 'pino';
 import events from 'events';
 import fs from 'fs';
@@ -129,14 +130,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 +181,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;
   }
   /**
@@ -260,6 +280,12 @@ class GeoDb {
     if (geonameid) {
       return this.lookupGeoname(geonameid);
     } else {
+      const location = Location.lookup(cityName);
+
+      if (location) {
+        return location;
+      }
+
       if (this.logger) this.logger.warn(`GeoDb: unknown city=${cityName}`);
       return null;
     }
@@ -294,16 +320,21 @@ class GeoDb {
 
 
   autoComplete(qraw) {
+    qraw = qraw.trim();
+
     if (qraw.length === 0) {
       return [];
     }
 
-    if (qraw.charCodeAt(0) >= 48 && qraw.charCodeAt(0) <= 57) {
+    const firstCharCode = qraw.charCodeAt(0);
+
+    if (firstCharCode >= 48 && firstCharCode <= 57) {
       if (!this.zipCompStmt) {
         this.zipCompStmt = this.zipsDb.prepare(ZIP_COMPLETE_SQL);
       }
 
-      return this.zipCompStmt.all(qraw + '%').map(GeoDb.zipResultToObj);
+      const zip5 = qraw.substring(0, 5);
+      return this.zipCompStmt.all(zip5 + '%').map(GeoDb.zipResultToObj);
     } else {
       if (!this.geonamesCompStmt) {
         this.geonamesCompStmt = this.geonamesDb.prepare(GEONAME_COMPLETE_SQL);
@@ -414,9 +445,12 @@ class GeoDb {
 async function buildGeonamesSqlite(dbFilename, countryInfotxt, cities5000txt, citiesPatch, admin1CodesASCIItxt, ILtxt) {
   const logger = pino({
     // level: argv.quiet ? 'warn' : 'info',
-    prettyPrint: {
-      translateTime: true,
-      ignore: 'pid,hostname'
+    transport: {
+      target: 'pino-pretty',
+      options: {
+        translateTime: 'SYS:standard',
+        ignore: 'pid,hostname'
+      }
     }
   });
   const db = new Database(dbFilename);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/geo-sqlite",
-  "version": "3.7.0",
+  "version": "3.9.0",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal"
@@ -28,10 +28,11 @@
     "geo-sqlite.d.ts"
   ],
   "dependencies": {
-    "@hebcal/core": "^3.32.0",
-    "better-sqlite3": "^7.4.6",
-    "pino": "^7.6.2",
-    "pino-pretty": "^7.3.0"
+    "@hebcal/cities": "^3.1.1",
+    "@hebcal/core": "^3.33.3",
+    "better-sqlite3": "^7.5.0",
+    "pino": "^7.8.0",
+    "pino-pretty": "^7.5.1"
   },
   "scripts": {
     "build": "rollup -c",
@@ -45,34 +46,25 @@
     ],
     "require": [
       "@babel/register",
-      "@babel/polyfill"
+      "regenerator-runtime/runtime"
     ],
-    "babel": {
-      "testOptions": {
-        "presets": [
-          "@babel/env"
-        ]
-      }
-    },
     "inherit": true,
     "verbose": true
   },
   "license": "BSD-2-Clause",
   "devDependencies": {
-    "@ava/babel": "^2.0.0",
-    "@babel/core": "^7.16.7",
-    "@babel/polyfill": "^7.12.1",
-    "@babel/preset-env": "^7.16.7",
-    "@babel/register": "^7.16.7",
-    "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^21.0.1",
+    "@babel/core": "^7.17.5",
+    "@babel/preset-env": "^7.16.11",
+    "@babel/register": "^7.17.0",
+    "@rollup/plugin-babel": "^5.3.1",
+    "@rollup/plugin-commonjs": "^21.0.2",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.1.3",
-    "ava": "^3.15.0",
-    "eslint": "^8.6.0",
+    "ava": "^4.0.1",
+    "eslint": "^8.9.0",
     "eslint-config-google": "^0.14.0",
-    "jsdoc": "^3.6.7",
-    "jsdoc-to-markdown": "^7.1.0",
-    "rollup": "^2.63.0"
+    "jsdoc": "^3.6.10",
+    "jsdoc-to-markdown": "^7.1.1",
+    "rollup": "^2.68.0"
   }
 }