aboutsummaryrefslogtreecommitdiff
path: root/index.js
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2020-07-29 14:46:16 +0100
committerNeil Fuller <nfuller@google.com>2020-07-29 14:46:16 +0100
commit6128709e84cc8c8e7bcfe0193cab9f409d9afe43 (patch)
treefb59c15854a0c50118e647e5312fcc6a2b7ed513 /index.js
parenta83cc6d35635387e98bae2ae1ce27964d3a80fb0 (diff)
downloadtimezone-boundary-builder-6128709e84cc8c8e7bcfe0193cab9f409d9afe43.tar.gz
Changes to address review comments
Updated README.md and index.js Tested by running: $ node --max-old-space-size=8192 index.js \ --included_zones America/New_York America/Chicago \ --excluded_zones America/New_York \ --dist_dir ./dist3 \ --downloads_dir ./downloads2 \ --skip_zip \ --skip_shapefile $ node --max-old-space-size=8192 index.js \ --included_zones America/New_York America/Chicago \ --excluded_zones America/New_York \ --dist_dir ./dist2 \ --downloads_dir ./downloads2 $ node --max-old-space-size=8192 index.js \ --included_zones America/New_York America/Chicago \ --excluded_zones America/New_York [No failures, assumed output is as it was before changes]
Diffstat (limited to 'index.js')
-rw-r--r--index.js76
1 files changed, 38 insertions, 38 deletions
diff --git a/index.js b/index.js
index bfcb001..3425eb5 100644
--- a/index.js
+++ b/index.js
@@ -747,60 +747,60 @@ const autoScript = {
zipGeoJson: ['mergeZones', function (results, cb) {
if (argv.skip_zip) {
overallProgress.beginTask('Skipping zip')
- } else {
- overallProgress.beginTask('Zipping geojson')
- let zipFile = argv.dist_dir + '/timezones.geojson.zip'
- let jsonFile = argv.dist_dir + '/combined.json'
- exec('zip ' + zipFile + ' ' + jsonFile, cb)
+ return cb()
}
+ overallProgress.beginTask('Zipping geojson')
+ let zipFile = argv.dist_dir + '/timezones.geojson.zip'
+ let jsonFile = argv.dist_dir + '/combined.json'
+ exec('zip ' + zipFile + ' ' + jsonFile, cb)
}],
zipGeoJsonWithOceans: ['mergeZones', function (results, cb) {
if (argv.skip_zip) {
overallProgress.beginTask('Skipping with oceans zip')
- } else {
- overallProgress.beginTask('Zipping geojson with oceans')
- let zipFile = argv.dist_dir + '/timezones-with-oceans.geojson.zip'
- let jsonFile = argv.dist_dir + '/combined-with-oceans.json'
- exec('zip ' + zipFile + ' ' + jsonFile, cb)
+ return cb()
}
+ overallProgress.beginTask('Zipping geojson with oceans')
+ let zipFile = argv.dist_dir + '/timezones-with-oceans.geojson.zip'
+ let jsonFile = argv.dist_dir + '/combined-with-oceans.json'
+ exec('zip ' + zipFile + ' ' + jsonFile, cb)
}],
makeShapefile: ['mergeZones', function (results, cb) {
if (argv.skip_shapefile) {
overallProgress.beginTask('Skipping shapefile creation')
- } else {
- overallProgress.beginTask('Converting from geojson to shapefile')
- let shapeFileGlob = argv.dist_dir + '/combined-shapefile.*'
- rimraf.sync(shapeFileGlob)
- let shapeFile = argv.dist_dir + '/combined-shapefile.shp'
- let jsonFile = argv.dist_dir + '/combined.json'
- exec(
- 'ogr2ogr -f "ESRI Shapefile" ' + shapeFile + ' ' + jsonFile,
- function (err, stdout, stderr) {
- if (err) { return cb(err) }
- let shapeFileZip = argv.dist_dir + '/timezones.shapefile.zip'
- exec('zip ' + shapeFileZip + ' ' + shapeFileGlob, cb)
- }
- )
+ return cb()
}
+ overallProgress.beginTask('Converting from geojson to shapefile')
+ let shapeFileGlob = argv.dist_dir + '/combined-shapefile.*'
+ rimraf.sync(shapeFileGlob)
+ let shapeFile = argv.dist_dir + '/combined-shapefile.shp'
+ let jsonFile = argv.dist_dir + '/combined.json'
+ exec(
+ 'ogr2ogr -f "ESRI Shapefile" ' + shapeFile + ' ' + jsonFile,
+ function (err, stdout, stderr) {
+ if (err) { return cb(err) }
+ let shapeFileZip = argv.dist_dir + '/timezones.shapefile.zip'
+ exec('zip ' + shapeFileZip + ' ' + shapeFileGlob, cb)
+ }
+ )
}],
makeShapefileWithOceans: ['mergeZones', function (results, cb) {
if (argv.skip_shapefile) {
overallProgress.beginTask('Skipping with oceans shapefile creation')
- } else {
- overallProgress.beginTask('Converting from geojson with oceans to shapefile')
- let shapeFileGlob = argv.dist_dir + '/combined-shapefile-with-oceans.*'
- rimraf.sync(shapeFileGlob)
- let shapeFile = argv.dist_dir + '/combined-shapefile-with-oceans.shp'
- let jsonFile = argv.dist_dir + '/combined-with-oceans.json'
- exec(
- 'ogr2ogr -f "ESRI Shapefile" ' + shapeFile + ' ' + jsonFile,
- function (err, stdout, stderr) {
- if (err) { return cb(err) }
- let shapeFileZip = argv.dist_dir + '/timezones-with-oceans.shapefile.zip'
- exec('zip ' + shapeFileZip + ' ' + shapeFileGlob, cb)
- }
- )
+ return cb()
}
+ overallProgress.beginTask('Converting from geojson with oceans to shapefile')
+ let shapeFileGlob = argv.dist_dir + '/combined-shapefile-with-oceans.*'
+ rimraf.sync(shapeFileGlob)
+ let shapeFile = argv.dist_dir + '/combined-shapefile-with-oceans.shp'
+ let jsonFile = argv.dist_dir + '/combined-with-oceans.json'
+ exec(
+ 'ogr2ogr -f "ESRI Shapefile" ' + shapeFile + ' ' + jsonFile,
+ function (err, stdout, stderr) {
+ if (err) { return cb(err) }
+ let shapeFileZip = argv.dist_dir + '/timezones-with-oceans.shapefile.zip'
+ exec('zip ' + shapeFileZip + ' ' + shapeFileGlob, cb)
+ }
+ )
}],
makeListOfTimeZoneNames: function (cb) {
overallProgress.beginTask('Writing timezone names to file')