@hebcal/geo-sqlite 3.8.0 → 3.9.0

package/dist/index.js

@@ -1,10 +1,11 @@
-/*! @hebcal/geo-sqlite v3.8.0 */
+/*! @hebcal/geo-sqlite v3.9.0 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var Database = require('better-sqlite3');
 var core = require('@hebcal/core');
+require('@hebcal/cities');
 var pino = require('pino');
 var events = require('events');
 var fs = require('fs');
@@ -291,6 +292,12 @@ class GeoDb {
     if (geonameid) {
       return this.lookupGeoname(geonameid);
     } else {
+      const location = core.Location.lookup(cityName);
+
+      if (location) {
+        return location;
+      }
+
       if (this.logger) this.logger.warn(`GeoDb: unknown city=${cityName}`);
       return null;
     }
@@ -450,9 +457,12 @@ class GeoDb {
 async function buildGeonamesSqlite(dbFilename, countryInfotxt, cities5000txt, citiesPatch, admin1CodesASCIItxt, ILtxt) {
   const logger = pino__default["default"]({
     // level: argv.quiet ? 'warn' : 'info',
-    prettyPrint: {
-      translateTime: true,
-      ignore: 'pid,hostname'
+    transport: {
+      target: 'pino-pretty',
+      options: {
+        translateTime: 'SYS:standard',
+        ignore: 'pid,hostname'
+      }
     }
   });
   const db = new Database__default["default"](dbFilename);

package/dist/index.mjs

@@ -1,6 +1,7 @@
-/*! @hebcal/geo-sqlite v3.8.0 */
+/*! @hebcal/geo-sqlite v3.9.0 */
 import Database from 'better-sqlite3';
 import { Location, Locale } from '@hebcal/core';
+import '@hebcal/cities';
 import pino from 'pino';
 import events from 'events';
 import fs from 'fs';
@@ -279,6 +280,12 @@ class GeoDb {
     if (geonameid) {
       return this.lookupGeoname(geonameid);
     } else {
+      const location = Location.lookup(cityName);
+
+      if (location) {
+        return location;
+      }
+
       if (this.logger) this.logger.warn(`GeoDb: unknown city=${cityName}`);
       return null;
     }
@@ -438,9 +445,12 @@ class GeoDb {
 async function buildGeonamesSqlite(dbFilename, countryInfotxt, cities5000txt, citiesPatch, admin1CodesASCIItxt, ILtxt) {
   const logger = pino({
     // level: argv.quiet ? 'warn' : 'info',
-    prettyPrint: {
-      translateTime: true,
-      ignore: 'pid,hostname'
+    transport: {
+      target: 'pino-pretty',
+      options: {
+        translateTime: 'SYS:standard',
+        ignore: 'pid,hostname'
+      }
     }
   });
   const db = new Database(dbFilename);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/geo-sqlite",
-  "version": "3.8.0",
+  "version": "3.9.0",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal"
@@ -28,10 +28,11 @@
     "geo-sqlite.d.ts"
   ],
   "dependencies": {
-    "@hebcal/core": "^3.33.2",
+    "@hebcal/cities": "^3.1.1",
+    "@hebcal/core": "^3.33.3",
     "better-sqlite3": "^7.5.0",
-    "pino": "^7.6.4",
-    "pino-pretty": "^7.5.0"
+    "pino": "^7.8.0",
+    "pino-pretty": "^7.5.1"
   },
   "scripts": {
     "build": "rollup -c",
@@ -45,34 +46,25 @@
     ],
     "require": [
       "@babel/register",
-      "@babel/polyfill"
+      "regenerator-runtime/runtime"
     ],
-    "babel": {
-      "testOptions": {
-        "presets": [
-          "@babel/env"
-        ]
-      }
-    },
     "inherit": true,
     "verbose": true
   },
   "license": "BSD-2-Clause",
   "devDependencies": {
-    "@ava/babel": "^2.0.0",
-    "@babel/core": "^7.16.12",
-    "@babel/polyfill": "^7.12.1",
+    "@babel/core": "^7.17.5",
     "@babel/preset-env": "^7.16.11",
-    "@babel/register": "^7.16.9",
-    "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^21.0.1",
+    "@babel/register": "^7.17.0",
+    "@rollup/plugin-babel": "^5.3.1",
+    "@rollup/plugin-commonjs": "^21.0.2",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.1.3",
-    "ava": "^3.15.0",
-    "eslint": "^8.7.0",
+    "ava": "^4.0.1",
+    "eslint": "^8.9.0",
     "eslint-config-google": "^0.14.0",
-    "jsdoc": "^3.6.9",
-    "jsdoc-to-markdown": "^7.1.0",
-    "rollup": "^2.66.0"
+    "jsdoc": "^3.6.10",
+    "jsdoc-to-markdown": "^7.1.1",
+    "rollup": "^2.68.0"
   }
 }