From 418ad3fb58ef18e5c39d22d1cdc3b88c64429914 Mon Sep 17 00:00:00 2001 From: Tomas Vajda Date: Mon, 30 Sep 2019 12:25:50 +0200 Subject: [PATCH 1/3] Add chimney to pois --- yaml/pois.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/yaml/pois.yaml b/yaml/pois.yaml index 3a65dab42..15052aa59 100644 --- a/yaml/pois.yaml +++ b/yaml/pois.yaml @@ -443,7 +443,7 @@ global: - landuse: quarry - leisure: [ dog_park, firepit, fishing, pitch, playground, slipway, swimming_area ] - lock: yes - - man_made: [ adit, communications_tower, crane, mast, mineshaft, obelisk, observatory, + - man_made: [ adit, communications_tower, chimney, crane, mast, mineshaft, obelisk, observatory, offshore_platform, petroleum_well, power_wind, telescope, water_tower, water_well, watermill, windmill ] - military: bunker @@ -2640,6 +2640,11 @@ filters: - shiploader - tower_crane then: {col: "crane:type"} + - filter: {man_made: chimney} + min_zoom: 14 + output: + <<: *output_properties + kind: chimney - filter: {leisure: water_park} min_zoom: { clamp: { min: 13, max: 15, value: { sum: [ { col: zoom }, 2.34 ] } } } output: From 574a9f29b57011093cfe1eee7da97e088887649e Mon Sep 17 00:00:00 2001 From: Vectura Games Maps Date: Tue, 1 Oct 2019 12:48:57 +0200 Subject: [PATCH 2/3] Add chimney to docs --- docs/layers.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/layers.md b/docs/layers.md index 0059e1118..f7ed1e891 100644 --- a/docs/layers.md +++ b/docs/layers.md @@ -966,6 +966,7 @@ To resolve inconsistency in data tagging in OpenStreetMap we normalize several o * `chemist` - A shop selling household chemicals, often including soaps, toothpaste and cosmetics. * `childcare` * `childrens_centre` +* `chimney` * `chiropractor` * `cinema` * `clinic` with `kind_detail` property. From a6fc985900b7de5a677bfbe9be5947483c932ae0 Mon Sep 17 00:00:00 2001 From: Tomas Vajda Date: Tue, 1 Oct 2019 22:46:32 +0200 Subject: [PATCH 3/3] Changed chimney min_zoom as in obelisk --- yaml/pois.yaml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/yaml/pois.yaml b/yaml/pois.yaml index 15052aa59..c6e1b0903 100644 --- a/yaml/pois.yaml +++ b/yaml/pois.yaml @@ -1255,7 +1255,20 @@ filters: case: - when: {historic: [monument, memorial]} then: {col: historic} - + - filter: {man_made: chimney} + min_zoom: + lookup: + key: { call: { func: mz_to_float_meters, args: [ { col: height } ] } } + op: '>=' + table: + - [ 14, 20 ] # z14 if height >= 20m + - [ 15, 10 ] # z15 if height >= 10m + default: 16 + output: + <<: *output_properties + kind: chimney + tier: 5 + ############################################################ # TIER 6 ############################################################ @@ -2640,11 +2653,6 @@ filters: - shiploader - tower_crane then: {col: "crane:type"} - - filter: {man_made: chimney} - min_zoom: 14 - output: - <<: *output_properties - kind: chimney - filter: {leisure: water_park} min_zoom: { clamp: { min: 13, max: 15, value: { sum: [ { col: zoom }, 2.34 ] } } } output: