@hebcal/geo-sqlite 4.9.3 → 4.10.1

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v4.9.3 */
+/*! @hebcal/geo-sqlite v4.10.1 */
 'use strict';
 
 var Database = require('better-sqlite3');
@@ -30,6 +30,7 @@ const GEONAME_SQL = `SELECT
   g.latitude as latitude,
   g.longitude as longitude,
   g.population as population,
+  g.gtopo30 as elevation,
   g.timezone as timezone
 FROM geoname g
 LEFT JOIN country c on g.country = c.iso
@@ -46,14 +47,17 @@ const GEONAME_ALL_SQL = `SELECT
   g.latitude as latitude,
   g.longitude as longitude,
   g.population as population,
+  g.gtopo30 as elevation,
   g.timezone as timezone
 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
+const ZIPCODE_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,Elevation,
+TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary WHERE ZipCode = ?`;
-const ZIPCODE_ALL_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,TimeZone,DayLightSaving,Population
+const ZIPCODE_ALL_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,Elevation,
+TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary`;
 const ZIP_COMPLETE_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary
@@ -216,6 +220,9 @@ class GeoDb {
     location.geo = 'zip';
     location.zip = zip;
     location.population = result.Population;
+    if (result.Elevation && result.Elevation > 0) {
+      location.elevation = result.Elevation;
+    }
     return location;
   }
 
@@ -299,6 +306,9 @@ class GeoDb {
     if (result.population) {
       location.population = result.population;
     }
+    if (result.elevation && result.elevation > 0) {
+      location.elevation = result.elevation;
+    }
     return location;
   }
 
@@ -340,6 +350,9 @@ class GeoDb {
       population: res.Population,
       geo: 'zip'
     };
+    if (res.Elevation && res.Elevation > 0) {
+      obj.elevation = res.Elevation;
+    }
     return obj;
   }
 

package/dist/index.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v4.9.3 */
+/*! @hebcal/geo-sqlite v4.10.1 */
 import Database from 'better-sqlite3';
 import { Location, Locale } from '@hebcal/core';
 import '@hebcal/cities';
@@ -28,6 +28,7 @@ const GEONAME_SQL = `SELECT
   g.latitude as latitude,
   g.longitude as longitude,
   g.population as population,
+  g.gtopo30 as elevation,
   g.timezone as timezone
 FROM geoname g
 LEFT JOIN country c on g.country = c.iso
@@ -44,14 +45,17 @@ const GEONAME_ALL_SQL = `SELECT
   g.latitude as latitude,
   g.longitude as longitude,
   g.population as population,
+  g.gtopo30 as elevation,
   g.timezone as timezone
 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
+const ZIPCODE_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,Elevation,
+TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary WHERE ZipCode = ?`;
-const ZIPCODE_ALL_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,TimeZone,DayLightSaving,Population
+const ZIPCODE_ALL_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,Elevation,
+TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary`;
 const ZIP_COMPLETE_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary
@@ -214,6 +218,9 @@ class GeoDb {
     location.geo = 'zip';
     location.zip = zip;
     location.population = result.Population;
+    if (result.Elevation && result.Elevation > 0) {
+      location.elevation = result.Elevation;
+    }
     return location;
   }
 
@@ -297,6 +304,9 @@ class GeoDb {
     if (result.population) {
       location.population = result.population;
     }
+    if (result.elevation && result.elevation > 0) {
+      location.elevation = result.elevation;
+    }
     return location;
   }
 
@@ -338,6 +348,9 @@ class GeoDb {
       population: res.Population,
       geo: 'zip'
     };
+    if (res.Elevation && res.Elevation > 0) {
+      obj.elevation = res.Elevation;
+    }
     return obj;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/geo-sqlite",
-  "version": "4.9.3",
+  "version": "4.10.1",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal"
@@ -28,11 +28,11 @@
     "geo-sqlite.d.ts"
   ],
   "dependencies": {
-    "@hebcal/cities": "^3.2.0",
-    "@hebcal/core": "^4.3.0",
-    "better-sqlite3": "^8.5.0",
-    "pino": "^8.15.0",
-    "pino-pretty": "^10.2.0",
+    "@hebcal/cities": "^3.2.2",
+    "@hebcal/core": "^4.5.1",
+    "better-sqlite3": "^9.1.1",
+    "pino": "^8.16.2",
+    "pino-pretty": "^10.2.3",
     "transliteration": "^2.3.5"
   },
   "scripts": {
@@ -46,18 +46,18 @@
   },
   "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.1.0",
+    "@babel/core": "^7.23.3",
+    "@babel/preset-env": "^7.23.3",
+    "@babel/register": "^7.22.15",
+    "@rollup/plugin-babel": "^6.0.4",
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-json": "^6.0.1",
+    "@rollup/plugin-node-resolve": "^15.2.3",
     "ava": "^5.3.1",
-    "eslint": "^8.47.0",
+    "eslint": "^8.54.0",
     "eslint-config-google": "^0.14.0",
     "jsdoc": "^4.0.2",
     "jsdoc-to-markdown": "^8.0.0",
-    "rollup": "^3.28.0"
+    "rollup": "^4.5.0"
   }
 }

package/zips-dummy.sql

@@ -4,6 +4,7 @@ CREATE TABLE ZIPCodes_Primary (
   State char(2),
   Latitude decimal(12, 6),
   Longitude decimal(12, 6),
+  Elevation int NULL,
   TimeZone char(2) NULL,
   DayLightSaving char(1) NULL,
   Population int NULL