@hebcal/geo-sqlite 4.0.1 → 4.3.0

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v4.0.1 */
+/*! @hebcal/geo-sqlite v4.3.0 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -222,6 +222,7 @@ class GeoDb {
     const cityDescr = `${result.CityMixedCase}, ${result.State} ${zip}`;
     const location = new core.Location(result.Latitude, result.Longitude, false, tzid, cityDescr, 'US', zip);
     location.admin1 = location.state = result.State;
+    location.stateName = stateNames[location.state];
     location.geo = 'zip';
     location.zip = zip;
     return location;
@@ -305,33 +306,39 @@ class GeoDb {
   /**
    * @private
    * @param {any[]} res
+   * @param {boolean} latlong
    * @return {Object[]}
    */
 
 
-  static zipResultToObj(res) {
+  static zipResultToObj(res, latlong = false) {
     const obj = {
       id: String(res.ZipCode),
       value: `${res.CityMixedCase}, ${res.State} ${res.ZipCode}`,
       admin1: res.State,
       asciiname: res.CityMixedCase,
       country: 'United States',
-      latitude: res.Latitude,
-      longitude: res.Longitude,
-      timezone: core.Location.getUsaTzid(res.State, res.TimeZone, res.DayLightSaving),
       population: res.Population,
       geo: 'zip'
     };
+
+    if (latlong) {
+      obj.latitude = res.Latitude;
+      obj.longitude = res.Longitude;
+      obj.timezone = core.Location.getUsaTzid(res.State, res.TimeZone, res.DayLightSaving);
+    }
+
     return obj;
   }
   /**
    * Generates autocomplete results based on a query string
    * @param {string} qraw
+   * @param {boolean} latlong
    * @return {Object[]}
    */
 
 
-  autoComplete(qraw) {
+  autoComplete(qraw, latlong = false) {
     qraw = qraw.trim();
 
     if (qraw.length === 0) {
@@ -346,7 +353,7 @@ class GeoDb {
       }
 
       const zip5 = qraw.substring(0, 5);
-      return this.zipCompStmt.all(zip5 + '%').map(GeoDb.zipResultToObj);
+      return this.zipCompStmt.all(zip5 + '%').map(row => GeoDb.zipResultToObj(row, latlong));
     } else {
       if (!this.geonamesCompStmt) {
         this.geonamesCompStmt = this.geonamesDb.prepare(GEONAME_COMPLETE_SQL);
@@ -361,11 +368,6 @@ class GeoDb {
           id: res.geonameid,
           value: core.Location.geonameCityDescr(res.asciiname, admin1, country),
           asciiname: res.asciiname,
-          admin1,
-          country,
-          latitude: res.latitude,
-          longitude: res.longitude,
-          timezone: res.timezone,
           population: res.population,
           geo: 'geoname'
         };
@@ -378,7 +380,12 @@ class GeoDb {
           obj.admin1 = admin1;
         }
 
-        obj.tokens = Array.from(new Set(res.asciiname.split(' ').concat(admin1.split(' '), country.split(' '))));
+        if (latlong) {
+          obj.latitude = res.latitude;
+          obj.longitude = res.longitude;
+          obj.timezone = res.timezone;
+        }
+
         return obj;
       });
 
@@ -387,7 +394,7 @@ class GeoDb {
       }
 
       const zipRows = this.zipFulltextCompStmt.all(`"${qraw}*"`);
-      const zipMatches = zipRows.map(GeoDb.zipResultToObj);
+      const zipMatches = zipRows.map(row => GeoDb.zipResultToObj(row, latlong));
       const map = new Map();
 
       for (const obj of zipMatches) {
@@ -549,6 +556,12 @@ async function buildGeonamesSqlite(opts) {
     periodTo NULL
     );`);
   await doFile(logger, db, ILalternate, 'alternatenames', 10, a => {
+    const firstchar = a[3][0];
+
+    if (a[2] === 'he' && (firstchar < '\u05D0' || firstchar > '\u05EA')) {
+      a[2] = 'en';
+    }
+
     if (a[2] === 'he' || a[2] === 'en') {
       if (a[2] === 'he') {
         a[3] = a[3].replace(/‘/g, '׳');
@@ -558,6 +571,13 @@ async function buildGeonamesSqlite(opts) {
       } else {
         a[3] = a[3].replace(/‘/g, '\'');
         a[3] = a[3].replace(/’/g, '\'');
+        a[3] = a[3].replace(/Ḥ/g, 'Ch');
+        a[3] = a[3].replace(/H̱/g, 'Ch');
+        a[3] = a[3].replace(/ẖ/g, 'ch');
+        a[3] = a[3].replace(/Ẕ/g, 'Tz');
+        a[3] = a[3].replace(/ẕ/g, 'tz');
+        a[3] = a[3].replace(/ā/g, 'a');
+        a[3] = a[3].replace(/é/g, 'e');
       }
 
       return true;
@@ -604,11 +624,20 @@ async function buildGeonamesSqlite(opts) {
       SELECT g.geonameid, alt.name||', ישראל',
       alt.name, '', 'ישראל',
       g.population, g.latitude, g.longitude, g.timezone
-      FROM geoname g, country c, altnames alt
+      FROM geoname g, altnames alt
       WHERE g.country = 'IL'
       AND alt.isolanguage = 'he'
       AND g.geonameid = alt.geonameid
-      `);
+      `, `INSERT INTO geoname_fulltext
+      SELECT g.geonameid, alt.name||', '||a1.asciiname||', Israel',
+      alt.name, a1.asciiname, 'Israel',
+      g.population, g.latitude, g.longitude, g.timezone
+      FROM geoname g, admin1 a1, 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.0.1 */
+/*! @hebcal/geo-sqlite v4.3.0 */
 import Database from 'better-sqlite3';
 import { Location, Locale } from '@hebcal/core';
 import '@hebcal/cities';
@@ -210,6 +210,7 @@ class GeoDb {
     const cityDescr = `${result.CityMixedCase}, ${result.State} ${zip}`;
     const location = new Location(result.Latitude, result.Longitude, false, tzid, cityDescr, 'US', zip);
     location.admin1 = location.state = result.State;
+    location.stateName = stateNames[location.state];
     location.geo = 'zip';
     location.zip = zip;
     return location;
@@ -293,33 +294,39 @@ class GeoDb {
   /**
    * @private
    * @param {any[]} res
+   * @param {boolean} latlong
    * @return {Object[]}
    */
 
 
-  static zipResultToObj(res) {
+  static zipResultToObj(res, latlong = false) {
     const obj = {
       id: String(res.ZipCode),
       value: `${res.CityMixedCase}, ${res.State} ${res.ZipCode}`,
       admin1: res.State,
       asciiname: res.CityMixedCase,
       country: 'United States',
-      latitude: res.Latitude,
-      longitude: res.Longitude,
-      timezone: Location.getUsaTzid(res.State, res.TimeZone, res.DayLightSaving),
       population: res.Population,
       geo: 'zip'
     };
+
+    if (latlong) {
+      obj.latitude = res.Latitude;
+      obj.longitude = res.Longitude;
+      obj.timezone = Location.getUsaTzid(res.State, res.TimeZone, res.DayLightSaving);
+    }
+
     return obj;
   }
   /**
    * Generates autocomplete results based on a query string
    * @param {string} qraw
+   * @param {boolean} latlong
    * @return {Object[]}
    */
 
 
-  autoComplete(qraw) {
+  autoComplete(qraw, latlong = false) {
     qraw = qraw.trim();
 
     if (qraw.length === 0) {
@@ -334,7 +341,7 @@ class GeoDb {
       }
 
       const zip5 = qraw.substring(0, 5);
-      return this.zipCompStmt.all(zip5 + '%').map(GeoDb.zipResultToObj);
+      return this.zipCompStmt.all(zip5 + '%').map(row => GeoDb.zipResultToObj(row, latlong));
     } else {
       if (!this.geonamesCompStmt) {
         this.geonamesCompStmt = this.geonamesDb.prepare(GEONAME_COMPLETE_SQL);
@@ -349,11 +356,6 @@ class GeoDb {
           id: res.geonameid,
           value: Location.geonameCityDescr(res.asciiname, admin1, country),
           asciiname: res.asciiname,
-          admin1,
-          country,
-          latitude: res.latitude,
-          longitude: res.longitude,
-          timezone: res.timezone,
           population: res.population,
           geo: 'geoname'
         };
@@ -366,7 +368,12 @@ class GeoDb {
           obj.admin1 = admin1;
         }
 
-        obj.tokens = Array.from(new Set(res.asciiname.split(' ').concat(admin1.split(' '), country.split(' '))));
+        if (latlong) {
+          obj.latitude = res.latitude;
+          obj.longitude = res.longitude;
+          obj.timezone = res.timezone;
+        }
+
         return obj;
       });
 
@@ -375,7 +382,7 @@ class GeoDb {
       }
 
       const zipRows = this.zipFulltextCompStmt.all(`"${qraw}*"`);
-      const zipMatches = zipRows.map(GeoDb.zipResultToObj);
+      const zipMatches = zipRows.map(row => GeoDb.zipResultToObj(row, latlong));
       const map = new Map();
 
       for (const obj of zipMatches) {
@@ -537,6 +544,12 @@ async function buildGeonamesSqlite(opts) {
     periodTo NULL
     );`);
   await doFile(logger, db, ILalternate, 'alternatenames', 10, a => {
+    const firstchar = a[3][0];
+
+    if (a[2] === 'he' && (firstchar < '\u05D0' || firstchar > '\u05EA')) {
+      a[2] = 'en';
+    }
+
     if (a[2] === 'he' || a[2] === 'en') {
       if (a[2] === 'he') {
         a[3] = a[3].replace(/‘/g, '׳');
@@ -546,6 +559,13 @@ async function buildGeonamesSqlite(opts) {
       } else {
         a[3] = a[3].replace(/‘/g, '\'');
         a[3] = a[3].replace(/’/g, '\'');
+        a[3] = a[3].replace(/Ḥ/g, 'Ch');
+        a[3] = a[3].replace(/H̱/g, 'Ch');
+        a[3] = a[3].replace(/ẖ/g, 'ch');
+        a[3] = a[3].replace(/Ẕ/g, 'Tz');
+        a[3] = a[3].replace(/ẕ/g, 'tz');
+        a[3] = a[3].replace(/ā/g, 'a');
+        a[3] = a[3].replace(/é/g, 'e');
       }
 
       return true;
@@ -592,11 +612,20 @@ async function buildGeonamesSqlite(opts) {
       SELECT g.geonameid, alt.name||', ישראל',
       alt.name, '', 'ישראל',
       g.population, g.latitude, g.longitude, g.timezone
-      FROM geoname g, country c, altnames alt
+      FROM geoname g, altnames alt
       WHERE g.country = 'IL'
       AND alt.isolanguage = 'he'
       AND g.geonameid = alt.geonameid
-      `);
+      `, `INSERT INTO geoname_fulltext
+      SELECT g.geonameid, alt.name||', '||a1.asciiname||', Israel',
+      alt.name, a1.asciiname, 'Israel',
+      g.population, g.latitude, g.longitude, g.timezone
+      FROM geoname g, admin1 a1, 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.0.1",
+  "version": "4.3.0",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal"
@@ -28,10 +28,10 @@
     "geo-sqlite.d.ts"
   ],
   "dependencies": {
-    "@hebcal/cities": "^3.1.1",
+    "@hebcal/cities": "^3.1.2",
     "@hebcal/core": "^3.33.3",
     "better-sqlite3": "^7.5.0",
-    "pino": "^7.8.0",
+    "pino": "^7.8.1",
     "pino-pretty": "^7.5.3"
   },
   "scripts": {
@@ -60,11 +60,11 @@
     "@rollup/plugin-commonjs": "^21.0.2",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.1.3",
-    "ava": "^4.0.1",
-    "eslint": "^8.10.0",
+    "ava": "^4.1.0",
+    "eslint": "^8.11.0",
     "eslint-config-google": "^0.14.0",
     "jsdoc": "^3.6.10",
     "jsdoc-to-markdown": "^7.1.1",
-    "rollup": "^2.69.0"
+    "rollup": "^2.70.0"
   }
 }