@hebcal/geo-sqlite 4.4.2 → 4.4.3

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v4.4.2 */
+/*! @hebcal/geo-sqlite v4.4.3 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -60,18 +60,14 @@ FROM ZIPCodes_Primary
 WHERE ZipCode LIKE ?
 ORDER BY Population DESC
 LIMIT 10`;
-const ZIP_FULLTEXT_COMPLETE_SQL = `SELECT ZipCode,CityMixedCase,rank
+const ZIP_FULLTEXT_COMPLETE_SQL = `SELECT ZipCode, rank
 FROM ZIPCodes_CityFullText5
-WHERE CityMixedCase MATCH ?
-ORDER BY Population DESC
-LIMIT 15`;
-const GEONAME_COMPLETE_SQL = `SELECT geonameid, longname,
-((sqrt(population)/40) + (-30 * rank)) as myrank
+WHERE ZIPCodes_CityFullText5 MATCH ?
+LIMIT 20`;
+const GEONAME_COMPLETE_SQL = `SELECT geonameid, rank
 FROM geoname_fulltext
 WHERE geoname_fulltext MATCH ?
-GROUP BY geonameid
-ORDER BY myrank DESC
-LIMIT 15`;
+LIMIT 20`;
 const stateNames = {
   'AK': 'Alaska',
   'AL': 'Alabama',
@@ -358,12 +354,24 @@ class GeoDb {
       }
 
       qraw = qraw.replace(/\"/g, '""');
-      const geoRows = this.geonamesCompStmt.all(`{longname} : "${qraw}" *`);
+      const geoRows0 = this.geonamesCompStmt.all(`{longname} : "${qraw}" *`);
+      const ids = new Set();
+      const geoRows = [];
+
+      for (const row of geoRows0) {
+        const id = row.geonameid;
+
+        if (!ids.has(id)) {
+          ids.add(id);
+          geoRows.push(row);
+        }
+      }
+
       const geoMatches = geoRows.map(res => {
         const loc = this.lookupGeoname(res.geonameid);
         const country = this.countryNames.get(loc.getCountryCode()) || '';
         const admin1 = loc.admin1 || '';
-        const rank = Math.trunc(res.myrank * 100.0) / 100.0;
+        const rankPop = Math.sqrt(loc.population) / 40;
         const obj = {
           id: res.geonameid,
           value: loc.name,
@@ -373,7 +381,7 @@ class GeoDb {
           longitude: loc.longitude,
           timezone: loc.getTzid(),
           geo: 'geoname',
-          rank: rank
+          rank: rankPop + -30 * res.rank
         };
 
         if (loc.population) {
@@ -399,11 +407,11 @@ class GeoDb {
         this.zipFulltextCompStmt = this.zipsDb.prepare(ZIP_FULLTEXT_COMPLETE_SQL);
       }
 
-      const zipRows = this.zipFulltextCompStmt.all(`"${qraw}" *`);
+      const zipRows = this.zipFulltextCompStmt.all(`{longname} : "${qraw}" *`);
       const zipMatches = zipRows.map(res => {
         const zipCode = res.ZipCode;
         const loc = this.lookupZip(zipCode);
-        const myrank = Math.sqrt(loc.population) / 40 + -30 * res.rank;
+        const rankPop = Math.sqrt(loc.population) / 40;
         const obj = {
           id: zipCode,
           value: loc.getName(),
@@ -415,7 +423,7 @@ class GeoDb {
           timezone: loc.getTzid(),
           population: loc.population,
           geo: 'zip',
-          rank: myrank
+          rank: rankPop + -30 * res.rank
         };
         return obj;
       });
@@ -628,12 +636,13 @@ async function buildGeonamesSqlite(opts) {
     `);
   doSql(logger, db, `update admin1 set name='',asciiname='' where key like 'PS.%';`, `update country set country = '' where iso = 'PS';`, `delete from geoname where geonameid = 7303419;`);
   doSql(logger, db, `DROP TABLE IF EXISTS geoname_fulltext`, `CREATE VIRTUAL TABLE geoname_fulltext
-      USING fts5(geonameid, longname, population);
+      USING fts5(geonameid UNINDEXED, longname, population, city, admin1, country);
     `, `DROP TABLE IF EXISTS geoname_non_ascii`, `CREATE TABLE geoname_non_ascii AS
       SELECT geonameid FROM geoname WHERE asciiname <> name`, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||a.asciiname||', '||c.Country,
-      g.population
+      g.population,
+      g.asciiname,a.asciiname,c.Country
       FROM geoname g, admin1 a, country c
       WHERE g.country = c.ISO
       AND g.country <> 'US'
@@ -641,21 +650,24 @@ async function buildGeonamesSqlite(opts) {
       `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||a.asciiname||', USA',
-      g.population
+      g.population,
+      g.asciiname,a.asciiname,'USA'
       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||', '||c.Country,
-      g.population
+      g.population,
+      g.asciiname,NULL,c.Country
       FROM geoname g, country c
       WHERE g.country = c.ISO
       AND (g.admin1 = '' OR g.admin1 = '00')
       `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.name||', '||a.name||', '||c.Country,
-      g.population
+      g.population,
+      g.name,a.name,c.Country
       FROM geoname_non_ascii gna, geoname g, admin1 a, country c
       WHERE gna.geonameid = g.geonameid
       AND g.country = c.ISO
@@ -663,7 +675,8 @@ async function buildGeonamesSqlite(opts) {
       `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       alt.name||', ישראל',
-      g.population
+      g.population,
+      alt.name,NULL,'ישראל'
       FROM geoname g, altnames alt
       WHERE g.country = 'IL'
       AND alt.isolanguage = 'he'
@@ -671,7 +684,8 @@ async function buildGeonamesSqlite(opts) {
       `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       alt.name||', '||a1.asciiname||', Israel',
-      g.population
+      g.population,
+      alt.name,a1.asciiname,'Israel'
       FROM geoname g, admin1 a1, altnames alt
       WHERE g.country = 'IL'
       AND alt.isolanguage = 'en'

package/dist/index.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v4.4.2 */
+/*! @hebcal/geo-sqlite v4.4.3 */
 import Database from 'better-sqlite3';
 import { Location, Locale } from '@hebcal/core';
 import '@hebcal/cities';
