This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch prepare-release
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
The following commit(s) were added to refs/heads/prepare-release by this push:
new caccbf8b Remove geoboundaries due to projection problems at the poles
caccbf8b is described below
commit caccbf8b4976aaef8636ab83bde996b730fc4dc1
Author: Bertil Chapuis <[email protected]>
AuthorDate: Mon Aug 14 15:28:17 2023 +0200
Remove geoboundaries due to projection problems at the poles
---
basemap/layers/boundary/tileset.js | 12 -------
basemap/tileset.js | 2 +-
basemap/workflow.js | 72 --------------------------------------
3 files changed, 1 insertion(+), 85 deletions(-)
diff --git a/basemap/layers/boundary/tileset.js
b/basemap/layers/boundary/tileset.js
index 34cb9fc6..75525332 100644
--- a/basemap/layers/boundary/tileset.js
+++ b/basemap/layers/boundary/tileset.js
@@ -12,18 +12,6 @@
export default {
id: 'boundary',
queries: [
- {
- minzoom: 1,
- maxzoom: 6,
- sql:
- "SELECT fid as id, jsonb_build_object('boundary',
'administrative', 'admin_level', '0') as tags, geom FROM globaladm0_z$zoom",
- },
- {
- minzoom: 6,
- maxzoom: 10,
- sql:
- "SELECT fid as id, jsonb_build_object('boundary',
'administrative', 'admin_level', '1') as tags, geom FROM globaladm1_z$zoom",
- },
{
minzoom: 10,
maxzoom: 20,
diff --git a/basemap/tileset.js b/basemap/tileset.js
index 453a786c..72c4c9a9 100644
--- a/basemap/tileset.js
+++ b/basemap/tileset.js
@@ -47,7 +47,7 @@ export default {
amenity,
attraction,
barrier,
- //boundary,
+ boundary,
building,
highway,
landuse,
diff --git a/basemap/workflow.js b/basemap/workflow.js
index 5dafaddf..5ff3b1ec 100644
--- a/basemap/workflow.js
+++ b/basemap/workflow.js
@@ -42,78 +42,6 @@ export default {
}
]
},
- {
- "id": "globaladm0",
- "needs": [],
- "tasks": [
- {
- "type": "DownloadUrl",
- "url":
"https://github.com/wmgeolab/geoBoundaries/raw/main/releaseData/CGAZ/geoBoundariesCGAZ_ADM0.gpkg",
- "path": "data/geoBoundariesCGAZ_ADM0.gpkg"
- },
- {
- "type": "ImportGeoPackage",
- "file": "data/geoBoundariesCGAZ_ADM0.gpkg",
- "database": config.database,
- "sourceSRID": 4326,
- "targetSRID": 3857
- },
- {
- "type": "ExecuteSql",
- "file": "layers/boundary/globaladm0_clean.sql",
- "database": config.database,
- "parallel": true,
- },
- {
- "type": "ExecuteSql",
- "file": "layers/boundary/globaladm0_simplify.sql",
- "database": config.database,
- "parallel": true,
- },
- {
- "type": "ExecuteSql",
- "file": "layers/boundary/globaladm0_index.sql",
- "database": config.database,
- "parallel": true,
- }
- ]
- },
- {
- "id": "globaladm1",
- "needs": [],
- "tasks": [
- {
- "type": "DownloadUrl",
- "url":
"https://github.com/wmgeolab/geoBoundaries/raw/main/releaseData/CGAZ/geoBoundariesCGAZ_ADM1.gpkg",
- "path": "data/geoBoundariesCGAZ_ADM1.gpkg"
- },
- {
- "type": "ImportGeoPackage",
- "file": "data/geoBoundariesCGAZ_ADM1.gpkg",
- "database": config.database,
- "sourceSRID": 4326,
- "targetSRID": 3857
- },
- {
- "type": "ExecuteSql",
- "file": "layers/boundary/globaladm1_clean.sql",
- "database": config.database,
- "parallel": true,
- },
- {
- "type": "ExecuteSql",
- "file": "layers/boundary/globaladm1_simplify.sql",
- "database": config.database,
- "parallel": true,
- },
- {
- "type": "ExecuteSql",
- "file": "layers/boundary/globaladm1_index.sql",
- "database": config.database,
- "parallel": true,
- }
- ]
- },
{
"id": "water-polygons",
"needs": [],