From 73c471c6124e8ef0c7f13fbe0d044c9ad4cb4b16 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 27 Sep 2018 17:08:31 -0700 Subject: [PATCH] Adds the traffic_sign/direction field Replaces the direction_vertex field in the vertex Traffic Sign presets with the traffic_sign/direction field --- data/presets.yaml | 10 ++++++++++ data/presets/fields.json | 1 + data/presets/fields/traffic_sign/direction.json | 12 ++++++++++++ data/presets/presets.json | 6 +++--- .../presets/traffic_sign/city_limit_vertex.json | 2 +- .../presets/traffic_sign/maxspeed_vertex.json | 2 +- data/presets/presets/traffic_sign_vertex.json | 2 +- data/taginfo.json | 15 +++++++++++++++ dist/locales/en.json | 8 ++++++++ 9 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 data/presets/fields/traffic_sign/direction.json diff --git a/data/presets.yaml b/data/presets.yaml index 934fa7784..1780a064e 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1733,6 +1733,16 @@ en: traffic_sign: # traffic_sign=* label: Traffic Sign + traffic_sign/direction: + # 'traffic_sign:direction=*' + label: Direction + options: + # 'traffic_sign:direction=backward' + backward: Backward + # 'traffic_sign:direction=both' + both: Both / All + # 'traffic_sign:direction=forward' + forward: Forward traffic_signals: # traffic_signals=* label: Type diff --git a/data/presets/fields.json b/data/presets/fields.json index db1fd4660..aeb7fc9da 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -302,6 +302,7 @@ "trade": {"key": "trade", "type": "typeCombo", "label": "Type"}, "traffic_calming": {"key": "traffic_calming", "type": "typeCombo", "label": "Type"}, "traffic_sign": {"key": "traffic_sign", "type": "typeCombo", "label": "Traffic Sign"}, + "traffic_sign/direction": {"key": "traffic_sign:direction", "type": "combo", "label": "Direction", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}}, "traffic_signals": {"key": "traffic_signals", "type": "combo", "label": "Type", "default": "signal"}, "traffic_signals/direction": {"key": "traffic_signals:direction", "type": "combo", "label": "Direction", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}}, "trail_visibility": {"key": "trail_visibility", "type": "combo", "label": "Trail Visibility", "placeholder": "Excellent, Good, Bad...", "strings": {"options": {"excellent": "Excellent: unambiguous path or markers everywhere", "good": "Good: markers visible, sometimes require searching", "intermediate": "Intermediate: few markers, path mostly visible", "bad": "Bad: no markers, path sometimes invisible/pathless", "horrible": "Horrible: often pathless, some orientation skills required", "no": "No: pathless, excellent orientation skills required"}}}, diff --git a/data/presets/fields/traffic_sign/direction.json b/data/presets/fields/traffic_sign/direction.json new file mode 100644 index 000000000..8b5ab49a5 --- /dev/null +++ b/data/presets/fields/traffic_sign/direction.json @@ -0,0 +1,12 @@ +{ + "key": "traffic_sign:direction", + "type": "combo", + "label": "Direction", + "strings": { + "options": { + "forward": "Forward", + "backward": "Backward", + "both": "Both / All" + } + } +} diff --git a/data/presets/presets.json b/data/presets/presets.json index de376a149..17c47a991 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -926,11 +926,11 @@ "traffic_calming/island": {"icon": "temaki-diamond", "geometry": ["vertex"], "terms": ["circle", "roundabout", "slow"], "tags": {"traffic_calming": "island"}, "name": "Traffic Island"}, "traffic_calming/rumble_strip": {"icon": "temaki-diamond", "fields": ["direction_vertex"], "geometry": ["vertex", "line"], "terms": ["audible lines", "sleeper lines", "growlers"], "tags": {"traffic_calming": "rumble_strip"}, "name": "Rumble Strip"}, "traffic_calming/table": {"icon": "temaki-diamond", "fields": ["surface"], "geometry": ["vertex"], "tags": {"traffic_calming": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Speed Table"}, - "traffic_sign_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction_vertex"], "geometry": ["vertex"], "tags": {"traffic_sign": "*"}, "terms": ["road", "highway"], "name": "Traffic Sign"}, + "traffic_sign_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction"], "geometry": ["vertex"], "tags": {"traffic_sign": "*"}, "terms": ["road", "highway"], "name": "Traffic Sign"}, "traffic_sign": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction"], "geometry": ["point"], "tags": {"traffic_sign": "*"}, "terms": ["road", "highway"], "name": "Traffic Sign"}, - "traffic_sign/city_limit_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction_vertex", "name"], "geometry": ["vertex"], "tags": {"traffic_sign": "city_limit"}, "terms": ["town", "village", "hamlet", "boundary", "edge", "border", "road", "highway"], "name": "City Limit Sign"}, + "traffic_sign/city_limit_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction", "name"], "geometry": ["vertex"], "tags": {"traffic_sign": "city_limit"}, "terms": ["town", "village", "hamlet", "boundary", "edge", "border", "road", "highway"], "name": "City Limit Sign"}, "traffic_sign/city_limit": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction", "name"], "geometry": ["point"], "tags": {"traffic_sign": "city_limit"}, "terms": ["town", "village", "hamlet", "boundary", "edge", "border", "road", "highway"], "name": "City Limit Sign"}, - "traffic_sign/maxspeed_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction_vertex", "maxspeed"], "geometry": ["vertex"], "tags": {"traffic_sign": "maxspeed"}, "terms": ["max speed", "maximum speed", "road", "highway"], "name": "Speed Limit Sign"}, + "traffic_sign/maxspeed_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction", "maxspeed"], "geometry": ["vertex"], "tags": {"traffic_sign": "maxspeed"}, "terms": ["max speed", "maximum speed", "road", "highway"], "name": "Speed Limit Sign"}, "traffic_sign/maxspeed": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction", "maxspeed"], "geometry": ["point"], "tags": {"traffic_sign": "maxspeed"}, "terms": ["max speed", "maximum speed", "road", "highway"], "name": "Speed Limit Sign"}, "type/multipolygon": {"icon": "iD-multipolygon", "geometry": ["area", "relation"], "tags": {"type": "multipolygon"}, "removeTags": {}, "name": "Multipolygon", "searchable": false, "matchScore": 0.1}, "type/boundary": {"icon": "iD-boundary", "fields": ["name", "boundary"], "geometry": ["relation"], "tags": {"type": "boundary"}, "name": "Boundary"}, diff --git a/data/presets/presets/traffic_sign/city_limit_vertex.json b/data/presets/presets/traffic_sign/city_limit_vertex.json index 89984f740..11c71e054 100644 --- a/data/presets/presets/traffic_sign/city_limit_vertex.json +++ b/data/presets/presets/traffic_sign/city_limit_vertex.json @@ -2,7 +2,7 @@ "icon": "maki-square-stroked", "fields": [ "traffic_sign", - "direction_vertex", + "traffic_sign/direction", "name" ], "geometry": [ diff --git a/data/presets/presets/traffic_sign/maxspeed_vertex.json b/data/presets/presets/traffic_sign/maxspeed_vertex.json index ecc5cb71b..667d3c7d9 100644 --- a/data/presets/presets/traffic_sign/maxspeed_vertex.json +++ b/data/presets/presets/traffic_sign/maxspeed_vertex.json @@ -2,7 +2,7 @@ "icon": "maki-square-stroked", "fields": [ "traffic_sign", - "direction_vertex", + "traffic_sign/direction", "maxspeed" ], "geometry": [ diff --git a/data/presets/presets/traffic_sign_vertex.json b/data/presets/presets/traffic_sign_vertex.json index 8c1841a40..67edd21d8 100644 --- a/data/presets/presets/traffic_sign_vertex.json +++ b/data/presets/presets/traffic_sign_vertex.json @@ -2,7 +2,7 @@ "icon": "maki-square-stroked", "fields": [ "traffic_sign", - "direction_vertex" + "traffic_sign/direction" ], "geometry": [ "vertex" diff --git a/data/taginfo.json b/data/taginfo.json index eadb71c0f..98f84a59c 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -7356,6 +7356,21 @@ {"key": "tracktype", "value": "grade4", "description": "Track Type"}, {"key": "tracktype", "value": "grade5", "description": "Track Type"}, {"key": "trade", "description": "Type"}, + { + "key": "traffic_sign:direction", + "value": "forward", + "description": "Direction" + }, + { + "key": "traffic_sign:direction", + "value": "backward", + "description": "Direction" + }, + { + "key": "traffic_sign:direction", + "value": "both", + "description": "Direction" + }, {"key": "traffic_signals", "description": "Type"}, { "key": "traffic_signals:direction", diff --git a/dist/locales/en.json b/dist/locales/en.json index 153ff053c..b28d499ad 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2906,6 +2906,14 @@ "traffic_sign": { "label": "Traffic Sign" }, + "traffic_sign/direction": { + "label": "Direction", + "options": { + "forward": "Forward", + "backward": "Backward", + "both": "Both / All" + } + }, "traffic_signals": { "label": "Type" },