This is an automated email from the ASF dual-hosted git repository. bchapuis pushed a commit to branch 745-daylight in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit 3798e119b9d4b0ce3b883527665bac235d5fcca3 Author: Bertil Chapuis <[email protected]> AuthorDate: Sun Aug 27 21:39:54 2023 +0200 Fix workflow --- basemap/{daylight.js => daylight/workflow.js} | 82 ++++++++++++++------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/basemap/daylight.js b/basemap/daylight/workflow.js similarity index 84% rename from basemap/daylight.js rename to basemap/daylight/workflow.js index 008336f9..2c23d5d8 100644 --- a/basemap/daylight.js +++ b/basemap/daylight/workflow.js @@ -20,30 +20,31 @@ export default { "id": "openstreetmap-data", "needs": [], "tasks": [ - { - "type": "DownloadUrl", - "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/planet-v1.29.osm.pbf", - "path": "data/data.osm.pbf" - }, - { - "type": "ImportOpenStreetMap", - "file": "data/data.osm.pbf", - "database": config.database, - "databaseSrid": 3857 - }, + // { + // "type": "DownloadUrl", + // "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/planet-v1.29.osm.pbf", + // "path": "data/data.osm.pbf" + // }, + // { + // "type": "ImportOpenStreetMap", + // "file": "data/data.osm.pbf", + // "database": config.database, + // "databaseSrid": 3857 + // }, ] }, { "id": "openstreetmap-roads", "needs": ["openstreetmap-data"], "tasks": [ + // { + // "type": "DownloadUrl", + // "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/fb-ml-roads-v1.29.osc.bz2", + // "path": "data/roads.osc.bz2" + // }, { - "type": "DownloadUrl", - "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/fb-ml-roads-v1.29.osc.bz2", - "path": "data/roads.osc.bz2" - }, - { - "type": "DecompressBZip2", + "type": "DecompressFile", + "compression": "bzip2", "file": "data/roads.osc.bz2", "directory": "data/roads.osc" }, @@ -53,13 +54,14 @@ export default { "id": "openstreetmap-admin", "needs": ["openstreetmap-data"], "tasks": [ + // { + // "type": "DownloadUrl", + // "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/admin-v1.29.osc.bz2", + // "path": "data/admin.osc.bz2" + // }, { - "type": "DownloadUrl", - "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/admin-v1.29.osc.bz2", - "path": "data/admin.osc.bz2" - }, - { - "type": "DecompressBZip2", + "type": "DecompressFile", + "compression": "bzip2", "file": "data/admin.osc.bz2", "directory": "data/admin.osc" }, @@ -69,13 +71,14 @@ export default { "id": "openstreetmap-coastlines", "needs": ["openstreetmap-data"], "tasks": [ + // { + // "type": "DownloadUrl", + // "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/coastlines-v1.29.tgz", + // "path": "data/coastlines.osc.bz2" + // }, { - "type": "DownloadUrl", - "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/coastlines-v1.29.tgz", - "path": "data/coastlines.osc.bz2" - }, - { - "type": "DecompressBZip2", + "type": "DecompressFile", + "compression": "bzip2", "file": "data/coastlines.osc.bz2", "directory": "data/coastlines.osc" }, @@ -85,25 +88,24 @@ export default { "id": "openstreetmap-preferred-localization", "needs": ["openstreetmap-data"], "tasks": [ - { - "type": "DownloadUrl", - "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/preferred-localization-v1.29.tsv", - "path": "data/preferred-localization.tsv" - }, + // { + // "type": "DownloadUrl", + // "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/preferred-localization-v1.29.tsv", + // "path": "data/preferred-localization.tsv" + // }, ] }, { "id": "openstreetmap-important-features", "needs": ["openstreetmap-data"], "tasks": [ - { - "type": "DownloadUrl", - "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/important-features-v1.29.json", - "path": "data/important-features.json" - }, + // { + // "type": "DownloadUrl", + // "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.29/important-features-v1.29.json", + // "path": "data/important-features.json" + // }, ] }, - // { // "id": "openstreetmap-nodes", // "needs": [
