@hebcal/geo-sqlite 4.0.0 → 4.2.0

package/bin/download-and-make-dbs

@@ -9,9 +9,13 @@ curl -o $TMPDIR/countryInfo.txt http://download.geonames.org/export/dump/country
 curl -o $TMPDIR/admin1CodesASCII.txt http://download.geonames.org/export/dump/admin1CodesASCII.txt
 curl -o $TMPDIR/cities5000.zip http://download.geonames.org/export/dump/cities5000.zip
 curl -o $TMPDIR/IL.zip http://download.geonames.org/export/dump/IL.zip
+curl -o $TMPDIR/alt-IL.zip http://download.geonames.org/export/dump/alternatenames/IL.zip
 
 cd $TMPDIR
 unzip cities5000.zip
+unzip alt-IL.zip
+mv IL.txt alt-IL.txt
+rm readme.txt
 unzip IL.zip
 
 cd $CURDIR
@@ -23,7 +27,8 @@ $CURDIR/node_modules/.bin/build-geonames-sqlite \
   $TMPDIR/cities5000.txt \
   "$CURDIR/node_modules/@hebcal/geo-sqlite/cities-patch.txt" \
   $TMPDIR/admin1CodesASCII.txt \
-  $TMPDIR/IL.txt
+  $TMPDIR/IL.txt \
+  $TMPDIR/alt-IL.txt
 
 rm -rf $TMPDIR
 

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v4.0.0 */
+/*! @hebcal/geo-sqlite v4.2.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;
@@ -511,9 +512,16 @@ async function buildGeonamesSqlite(opts) {
       gtopo30 int,
       timezone nvarchar(40),
       moddate date);`);
-  await doFile(logger, db, cities5000txt, 'geoname', 19);
-  await doFile(logger, db, citiesPatch, 'geoname', 19);
+
+  const truncateAlternateNames = a => {
+    a[3] = '';
+    return true;
+  };
+
+  await doFile(logger, db, cities5000txt, 'geoname', 19, truncateAlternateNames);
+  await doFile(logger, db, citiesPatch, 'geoname', 19, truncateAlternateNames);
   await doFile(logger, db, ILtxt, 'geoname', 19, a => {
+    a[3] = '';
     return a[6] == 'P' && (a[7] == 'PPL' || a[7] == 'STLMT');
   });
   doSql(logger, db, `DROP TABLE IF EXISTS admin1`, `CREATE TABLE admin1 (
@@ -542,6 +550,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, '׳');
@@ -597,11 +611,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.0 */
+/*! @hebcal/geo-sqlite v4.2.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;
@@ -499,9 +500,16 @@ async function buildGeonamesSqlite(opts) {
       gtopo30 int,
       timezone nvarchar(40),
       moddate date);`);
-  await doFile(logger, db, cities5000txt, 'geoname', 19);
-  await doFile(logger, db, citiesPatch, 'geoname', 19);
+
+  const truncateAlternateNames = a => {
+    a[3] = '';
+    return true;
+  };
+
+  await doFile(logger, db, cities5000txt, 'geoname', 19, truncateAlternateNames);
+  await doFile(logger, db, citiesPatch, 'geoname', 19, truncateAlternateNames);
   await doFile(logger, db, ILtxt, 'geoname', 19, a => {
+    a[3] = '';
     return a[6] == 'P' && (a[7] == 'PPL' || a[7] == 'STLMT');
   });
   doSql(logger, db, `DROP TABLE IF EXISTS admin1`, `CREATE TABLE admin1 (
@@ -530,6 +538,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, '׳');
@@ -585,11 +599,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.0",
+  "version": "4.2.0",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal"
@@ -28,7 +28,7 @@
     "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",
@@ -65,6 +65,6 @@
     "eslint-config-google": "^0.14.0",
     "jsdoc": "^3.6.10",
     "jsdoc-to-markdown": "^7.1.1",
-    "rollup": "^2.69.0"
+    "rollup": "^2.69.1"
   }
 }