Skip to content
This repository has been archived by the owner on Aug 31, 2021. It is now read-only.

Commit

Permalink
6.1.5: fix #14
Browse files Browse the repository at this point in the history
  • Loading branch information
J. T. L committed Feb 6, 2018
1 parent d48e1cc commit 2466ec7
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
1 change: 1 addition & 0 deletions pack.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ function coarse() {
force_urban(36.9147, -111.4558, urban_data); // fix #7
force_urban(44.9280, -87.1853, urban_data); // fix #13
force_urban(50.7029, -57.3511, urban_data); // fix #13
force_urban(29.9414, -85.4064, urban_data); // fix #14
force_urban(49.7261, -1.9104, urban_data); // fix #15
force_urban(65.5280, 23.5570, urban_data); // fix #16

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tz-lookup",
"version": "6.1.4",
"version": "6.1.5",
"description": "fast time zone lookup",
"main": "tz.js",
"keywords": [
Expand Down
6 changes: 3 additions & 3 deletions rebuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e
TZ="2017c"

# get data
curl -L \
curl -L --retry 3 -C - \
-O "https://github.com/evansiroky/timezone-boundary-builder/releases/download/$TZ/timezones.geojson.zip" \
-O "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/ne_10m_urban_areas.zip" \
-O "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/ne_10m_populated_places_simple.zip"
Expand Down Expand Up @@ -35,12 +35,12 @@ rm -rf dist timezones.geojson.zip tz_a.tiff tz_b.tiff tz_c.tiff tz_d.tiff tz_e.t
unzip ne_10m_urban_areas.zip
gdal_rasterize -burn 255 -te -180 -90 180 90 -ts 49152 24576 -ot Byte ne_10m_urban_areas.shp ne_10m_urban_areas.tiff
convert ne_10m_urban_areas.tiff ne_10m_urban_areas.pbm
rm -rf ne_10m_urban_areas.README.html ne_10m_urban_areas.VERSION.txt ne_10m_urban_areas.dbf ne_10m_urban_areas.shp ne_10m_urban_areas.shx ne_10m_urban_areas.prj ne_10m_urban_areas.tiff ne_10m_urban_areas.zip
rm -rf ne_10m_urban_areas.README.html ne_10m_urban_areas.VERSION.txt ne_10m_urban_areas.cpg ne_10m_urban_areas.dbf ne_10m_urban_areas.shp ne_10m_urban_areas.shx ne_10m_urban_areas.prj ne_10m_urban_areas.tiff ne_10m_urban_areas.zip

# and, for good measure, populated places
unzip ne_10m_populated_places_simple.zip
ogr2ogr -f GeoJSON ne_10m_populated_places_simple.json ne_10m_populated_places_simple.shp
rm -rf ne_10m_populated_places_simple.README.html ne_10m_populated_places_simple.VERSION.txt ne_10m_populated_places_simple.dbf ne_10m_populated_places_simple.prj ne_10m_populated_places_simple.shp ne_10m_populated_places_simple.shx ne_10m_populated_places_simple.zip
rm -rf ne_10m_populated_places_simple.README.html ne_10m_populated_places_simple.VERSION.txt ne_10m_populated_places_simple.cpg ne_10m_populated_places_simple.dbf ne_10m_populated_places_simple.prj ne_10m_populated_places_simple.shp ne_10m_populated_places_simple.shx ne_10m_populated_places_simple.zip

# repack tz_world_mp and ne_10m_urban_areas into a compressed image
node pack | ./node_modules/.bin/uglifyjs -mc >tz.js
Expand Down
1 change: 1 addition & 0 deletions test.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ describe("tzlookup", function() {
[[ 46.1328, -64.7714], "America/Moncton"],
[[ 44.9280, -87.1853], "America/Chicago"], // #13
[[ 50.7029, -57.3511], "America/St_Johns"], // #13
[[ 29.9414, -85.4064], "America/Chicago"], // #14
[[ 49.7261, -1.9104], "Europe/Paris"], // #15
[[ 65.5280, 23.5570], "Europe/Stockholm"], // #16

Expand Down
4 changes: 3 additions & 1 deletion tz.js

Large diffs are not rendered by default.

0 comments on commit 2466ec7

Please sign in to comment.