From 594c61ff2b71ef91bda017d05a2980e7277de024 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 6 Jan 2020 12:41:35 -0500 Subject: [PATCH] Add Swing Gate preset (close #7208) Add additional fields to Gate preset --- data/presets.yaml | 4 ++++ data/presets/presets.json | 5 +++-- data/presets/presets/barrier/gate.json | 11 ++++++++++- data/presets/presets/barrier/lift_gate.json | 3 ++- data/presets/presets/barrier/swing_gate.json | 16 ++++++++++++++++ data/taginfo.json | 1 + dist/locales/en.json | 4 ++++ 7 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 data/presets/presets/barrier/swing_gate.json diff --git a/data/presets.yaml b/data/presets.yaml index 31722222c..428a28e7d 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -4123,6 +4123,10 @@ en: # barrier=stile name: Stile terms: '' + barrier/swing_gate: + # barrier=swing_gate + name: Swing Gate + terms: '' barrier/toll_booth: # barrier=toll_booth name: Toll Booth diff --git a/data/presets/presets.json b/data/presets/presets.json index 82315b1f6..7e1bca524 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -305,7 +305,7 @@ "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", "material"], "geometry": ["line"], "tags": {"barrier": "fence"}, "name": "Fence", "matchScore": 0.25}, "barrier/fence/railing": {"icon": "temaki-railing", "geometry": ["line"], "tags": {"barrier": "fence", "fence_type": "railing"}, "terms": ["railing", "handrail", "guard rail"], "name": "Railing", "matchScore": 0.5}, - "barrier/gate": {"icon": "temaki-gate", "fields": ["access", "opening_hours"], "geometry": ["vertex", "line"], "tags": {"barrier": "gate"}, "name": "Gate"}, + "barrier/gate": {"icon": "temaki-gate", "fields": ["access", "wheelchair", "opening_hours", "height", "material"], "moreFields": ["colour", "manufacturer", "operator", "ref"], "geometry": ["vertex", "line"], "tags": {"barrier": "gate"}, "name": "Gate"}, "barrier/guard_rail": {"icon": "temaki-guard_rail", "fields": ["material"], "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/height_restrictor": {"icon": "temaki-height_restrictor", "fields": ["maxheight"], "geometry": ["vertex"], "tags": {"barrier": "height_restrictor"}, "name": "Height Restrictor"}, @@ -315,10 +315,11 @@ "barrier/kerb/raised": {"icon": "temaki-kerb-raised", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "raised"}, "addTags": {"barrier": "kerb", "kerb": "raised"}, "reference": {"key": "kerb", "value": "raised"}, "terms": [], "matchScore": 0.55, "name": "Raised Curb"}, "barrier/kerb/rolled": {"icon": "temaki-kerb-rolled", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "rolled"}, "addTags": {"barrier": "kerb", "kerb": "rolled"}, "reference": {"key": "kerb", "value": "rolled"}, "terms": ["gutter"], "matchScore": 0.55, "name": "Rolled Curb"}, "barrier/kissing_gate": {"icon": "temaki-gate", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "kissing_gate"}, "name": "Kissing Gate"}, - "barrier/lift_gate": {"icon": "temaki-lift_gate", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"}, + "barrier/lift_gate": {"icon": "temaki-lift_gate", "fields": ["access", "opening_hours"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"}, "barrier/retaining_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"}, "barrier/sally_port": {"icon": "fas-dungeon", "geometry": ["vertex"], "tags": {"barrier": "sally_port"}, "terms": ["Postern", "castle side gate"], "name": "Sally Port"}, "barrier/stile": {"icon": "maki-roadblock", "fields": ["access", "stile", "material"], "geometry": ["vertex"], "tags": {"barrier": "stile"}, "name": "Stile"}, + "barrier/swing_gate": {"icon": "temaki-gate", "fields": ["{barrier/gate}"], "moreFields": ["{barrier/gate}"], "geometry": ["vertex"], "tags": {"barrier": "swing_gate"}, "name": "Swing Gate"}, "barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area", "payment_multi", "currency_multi"], "moreFields": ["address", "email", "fax", "opening_hours", "phone", "website"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"}, "barrier/turnstile": {"icon": "temaki-turnstile", "fields": ["access"], "geometry": ["vertex"], "terms": ["baffle gate", "turnstyle"], "tags": {"barrier": "turnstile"}, "name": "Turnstile"}, "barrier/wall": {"icon": "temaki-wall", "fields": ["wall", "height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "wall"}, "name": "Wall", "matchScore": 0.25}, diff --git a/data/presets/presets/barrier/gate.json b/data/presets/presets/barrier/gate.json index 5bcad4b4b..f88f99f44 100644 --- a/data/presets/presets/barrier/gate.json +++ b/data/presets/presets/barrier/gate.json @@ -2,7 +2,16 @@ "icon": "temaki-gate", "fields": [ "access", - "opening_hours" + "wheelchair", + "opening_hours", + "height", + "material" + ], + "moreFields": [ + "colour", + "manufacturer", + "operator", + "ref" ], "geometry": [ "vertex", diff --git a/data/presets/presets/barrier/lift_gate.json b/data/presets/presets/barrier/lift_gate.json index 3b00ff51f..3731b64d5 100644 --- a/data/presets/presets/barrier/lift_gate.json +++ b/data/presets/presets/barrier/lift_gate.json @@ -1,7 +1,8 @@ { "icon": "temaki-lift_gate", "fields": [ - "access" + "access", + "opening_hours" ], "geometry": [ "vertex", diff --git a/data/presets/presets/barrier/swing_gate.json b/data/presets/presets/barrier/swing_gate.json new file mode 100644 index 000000000..1dc67bd9d --- /dev/null +++ b/data/presets/presets/barrier/swing_gate.json @@ -0,0 +1,16 @@ +{ + "icon": "temaki-gate", + "fields": [ + "{barrier/gate}" + ], + "moreFields": [ + "{barrier/gate}" + ], + "geometry": [ + "vertex" + ], + "tags": { + "barrier": "swing_gate" + }, + "name": "Swing Gate" +} diff --git a/data/taginfo.json b/data/taginfo.json index 23e5b56f8..7823e6588 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -315,6 +315,7 @@ {"key": "barrier", "value": "retaining_wall", "description": "🄿 Retaining Wall", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/wall.svg"}, {"key": "barrier", "value": "sally_port", "description": "🄿 Sally Port", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-dungeon.svg"}, {"key": "barrier", "value": "stile", "description": "🄿 Stile", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"}, + {"key": "barrier", "value": "swing_gate", "description": "🄿 Swing Gate", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/gate.svg"}, {"key": "barrier", "value": "toll_booth", "description": "🄿 Toll Booth", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"}, {"key": "barrier", "value": "turnstile", "description": "🄿 Turnstile", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/turnstile.svg"}, {"key": "barrier", "value": "wall", "description": "🄿 Wall", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/wall.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 6fed317da..6474fb5a6 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -6096,6 +6096,10 @@ "name": "Stile", "terms": "" }, + "barrier/swing_gate": { + "name": "Swing Gate", + "terms": "" + }, "barrier/toll_booth": { "name": "Toll Booth", "terms": ""