From 7d80494ac5a6115fdb02fe7b418d26c8888041c6 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 23 Jun 2016 21:24:10 -0400 Subject: [PATCH] Add stop type, direction forward/backward --- data/presets.yaml | 23 ++++++++++++++++++++++- data/presets/fields.json | 22 ++++++++++++++++++++++ data/presets/fields/stop.json | 11 +++++++++++ data/presets/presets.json | 25 ++++++++++++++++++++++++- data/presets/presets/highway/stop.json | 1 + data/taginfo.json | 4 ++++ dist/locales/en.json | 20 +++++++++++++++++++- 7 files changed, 103 insertions(+), 3 deletions(-) create mode 100644 data/presets/fields/stop.json diff --git a/data/presets.yaml b/data/presets.yaml index 8e23b4195..3fec43e21 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -661,6 +661,14 @@ en: label: Par # par field placeholder placeholder: '3, 4, 5...' + parallel_direction: + # 'direction=*' + label: Direction + options: + # direction=backward + backward: Backward + # direction=forward + forward: Forward park_ride: # 'park_ride=*' label: Park and Ride @@ -923,6 +931,14 @@ en: stars: # 'stars=*' label: Stars + stop: + # 'stop=*' + label: Stop Type + options: + # stop=all + all: All Ways + # stop=minor + minor: Minor Road structure: # 'bridge=*, tunnel=*, embankment=*, cutting=*, ford=*' label: Structure @@ -2140,6 +2156,11 @@ en: name: Foot Path # 'terms: hike,hiking,trackway,trail,walk' terms: "" + highway/give_way: + # highway=give_way + name: Yield Sign + # 'terms: give way,yield,sign' + terms: "" highway/living_street: # highway=living_street name: Living Street @@ -2243,7 +2264,7 @@ en: highway/stop: # highway=stop name: Stop Sign - # 'terms: stop sign' + # 'terms: stop,halt,sign' terms: "" highway/street_lamp: # highway=street_lamp diff --git a/data/presets/fields.json b/data/presets/fields.json index c12b59aa0..79a87367c 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -891,6 +891,17 @@ "label": "Par", "placeholder": "3, 4, 5..." }, + "parallel_direction": { + "key": "direction", + "type": "combo", + "label": "Direction", + "strings": { + "options": { + "forward": "Forward", + "backward": "Backward" + } + } + }, "park_ride": { "key": "park_ride", "type": "check", @@ -1248,6 +1259,17 @@ "type": "number", "label": "Stars" }, + "stop": { + "key": "stop", + "type": "combo", + "label": "Stop Type", + "strings": { + "options": { + "all": "All Ways", + "minor": "Minor Road" + } + } + }, "structure": { "type": "radio", "keys": [ diff --git a/data/presets/fields/stop.json b/data/presets/fields/stop.json new file mode 100644 index 000000000..fb5659e97 --- /dev/null +++ b/data/presets/fields/stop.json @@ -0,0 +1,11 @@ +{ + "key": "stop", + "type": "combo", + "label": "Stop Type", + "strings": { + "options": { + "all": "All Ways", + "minor": "Minor Road" + } + } +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 23b983a10..560474f92 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -4364,6 +4364,23 @@ }, "name": "Foot Path" }, + "highway/give_way": { + "fields": [ + "parallel_direction" + ], + "geometry": [ + "vertex" + ], + "tags": { + "highway": "give_way" + }, + "terms": [ + "give way", + "yield", + "sign" + ], + "name": "Yield Sign" + }, "highway/living_street": { "icon": "highway-living-street", "fields": [ @@ -4811,6 +4828,10 @@ "name": "Steps" }, "highway/stop": { + "fields": [ + "stop", + "parallel_direction" + ], "geometry": [ "vertex" ], @@ -4818,7 +4839,9 @@ "highway": "stop" }, "terms": [ - "stop sign" + "stop", + "halt", + "sign" ], "name": "Stop Sign" }, diff --git a/data/presets/presets/highway/stop.json b/data/presets/presets/highway/stop.json index ff64b045b..403a533b2 100644 --- a/data/presets/presets/highway/stop.json +++ b/data/presets/presets/highway/stop.json @@ -1,5 +1,6 @@ { "fields": [ + "stop", "parallel_direction" ], "geometry": [ diff --git a/data/taginfo.json b/data/taginfo.json index 6e2273568..ac5762cc2 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -974,6 +974,10 @@ "key": "highway", "value": "footway" }, + { + "key": "highway", + "value": "give_way" + }, { "key": "highway", "value": "living_street" diff --git a/dist/locales/en.json b/dist/locales/en.json index d632b722e..e8dec12fa 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1198,6 +1198,13 @@ "label": "Par", "placeholder": "3, 4, 5..." }, + "parallel_direction": { + "label": "Direction", + "options": { + "forward": "Forward", + "backward": "Backward" + } + }, "park_ride": { "label": "Park and Ride" }, @@ -1406,6 +1413,13 @@ "stars": { "label": "Stars" }, + "stop": { + "label": "Stop Type", + "options": { + "all": "All Ways", + "minor": "Minor Road" + } + }, "structure": { "label": "Structure", "placeholder": "Unknown", @@ -2490,6 +2504,10 @@ "name": "Foot Path", "terms": "hike,hiking,trackway,trail,walk" }, + "highway/give_way": { + "name": "Yield Sign", + "terms": "give way,yield,sign" + }, "highway/living_street": { "name": "Living Street", "terms": "" @@ -2584,7 +2602,7 @@ }, "highway/stop": { "name": "Stop Sign", - "terms": "stop sign" + "terms": "stop,halt,sign" }, "highway/street_lamp": { "name": "Street Lamp",