@hebcal/geo-sqlite 4.9.1 → 4.9.3

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v4.9.1 */
+/*! @hebcal/geo-sqlite v4.9.3 */
 'use strict';
 
 var Database = require('better-sqlite3');
@@ -18,10 +18,7 @@ let a=[["\0","
","","","","","","","\b","\t","\n","\v","\f","\r","","","
  * @return {string}
  */
 function munge(s) {
-  return s.toLowerCase()
-      .replace(/'/g, '')
-      .replace(/ /g, '')
-      .replace(/\+/g, '');
+  return s.toLowerCase().replace(/'/g, '').replace(/ /g, '').replace(/\+/g, '');
 }
 
 const GEONAME_SQL = `SELECT
@@ -39,7 +36,6 @@ LEFT JOIN country c on g.country = c.iso
 LEFT JOIN admin1 a on g.country||'.'||g.admin1 = a.key
 WHERE g.geonameid = ?
 `;
-
 const GEONAME_ALL_SQL = `SELECT
   g.geonameid as geonameid,
   g.name as name,
@@ -55,33 +51,25 @@ FROM geoname g
 LEFT JOIN country c on g.country = c.iso
 LEFT JOIN admin1 a on g.country||'.'||g.admin1 = a.key
 `;
-
 const ZIPCODE_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary WHERE ZipCode = ?`;
-
 const ZIPCODE_ALL_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary`;
-
 const ZIP_COMPLETE_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary
 WHERE ZipCode LIKE ?
 ORDER BY Population DESC
 LIMIT 10`;
-
-const ZIP_FULLTEXT_COMPLETE_SQL =
-`SELECT ZipCode
+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, longname, city, admin1, country
+const GEONAME_COMPLETE_SQL = `SELECT geonameid, longname, city, admin1, country
 FROM geoname_fulltext
 WHERE geoname_fulltext MATCH ?
 ORDER BY population DESC
 LIMIT 20`;
-
 const stateNames = {
   'AK': 'Alaska',
   'AL': 'Alabama',
@@ -133,7 +121,7 @@ const stateNames = {
   'WA': 'Washington',
   'WI': 'Wisconsin',
   'WV': 'West Virginia',
-  'WY': 'Wyoming',
+  'WY': 'Wyoming'
 };
 
 /** Wrapper around sqlite databases */
@@ -146,9 +134,13 @@ class GeoDb {
   constructor(logger, zipsFilename, geonamesFilename) {
     this.logger = logger;
     if (logger) logger.info(`GeoDb: opening ${zipsFilename}...`);
-    this.zipsDb = new Database(zipsFilename, {fileMustExist: true});
+    this.zipsDb = new Database(zipsFilename, {
+      fileMustExist: true
+    });
     if (logger) logger.info(`GeoDb: opening ${geonamesFilename}...`);
-    this.geonamesDb = new Database(geonamesFilename, {fileMustExist: true});
+    this.geonamesDb = new Database(geonamesFilename, {
+      fileMustExist: true
+    });
     this.zipStmt = this.zipsDb.prepare(ZIPCODE_SQL);
     /** @type {Map<string, Location>} */
     this.zipCache = new Map();
@@ -294,15 +286,7 @@ class GeoDb {
     const country = result.country || '';
     const admin1 = result.admin1 || '';
     const cityDescr = GeoDb.geonameCityDescr(result.name, admin1, country);
-    const location = new core.Location(
-        result.latitude,
-        result.longitude,
-        result.cc == 'IL',
-        result.timezone,
-        cityDescr,
-        result.cc,
-        geonameid,
-    );
+    const location = new core.Location(result.latitude, result.longitude, result.cc == 'IL', result.timezone, cityDescr, result.cc, geonameid);
     location.geo = 'geoname';
     location.geonameid = geonameid;
     location.asciiname = result.asciiname;
@@ -354,7 +338,7 @@ class GeoDb {
       longitude: res.Longitude,
       timezone: core.Location.getUsaTzid(res.State, res.TimeZone, res.DayLightSaving),
       population: res.Population,
-      geo: 'zip',
+      geo: 'zip'
     };
     return obj;
   }
@@ -365,7 +349,7 @@ class GeoDb {
    * @param {boolean} latlong
    * @return {Object[]}
    */
-  autoComplete(qraw, latlong=false) {
+  autoComplete(qraw, latlong = false) {
     qraw = qraw.trim();
     if (qraw.length === 0) {
       return [];
@@ -392,7 +376,7 @@ class GeoDb {
           geoRows.push(row);
         }
       }
-      const geoMatches = geoRows.map((res) => {
+      const geoMatches = geoRows.map(res => {
         const loc = this.lookupGeoname(res.geonameid);
         return this.geonameLocToAutocomplete(loc, res);
       });
@@ -400,7 +384,7 @@ class GeoDb {
         this.zipFulltextCompStmt = this.zipsDb.prepare(ZIP_FULLTEXT_COMPLETE_SQL);
       }
       const zipRows = this.zipFulltextCompStmt.all(`{longname} : "${qraw}" *`);
-      const zipMatches = zipRows.map((res) => {
+      const zipMatches = zipRows.map(res => {
         const loc = this.lookupZip(res.ZipCode);
         return GeoDb.zipLocToAutocomplete(loc);
       });
@@ -438,7 +422,7 @@ class GeoDb {
       latitude: loc.latitude,
       longitude: loc.longitude,
       timezone: loc.getTzid(),
-      geo: 'geoname',
+      geo: 'geoname'
     };
     if (loc.population) {
       obj.population = loc.population;
@@ -475,7 +459,7 @@ class GeoDb {
       longitude: loc.longitude,
       timezone: loc.getTzid(),
       population: loc.population,
-      geo: 'zip',
+      geo: 'zip'
     };
   }
 
@@ -551,11 +535,7 @@ async function buildGeonamesSqlite(opts) {
   logger.info(`Opening ${dbFilename}`);
   const db = new Database(dbFilename);
   db.pragma('journal_mode = MEMORY');
-
-  doSql(logger, db,
-      `DROP TABLE IF EXISTS country`,
-
-      `CREATE TABLE country (
+  doSql(logger, db, `DROP TABLE IF EXISTS country`, `CREATE TABLE country (
       ISO TEXT PRIMARY KEY,
       ISO3 TEXT NOT NULL,
       IsoNumeric TEXT NOT NULL,
@@ -575,14 +555,9 @@ async function buildGeonamesSqlite(opts) {
       geonameid INT NOT NULL,
       neighbours TEXT NOT NULL,
       EquivalentFipsCode TEXT NOT NULL
-    );`,
-  );
+    );`);
   await doFile(logger, db, countryInfotxt, 'country', 19);
-
-  doSql(logger, db,
-      `DROP TABLE IF EXISTS geoname`,
-
-      `CREATE TABLE geoname (
+  doSql(logger, db, `DROP TABLE IF EXISTS geoname`, `CREATE TABLE geoname (
       geonameid int PRIMARY KEY,
       name nvarchar(200),
       asciiname nvarchar(200),
@@ -601,48 +576,32 @@ async function buildGeonamesSqlite(opts) {
       elevation int,
       gtopo30 int,
       timezone nvarchar(40),
-      moddate date);`,
-  );
-
-  const truncateAlternateNames = (a) => {
+      moddate date);`);
+  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) => {
+  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 (
+  doSql(logger, db, `DROP TABLE IF EXISTS admin1`, `CREATE TABLE admin1 (
       key TEXT PRIMARY KEY,
       name nvarchar(200) NOT NULL,
       asciiname nvarchar(200) NOT NULL,
       geonameid int NOT NULL
-      );`,
-  );
-
+      );`);
   await doFile(logger, db, admin1CodesASCIItxt, 'admin1', 4);
 
   // fix inconsistencies with the USA capitol
-  doSql(logger, db,
-      `UPDATE geoname
+  doSql(logger, db, `UPDATE geoname
       SET name = 'Washington, D.C.', asciiname = 'Washington, D.C.'
-      WHERE geonameid = 4140963;`,
-
-      `UPDATE admin1
+      WHERE geonameid = 4140963;`, `UPDATE admin1
       SET name = 'Washington, D.C.', asciiname = 'Washington, D.C.'
-      WHERE key = 'US.DC';`,
-  );
-
-  doSql(logger, db,
-      `DROP TABLE IF EXISTS alternatenames`,
-
-      `CREATE TABLE alternatenames (
+      WHERE key = 'US.DC';`);
+  doSql(logger, db, `DROP TABLE IF EXISTS alternatenames`, `CREATE TABLE alternatenames (
     id int PRIMARY KEY,
     geonameid int NOT NULL,
     isolanguage varchar(7),
@@ -653,10 +612,8 @@ async function buildGeonamesSqlite(opts) {
     isHistoric tinyint,
     periodFrom NULL,
     periodTo NULL
-    );`,
-  );
-
-  await doFile(logger, db, ILalternate, 'alternatenames', 10, (a) => {
+    );`);
+  await doFile(logger, db, ILalternate, 'alternatenames', 10, a => {
     const firstchar = a[3][0];
     if (a[2] === 'he' && (firstchar < '\u05D0' || firstchar > '\u05EA')) {
       a[2] = 'en';
@@ -684,35 +641,16 @@ async function buildGeonamesSqlite(opts) {
   });
 
   // remove duplicates from alternatenames
-  doSql(logger, db,
-      `DROP TABLE IF EXISTS altnames`,
-
-      `CREATE TABLE altnames
+  doSql(logger, db, `DROP TABLE IF EXISTS altnames`, `CREATE TABLE altnames
     AS SELECT geonameid, isolanguage, name
     FROM alternatenames
     GROUP BY 1, 2, 3
-    `,
-  );
-
-  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
+    `);
+  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 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
+    `, `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,
@@ -723,9 +661,7 @@ async function buildGeonamesSqlite(opts) {
       AND g.country <> 'IL'
       AND g.country <> 'GB'
       AND g.country||'.'||g.admin1 = a.key
-      `,
-
-      `INSERT INTO geoname_fulltext
+      `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||a.asciiname||', USA',
       g.population,
@@ -733,9 +669,7 @@ async function buildGeonamesSqlite(opts) {
       FROM geoname g, admin1 a
       WHERE g.country = 'US'
       AND g.country||'.'||g.admin1 = a.key
-      `,
-
-      `INSERT INTO geoname_fulltext
+      `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||a.asciiname||', UK',
       g.population,
@@ -743,18 +677,14 @@ async function buildGeonamesSqlite(opts) {
       FROM geoname g, admin1 a
       WHERE g.country = 'GB'
       AND g.country||'.'||g.admin1 = a.key
-      `,
-
-      `INSERT INTO geoname_fulltext
+      `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', Israel',
       g.population,
       g.asciiname,NULL,'Israel'
       FROM geoname g
       WHERE g.country = 'IL'
-      `,
-
-      `INSERT INTO geoname_fulltext
+      `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||c.Country,
       g.population,
@@ -762,9 +692,7 @@ async function buildGeonamesSqlite(opts) {
       FROM geoname g, country c
       WHERE g.country = c.ISO
       AND (g.admin1 = '' OR g.admin1 = '00')
-      `,
-
-      `INSERT INTO geoname_fulltext
+      `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.name||', '||a.name||', '||c.Country,
       g.population,
@@ -773,9 +701,7 @@ async function buildGeonamesSqlite(opts) {
       WHERE gna.geonameid = g.geonameid
       AND g.country = c.ISO
       AND g.country||'.'||g.admin1 = a.key
-      `,
-
-      `INSERT INTO geoname_fulltext
+      `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       alt.name||', ישראל',
       g.population,
@@ -784,9 +710,7 @@ async function buildGeonamesSqlite(opts) {
       WHERE g.country = 'IL'
       AND alt.isolanguage = 'he'
       AND g.geonameid = alt.geonameid
-      `,
-
-      `INSERT INTO geoname_fulltext
+      `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       alt.name||', Israel',
       g.population,
@@ -795,11 +719,7 @@ async function buildGeonamesSqlite(opts) {
       WHERE g.country = 'IL'
       AND alt.isolanguage = 'en'
       AND g.geonameid = alt.geonameid
-      `,
-
-      'VACUUM',
-  );
-
+      `, 'VACUUM');
   return new Promise((resolve, reject) => {
     try {
       logger.info(`Closing ${dbFilename}`);
@@ -847,11 +767,11 @@ async function doFile(logger, db, infile, tableName, expectedFields, callback) {
     try {
       const rl = readline.createInterface({
         input: fs.createReadStream(infile),
-        crlfDelay: Infinity,
+        crlfDelay: Infinity
       });
       let num = 0;
       let accepted = 0;
-      rl.on('line', (line) => {
+      rl.on('line', line => {
         num++;
         if (line[0] == '#') {
           return;
@@ -870,13 +790,11 @@ async function doFile(logger, db, infile, tableName, expectedFields, callback) {
         stmt.run(a);
         accepted++;
       });
-
       rl.on('close', () => {
         logger.info(`Inserted ${accepted} / ${num} into ${tableName} from ${infile}`);
         stmt = null;
         db.exec('COMMIT');
       });
-
       return resolve(events.once(rl, 'close'));
     } catch (err) {
       logger.error(err);

package/dist/index.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v4.9.1 */
+/*! @hebcal/geo-sqlite v4.9.3 */
 import Database from 'better-sqlite3';
 import { Location, Locale } from '@hebcal/core';
 import '@hebcal/cities';
@@ -16,10 +16,7 @@ let a=[["\0","
","","","","","","","\b","\t","\n","\v","\f","\r","","","
  * @return {string}
  */
 function munge(s) {
-  return s.toLowerCase()
-      .replace(/'/g, '')
-      .replace(/ /g, '')
-      .replace(/\+/g, '');
+  return s.toLowerCase().replace(/'/g, '').replace(/ /g, '').replace(/\+/g, '');
 }
 
 const GEONAME_SQL = `SELECT
@@ -37,7 +34,6 @@ LEFT JOIN country c on g.country = c.iso
 LEFT JOIN admin1 a on g.country||'.'||g.admin1 = a.key
 WHERE g.geonameid = ?
 `;
-
 const GEONAME_ALL_SQL = `SELECT
   g.geonameid as geonameid,
   g.name as name,
@@ -53,33 +49,25 @@ FROM geoname g
 LEFT JOIN country c on g.country = c.iso
 LEFT JOIN admin1 a on g.country||'.'||g.admin1 = a.key
 `;
-
 const ZIPCODE_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary WHERE ZipCode = ?`;
-
 const ZIPCODE_ALL_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary`;
-
 const ZIP_COMPLETE_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary
 WHERE ZipCode LIKE ?
 ORDER BY Population DESC
 LIMIT 10`;
-
-const ZIP_FULLTEXT_COMPLETE_SQL =
-`SELECT ZipCode
+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, longname, city, admin1, country
+const GEONAME_COMPLETE_SQL = `SELECT geonameid, longname, city, admin1, country
 FROM geoname_fulltext
 WHERE geoname_fulltext MATCH ?
 ORDER BY population DESC
 LIMIT 20`;
-
 const stateNames = {
   'AK': 'Alaska',
   'AL': 'Alabama',
@@ -131,7 +119,7 @@ const stateNames = {
   'WA': 'Washington',
   'WI': 'Wisconsin',
   'WV': 'West Virginia',
-  'WY': 'Wyoming',
+  'WY': 'Wyoming'
 };
 
 /** Wrapper around sqlite databases */
@@ -144,9 +132,13 @@ class GeoDb {
   constructor(logger, zipsFilename, geonamesFilename) {
     this.logger = logger;
     if (logger) logger.info(`GeoDb: opening ${zipsFilename}...`);
-    this.zipsDb = new Database(zipsFilename, {fileMustExist: true});
+    this.zipsDb = new Database(zipsFilename, {
+      fileMustExist: true
+    });
     if (logger) logger.info(`GeoDb: opening ${geonamesFilename}...`);
-    this.geonamesDb = new Database(geonamesFilename, {fileMustExist: true});
+    this.geonamesDb = new Database(geonamesFilename, {
+      fileMustExist: true
+    });
     this.zipStmt = this.zipsDb.prepare(ZIPCODE_SQL);
     /** @type {Map<string, Location>} */
     this.zipCache = new Map();
@@ -292,15 +284,7 @@ class GeoDb {
     const country = result.country || '';
     const admin1 = result.admin1 || '';
     const cityDescr = GeoDb.geonameCityDescr(result.name, admin1, country);
-    const location = new Location(
-        result.latitude,
-        result.longitude,
-        result.cc == 'IL',
-        result.timezone,
-        cityDescr,
-        result.cc,
-        geonameid,
-    );
+    const location = new Location(result.latitude, result.longitude, result.cc == 'IL', result.timezone, cityDescr, result.cc, geonameid);
     location.geo = 'geoname';
     location.geonameid = geonameid;
     location.asciiname = result.asciiname;
@@ -352,7 +336,7 @@ class GeoDb {
       longitude: res.Longitude,
       timezone: Location.getUsaTzid(res.State, res.TimeZone, res.DayLightSaving),
       population: res.Population,
-      geo: 'zip',
+      geo: 'zip'
     };
     return obj;
   }
@@ -363,7 +347,7 @@ class GeoDb {
    * @param {boolean} latlong
    * @return {Object[]}
    */
-  autoComplete(qraw, latlong=false) {
+  autoComplete(qraw, latlong = false) {
     qraw = qraw.trim();
     if (qraw.length === 0) {
       return [];
@@ -390,7 +374,7 @@ class GeoDb {
           geoRows.push(row);
         }
       }
-      const geoMatches = geoRows.map((res) => {
+      const geoMatches = geoRows.map(res => {
         const loc = this.lookupGeoname(res.geonameid);
         return this.geonameLocToAutocomplete(loc, res);
       });
@@ -398,7 +382,7 @@ class GeoDb {
         this.zipFulltextCompStmt = this.zipsDb.prepare(ZIP_FULLTEXT_COMPLETE_SQL);
       }
       const zipRows = this.zipFulltextCompStmt.all(`{longname} : "${qraw}" *`);
-      const zipMatches = zipRows.map((res) => {
+      const zipMatches = zipRows.map(res => {
         const loc = this.lookupZip(res.ZipCode);
         return GeoDb.zipLocToAutocomplete(loc);
       });
@@ -436,7 +420,7 @@ class GeoDb {
       latitude: loc.latitude,
       longitude: loc.longitude,
       timezone: loc.getTzid(),
-      geo: 'geoname',
+      geo: 'geoname'
     };
     if (loc.population) {
       obj.population = loc.population;
@@ -473,7 +457,7 @@ class GeoDb {
       longitude: loc.longitude,
       timezone: loc.getTzid(),
       population: loc.population,
-      geo: 'zip',
+      geo: 'zip'
     };
   }
 
@@ -549,11 +533,7 @@ async function buildGeonamesSqlite(opts) {
   logger.info(`Opening ${dbFilename}`);
   const db = new Database(dbFilename);
   db.pragma('journal_mode = MEMORY');
-
-  doSql(logger, db,
-      `DROP TABLE IF EXISTS country`,
-
-      `CREATE TABLE country (
+  doSql(logger, db, `DROP TABLE IF EXISTS country`, `CREATE TABLE country (
       ISO TEXT PRIMARY KEY,
       ISO3 TEXT NOT NULL,
       IsoNumeric TEXT NOT NULL,
@@ -573,14 +553,9 @@ async function buildGeonamesSqlite(opts) {
       geonameid INT NOT NULL,
       neighbours TEXT NOT NULL,
       EquivalentFipsCode TEXT NOT NULL
-    );`,
-  );
+    );`);
   await doFile(logger, db, countryInfotxt, 'country', 19);
-
-  doSql(logger, db,
-      `DROP TABLE IF EXISTS geoname`,
-
-      `CREATE TABLE geoname (
+  doSql(logger, db, `DROP TABLE IF EXISTS geoname`, `CREATE TABLE geoname (
       geonameid int PRIMARY KEY,
       name nvarchar(200),
       asciiname nvarchar(200),
@@ -599,48 +574,32 @@ async function buildGeonamesSqlite(opts) {
       elevation int,
       gtopo30 int,
       timezone nvarchar(40),
-      moddate date);`,
-  );
-
-  const truncateAlternateNames = (a) => {
+      moddate date);`);
+  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) => {
+  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 (
+  doSql(logger, db, `DROP TABLE IF EXISTS admin1`, `CREATE TABLE admin1 (
       key TEXT PRIMARY KEY,
       name nvarchar(200) NOT NULL,
       asciiname nvarchar(200) NOT NULL,
       geonameid int NOT NULL
-      );`,
-  );
-
+      );`);
   await doFile(logger, db, admin1CodesASCIItxt, 'admin1', 4);
 
   // fix inconsistencies with the USA capitol
-  doSql(logger, db,
-      `UPDATE geoname
+  doSql(logger, db, `UPDATE geoname
       SET name = 'Washington, D.C.', asciiname = 'Washington, D.C.'
-      WHERE geonameid = 4140963;`,
-
-      `UPDATE admin1
+      WHERE geonameid = 4140963;`, `UPDATE admin1
       SET name = 'Washington, D.C.', asciiname = 'Washington, D.C.'
-      WHERE key = 'US.DC';`,
-  );
-
-  doSql(logger, db,
-      `DROP TABLE IF EXISTS alternatenames`,
-
-      `CREATE TABLE alternatenames (
+      WHERE key = 'US.DC';`);
+  doSql(logger, db, `DROP TABLE IF EXISTS alternatenames`, `CREATE TABLE alternatenames (
     id int PRIMARY KEY,
     geonameid int NOT NULL,
     isolanguage varchar(7),
@@ -651,10 +610,8 @@ async function buildGeonamesSqlite(opts) {
     isHistoric tinyint,
     periodFrom NULL,
     periodTo NULL
-    );`,
-  );
-
-  await doFile(logger, db, ILalternate, 'alternatenames', 10, (a) => {
+    );`);
+  await doFile(logger, db, ILalternate, 'alternatenames', 10, a => {
     const firstchar = a[3][0];
     if (a[2] === 'he' && (firstchar < '\u05D0' || firstchar > '\u05EA')) {
       a[2] = 'en';
@@ -682,35 +639,16 @@ async function buildGeonamesSqlite(opts) {
   });
 
   // remove duplicates from alternatenames
-  doSql(logger, db,
-      `DROP TABLE IF EXISTS altnames`,
-
-      `CREATE TABLE altnames
+  doSql(logger, db, `DROP TABLE IF EXISTS altnames`, `CREATE TABLE altnames
     AS SELECT geonameid, isolanguage, name
     FROM alternatenames
     GROUP BY 1, 2, 3
-    `,
-  );
-
-  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
+    `);
+  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 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
+    `, `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,
@@ -721,9 +659,7 @@ async function buildGeonamesSqlite(opts) {
       AND g.country <> 'IL'
       AND g.country <> 'GB'
       AND g.country||'.'||g.admin1 = a.key
-      `,
-
-      `INSERT INTO geoname_fulltext
+      `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||a.asciiname||', USA',
       g.population,
@@ -731,9 +667,7 @@ async function buildGeonamesSqlite(opts) {
       FROM geoname g, admin1 a
       WHERE g.country = 'US'
       AND g.country||'.'||g.admin1 = a.key
-      `,
-
-      `INSERT INTO geoname_fulltext
+      `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||a.asciiname||', UK',
       g.population,
@@ -741,18 +675,14 @@ async function buildGeonamesSqlite(opts) {
       FROM geoname g, admin1 a
       WHERE g.country = 'GB'
       AND g.country||'.'||g.admin1 = a.key
-      `,
-
-      `INSERT INTO geoname_fulltext
+      `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', Israel',
       g.population,
       g.asciiname,NULL,'Israel'
       FROM geoname g
       WHERE g.country = 'IL'
-      `,
-
-      `INSERT INTO geoname_fulltext
+      `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||c.Country,
       g.population,
@@ -760,9 +690,7 @@ async function buildGeonamesSqlite(opts) {
       FROM geoname g, country c
       WHERE g.country = c.ISO
       AND (g.admin1 = '' OR g.admin1 = '00')
-      `,
-
-      `INSERT INTO geoname_fulltext
+      `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.name||', '||a.name||', '||c.Country,
       g.population,
@@ -771,9 +699,7 @@ async function buildGeonamesSqlite(opts) {
       WHERE gna.geonameid = g.geonameid
       AND g.country = c.ISO
       AND g.country||'.'||g.admin1 = a.key
-      `,
-
-      `INSERT INTO geoname_fulltext
+      `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       alt.name||', ישראל',
       g.population,
@@ -782,9 +708,7 @@ async function buildGeonamesSqlite(opts) {
       WHERE g.country = 'IL'
       AND alt.isolanguage = 'he'
       AND g.geonameid = alt.geonameid
-      `,
-
-      `INSERT INTO geoname_fulltext
+      `, `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       alt.name||', Israel',
       g.population,
@@ -793,11 +717,7 @@ async function buildGeonamesSqlite(opts) {
       WHERE g.country = 'IL'
       AND alt.isolanguage = 'en'
       AND g.geonameid = alt.geonameid
-      `,
-
-      'VACUUM',
-  );
-
+      `, 'VACUUM');
   return new Promise((resolve, reject) => {
     try {
       logger.info(`Closing ${dbFilename}`);
@@ -845,11 +765,11 @@ async function doFile(logger, db, infile, tableName, expectedFields, callback) {
     try {
       const rl = readline.createInterface({
         input: fs.createReadStream(infile),
-        crlfDelay: Infinity,
+        crlfDelay: Infinity
       });
       let num = 0;
       let accepted = 0;
-      rl.on('line', (line) => {
+      rl.on('line', line => {
         num++;
         if (line[0] == '#') {
           return;
@@ -868,13 +788,11 @@ async function doFile(logger, db, infile, tableName, expectedFields, callback) {
         stmt.run(a);
         accepted++;
       });
-
       rl.on('close', () => {
         logger.info(`Inserted ${accepted} / ${num} into ${tableName} from ${infile}`);
         stmt = null;
         db.exec('COMMIT');
       });
-
       return resolve(events.once(rl, 'close'));
     } catch (err) {
       logger.error(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/geo-sqlite",
-  "version": "4.9.1",
+  "version": "4.9.3",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal"
@@ -8,9 +8,8 @@
   "description": "Hebcal ES6 interface to GeoNames and USA ZIP code SQLite databases",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
-  "type": "module",
   "bin": {
-    "build-geonames-sqlite": "bin/build-geonames-sqlite.cjs",
+    "build-geonames-sqlite": "bin/build-geonames-sqlite",
     "download-and-make-dbs": "bin/download-and-make-dbs"
   },
   "repository": {
@@ -31,7 +30,7 @@
   "dependencies": {
     "@hebcal/cities": "^3.2.0",
     "@hebcal/core": "^4.3.0",
-    "better-sqlite3": "^8.5.1",
+    "better-sqlite3": "^8.5.0",
     "pino": "^8.15.0",
     "pino-pretty": "^10.2.0",
     "transliteration": "^2.3.5"
@@ -42,11 +41,18 @@
     "readme": "npx jsdoc2md dist/index.js",
     "test": "ava"
   },
+  "ava": {
+    "require": ["@babel/register"]
+  },
   "license": "BSD-2-Clause",
   "devDependencies": {
+    "@babel/core": "^7.22.10",
+    "@babel/preset-env": "^7.22.10",
+    "@babel/register": "^7.22.5",
+    "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.2.0",
+    "@rollup/plugin-node-resolve": "^15.1.0",
     "ava": "^5.3.1",
     "eslint": "^8.47.0",
     "eslint-config-google": "^0.14.0",

package/readme.txt

@@ -1,141 +0,0 @@
-
-Readme for GeoNames Gazetteer extract files
-
-============================================================================================================
-
-This work is licensed under a Creative Commons Attribution 4.0 License,
-see https://creativecommons.org/licenses/by/4.0/
-The Data is provided "as is" without warranty or any representation of accuracy, timeliness or completeness.
-
-The data format is tab-delimited text in utf8 encoding.
-
-
-Files :
--------
-XX.zip                   : features for country with iso code XX, see 'geoname' table for columns. 'no-country' for features not belonging to a country.
-allCountries.zip         : all countries combined in one file, see 'geoname' table for columns
-cities500.zip            : all cities with a population > 500 or seats of adm div down to PPLA4 (ca 185.000), see 'geoname' table for columns
-cities1000.zip           : all cities with a population > 1000 or seats of adm div down to PPLA3 (ca 130.000), see 'geoname' table for columns
-cities5000.zip           : all cities with a population > 5000 or PPLA (ca 50.000), see 'geoname' table for columns
-cities15000.zip          : all cities with a population > 15000 or capitals (ca 25.000), see 'geoname' table for columns
-alternateNamesV2.zip     : alternate names with language codes and geonameId, file with iso language codes, with new columns from and to
-alternateNames.zip       : obsolete use V2, this file does not have the new columns to and from and will be removed in the future
-admin1CodesASCII.txt     : names in English for admin divisions. Columns: code, name, name ascii, geonameid
-admin2Codes.txt          : names for administrative subdivision 'admin2 code' (UTF8), Format : concatenated codes <tab>name <tab> asciiname <tab> geonameId
-iso-languagecodes.txt    : iso 639 language codes, as used for alternate names in file alternateNames.zip
-featureCodes.txt         : name and description for feature classes and feature codes 
-timeZones.txt            : countryCode, timezoneId, gmt offset on 1st of January, dst offset to gmt on 1st of July (of the current year), rawOffset without DST
-countryInfo.txt          : country information : iso codes, fips codes, languages, capital ,...
-                           see the geonames webservices for additional country information,
-                                bounding box                         : http://api.geonames.org/countryInfo?
-                                country names in different languages : http:/api.geonames.org/countryInfoCSV?lang=it
-modifications-<date>.txt : all records modified on the previous day, the date is in yyyy-MM-dd format. You can use this file to daily synchronize your own geonames database.
-deletes-<date>.txt       : all records deleted on the previous day, format : geonameId <tab> name <tab> comment.
-
-alternateNamesModifications-<date>.txt : all alternate names modified on the previous day,
-alternateNamesDeletes-<date>.txt       : all alternate names deleted on the previous day, format : alternateNameId <tab> geonameId <tab> name <tab> comment.
-userTags.zip		: user tags , format : geonameId <tab> tag.
-hierarchy.zip		: parentId, childId, type. The type 'ADM' stands for the admin hierarchy modeled by the admin1-4 codes. The other entries are entered with the user interface. The relation toponym-adm hierarchy is not included in the file, it can instead be built from the admincodes of the toponym.
-adminCode5.zip		: the new adm5 column is not yet exported in the other files (in order to not break import scripts). Instead it is availabe as separate file.
-			  columns: geonameId,adm5code
-
-The main 'geoname' table has the following fields :
----------------------------------------------------
-geonameid         : integer id of record in geonames database
-name              : name of geographical point (utf8) varchar(200)
-asciiname         : name of geographical point in plain ascii characters, varchar(200)
-alternatenames    : alternatenames, comma separated, ascii names automatically transliterated, convenience attribute from alternatename table, varchar(10000)
-latitude          : latitude in decimal degrees (wgs84)
-longitude         : longitude in decimal degrees (wgs84)
-feature class     : see http://www.geonames.org/export/codes.html, char(1)
-feature code      : see http://www.geonames.org/export/codes.html, varchar(10)
-country code      : ISO-3166 2-letter country code, 2 characters
-cc2               : alternate country codes, comma separated, ISO-3166 2-letter country code, 200 characters
-admin1 code       : fipscode (subject to change to iso code), see exceptions below, see file admin1Codes.txt for display names of this code; varchar(20)
-admin2 code       : code for the second administrative division, a county in the US, see file admin2Codes.txt; varchar(80) 
-admin3 code       : code for third level administrative division, varchar(20)
-admin4 code       : code for fourth level administrative division, varchar(20)
-population        : bigint (8 byte int) 
-elevation         : in meters, integer
-dem               : digital elevation model, srtm3 or gtopo30, average elevation of 3''x3'' (ca 90mx90m) or 30''x30'' (ca 900mx900m) area in meters, integer. srtm processed by cgiar/ciat.
-timezone          : the iana timezone id (see file timeZone.txt) varchar(40)
-modification date : date of last modification in yyyy-MM-dd format
-
-
-AdminCodes:
-Most adm1 are FIPS codes. ISO codes are used for US, CH, BE and ME. UK and Greece are using an additional level between country and fips code. The code '00' stands for general features where no specific adm1 code is defined.
-The corresponding admin feature is found with the same countrycode and adminX codes and the respective feature code ADMx.
-
-
-
-The table 'alternate names' :
------------------------------
-alternateNameId   : the id of this alternate name, int
-geonameid         : geonameId referring to id in table 'geoname', int
-isolanguage       : iso 639 language code 2- or 3-characters; 4-characters 'post' for postal codes and 'iata','icao' and faac for airport codes, fr_1793 for French Revolution names,  abbr for abbreviation, link to a website (mostly to wikipedia), wkdt for the wikidataid, varchar(7)
-alternate name    : alternate name or name variant, varchar(400)
-isPreferredName   : '1', if this alternate name is an official/preferred name
-isShortName       : '1', if this is a short name like 'California' for 'State of California'
-isColloquial      : '1', if this alternate name is a colloquial or slang term. Example: 'Big Apple' for 'New York'.
-isHistoric        : '1', if this alternate name is historic and was used in the past. Example 'Bombay' for 'Mumbai'.
-from		  : from period when the name was used
-to		  : to period when the name was used
-
-Remark : the field 'alternatenames' in the table 'geoname' is a short version of the 'alternatenames' table without links and postal codes but with ascii transliterations. You probably don't need both. 
-If you don't need to know the language of a name variant, the field 'alternatenames' will be sufficient. If you need to know the language
-of a name variant, then you will need to load the table 'alternatenames' and you can drop the column in the geoname table.
-
-
-
-
-Boundaries:
-Simplified country boundaries are available in two slightly different formats:
-shapes_simplified_low:
-geonameId: 	The geonameId of the feature
-geoJson:	The boundary in geoJson format
-
-shapes_simplified_low.json:
-similar to the abovementioned file, but fully in geojson format. The geonameId is a feature property in the geojson string.
-
-
-Statistics on the number of features per country and the feature class and code distributions : http://www.geonames.org/statistics/ 
-
-
-Continent codes :
-AF : Africa			geonameId=6255146
-AS : Asia			geonameId=6255147
-EU : Europe			geonameId=6255148
-NA : North America		geonameId=6255149
-OC : Oceania			geonameId=6255151
-SA : South America		geonameId=6255150
-AN : Antarctica			geonameId=6255152
-
-
-feature classes:
-A: country, state, region,...
-H: stream, lake, ...
-L: parks,area, ...
-P: city, village,...
-R: road, railroad 
-S: spot, building, farm
-T: mountain,hill,rock,... 
-U: undersea
-V: forest,heath,...
-
-
-If you find errors or miss important places, please do use the wiki-style edit interface on our website 
-https://www.geonames.org to correct inaccuracies and to add new records. 
-Thanks in the name of the geonames community for your valuable contribution.
-
-Data Sources:
-https://www.geonames.org/data-sources.html
-
-
-More Information is also available in the geonames faq :
-
-https://forum.geonames.org/gforum/forums/show/6.page
-
-The forum : https://forum.geonames.org
-
-or the google group : https://groups.google.com/group/geonames
-