@hebcal/geo-sqlite 5.7.3 → 5.8.0

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v5.7.2 */
+/*! @hebcal/geo-sqlite v5.8.0 */
 import Database from 'better-sqlite3';
 import QuickLRU from 'quick-lru';
 import { Location, Locale } from '@hebcal/core';
@@ -511,7 +511,7 @@ function munge(s) {
 }
 
 // DO NOT EDIT THIS AUTO-GENERATED FILE!
-const version = '5.7.2';
+const version = '5.8.0';
 
 const GEONAME_SQL = `SELECT
   g.name as name,
@@ -635,19 +635,22 @@ class GeoDb {
    * @param {any} logger
    * @param {string} zipsFilename
    * @param {string} geonamesFilename
+   * @param {any} options
    */
-  constructor(logger, zipsFilename, geonamesFilename) {
+  constructor(logger, zipsFilename, geonamesFilename, options) {
     this.logger = logger;
     if (logger) logger.info(`GeoDb: opening ${zipsFilename}...`);
     this.zipsDb = new Database(zipsFilename, {fileMustExist: true});
     if (logger) logger.info(`GeoDb: opening ${geonamesFilename}...`);
     this.geonamesDb = new Database(geonamesFilename, {fileMustExist: true});
     this.zipStmt = this.zipsDb.prepare(ZIPCODE_SQL);
+    const zipsCacheSize = options?.zipsCacheSize || 150;
     /** @type {Map<string, Location>} */
-    this.zipCache = new QuickLRU({maxSize: 150});
+    this.zipCache = new QuickLRU({maxSize: zipsCacheSize});
     this.geonamesStmt = this.geonamesDb.prepare(GEONAME_SQL);
+    const geonamesCacheSize = options?.geonamesCacheSize || 750;
     /** @type {Map<number, Location>} */
-    this.geonamesCache = new QuickLRU({maxSize: 750});
+    this.geonamesCache = new QuickLRU({maxSize: geonamesCacheSize});
     /** @type {Map<string, number>} */
     this.legacyCities = new Map();
     for (const [name, id] of Object.entries(city2geonameid)) {
@@ -690,7 +693,7 @@ class GeoDb {
   lookupZip(zip) {
     const zip5 = zip.trim().substring(0, 5);
     const found = this.zipCache.get(zip5);
-    if (typeof found !== 'undefined') return found;
+    if (found !== undefined) return found;
     const result = this.zipStmt.get(zip5);
     if (!result) {
       if (this.logger) this.logger.warn(`GeoDb: unknown zipcode=${zip5}`);
@@ -735,7 +738,7 @@ class GeoDb {
       geonameid = 293397;
     }
     const found = this.geonamesCache.get(geonameid);
-    if (typeof found !== 'undefined') return found;
+    if (found !== undefined) return found;
     const result = this.geonamesStmt.get(geonameid);
     if (!result) {
       if (this.logger) this.logger.warn(`GeoDb: unknown geonameid=${geonameid}`);
@@ -769,10 +772,10 @@ class GeoDb {
     if (countryName === 'United States') countryName = 'USA';
     if (countryName === 'United Kingdom') countryName = 'UK';
     let cityDescr = cityName;
-    if (countryName !== 'Israel' && admin1 && admin1.indexOf(cityName) !== 0) {
+    if (countryName !== 'Israel' && admin1 && !admin1.includes(cityName)) {
       const tlitCityName = transliterate(cityName);
       const tlitAdmin1 = transliterate(admin1);
-      if (tlitAdmin1.indexOf(tlitCityName) != 0) {
+      if (!tlitAdmin1.includes(tlitCityName)) {
         cityDescr += ', ' + admin1;
       }
     }
@@ -796,7 +799,7 @@ class GeoDb {
     const location = new Location(
         result.latitude,
         result.longitude,
-        result.cc == 'IL',
+        result.cc === 'IL',
         result.timezone,
         cityDescr,
         result.cc,
@@ -809,7 +812,7 @@ class GeoDb {
     if (admin1) {
       location.admin1 = admin1;
     }
-    if (result.cc == 'IL' && admin1.startsWith('Jerusalem') && result.name.startsWith('Jerualem')) {
+    if (result.cc === 'IL' && admin1.startsWith('Jerusalem') && result.name.startsWith('Jerualem')) {
       location.jersualem = true;
     }
     if (result.population) {
@@ -884,7 +887,7 @@ class GeoDb {
       if (!this.geonamesCompStmt) {
         this.geonamesCompStmt = this.geonamesDb.prepare(GEONAME_COMPLETE_SQL);
       }
-      qraw = qraw.replace(/"/g, '""');
+      qraw = qraw.replaceAll('"', '""');
       const geoRows0 = this.geonamesCompStmt.all(`{longname} : "${qraw}" *`);
       const ids = new Set();
       const geoRows = [];
@@ -934,7 +937,7 @@ class GeoDb {
     const admin1 = res.admin || loc.admin1 || '';
     const obj = {
       id: res.geonameid,
-      value: res.longname,
+      value: loc.getName(),
       admin1,
       country,
       cc,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/geo-sqlite",
-  "version": "5.7.3",
+  "version": "5.8.0",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal"
@@ -60,16 +60,16 @@
   },
   "license": "BSD-2-Clause",
   "devDependencies": {
-    "@eslint/js": "^9.39.2",
+    "@eslint/js": "^10.0.1",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "ava": "^6.4.1",
-    "eslint": "^9.39.2",
+    "eslint": "^10.0.1",
     "eslint-config-google": "^0.14.0",
-    "eslint-plugin-n": "^17.23.2",
+    "eslint-plugin-n": "^17.24.0",
     "globals": "^17.3.0",
     "jsdoc": "^4.0.5",
     "jsdoc-to-markdown": "^9.1.3",
-    "rollup": "^4.57.1"
+    "rollup": "^4.59.0"
   }
 }