@hebcal/geo-sqlite 5.7.2 → 5.7.4

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v5.7.2 */
+/*! @hebcal/geo-sqlite v5.7.4 */
 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.7.4';
 
 const GEONAME_SQL = `SELECT
   g.name as name,
@@ -730,6 +730,7 @@ class GeoDb {
    */
   lookupGeoname(geonameid) {
     geonameid = +geonameid;
+    if (!geonameid) return null;
     if (geonameid === 293396) {
       geonameid = 293397;
     }
@@ -768,10 +769,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;
       }
     }
@@ -795,7 +796,7 @@ class GeoDb {
     const location = new Location(
         result.latitude,
         result.longitude,
-        result.cc == 'IL',
+        result.cc === 'IL',
         result.timezone,
         cityDescr,
         result.cc,
@@ -808,7 +809,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) {
@@ -933,7 +934,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.2",
+  "version": "5.7.4",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal"
@@ -36,13 +36,13 @@
   ],
   "dependencies": {
     "@hebcal/cities": "^6.1.0",
-    "@hebcal/core": "^6.0.6",
-    "better-sqlite3": "^12.5.0",
+    "@hebcal/core": "^6.0.8",
+    "better-sqlite3": "^12.6.2",
     "minimist": "^1.2.8",
-    "pino": "^10.1.0",
+    "pino": "^10.3.1",
     "pino-pretty": "^13.1.3",
     "quick-lru": "^7.3.0",
-    "transliteration": "^2.6.0"
+    "transliteration": "^2.6.1"
   },
   "scripts": {
     "build:rollup": "rollup -c",
@@ -66,10 +66,10 @@
     "ava": "^6.4.1",
     "eslint": "^9.39.2",
     "eslint-config-google": "^0.14.0",
-    "eslint-plugin-n": "^17.23.1",
-    "globals": "^16.5.0",
+    "eslint-plugin-n": "^17.23.2",
+    "globals": "^17.3.0",
     "jsdoc": "^4.0.5",
     "jsdoc-to-markdown": "^9.1.3",
-    "rollup": "^4.54.0"
+    "rollup": "^4.57.1"
   }
 }