From 40884b9976e95be3c078a9619b9dfb423da90888 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 7 Jan 2017 14:55:08 +0100 Subject: [PATCH 1/3] imposm3 mapping change to the new reject/require syntax --- layers/boundary/mapping.yaml | 10 +++++++--- layers/building/mapping.yaml | 10 ++++++---- layers/place/mapping.yaml | 36 ++++++++++++++++++++++------------ layers/water/mapping.yaml | 6 ++++-- layers/water_name/mapping.yaml | 6 ++++-- 5 files changed, 45 insertions(+), 23 deletions(-) diff --git a/layers/boundary/mapping.yaml b/layers/boundary/mapping.yaml index 5eee06e..a5e7034 100644 --- a/layers/boundary/mapping.yaml +++ b/layers/boundary/mapping.yaml @@ -37,9 +37,13 @@ tables: name: admin_level type: integer filters: - exclude_tags: - - [ "admin_level", "__nil__" ] - - [ "natural", "coastline" ] + #exclude_tags: + #- [ "admin_level", "__nil__" ] + #- [ "natural", "coastline" ] + reject: + natural: ["coastline"] + require: + admin_level: ["__any__"] mapping: boundary: - administrative diff --git a/layers/building/mapping.yaml b/layers/building/mapping.yaml index e4489f0..f4c4e85 100644 --- a/layers/building/mapping.yaml +++ b/layers/building/mapping.yaml @@ -42,8 +42,10 @@ tables: - terminal - hangar filters: - exclude_tags: - - [ "building", "no" ] - - [ "building", "none" ] - - [ "building", "No" ] + # exclude_tags: + # - [ "building", "no" ] + # - [ "building", "none" ] + # - [ "building", "No" ] + reject: + building: ["no","none","No"] type: polygon diff --git a/layers/place/mapping.yaml b/layers/place/mapping.yaml index ab14e41..fff292f 100644 --- a/layers/place/mapping.yaml +++ b/layers/place/mapping.yaml @@ -56,8 +56,10 @@ tables: - *name - *name_en filters: - exclude_tags: - - [ "name", "__nil__" ] + #exclude_tags: + #- [ "name", "__nil__" ] + require: + name: ["__any__"] mapping: place: - continent @@ -82,8 +84,10 @@ tables: - *name_ja - *rank filters: - exclude_tags: - - [ "name", "__nil__" ] + #exclude_tags: + #- [ "name", "__nil__" ] + require: + name: ["__any__"] mapping: place: - country @@ -110,8 +114,10 @@ tables: - *name_ja - *rank filters: - exclude_tags: - - [ "name", "__nil__" ] + #exclude_tags: + #- [ "name", "__nil__" ] + require: + name: ["__any__"] mapping: place: - island @@ -136,8 +142,10 @@ tables: - *name_ja - *rank filters: - exclude_tags: - - [ "name", "__nil__" ] + #exclude_tags: + #- [ "name", "__nil__" ] + require: + name: ["__any__"] mapping: place: - island @@ -171,8 +179,10 @@ tables: type: string - *rank filters: - exclude_tags: - - [ "name", "__nil__" ] + #exclude_tags: + #- [ "name", "__nil__" ] + require: + name: ["__any__"] mapping: place: - state @@ -206,8 +216,10 @@ tables: type: string - *rank filters: - exclude_tags: - - [ "name", "__nil__" ] + #exclude_tags: + #- [ "name", "__nil__" ] + require: + name: ["__any__"] mapping: place: - city diff --git a/layers/water/mapping.yaml b/layers/water/mapping.yaml index e923fb0..c7c6d8e 100644 --- a/layers/water/mapping.yaml +++ b/layers/water/mapping.yaml @@ -57,8 +57,10 @@ tables: key: waterway type: string filters: - exclude_tags: - - [ "covered", "yes" ] + #exclude_tags: + #- [ "covered", "yes" ] + reject: + covered: ["yes"] mapping: landuse: - reservoir diff --git a/layers/water_name/mapping.yaml b/layers/water_name/mapping.yaml index c1d35cc..14a3ea7 100644 --- a/layers/water_name/mapping.yaml +++ b/layers/water_name/mapping.yaml @@ -17,8 +17,10 @@ tables: key: place type: string filters: - exclude_tags: - - [ "name", "__nil__" ] + #exclude_tags: + #- [ "name", "__nil__" ] + require: + name: ["__any__"] mapping: place: - ocean From 5b430f4b83bfbedd044cc5b7036bd676bd2da318 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 18 Jan 2017 15:06:24 +0100 Subject: [PATCH 2/3] Remove commented out code --- layers/boundary/mapping.yaml | 5 +---- layers/place/mapping.yaml | 20 ++++---------------- layers/water/mapping.yaml | 2 -- layers/water_name/mapping.yaml | 2 -- 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/layers/boundary/mapping.yaml b/layers/boundary/mapping.yaml index a5e7034..81b0a89 100644 --- a/layers/boundary/mapping.yaml +++ b/layers/boundary/mapping.yaml @@ -37,13 +37,10 @@ tables: name: admin_level type: integer filters: - #exclude_tags: - #- [ "admin_level", "__nil__" ] - #- [ "natural", "coastline" ] reject: natural: ["coastline"] require: - admin_level: ["__any__"] + admin_level: ["__any__"] mapping: boundary: - administrative diff --git a/layers/place/mapping.yaml b/layers/place/mapping.yaml index fff292f..6e42b65 100644 --- a/layers/place/mapping.yaml +++ b/layers/place/mapping.yaml @@ -56,10 +56,8 @@ tables: - *name - *name_en filters: - #exclude_tags: - #- [ "name", "__nil__" ] require: - name: ["__any__"] + name: ["__any__"] mapping: place: - continent @@ -84,10 +82,8 @@ tables: - *name_ja - *rank filters: - #exclude_tags: - #- [ "name", "__nil__" ] require: - name: ["__any__"] + name: ["__any__"] mapping: place: - country @@ -114,10 +110,8 @@ tables: - *name_ja - *rank filters: - #exclude_tags: - #- [ "name", "__nil__" ] require: - name: ["__any__"] + name: ["__any__"] mapping: place: - island @@ -142,8 +136,6 @@ tables: - *name_ja - *rank filters: - #exclude_tags: - #- [ "name", "__nil__" ] require: name: ["__any__"] mapping: @@ -179,10 +171,8 @@ tables: type: string - *rank filters: - #exclude_tags: - #- [ "name", "__nil__" ] require: - name: ["__any__"] + name: ["__any__"] mapping: place: - state @@ -216,8 +206,6 @@ tables: type: string - *rank filters: - #exclude_tags: - #- [ "name", "__nil__" ] require: name: ["__any__"] mapping: diff --git a/layers/water/mapping.yaml b/layers/water/mapping.yaml index c7c6d8e..b0bf580 100644 --- a/layers/water/mapping.yaml +++ b/layers/water/mapping.yaml @@ -57,8 +57,6 @@ tables: key: waterway type: string filters: - #exclude_tags: - #- [ "covered", "yes" ] reject: covered: ["yes"] mapping: diff --git a/layers/water_name/mapping.yaml b/layers/water_name/mapping.yaml index 14a3ea7..fbeaf39 100644 --- a/layers/water_name/mapping.yaml +++ b/layers/water_name/mapping.yaml @@ -17,8 +17,6 @@ tables: key: place type: string filters: - #exclude_tags: - #- [ "name", "__nil__" ] require: name: ["__any__"] mapping: From 99eacd496f9cc6df2c595cf3b3470b4d68205015 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 18 Jan 2017 15:06:44 +0100 Subject: [PATCH 3/3] Use import-osm:0.3 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1e26f73..4e775f1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,7 @@ services: links: - postgres import-osm: - image: "openmaptiles/import-osm:0.2" + image: "openmaptiles/import-osm:0.3" env_file: .env environment: DIFF_MODE: ${DIFF_MODE}