@hebcal/geo-sqlite 4.5.1 → 4.7.0

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v4.5.1 */
+/*! @hebcal/geo-sqlite v4.7.0 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -65,7 +65,7 @@ FROM ZIPCodes_CityFullText5
 WHERE ZIPCodes_CityFullText5 MATCH ?
 ORDER BY Population DESC
 LIMIT 20`;
-const GEONAME_COMPLETE_SQL = `SELECT geonameid
+const GEONAME_COMPLETE_SQL = `SELECT geonameid, longname, city, admin1, country
 FROM geoname_fulltext
 WHERE geoname_fulltext MATCH ?
 ORDER BY population DESC
@@ -318,6 +318,7 @@ class GeoDb {
       admin1: res.State,
       asciiname: res.CityMixedCase,
       country: 'United States',
+      cc: 'US',
       latitude: res.Latitude,
       longitude: res.Longitude,
       timezone: core.Location.getUsaTzid(res.State, res.TimeZone, res.DayLightSaving),
@@ -371,36 +372,7 @@ class GeoDb {
 
       const geoMatches = geoRows.map(res => {
         const loc = this.lookupGeoname(res.geonameid);
-        const country = this.countryNames.get(loc.getCountryCode()) || '';
-        const admin1 = loc.admin1 || '';
-        const obj = {
-          id: res.geonameid,
-          value: loc.name,
-          admin1,
-          country,
-          latitude: loc.latitude,
-          longitude: loc.longitude,
-          timezone: loc.getTzid(),
-          geo: 'geoname'
-        };
-
-        if (loc.population) {
-          obj.population = loc.population;
-        }
-
-        if (loc.asciiname) {
-          obj.asciiname = loc.asciiname;
-        }
-
-        if (country) {
-          obj.country = country;
-        }
-
-        if (admin1) {
-          obj.admin1 = admin1;
-        }
-
-        return obj;
+        return this.geonameLocToAutocomplete(loc, res);
       });
 
       if (!this.zipFulltextCompStmt) {
@@ -409,41 +381,12 @@ class GeoDb {
 
       const zipRows = this.zipFulltextCompStmt.all(`{longname} : "${qraw}" *`);
       const zipMatches = zipRows.map(res => {
-        const zipCode = res.ZipCode;
-        const loc = this.lookupZip(zipCode);
-        const obj = {
-          id: zipCode,
-          value: loc.getName(),
-          admin1: loc.admin1,
-          asciiname: loc.getShortName(),
-          country: 'United States',
-          latitude: loc.latitude,
-          longitude: loc.longitude,
-          timezone: loc.getTzid(),
-          population: loc.population,
-          geo: 'zip'
-        };
-        return obj;
+        const loc = this.lookupZip(res.ZipCode);
+        return GeoDb.zipLocToAutocomplete(loc);
       });
-      const map = new Map();
-
-      for (const obj of zipMatches) {
-        const key = [obj.asciiname, stateNames[obj.admin1], obj.country].join('|');
-
-        if (!map.has(key)) {
-          map.set(key, obj);
-        }
-      } // GeoNames takes priority over USA ZIP code matches
-
-
-      for (const obj of geoMatches) {
-        const key = [obj.asciiname, obj.admin1, obj.country].join('|');
-        map.set(key, obj);
-      }
-
-      const values = Array.from(map.values());
+      const values = this.mergeZipGeo(zipMatches, geoMatches);
       values.sort((a, b) => b.population - a.population);
-      const topN = values.slice(0, 15);
+      const topN = values.slice(0, 12);
 
       if (!latlong) {
         for (const val of topN) {
@@ -457,6 +400,110 @@ class GeoDb {
       return topN;
     }
   }
+  /**
+   * @private
+   * @param {Location} loc
+   * @param {any} res
+   * @return {any}
+   */
+
+
+  geonameLocToAutocomplete(loc, res) {
+    const cc = loc.getCountryCode();
+    const country = res.country || this.countryNames.get(cc) || '';
+    const admin1 = res.admin || loc.admin1 || '';
+    const obj = {
+      id: res.geonameid,
+      value: res.longname,
+      admin1,
+      country,
+      cc,
+      latitude: loc.latitude,
+      longitude: loc.longitude,
+      timezone: loc.getTzid(),
+      geo: 'geoname'
+    };
+
+    if (loc.population) {
+      obj.population = loc.population;
+    }
+
+    if (res.city !== loc.asciiname) {
+      obj.name = res.city;
+    }
+
+    if (loc.asciiname) {
+      obj.asciiname = loc.asciiname;
+    }
+
+    if (country) {
+      obj.country = country;
+    }
+
+    if (admin1) {
+      obj.admin1 = admin1;
+    }
+
+    return obj;
+  }
+  /**
+   * @private
+   * @param {Location} loc
+   * @return {any}
+   */
+
+
+  static zipLocToAutocomplete(loc) {
+    return {
+      id: loc.zip,
+      value: loc.getName(),
+      admin1: loc.admin1,
+      asciiname: loc.getShortName(),
+      country: 'United States',
+      cc: 'US',
+      latitude: loc.latitude,
+      longitude: loc.longitude,
+      timezone: loc.getTzid(),
+      population: loc.population,
+      geo: 'zip'
+    };
+  }
+  /**
+   * GeoNames matches takes priority over USA ZIP code matches
+   * @private
+   * @param {any[]} zipMatches
+   * @param {any[]} geoMatches
+   * @return {any[]}
+   */
+
+
+  mergeZipGeo(zipMatches, geoMatches) {
+    const zlen = zipMatches.length;
+    const glen = geoMatches.length;
+
+    if (zlen && !glen) {
+      return zipMatches;
+    } else if (glen && !zlen) {
+      return geoMatches;
+    }
+
+    const map = new Map();
+
+    for (const obj of zipMatches) {
+      const key = [obj.asciiname, stateNames[obj.admin1], obj.cc].join('|');
+
+      if (!map.has(key)) {
+        map.set(key, obj);
+      }
+    }
+
+    for (const obj of geoMatches) {
+      const key = [obj.asciiname, obj.admin1, obj.cc].join('|');
+      map.set(key, obj);
+    }
+
+    return Array.from(map.values());
+  }
   /** Reads entire ZIP database and caches in-memory */
 
 
