@hebcal/geo-sqlite 4.4.3 → 4.5.2

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v4.4.3 */
+/*! @hebcal/geo-sqlite v4.5.2 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -60,13 +60,15 @@ FROM ZIPCodes_Primary
 WHERE ZipCode LIKE ?
 ORDER BY Population DESC
 LIMIT 10`;
-const ZIP_FULLTEXT_COMPLETE_SQL = `SELECT ZipCode, rank
+const ZIP_FULLTEXT_COMPLETE_SQL = `SELECT ZipCode
 FROM ZIPCodes_CityFullText5
 WHERE ZIPCodes_CityFullText5 MATCH ?
+ORDER BY Population DESC
 LIMIT 20`;
-const GEONAME_COMPLETE_SQL = `SELECT geonameid, rank
+const GEONAME_COMPLETE_SQL = `SELECT geonameid
 FROM geoname_fulltext
 WHERE geoname_fulltext MATCH ?
+ORDER BY population DESC
 LIMIT 20`;
 const stateNames = {
   'AK': 'Alaska',
@@ -316,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),
@@ -369,19 +372,19 @@ class GeoDb {
 
       const geoMatches = geoRows.map(res => {
         const loc = this.lookupGeoname(res.geonameid);
-        const country = this.countryNames.get(loc.getCountryCode()) || '';
+        const cc = loc.getCountryCode();
+        const country = this.countryNames.get(cc) || '';
         const admin1 = loc.admin1 || '';
-        const rankPop = Math.sqrt(loc.population) / 40;
         const obj = {
           id: res.geonameid,
           value: loc.name,
           admin1,
           country,
+          cc,
           latitude: loc.latitude,
           longitude: loc.longitude,
           timezone: loc.getTzid(),
-          geo: 'geoname',
-          rank: rankPop + -30 * res.rank
+          geo: 'geoname'
         };
 
         if (loc.population) {
@@ -411,19 +414,18 @@ class GeoDb {
       const zipMatches = zipRows.map(res => {
         const zipCode = res.ZipCode;
         const loc = this.lookupZip(zipCode);
-        const rankPop = Math.sqrt(loc.population) / 40;
         const obj = {
           id: zipCode,
           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',
-          rank: rankPop + -30 * res.rank
+          geo: 'zip'
         };
         return obj;
       });
@@ -444,8 +446,8 @@ class GeoDb {
       }
 
       const values = Array.from(map.values());
-      values.sort((a, b) => b.rank - a.rank);
-      const topN = values.slice(0, 10);
+      values.sort((a, b) => b.population - a.population);
+      const topN = values.slice(0, 15);
 
       if (!latlong) {
         for (const val of topN) {

package/dist/index.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v4.4.3 */
+/*! @hebcal/geo-sqlite v4.5.2 */
 import Database from 'better-sqlite3';
 import { Location, Locale } from '@hebcal/core';
 import '@hebcal/cities';
@@ -48,13 +48,15 @@ FROM ZIPCodes_Primary
 WHERE ZipCode LIKE ?
 ORDER BY Population DESC
 LIMIT 10`;
-const ZIP_FULLTEXT_COMPLETE_SQL = `SELECT ZipCode, rank
+const ZIP_FULLTEXT_COMPLETE_SQL = `SELECT ZipCode
 FROM ZIPCodes_CityFullText5
 WHERE ZIPCodes_CityFullText5 MATCH ?
+ORDER BY Population DESC
 LIMIT 20`;
-const GEONAME_COMPLETE_SQL = `SELECT geonameid, rank
+const GEONAME_COMPLETE_SQL = `SELECT geonameid
 FROM geoname_fulltext
 WHERE geoname_fulltext MATCH ?
+ORDER BY population DESC
 LIMIT 20`;
 const stateNames = {
   'AK': 'Alaska',
@@ -304,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),
@@ -357,19 +360,19 @@ class GeoDb {
 
       const geoMatches = geoRows.map(res => {
         const loc = this.lookupGeoname(res.geonameid);
-        const country = this.countryNames.get(loc.getCountryCode()) || '';
+        const cc = loc.getCountryCode();
+        const country = this.countryNames.get(cc) || '';
         const admin1 = loc.admin1 || '';
-        const rankPop = Math.sqrt(loc.population) / 40;
         const obj = {
           id: res.geonameid,
           value: loc.name,
           admin1,
           country,
+          cc,
           latitude: loc.latitude,
           longitude: loc.longitude,
           timezone: loc.getTzid(),
-          geo: 'geoname',
-          rank: rankPop + -30 * res.rank
+          geo: 'geoname'
         };
 
         if (loc.population) {
@@ -399,19 +402,18 @@ class GeoDb {
       const zipMatches = zipRows.map(res => {
         const zipCode = res.ZipCode;
         const loc = this.lookupZip(zipCode);
-        const rankPop = Math.sqrt(loc.population) / 40;
         const obj = {
           id: zipCode,
           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',
-          rank: rankPop + -30 * res.rank
+          geo: 'zip'
         };
         return obj;
       });
@@ -432,8 +434,8 @@ class GeoDb {
       }
 
       const values = Array.from(map.values());
-      values.sort((a, b) => b.rank - a.rank);
-      const topN = values.slice(0, 10);
+      values.sort((a, b) => b.population - a.population);
+      const topN = values.slice(0, 15);
 
       if (!latlong) {
         for (const val of topN) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/geo-sqlite",
-  "version": "4.4.3",
+  "version": "4.5.2",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal"