From 52824d34ed02e1a128b23fb1403a488fe4267fa9 Mon Sep 17 00:00:00 2001 From: RudyTheDev Date: Thu, 29 Nov 2018 15:58:05 +0200 Subject: [PATCH] Add preset for "Railing": barrier=fence; fence_type=railing --- data/presets.yaml | 7 ++++++- data/presets/presets.json | 3 ++- .../presets/barrier/fence/railing.json | 20 +++++++++++++++++++ data/presets/presets/barrier/guard_rail.json | 1 - data/taginfo.json | 7 +++++++ dist/locales/en.json | 6 +++++- 6 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 data/presets/presets/barrier/fence/railing.json diff --git a/data/presets.yaml b/data/presets.yaml index cfcf5c405..284f6ced9 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3096,6 +3096,11 @@ en: # barrier=fence name: Fence terms: '' + barrier/fence/railing: + # 'barrier=fence, fence_type=railing' + name: Railing + # 'terms: railing,handrail,guard rail' + terms: '' barrier/gate: # barrier=gate name: Gate @@ -3103,7 +3108,7 @@ en: barrier/guard_rail: # barrier=guard_rail name: Guard Rail - # 'terms: railing,guardrail,traffic barrier,crash barrier,median barrier,roadside barrier,Armco barrier' + # 'terms: guardrail,traffic barrier,crash barrier,median barrier,roadside barrier,Armco barrier' terms: '' barrier/hedge: # barrier=hedge diff --git a/data/presets/presets.json b/data/presets/presets.json index dfa7cd695..7fdde59e9 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -234,8 +234,9 @@ "barrier/cycle_barrier": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "cycle_barrier"}, "name": "Cycle Barrier"}, "barrier/ditch": {"icon": "maki-roadblock", "geometry": ["line", "area"], "tags": {"barrier": "ditch"}, "name": "Trench", "matchScore": 0.25}, "barrier/fence": {"icon": "maki-fence", "fields": ["fence_type", "height"], "geometry": ["line"], "tags": {"barrier": "fence"}, "name": "Fence", "matchScore": 0.25}, + "barrier/fence/railing": {"icon": "maki-barrier", "geometry": ["line"], "tags": {"barrier": "fence", "fence_type": "railing"}, "fields": ["height"], "name": "Railing", "terms": ["railing", "handrail", "guard rail"], "matchScore": 0.5}, "barrier/gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "gate"}, "name": "Gate"}, - "barrier/guard_rail": {"icon": "maki-barrier", "geometry": ["line"], "tags": {"barrier": "guard_rail"}, "name": "Guard Rail", "terms": ["railing", "guardrail", "traffic barrier", "crash barrier", "median barrier", "roadside barrier", "Armco barrier"], "matchScore": 0.75}, + "barrier/guard_rail": {"icon": "maki-barrier", "geometry": ["line"], "tags": {"barrier": "guard_rail"}, "name": "Guard Rail", "terms": ["guardrail", "traffic barrier", "crash barrier", "median barrier", "roadside barrier", "Armco barrier"], "matchScore": 0.75}, "barrier/hedge": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "hedge"}, "name": "Hedge", "matchScore": 0.25}, "barrier/kerb": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "name": "Curb"}, "barrier/kerb/lowered": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "name": "Lowered Curb"}, diff --git a/data/presets/presets/barrier/fence/railing.json b/data/presets/presets/barrier/fence/railing.json new file mode 100644 index 000000000..f4d86b5af --- /dev/null +++ b/data/presets/presets/barrier/fence/railing.json @@ -0,0 +1,20 @@ +{ + "icon": "maki-barrier", + "geometry": [ + "line" + ], + "tags": { + "barrier": "fence", + "fence_type": "railing" + }, + "fields": [ + "height" + ], + "name": "Railing", + "terms": [ + "railing", + "handrail", + "guard rail" + ], + "matchScore": 0.5 +} diff --git a/data/presets/presets/barrier/guard_rail.json b/data/presets/presets/barrier/guard_rail.json index 061d1ebf0..6456f4d8e 100644 --- a/data/presets/presets/barrier/guard_rail.json +++ b/data/presets/presets/barrier/guard_rail.json @@ -8,7 +8,6 @@ }, "name": "Guard Rail", "terms": [ - "railing", "guardrail", "traffic barrier", "crash barrier", diff --git a/data/taginfo.json b/data/taginfo.json index e14e0b88f..5a0cb209f 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1590,6 +1590,13 @@ "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/fence-15.svg?sanitize=true" }, + { + "key": "fence_type", + "value": "railing", + "description": "Railing", + "object_types": ["way"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true" + }, { "key": "barrier", "value": "gate", diff --git a/dist/locales/en.json b/dist/locales/en.json index e99043811..181e5d31f 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4115,13 +4115,17 @@ "name": "Fence", "terms": "" }, + "barrier/fence/railing": { + "name": "Railing", + "terms": "railing,handrail,guard rail" + }, "barrier/gate": { "name": "Gate", "terms": "" }, "barrier/guard_rail": { "name": "Guard Rail", - "terms": "railing,guardrail,traffic barrier,crash barrier,median barrier,roadside barrier,Armco barrier" + "terms": "guardrail,traffic barrier,crash barrier,median barrier,roadside barrier,Armco barrier" }, "barrier/hedge": { "name": "Hedge",