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 e83f5b3ddb0c29686b717f1fb86ebc98cedcd408 Author: Bertil Chapuis <[email protected]> AuthorDate: Mon Sep 18 23:14:40 2023 +0200 Fix configuration --- basemap/config.js | 2 +- basemap/daylight-workflow.js | 151 ++++--------------------------------------- basemap/tileset.js | 4 +- 3 files changed, 14 insertions(+), 143 deletions(-) diff --git a/basemap/config.js b/basemap/config.js index 09c7848d..1ab4ddea 100644 --- a/basemap/config.js +++ b/basemap/config.js @@ -13,7 +13,7 @@ export default { "host": "http://demo.baremaps.com:8888";, "database": { "jdbcUrl": "jdbc:postgresql://localhost:5432/daylight?&user=daylight&password=daylight", - "maximumPoolSize": 2, + "maximumPoolSize": 8, }, "osmPbfUrl": "https://download.geofabrik.de/europe/switzerland-latest.osm.pbf";, "center": [6.6323, 46.5197], diff --git a/basemap/daylight-workflow.js b/basemap/daylight-workflow.js index ac5a2ddb..d2a38dfd 100644 --- a/basemap/daylight-workflow.js +++ b/basemap/daylight-workflow.js @@ -14,14 +14,13 @@ import config from "./config.js"; export default { "steps": [ - /* { "id": "openstreetmap-data", "needs": [], "tasks": [ { "type": "DownloadUrl", - "url": "https://download.geofabrik.de/europe/liechtenstein-latest.osm.pbf";, + "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.30/planet-v1.30.osm.pbf";, "path": "data/data.osm.pbf" }, { @@ -33,108 +32,23 @@ export default { ] }, { - "id": "openstreetmap-download", - "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/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.tgz" - }, - { - "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-decompress", - "needs": ["openstreetmap-download"], - "tasks": [ - { - "type": "DecompressFile", - "compression": "bzip2", - "source": "data/roads.osc.bz2", - "target": "data/roads.osc" - }, - { - "type": "DecompressFile", - "compression": "bzip2", - "source": "data/admin.osc.bz2", - "target": "data/admin.osc" - }, - { - "type": "DecompressFile", - "compression": "targz", - "source": "data/coastlines.tgz", - "target": "data/coastlines" - }, - ] - }, - { - "id": "openstreetmap-import", - "needs": [], + "id": "openstreetmap-building", + "needs": ["openstreetmap-data"], "tasks": [ { - "type": "ImportOsmChange", - "file": "data/roads.osc", - "database": config.database, - "srid": 3857 + "type": "DownloadUrl", + "url": "https://daylight-map-distribution.s3.us-west-1.amazonaws.com/release/v1.30/ms-buildings-v1.30.osc.gz";, + "path": "data/buildings.osc.gz" }, { "type": "ImportOsmChange", - "file": "data/admin.osc", + "file": "data/buildings.osc.gz", + "compression": "gzip", "database": config.database, "srid": 3857 }, ] }, - { - "id": "openstreetmap-coastlines", - "needs": [], - "tasks": [ - { - "type": "ImportShapefile", - "file": "data/coastlines/water_polygons.shp", - "database": config.database, - "sourceSRID": 4326, - "targetSRID": 3857 - }, - ] - } - { - "id": "openstreetmap-pbf", - "needs": [], - "tasks": [ - { - "type": "DownloadUrl", - "url": "https://download.geofabrik.de/europe/liechtenstein-latest.osm.pbf";, - "path": "data/data.osm.pbf" - }, - { - "type": "ImportOsmPbf", - "file": "data/data.osm.pbf", - "database": config.database, - "databaseSrid": 3857 - }, - ] - }, { "id": "openstreetmap-road", "needs": ["openstreetmap-data"], @@ -144,15 +58,10 @@ export default { "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": "DecompressFile", - "compression": "bzip2", - "source": "data/roads.osc.bz2", - "target": "data/roads.osc" - }, { "type": "ImportOsmChange", - "file": "data/roads.osc", + "file": "data/roads.osc.bz2", + "compression": "bzip2", "database": config.database, "srid": 3857 }, @@ -167,15 +76,10 @@ export default { "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", - "source": "data/admin.osc.bz2", - "target": "data/admin.osc" - }, { "type": "ImportOsmChange", "file": "data/admin.osc", + "compression": "bzip2", "database": config.database, "srid": 3857 }, @@ -360,7 +264,6 @@ export default { }, ] }, - */ { "id": "openstreetmap-highway", "needs": ["openstreetmap-linestring"], @@ -389,7 +292,6 @@ export default { }, ] }, - /* { "id": "openstreetmap-railway", "needs": ["openstreetmap-linestring"], @@ -530,36 +432,5 @@ export default { }, ] }, -<<<<<<< HEAD:basemap/daylight-workflow.js -======= - { - "id": "openstreetmap-water", - "needs": [], - "tasks": [ - { - "type": "ExecuteSql", - "file": "layers/water/clean.sql", - "database": config.database, - }, - { - "type": "ExecuteSql", - "file": "layers/water/prepare.sql", - "database": config.database, - }, - { - "type": "ExecuteSql", - "file": "layers/water/simplify.sql", - "database": config.database, - "parallel": true, - }, - { - "type": "ExecuteSql", - "file": "layers/water/index.sql", - "database": config.database, - }, - ] - }, - */ ->>>>>>> 8d538e1f (Fix queries):basemap/daylight.js ] } diff --git a/basemap/tileset.js b/basemap/tileset.js index 72c4c9a9..fe3cebfa 100644 --- a/basemap/tileset.js +++ b/basemap/tileset.js @@ -54,11 +54,11 @@ export default { leisure, man_made, natural, - ocean, + //ocean, point, power, railway, route, - waterway, + //waterway, ] }
