You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@baremaps.apache.org by bc...@apache.org on 2023/09/28 19:44:06 UTC
[incubator-baremaps] 05/35: Fix workflow
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 b63896e686071a741e4aae42a047a9bec5facb1c
Author: Bertil Chapuis <bc...@gmail.com>
AuthorDate: Mon Aug 28 08:41:37 2023 +0200
Fix workflow
---
basemap/daylight/workflow.js | 98 ++++++++++++++++++--------------------------
1 file changed, 40 insertions(+), 58 deletions(-)
diff --git a/basemap/daylight/workflow.js b/basemap/daylight/workflow.js
index 4fe28296..2d59fb66 100644
--- a/basemap/daylight/workflow.js
+++ b/basemap/daylight/workflow.js
@@ -20,21 +20,21 @@ 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",
+ "id": "openstreetmap-download",
"needs": ["openstreetmap-data"],
"tasks": [
{
@@ -43,66 +43,48 @@ export default {
"path": "data/roads.osc.bz2"
},
{
- "type": "DecompressFile",
- "compression": "bzip2",
- "file": "data/roads.osc.bz2",
- "directory": "data/roads.osc"
+ "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/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/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/important-features-v1.29.json",
+ "path": "data/important-features.json"
},
]
},
{
- "id": "openstreetmap-admin",
- "needs": ["openstreetmap-data"],
+ "id": "openstreetmap-decompress",
+ "needs": ["openstreetmap-download"],
"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": "DecompressFile",
"compression": "bzip2",
- "file": "data/admin.osc.bz2",
- "directory": "data/admin.osc"
- },
- ]
- },
- {
- "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"
+ "source": "data/roads.osc.bz2",
+ "target": "data/roads.osc"
},
{
"type": "DecompressFile",
"compression": "bzip2",
- "file": "data/coastlines.osc.bz2",
- "directory": "data/coastlines.osc"
+ "source": "data/admin.osc.bz2",
+ "target": "data/admin.osc"
},
- ]
- },
- {
- "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"
- },
- ]
- },
- {
- "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": "DecompressFile",
+ "compression": "bzip2",
+ "source": "data/coastlines.osc.bz2",
+ "target": "data/coastlines.osc"
},
]
},