@@ -48,18 +48,14 @@ FROM ZIPCodes_Primary
 WHERE ZipCode LIKE ?
 ORDER BY Population DESC
 LIMIT 10`;
-const ZIP_FULLTEXT_COMPLETE_SQL = `SELECT ZipCode,CityMixedCase,rank
+const ZIP_FULLTEXT_COMPLETE_SQL = `SELECT ZipCode, rank
 FROM ZIPCodes_CityFullText5
-WHERE CityMixedCase MATCH ?
-ORDER BY Population DESC
-LIMIT 15`;
-const GEONAME_COMPLETE_SQL = `SELECT geonameid, longname,
-((sqrt(population)/40) + (-30 * rank)) as myrank
+WHERE ZIPCodes_CityFullText5 MATCH ?
+LIMIT 20`;
+const GEONAME_COMPLETE_SQL = `SELECT geonameid, rank
 FROM geoname_fulltext
 WHERE geoname_fulltext MATCH ?
-GROUP BY geonameid
-ORDER BY myrank DESC
-LIMIT 15`;
+LIMIT 20`;
 const stateNames = {
   'AK': 'Alaska',
   'AL': 'Alabama',
@@ -346,12 +342,24 @@ class GeoDb {
       }
 
       qraw = qraw.replace(/\"/g, '""');
-      const geoRows = this.geonamesCompStmt.all(`{longname} : "${qraw}" *`);
+      const geoRows0 = this.geonamesCompStmt.all(`{longname} : "${qraw}" *`);
+      const ids = new Set();
+      const geoRows = [];
+
+      for (const row of geoRows0) {
+        const id = row.geonameid;
+
+        if (!ids.has(id)) {
+          ids.add(id);
+          geoRows.push(row);
+        }
+      }
+
       const geoMatches = geoRows.map(res => {
         const loc = this.lookupGeoname(res.geonameid);
         const country = this.countryNames.get(loc.getCountryCode()) || '';
         const admin1 = loc.admin1 || '';
-        const rank = Math.trunc(res.myrank * 100.0) / 100.0;
+        const rankPop = Math.sqrt(loc.population) / 40;
         const obj = {
           id: res.geonameid,
           value: loc.name,
@@ -361,7 +369,7 @@ class GeoDb {
           longitude: loc.longitude,
           timezone: loc.getTzid(),
           geo: 'geoname',
-          rank: rank
+          rank: rankPop + -30 * res.rank
         };
 
         if (loc.population) {
@@ -387,11 +395,11 @@ class GeoDb {
         this.zipFulltextCompStmt = this.zipsDb.prepare(ZIP_FULLTEXT_COMPLETE_SQL);
       }
 
-      const zipRows = this.zipFulltextCompStmt.all(`"${qraw}" *`);
+      const zipRows = this.zipFulltextCompStmt.all(`{longname} : "${qraw}" *`);
       const zipMatches = zipRows.map(res => {
         const zipCode = res.ZipCode;
         const loc = this.lookupZip(zipCode);
-        const myrank = Math.sqrt(loc.population) / 40 + -30 * res.rank;
+        const rankPop = Math.sqrt(loc.population) / 40;
         const obj = {
           id: zipCode,
           value: loc.getName(),
@@ -403,7 +411,7 @@ class GeoDb {
           timezone: loc.getTzid(),
           population: loc.population,
           geo: 'zip',
-          rank: myrank
+          rank: rankPop + -30 * res.rank
         };
         return obj;
       });
@@ -616,12 +624,13 @@ async function buildGeonamesSqlite(opts) {
     `);
   doSql(logger, db, `update admin1 set name='',asciiname='' where key like 'PS.%';`, `update country set country = '' where iso = 'PS';`, `delete from geoname where geonameid = 7303419;`);
   doSql(logger, db, `DROP TABLE IF EXISTS geoname_fulltext`, `CREATE VIRTUAL TABLE geoname_fulltext
-      USING fts5(geonameid, longname, population);
+      USING fts5(geonameid UNINDEXED, longname, population, city, admin1, country);
     `, `DROP TABLE IF EXISTS geoname_non_ascii`, `CREATE TABLE geoname_non_ascii AS
       SELECT geonameid FROM geoname WHERE asciiname <> name`, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||a.asciiname||', '||c.Country,
-      g.population
+      g.population,
+      g.asciiname,a.asciiname,c.Country
       FROM geoname g, admin1 a, country c
       WHERE g.country = c.ISO
       AND g.country <> 'US'
@@ -629,21 +638,24 @@ async function buildGeonamesSqlite(opts) {
       `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||a.asciiname||', USA',
-      g.population
+      g.population,
+      g.asciiname,a.asciiname,'USA'
       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||', '||c.Country,
-      g.population
+      g.population,
+      g.asciiname,NULL,c.Country
       FROM geoname g, country c
       WHERE g.country = c.ISO
       AND (g.admin1 = '' OR g.admin1 = '00')
       `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.name||', '||a.name||', '||c.Country,
-      g.population
+      g.population,
+      g.name,a.name,c.Country
       FROM geoname_non_ascii gna, geoname g, admin1 a, country c
       WHERE gna.geonameid = g.geonameid
       AND g.country = c.ISO
@@ -651,7 +663,8 @@ async function buildGeonamesSqlite(opts) {
       `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       alt.name||', ישראל',
-      g.population
+      g.population,
+      alt.name,NULL,'ישראל'
       FROM geoname g, altnames alt
       WHERE g.country = 'IL'
       AND alt.isolanguage = 'he'
@@ -659,7 +672,8 @@ async function buildGeonamesSqlite(opts) {
       `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       alt.name||', '||a1.asciiname||', Israel',
-      g.population
+      g.population,
+      alt.name,a1.asciiname,'Israel'
       FROM geoname g, admin1 a1, altnames alt
       WHERE g.country = 'IL'
       AND alt.isolanguage = 'en'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/geo-sqlite",
-  "version": "4.4.2",
+  "version": "4.4.3",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal"
@@ -29,8 +29,8 @@
   ],
   "dependencies": {
     "@hebcal/cities": "^3.1.2",
-    "@hebcal/core": "^3.36.2",
-    "better-sqlite3": "^7.5.1",
+    "@hebcal/core": "^3.38.0",
+    "better-sqlite3": "^7.5.3",
     "pino": "^7.11.0",
     "pino-pretty": "^7.6.1"
   },
@@ -53,18 +53,18 @@
   },
   "license": "BSD-2-Clause",
   "devDependencies": {
-    "@babel/core": "^7.17.10",
-    "@babel/preset-env": "^7.17.10",
+    "@babel/core": "^7.18.2",
+    "@babel/preset-env": "^7.18.2",
     "@babel/register": "^7.17.7",
     "@rollup/plugin-babel": "^5.3.1",
     "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.2.1",
+    "@rollup/plugin-node-resolve": "^13.3.0",
     "ava": "^4.2.0",
-    "eslint": "^8.14.0",
+    "eslint": "^8.16.0",
     "eslint-config-google": "^0.14.0",
     "jsdoc": "^3.6.10",
     "jsdoc-to-markdown": "^7.1.1",
-    "rollup": "^2.71.1"
+    "rollup": "^2.75.4"
   }
 }

package/zips-dummy.sql

@@ -13,4 +13,4 @@ CREATE VIRTUAL TABLE ZIPCodes_CityFullText
 USING fts4(ZipCode,CityMixedCase,State,Latitude,Longitude,TimeZone,DayLightSaving,Population);
 
 CREATE VIRTUAL TABLE ZIPCodes_CityFullText5
-USING fts5(ZipCode,CityMixedCase,Population);
+USING fts5(ZipCode UNINDEXED,CityMixedCase,Population UNINDEXED,longname);