From 5f5ff68c79a35c45ecc9be298b6084f427cfa56a Mon Sep 17 00:00:00 2001 From: arch0345 Date: Tue, 20 Jun 2023 12:43:42 -0700 Subject: [PATCH] Apply suggestions from review --- data/fields/curve.json | 6 ++++++ data/fields/curves.json | 6 ++++++ data/fields/hazard/animal.json | 12 ++++++++++++ data/fields/traffic_sign.json | 8 ++++++++ data/presets/boundary/hazard.json | 1 + data/presets/traffic_sign/hazard.json | 1 + .../presets/traffic_sign/hazard/animal_crossing.json | 1 + data/presets/traffic_sign/hazard/bump.json | 1 + data/presets/traffic_sign/hazard/children.json | 1 + data/presets/traffic_sign/hazard/curve.json | 1 + data/presets/traffic_sign/hazard/curves.json | 1 + .../traffic_sign/hazard/dangerous_junction.json | 7 ++++--- data/presets/traffic_sign/hazard/dip.json | 1 + data/presets/traffic_sign/hazard/horse_riders.json | 6 +++--- data/presets/traffic_sign/hazard/pedestrians.json | 3 +++ data/presets/traffic_sign/hazard/queues_likely.json | 3 +++ data/presets/traffic_sign/hazard/road_narrows.json | 3 +++ data/presets/traffic_sign/hazard/turn.json | 5 +++++ data/presets/traffic_sign/hazard/turns.json | 4 ++++ 19 files changed, 65 insertions(+), 6 deletions(-) diff --git a/data/fields/curve.json b/data/fields/curve.json index bd97af9f..6c18cc1f 100644 --- a/data/fields/curve.json +++ b/data/fields/curve.json @@ -1,6 +1,12 @@ { "key": "curve", "type": "combo", + "strings": { + "options": { + "hairpin": "Hairpin/Switchback", + "loop": "Loop (270 Degrees or More)" + } + }, "label": "Type", "prerequisiteTag": { "key": "hazard", diff --git a/data/fields/curves.json b/data/fields/curves.json index f4b61aa5..0f128809 100644 --- a/data/fields/curves.json +++ b/data/fields/curves.json @@ -1,6 +1,12 @@ { "key": "curves", "type": "combo", + "strings": { + "options": { + "serpentine": "Double Curve/Bend", + "extended": "Windy Road (Many Curves)" + } + }, "label": "Type", "prerequisiteTag": { "key": "hazard", diff --git a/data/fields/hazard/animal.json b/data/fields/hazard/animal.json index dc94f5fe..25c4c977 100644 --- a/data/fields/hazard/animal.json +++ b/data/fields/hazard/animal.json @@ -1,6 +1,18 @@ { "key": "hazard:animal", "type": "combo", + "strings": { + "options": { + "wild_animal": "Wild Animal", + "moose": "Moose", + "livestock": "Livestock", + "deer": "Deer", + "cow": "Cow", + "snake": "Snake", + "amphibian": "Amphibian", + "duck": "Duck" + } + }, "label": "Type", "prerequisiteTag": { "key": "hazard", diff --git a/data/fields/traffic_sign.json b/data/fields/traffic_sign.json index 46f800d3..c65a2b4c 100644 --- a/data/fields/traffic_sign.json +++ b/data/fields/traffic_sign.json @@ -1,6 +1,14 @@ { "key": "traffic_sign", "type": "typeCombo", + "strings": { + "options": { + "city_limit": "City Limit Sign", + "hazard": "Warning Sign", + "maxspeed": "Speed Limit Sign", + "variable_message": "Variable Message Sign" + } + }, "label": "Traffic Sign", "snake_case": false, "caseSensitive": true diff --git a/data/presets/boundary/hazard.json b/data/presets/boundary/hazard.json index 702dec9f..ad43ac01 100644 --- a/data/presets/boundary/hazard.json +++ b/data/presets/boundary/hazard.json @@ -1,4 +1,5 @@ { + "icon": "fas-triangle-exclamation", "fields": [ "name", "hazard" diff --git a/data/presets/traffic_sign/hazard.json b/data/presets/traffic_sign/hazard.json index 259f41a8..14c22e5b 100644 --- a/data/presets/traffic_sign/hazard.json +++ b/data/presets/traffic_sign/hazard.json @@ -1,6 +1,7 @@ { "icon": "fas-triangle-exclamation", "fields": [ + "{traffic_sign}", "hazard" ], "geometry": [ diff --git a/data/presets/traffic_sign/hazard/animal_crossing.json b/data/presets/traffic_sign/hazard/animal_crossing.json index 0bd284eb..91181a51 100644 --- a/data/presets/traffic_sign/hazard/animal_crossing.json +++ b/data/presets/traffic_sign/hazard/animal_crossing.json @@ -1,6 +1,7 @@ { "icon": "fas-frog", "fields": [ + "{traffic_sign/hazard}", "hazard/animal" ], "geometry": [ diff --git a/data/presets/traffic_sign/hazard/bump.json b/data/presets/traffic_sign/hazard/bump.json index fd35709d..6635f50e 100644 --- a/data/presets/traffic_sign/hazard/bump.json +++ b/data/presets/traffic_sign/hazard/bump.json @@ -1,6 +1,7 @@ { "icon": "temaki-speed_bump", "fields": [ + "{traffic_sign/hazard}", "maxspeed/advisory" ], "geometry": [ diff --git a/data/presets/traffic_sign/hazard/children.json b/data/presets/traffic_sign/hazard/children.json index 368a93d7..e2f5ba0e 100644 --- a/data/presets/traffic_sign/hazard/children.json +++ b/data/presets/traffic_sign/hazard/children.json @@ -1,6 +1,7 @@ { "icon": "temaki-seesaw", "fields": [ + "{traffic_sign/hazard}", "maxspeed/advisory" ], "geometry": [ diff --git a/data/presets/traffic_sign/hazard/curve.json b/data/presets/traffic_sign/hazard/curve.json index c60fba53..04e2dc95 100644 --- a/data/presets/traffic_sign/hazard/curve.json +++ b/data/presets/traffic_sign/hazard/curve.json @@ -1,5 +1,6 @@ { "fields": [ + "{traffic_sign/hazard}", "curve", "maxspeed/advisory" ], diff --git a/data/presets/traffic_sign/hazard/curves.json b/data/presets/traffic_sign/hazard/curves.json index 71f11168..31b56928 100644 --- a/data/presets/traffic_sign/hazard/curves.json +++ b/data/presets/traffic_sign/hazard/curves.json @@ -1,5 +1,6 @@ { "fields": [ + "{traffic_sign/hazard}", "curves", "maxspeed/advisory" ], diff --git a/data/presets/traffic_sign/hazard/dangerous_junction.json b/data/presets/traffic_sign/hazard/dangerous_junction.json index af079746..faca26ae 100644 --- a/data/presets/traffic_sign/hazard/dangerous_junction.json +++ b/data/presets/traffic_sign/hazard/dangerous_junction.json @@ -1,5 +1,6 @@ { "fields": [ + "{traffic_sign/hazard}", "maxspeed/advisory" ], "geometry": [ @@ -15,9 +16,9 @@ "value": "dangerous_junction" }, "aliases": [ - "Dangerous Intersection Sign", "Dangerous Junction Sign", - "Intersection Sign" + "Intersection Sign", + "Junction Sign" ], - "name": "Junction Warning Sign" + "name": "Dangerous Intersection Warning Sign" } diff --git a/data/presets/traffic_sign/hazard/dip.json b/data/presets/traffic_sign/hazard/dip.json index ba7d86e8..2940a175 100644 --- a/data/presets/traffic_sign/hazard/dip.json +++ b/data/presets/traffic_sign/hazard/dip.json @@ -1,6 +1,7 @@ { "icon": "temaki-speed_dip", "fields": [ + "{traffic_sign/hazard}", "maxspeed/advisory" ], "geometry": [ diff --git a/data/presets/traffic_sign/hazard/horse_riders.json b/data/presets/traffic_sign/hazard/horse_riders.json index bc180111..898e6126 100644 --- a/data/presets/traffic_sign/hazard/horse_riders.json +++ b/data/presets/traffic_sign/hazard/horse_riders.json @@ -13,8 +13,8 @@ "value": "horse_riders" }, "aliases": [ - "Equestrian Rider Sign", - "Horseback Rider Sign" + "Equestrian Sign", + "Horse Rider Sign" ], - "name": "Horse Rider Warning Sign" + "name": "Horseback Rider Warning Sign" } diff --git a/data/presets/traffic_sign/hazard/pedestrians.json b/data/presets/traffic_sign/hazard/pedestrians.json index 742ae433..16f040ca 100644 --- a/data/presets/traffic_sign/hazard/pedestrians.json +++ b/data/presets/traffic_sign/hazard/pedestrians.json @@ -12,5 +12,8 @@ "key": "hazard", "value": "pedestrian" }, + "aliases": [ + "Pedestrian Crossing Sign" + ], "name": "Pedestrian Warning Sign" } diff --git a/data/presets/traffic_sign/hazard/queues_likely.json b/data/presets/traffic_sign/hazard/queues_likely.json index 3fcdd3ae..dacb31b4 100644 --- a/data/presets/traffic_sign/hazard/queues_likely.json +++ b/data/presets/traffic_sign/hazard/queues_likely.json @@ -11,5 +11,8 @@ "key": "hazard", "value": "queues_likely" }, + "terms": [ + "watch for stopped traffic" + ], "name": "Congestion Warning Sign" } diff --git a/data/presets/traffic_sign/hazard/road_narrows.json b/data/presets/traffic_sign/hazard/road_narrows.json index f955165f..ab443dd9 100644 --- a/data/presets/traffic_sign/hazard/road_narrows.json +++ b/data/presets/traffic_sign/hazard/road_narrows.json @@ -11,5 +11,8 @@ "key": "hazard", "value": "road_narrows" }, + "aliases": [ + "Narrow Road Warning Sign" + ], "name": "Road Narrows Warning Sign" } diff --git a/data/presets/traffic_sign/hazard/turn.json b/data/presets/traffic_sign/hazard/turn.json index 6e48a38f..b9842356 100644 --- a/data/presets/traffic_sign/hazard/turn.json +++ b/data/presets/traffic_sign/hazard/turn.json @@ -1,6 +1,7 @@ { "icon": "fas-diamond-turn-right", "fields": [ + "{traffic_sign/hazard}", "maxspeed/advisory" ], "geometry": [ @@ -15,5 +16,9 @@ "key": "hazard", "value": "turn" }, + "terms": [ + "turn", + "sharp curve" + ], "name": "Sharp Turn Warning Sign" } diff --git a/data/presets/traffic_sign/hazard/turns.json b/data/presets/traffic_sign/hazard/turns.json index 28ab4e33..e2363df9 100644 --- a/data/presets/traffic_sign/hazard/turns.json +++ b/data/presets/traffic_sign/hazard/turns.json @@ -1,5 +1,6 @@ { "fields": [ + "{traffic_sign/hazard}", "maxspeed/advisory" ], "geometry": [ @@ -14,5 +15,8 @@ "key": "hazard", "value": "turns" }, + "terms": [ + "reverse turn" + ], "name": "Sharp Turns Warning Sign" }