@@ -644,17 +691,34 @@ async function buildGeonamesSqlite(opts) {
       FROM geoname g, admin1 a, country c
       WHERE g.country = c.ISO
       AND g.country <> 'US'
+      AND g.country <> 'IL'
+      AND g.country <> 'GB'
       AND g.country||'.'||g.admin1 = a.key
       `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||a.asciiname||', USA',
       g.population,
-      g.asciiname,a.asciiname,'USA'
+      g.asciiname,a.asciiname,'United States'
       FROM geoname g, admin1 a
       WHERE g.country = 'US'
       AND g.country||'.'||g.admin1 = a.key
       `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
+      g.asciiname||', '||a.asciiname||', UK',
+      g.population,
+      g.asciiname,a.asciiname,'UK'
+      FROM geoname g, admin1 a
+      WHERE g.country = 'GB'
+      AND g.country||'.'||g.admin1 = a.key
+      `, `INSERT INTO geoname_fulltext
+      SELECT g.geonameid,
+      g.asciiname||', Israel',
+      g.population,
+      g.asciiname,NULL,'Israel'
+      FROM geoname g
+      WHERE g.country = 'IL'
+      `, `INSERT INTO geoname_fulltext
+      SELECT g.geonameid,
       g.asciiname||', '||c.Country,
       g.population,
       g.asciiname,NULL,c.Country
@@ -681,14 +745,13 @@ async function buildGeonamesSqlite(opts) {
       AND g.geonameid = alt.geonameid
       `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
-      alt.name||', '||a1.asciiname||', Israel',
+      alt.name||', Israel',
       g.population,
-      alt.name,a1.asciiname,'Israel'
-      FROM geoname g, admin1 a1, altnames alt
+      alt.name,NULL,'Israel'
+      FROM geoname g, altnames alt
       WHERE g.country = 'IL'
       AND alt.isolanguage = 'en'
       AND g.geonameid = alt.geonameid
-      AND g.country||'.'||g.admin1 = a1.key
       `, 'VACUUM');
   db.close();
   return Promise.resolve(true);

package/dist/index.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v4.5.1 */
+/*! @hebcal/geo-sqlite v4.7.0 */
 import Database from 'better-sqlite3';
 import { Location, Locale } from '@hebcal/core';
 import '@hebcal/cities';
@@ -53,7 +53,7 @@ FROM ZIPCodes_CityFullText5
 WHERE ZIPCodes_CityFullText5 MATCH ?
 ORDER BY Population DESC
 LIMIT 20`;
-const GEONAME_COMPLETE_SQL = `SELECT geonameid
+const GEONAME_COMPLETE_SQL = `SELECT geonameid, longname, city, admin1, country
 FROM geoname_fulltext
 WHERE geoname_fulltext MATCH ?
 ORDER BY population DESC
@@ -306,6 +306,7 @@ class GeoDb {
       admin1: res.State,
       asciiname: res.CityMixedCase,
       country: 'United States',
+      cc: 'US',
       latitude: res.Latitude,
       longitude: res.Longitude,
       timezone: Location.getUsaTzid(res.State, res.TimeZone, res.DayLightSaving),
@@ -359,36 +360,7 @@ class GeoDb {
 
       const geoMatches = geoRows.map(res => {
         const loc = this.lookupGeoname(res.geonameid);
-        const country = this.countryNames.get(loc.getCountryCode()) || '';
-        const admin1 = loc.admin1 || '';
-        const obj = {
-          id: res.geonameid,
-          value: loc.name,
-          admin1,
-          country,
-          latitude: loc.latitude,
-          longitude: loc.longitude,
-          timezone: loc.getTzid(),
-          geo: 'geoname'
-        };
-
-        if (loc.population) {
-          obj.population = loc.population;
-        }
-
-        if (loc.asciiname) {
-          obj.asciiname = loc.asciiname;
-        }
-
-        if (country) {
-          obj.country = country;
-        }
-
-        if (admin1) {
-          obj.admin1 = admin1;
-        }
-
-        return obj;
+        return this.geonameLocToAutocomplete(loc, res);
       });
 
       if (!this.zipFulltextCompStmt) {
@@ -397,41 +369,12 @@ class GeoDb {
 
       const zipRows = this.zipFulltextCompStmt.all(`{longname} : "${qraw}" *`);
       const zipMatches = zipRows.map(res => {
-        const zipCode = res.ZipCode;
-        const loc = this.lookupZip(zipCode);
-        const obj = {
-          id: zipCode,
-          value: loc.getName(),
-          admin1: loc.admin1,
-          asciiname: loc.getShortName(),
-          country: 'United States',
-          latitude: loc.latitude,
-          longitude: loc.longitude,
-          timezone: loc.getTzid(),
-          population: loc.population,
-          geo: 'zip'
-        };
-        return obj;
+        const loc = this.lookupZip(res.ZipCode);
+        return GeoDb.zipLocToAutocomplete(loc);
       });
-      const map = new Map();
-
-      for (const obj of zipMatches) {
-        const key = [obj.asciiname, stateNames[obj.admin1], obj.country].join('|');
-
-        if (!map.has(key)) {
-          map.set(key, obj);
-        }
-      } // GeoNames takes priority over USA ZIP code matches
-
-
-      for (const obj of geoMatches) {
-        const key = [obj.asciiname, obj.admin1, obj.country].join('|');
-        map.set(key, obj);
-      }
-
-      const values = Array.from(map.values());
+      const values = this.mergeZipGeo(zipMatches, geoMatches);
       values.sort((a, b) => b.population - a.population);
-      const topN = values.slice(0, 15);
+      const topN = values.slice(0, 12);
 
       if (!latlong) {
         for (const val of topN) {
@@ -445,6 +388,110 @@ class GeoDb {
       return topN;
     }
   }
+  /**
+   * @private
+   * @param {Location} loc
+   * @param {any} res
+   * @return {any}
+   */
+
+
+  geonameLocToAutocomplete(loc, res) {
+    const cc = loc.getCountryCode();
+    const country = res.country || this.countryNames.get(cc) || '';
+    const admin1 = res.admin || loc.admin1 || '';
+    const obj = {
+      id: res.geonameid,
+      value: res.longname,
+      admin1,
+      country,
+      cc,
+      latitude: loc.latitude,
+      longitude: loc.longitude,
+      timezone: loc.getTzid(),
+      geo: 'geoname'
+    };
+
+    if (loc.population) {
+      obj.population = loc.population;
+    }
+
+    if (res.city !== loc.asciiname) {
+      obj.name = res.city;
+    }
+
+    if (loc.asciiname) {
+      obj.asciiname = loc.asciiname;
+    }
+
+    if (country) {
+      obj.country = country;
+    }
+
+    if (admin1) {
+      obj.admin1 = admin1;
+    }
+
+    return obj;
+  }
+  /**
+   * @private
+   * @param {Location} loc
+   * @return {any}
+   */
+
+
+  static zipLocToAutocomplete(loc) {
+    return {
+      id: loc.zip,
+      value: loc.getName(),
+      admin1: loc.admin1,
+      asciiname: loc.getShortName(),
+      country: 'United States',
+      cc: 'US',
+      latitude: loc.latitude,
+      longitude: loc.longitude,
+      timezone: loc.getTzid(),
+      population: loc.population,
+      geo: 'zip'
+    };
+  }
+  /**
+   * GeoNames matches takes priority over USA ZIP code matches
+   * @private
+   * @param {any[]} zipMatches
+   * @param {any[]} geoMatches
+   * @return {any[]}
+   */
+
+
+  mergeZipGeo(zipMatches, geoMatches) {
+    const zlen = zipMatches.length;
+    const glen = geoMatches.length;
+
+    if (zlen && !glen) {
+      return zipMatches;
+    } else if (glen && !zlen) {
+      return geoMatches;
+    }
+
+    const map = new Map();
+
+    for (const obj of zipMatches) {
+      const key = [obj.asciiname, stateNames[obj.admin1], obj.cc].join('|');
+
+      if (!map.has(key)) {
+        map.set(key, obj);
+      }
+    }
+
+    for (const obj of geoMatches) {
+      const key = [obj.asciiname, obj.admin1, obj.cc].join('|');
+      map.set(key, obj);
+    }
+
+    return Array.from(map.values());
+  }
   /** Reads entire ZIP database and caches in-memory */
 
 
@@ -632,17 +679,34 @@ async function buildGeonamesSqlite(opts) {
       FROM geoname g, admin1 a, country c
       WHERE g.country = c.ISO
       AND g.country <> 'US'
+      AND g.country <> 'IL'
+      AND g.country <> 'GB'
       AND g.country||'.'||g.admin1 = a.key
       `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||a.asciiname||', USA',
       g.population,
-      g.asciiname,a.asciiname,'USA'
+      g.asciiname,a.asciiname,'United States'
       FROM geoname g, admin1 a
       WHERE g.country = 'US'
       AND g.country||'.'||g.admin1 = a.key
       `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
+      g.asciiname||', '||a.asciiname||', UK',
+      g.population,
+      g.asciiname,a.asciiname,'UK'
+      FROM geoname g, admin1 a
+      WHERE g.country = 'GB'
+      AND g.country||'.'||g.admin1 = a.key
+      `, `INSERT INTO geoname_fulltext
+      SELECT g.geonameid,
+      g.asciiname||', Israel',
+      g.population,
+      g.asciiname,NULL,'Israel'
+      FROM geoname g
+      WHERE g.country = 'IL'
+      `, `INSERT INTO geoname_fulltext
+      SELECT g.geonameid,
       g.asciiname||', '||c.Country,
       g.population,
       g.asciiname,NULL,c.Country
@@ -669,14 +733,13 @@ async function buildGeonamesSqlite(opts) {
       AND g.geonameid = alt.geonameid
       `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
-      alt.name||', '||a1.asciiname||', Israel',
+      alt.name||', Israel',
       g.population,
-      alt.name,a1.asciiname,'Israel'
-      FROM geoname g, admin1 a1, altnames alt
+      alt.name,NULL,'Israel'
+      FROM geoname g, altnames alt
       WHERE g.country = 'IL'
       AND alt.isolanguage = 'en'
       AND g.geonameid = alt.geonameid
-      AND g.country||'.'||g.admin1 = a1.key
       `, 'VACUUM');
   db.close();
   return Promise.resolve(true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/geo-sqlite",
-  "version": "4.5.1",
+  "version": "4.7.0",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal"
@@ -31,8 +31,8 @@
     "@hebcal/cities": "^3.1.2",
     "@hebcal/core": "^3.38.0",
     "better-sqlite3": "^7.5.3",
-    "pino": "^7.11.0",
-    "pino-pretty": "^7.6.1"
+    "pino": "^8.0.0",
+    "pino-pretty": "^8.0.0"
   },
   "scripts": {
     "build": "rollup -c",
@@ -60,11 +60,11 @@
     "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
-    "ava": "^4.2.0",
-    "eslint": "^8.16.0",
+    "ava": "^4.3.0",
+    "eslint": "^8.17.0",
     "eslint-config-google": "^0.14.0",
     "jsdoc": "^3.6.10",
     "jsdoc-to-markdown": "^7.1.1",
-    "rollup": "^2.75.4"
+    "rollup": "^2.75.5"
   }
 }