From ae0361dad0a0c0022fbb2cfe35c3355c3b62d8fc Mon Sep 17 00:00:00 2001 From: arch0345 Date: Mon, 19 Jun 2023 22:44:10 -0700 Subject: [PATCH 1/6] Add Hazardous Area/Warning Sign presets Also added fields for `hazard`, `curve`, `curves`, `hazard:animal`, and changed the name for the `military=danger_area` preset --- data/fields/curve.json | 9 ++++++++ data/fields/curves.json | 9 ++++++++ data/fields/hazard.json | 5 ++++ data/fields/hazard/animal.json | 9 ++++++++ data/presets/boundary/hazard.json | 13 +++++++++++ .../presets/landuse/military/danger_area.json | 2 +- data/presets/traffic_sign/hazard.json | 16 +++++++++++++ .../traffic_sign/hazard/animal_crossing.json | 21 +++++++++++++++++ data/presets/traffic_sign/hazard/bump.json | 23 +++++++++++++++++++ .../presets/traffic_sign/hazard/children.json | 21 +++++++++++++++++ data/presets/traffic_sign/hazard/curve.json | 19 +++++++++++++++ data/presets/traffic_sign/hazard/curves.json | 19 +++++++++++++++ .../presets/traffic_sign/hazard/cyclists.json | 19 +++++++++++++++ .../hazard/dangerous_junction.json | 23 +++++++++++++++++++ data/presets/traffic_sign/hazard/dip.json | 18 +++++++++++++++ .../hazard/emergency_vehicles.json | 19 +++++++++++++++ .../traffic_sign/hazard/falling_rocks.json | 15 ++++++++++++ .../presets/traffic_sign/hazard/flooding.json | 18 +++++++++++++++ data/presets/traffic_sign/hazard/fog.json | 18 +++++++++++++++ .../traffic_sign/hazard/ground_clearance.json | 15 ++++++++++++ .../traffic_sign/hazard/horse_riders.json | 19 +++++++++++++++ data/presets/traffic_sign/hazard/ice.json | 18 +++++++++++++++ .../traffic_sign/hazard/landslide.json | 18 +++++++++++++++ .../traffic_sign/hazard/loose_gravel.json | 15 ++++++++++++ .../traffic_sign/hazard/pedestrians.json | 15 ++++++++++++ .../traffic_sign/hazard/queues_likely.json | 15 ++++++++++++ .../traffic_sign/hazard/road_narrows.json | 15 ++++++++++++ .../traffic_sign/hazard/roundabout.json | 21 +++++++++++++++++ .../traffic_sign/hazard/school_zone.json | 15 ++++++++++++ .../presets/traffic_sign/hazard/slippery.json | 18 +++++++++++++++ .../traffic_sign/hazard/traffic_signals.json | 21 +++++++++++++++++ data/presets/traffic_sign/hazard/turn.json | 18 +++++++++++++++ data/presets/traffic_sign/hazard/turns.json | 18 +++++++++++++++ 33 files changed, 536 insertions(+), 1 deletion(-) create mode 100644 data/fields/curve.json create mode 100644 data/fields/curves.json create mode 100644 data/fields/hazard.json create mode 100644 data/fields/hazard/animal.json create mode 100644 data/presets/boundary/hazard.json create mode 100644 data/presets/traffic_sign/hazard.json create mode 100644 data/presets/traffic_sign/hazard/animal_crossing.json create mode 100644 data/presets/traffic_sign/hazard/bump.json create mode 100644 data/presets/traffic_sign/hazard/children.json create mode 100644 data/presets/traffic_sign/hazard/curve.json create mode 100644 data/presets/traffic_sign/hazard/curves.json create mode 100644 data/presets/traffic_sign/hazard/cyclists.json create mode 100644 data/presets/traffic_sign/hazard/dangerous_junction.json create mode 100644 data/presets/traffic_sign/hazard/dip.json create mode 100644 data/presets/traffic_sign/hazard/emergency_vehicles.json create mode 100644 data/presets/traffic_sign/hazard/falling_rocks.json create mode 100644 data/presets/traffic_sign/hazard/flooding.json create mode 100644 data/presets/traffic_sign/hazard/fog.json create mode 100644 data/presets/traffic_sign/hazard/ground_clearance.json create mode 100644 data/presets/traffic_sign/hazard/horse_riders.json create mode 100644 data/presets/traffic_sign/hazard/ice.json create mode 100644 data/presets/traffic_sign/hazard/landslide.json create mode 100644 data/presets/traffic_sign/hazard/loose_gravel.json create mode 100644 data/presets/traffic_sign/hazard/pedestrians.json create mode 100644 data/presets/traffic_sign/hazard/queues_likely.json create mode 100644 data/presets/traffic_sign/hazard/road_narrows.json create mode 100644 data/presets/traffic_sign/hazard/roundabout.json create mode 100644 data/presets/traffic_sign/hazard/school_zone.json create mode 100644 data/presets/traffic_sign/hazard/slippery.json create mode 100644 data/presets/traffic_sign/hazard/traffic_signals.json create mode 100644 data/presets/traffic_sign/hazard/turn.json create mode 100644 data/presets/traffic_sign/hazard/turns.json diff --git a/data/fields/curve.json b/data/fields/curve.json new file mode 100644 index 000000000..bd97af9f3 --- /dev/null +++ b/data/fields/curve.json @@ -0,0 +1,9 @@ +{ + "key": "curve", + "type": "combo", + "label": "Type", + "prerequisiteTag": { + "key": "hazard", + "value": "curve" + } +} diff --git a/data/fields/curves.json b/data/fields/curves.json new file mode 100644 index 000000000..f4b61aa59 --- /dev/null +++ b/data/fields/curves.json @@ -0,0 +1,9 @@ +{ + "key": "curves", + "type": "combo", + "label": "Type", + "prerequisiteTag": { + "key": "hazard", + "value": "curves" + } +} diff --git a/data/fields/hazard.json b/data/fields/hazard.json new file mode 100644 index 000000000..764a0b7bf --- /dev/null +++ b/data/fields/hazard.json @@ -0,0 +1,5 @@ +{ + "key": "hazard", + "type": "combo", + "label": "Hazard" +} diff --git a/data/fields/hazard/animal.json b/data/fields/hazard/animal.json new file mode 100644 index 000000000..dc94f5fe8 --- /dev/null +++ b/data/fields/hazard/animal.json @@ -0,0 +1,9 @@ +{ + "key": "hazard:animal", + "type": "combo", + "label": "Type", + "prerequisiteTag": { + "key": "hazard", + "value": "animal_crossing" + } +} diff --git a/data/presets/boundary/hazard.json b/data/presets/boundary/hazard.json new file mode 100644 index 000000000..702dec9fc --- /dev/null +++ b/data/presets/boundary/hazard.json @@ -0,0 +1,13 @@ +{ + "fields": [ + "name", + "hazard" + ], + "geometry": [ + "area" + ], + "tags": { + "boundary": "hazard" + }, + "name": "Hazardous Area" +} diff --git a/data/presets/landuse/military/danger_area.json b/data/presets/landuse/military/danger_area.json index e5a08072c..c175261d8 100644 --- a/data/presets/landuse/military/danger_area.json +++ b/data/presets/landuse/military/danger_area.json @@ -29,5 +29,5 @@ "troop", "war" ], - "name": "Danger Zone, Access Prohibited" + "name": "Military Danger Area" } diff --git a/data/presets/traffic_sign/hazard.json b/data/presets/traffic_sign/hazard.json new file mode 100644 index 000000000..4309d4565 --- /dev/null +++ b/data/presets/traffic_sign/hazard.json @@ -0,0 +1,16 @@ +{ + "fields": [ + "hazard" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard" + }, + "aliases": [ + "Hazard Sign" + ], + "name": "Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/animal_crossing.json b/data/presets/traffic_sign/hazard/animal_crossing.json new file mode 100644 index 000000000..0958b21bc --- /dev/null +++ b/data/presets/traffic_sign/hazard/animal_crossing.json @@ -0,0 +1,21 @@ +{ + "fields": [ + "hazard/animal" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "animal_crossing" + }, + "reference": { + "key": "hazard", + "value": "animal_crossing" + }, + "aliases": [ + "Wildlife Crossing Sign" + ], + "name": "Animal Crossing Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/bump.json b/data/presets/traffic_sign/hazard/bump.json new file mode 100644 index 000000000..449da316c --- /dev/null +++ b/data/presets/traffic_sign/hazard/bump.json @@ -0,0 +1,23 @@ +{ + "fields": [ + "maxspeed/advisory" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "bump" + }, + "reference": { + "key": "hazard", + "value": "bump" + }, + "aliases": [ + "Speed Bump Sign", + "Speed Hump Sign", + "Speed Table Sign" + ], + "name": "Bump Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/children.json b/data/presets/traffic_sign/hazard/children.json new file mode 100644 index 000000000..94da04488 --- /dev/null +++ b/data/presets/traffic_sign/hazard/children.json @@ -0,0 +1,21 @@ +{ + "fields": [ + "maxspeed/advisory" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "children" + }, + "reference": { + "key": "hazard", + "value": "children" + }, + "aliases": [ + "Playing Children Sign" + ], + "name": "Children Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/curve.json b/data/presets/traffic_sign/hazard/curve.json new file mode 100644 index 000000000..c60fba536 --- /dev/null +++ b/data/presets/traffic_sign/hazard/curve.json @@ -0,0 +1,19 @@ +{ + "fields": [ + "curve", + "maxspeed/advisory" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "curve" + }, + "reference": { + "key": "hazard", + "value": "curve" + }, + "name": "Curve Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/curves.json b/data/presets/traffic_sign/hazard/curves.json new file mode 100644 index 000000000..71f111683 --- /dev/null +++ b/data/presets/traffic_sign/hazard/curves.json @@ -0,0 +1,19 @@ +{ + "fields": [ + "curves", + "maxspeed/advisory" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "curves" + }, + "reference": { + "key": "hazard", + "value": "curves" + }, + "name": "Curves Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/cyclists.json b/data/presets/traffic_sign/hazard/cyclists.json new file mode 100644 index 000000000..cbc5a70ba --- /dev/null +++ b/data/presets/traffic_sign/hazard/cyclists.json @@ -0,0 +1,19 @@ +{ + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "cyclists" + }, + "reference": { + "key": "hazard", + "value": "cyclists" + }, + "aliases": [ + "Bike Warning Sign", + "Cyclist Warning Sign" + ], + "name": "Bicycle Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/dangerous_junction.json b/data/presets/traffic_sign/hazard/dangerous_junction.json new file mode 100644 index 000000000..af0797461 --- /dev/null +++ b/data/presets/traffic_sign/hazard/dangerous_junction.json @@ -0,0 +1,23 @@ +{ + "fields": [ + "maxspeed/advisory" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "dangerous_junction" + }, + "reference": { + "key": "hazard", + "value": "dangerous_junction" + }, + "aliases": [ + "Dangerous Intersection Sign", + "Dangerous Junction Sign", + "Intersection Sign" + ], + "name": "Junction Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/dip.json b/data/presets/traffic_sign/hazard/dip.json new file mode 100644 index 000000000..421a92bb3 --- /dev/null +++ b/data/presets/traffic_sign/hazard/dip.json @@ -0,0 +1,18 @@ +{ + "fields": [ + "maxspeed/advisory" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "dip" + }, + "reference": { + "key": "hazard", + "value": "dip" + }, + "name": "Dip Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/emergency_vehicles.json b/data/presets/traffic_sign/hazard/emergency_vehicles.json new file mode 100644 index 000000000..62229cefd --- /dev/null +++ b/data/presets/traffic_sign/hazard/emergency_vehicles.json @@ -0,0 +1,19 @@ +{ + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "emergency_vehicles" + }, + "reference": { + "key": "hazard", + "value": "emergency_vehicles" + }, + "terms": [ + "ambulance", + "fire truck" + ], + "name": "Emergency Vehicles Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/falling_rocks.json b/data/presets/traffic_sign/hazard/falling_rocks.json new file mode 100644 index 000000000..f04f110d1 --- /dev/null +++ b/data/presets/traffic_sign/hazard/falling_rocks.json @@ -0,0 +1,15 @@ +{ + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "falling_rocks" + }, + "reference": { + "key": "hazard", + "value": "falling_rocks" + }, + "name": "Falling Rocks Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/flooding.json b/data/presets/traffic_sign/hazard/flooding.json new file mode 100644 index 000000000..9fe5db29b --- /dev/null +++ b/data/presets/traffic_sign/hazard/flooding.json @@ -0,0 +1,18 @@ +{ + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "flooding" + }, + "reference": { + "key": "hazard", + "value": "flooding" + }, + "terms": [ + "road may flood" + ], + "name": "Flood Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/fog.json b/data/presets/traffic_sign/hazard/fog.json new file mode 100644 index 000000000..6b1a9ccde --- /dev/null +++ b/data/presets/traffic_sign/hazard/fog.json @@ -0,0 +1,18 @@ +{ + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "fog" + }, + "reference": { + "key": "hazard", + "value": "fog" + }, + "terms": [ + "fog area" + ], + "name": "Fog Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/ground_clearance.json b/data/presets/traffic_sign/hazard/ground_clearance.json new file mode 100644 index 000000000..c4737a9f3 --- /dev/null +++ b/data/presets/traffic_sign/hazard/ground_clearance.json @@ -0,0 +1,15 @@ +{ + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "ground_clearance" + }, + "reference": { + "key": "hazard", + "value": "ground_clearance" + }, + "name": "Low Ground Clearance Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/horse_riders.json b/data/presets/traffic_sign/hazard/horse_riders.json new file mode 100644 index 000000000..c6bb06b0b --- /dev/null +++ b/data/presets/traffic_sign/hazard/horse_riders.json @@ -0,0 +1,19 @@ +{ + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "horse_riders" + }, + "reference": { + "key": "hazard", + "value": "horse_riders" + }, + "aliases": [ + "Equestrian Rider Sign", + "Horseback Rider Sign" + ], + "name": "Horse Rider Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/ice.json b/data/presets/traffic_sign/hazard/ice.json new file mode 100644 index 000000000..ede1f49ed --- /dev/null +++ b/data/presets/traffic_sign/hazard/ice.json @@ -0,0 +1,18 @@ +{ + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "ice" + }, + "reference": { + "key": "hazard", + "value": "ice" + }, + "terms": [ + "bridge ices before road" + ], + "name": "Ice Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/landslide.json b/data/presets/traffic_sign/hazard/landslide.json new file mode 100644 index 000000000..25887fbfd --- /dev/null +++ b/data/presets/traffic_sign/hazard/landslide.json @@ -0,0 +1,18 @@ +{ + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "landslide" + }, + "reference": { + "key": "hazard", + "value": "landslide" + }, + "terms": [ + "rock slide area" + ], + "name": "Landslide Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/loose_gravel.json b/data/presets/traffic_sign/hazard/loose_gravel.json new file mode 100644 index 000000000..1ef1480c4 --- /dev/null +++ b/data/presets/traffic_sign/hazard/loose_gravel.json @@ -0,0 +1,15 @@ +{ + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "loose_gravel" + }, + "reference": { + "key": "hazard", + "value": "loose_gravel" + }, + "name": "Loose Gravel Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/pedestrians.json b/data/presets/traffic_sign/hazard/pedestrians.json new file mode 100644 index 000000000..165d6a287 --- /dev/null +++ b/data/presets/traffic_sign/hazard/pedestrians.json @@ -0,0 +1,15 @@ +{ + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "pedestrian" + }, + "reference": { + "key": "hazard", + "value": "pedestrian" + }, + "name": "Pedestrian Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/queues_likely.json b/data/presets/traffic_sign/hazard/queues_likely.json new file mode 100644 index 000000000..3fcdd3ae8 --- /dev/null +++ b/data/presets/traffic_sign/hazard/queues_likely.json @@ -0,0 +1,15 @@ +{ + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "queues_likely" + }, + "reference": { + "key": "hazard", + "value": "queues_likely" + }, + "name": "Congestion Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/road_narrows.json b/data/presets/traffic_sign/hazard/road_narrows.json new file mode 100644 index 000000000..f955165fa --- /dev/null +++ b/data/presets/traffic_sign/hazard/road_narrows.json @@ -0,0 +1,15 @@ +{ + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "road_narrows" + }, + "reference": { + "key": "hazard", + "value": "road_narrows" + }, + "name": "Road Narrows Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/roundabout.json b/data/presets/traffic_sign/hazard/roundabout.json new file mode 100644 index 000000000..e61d34d3e --- /dev/null +++ b/data/presets/traffic_sign/hazard/roundabout.json @@ -0,0 +1,21 @@ +{ + "fields": [ + "maxspeed/advisory" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "roundabout" + }, + "reference": { + "key": "hazard", + "value": "roundabout" + }, + "aliases": [ + "Traffic Circle Sign" + ], + "name": "Roundabout Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/school_zone.json b/data/presets/traffic_sign/hazard/school_zone.json new file mode 100644 index 000000000..55aa6f712 --- /dev/null +++ b/data/presets/traffic_sign/hazard/school_zone.json @@ -0,0 +1,15 @@ +{ + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "school_zone" + }, + "reference": { + "key": "hazard", + "value": "school_zone" + }, + "name": "School Zone Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/slippery.json b/data/presets/traffic_sign/hazard/slippery.json new file mode 100644 index 000000000..9c08f7f14 --- /dev/null +++ b/data/presets/traffic_sign/hazard/slippery.json @@ -0,0 +1,18 @@ +{ + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "slippery" + }, + "reference": { + "key": "hazard", + "value": "slippery" + }, + "terms": [ + "slippery when wet" + ], + "name": "Slippery Road Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/traffic_signals.json b/data/presets/traffic_sign/hazard/traffic_signals.json new file mode 100644 index 000000000..befef9e44 --- /dev/null +++ b/data/presets/traffic_sign/hazard/traffic_signals.json @@ -0,0 +1,21 @@ +{ + "fields": [ + "maxspeed/advisory" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "traffic_signals" + }, + "reference": { + "key": "hazard", + "value": "traffic_signals" + }, + "aliases": [ + "Traffic Light Sign" + ], + "name": "Traffic Signals Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/turn.json b/data/presets/traffic_sign/hazard/turn.json new file mode 100644 index 000000000..67120b76e --- /dev/null +++ b/data/presets/traffic_sign/hazard/turn.json @@ -0,0 +1,18 @@ +{ + "fields": [ + "maxspeed/advisory" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "turn" + }, + "reference": { + "key": "hazard", + "value": "turn" + }, + "name": "Sharp Turn Warning Sign" +} diff --git a/data/presets/traffic_sign/hazard/turns.json b/data/presets/traffic_sign/hazard/turns.json new file mode 100644 index 000000000..28ab4e33d --- /dev/null +++ b/data/presets/traffic_sign/hazard/turns.json @@ -0,0 +1,18 @@ +{ + "fields": [ + "maxspeed/advisory" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "traffic_sign": "hazard", + "hazard": "turns" + }, + "reference": { + "key": "hazard", + "value": "turns" + }, + "name": "Sharp Turns Warning Sign" +} From e1f81b82d83b2db9dca622992193b2719450a6b3 Mon Sep 17 00:00:00 2001 From: arch0345 Date: Mon, 19 Jun 2023 23:16:53 -0700 Subject: [PATCH 2/6] Use more specific icons --- data/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/dip.json | 1 + data/presets/traffic_sign/hazard/emergency_vehicles.json | 1 + data/presets/traffic_sign/hazard/falling_rocks.json | 1 + data/presets/traffic_sign/hazard/horse_riders.json | 1 + data/presets/traffic_sign/hazard/pedestrians.json | 1 + data/presets/traffic_sign/hazard/roundabout.json | 1 + data/presets/traffic_sign/hazard/school_zone.json | 1 + data/presets/traffic_sign/hazard/turn.json | 1 + 11 files changed, 11 insertions(+) diff --git a/data/presets/traffic_sign/hazard/animal_crossing.json b/data/presets/traffic_sign/hazard/animal_crossing.json index 0958b21bc..0bd284eb1 100644 --- a/data/presets/traffic_sign/hazard/animal_crossing.json +++ b/data/presets/traffic_sign/hazard/animal_crossing.json @@ -1,4 +1,5 @@ { + "icon": "fas-frog", "fields": [ "hazard/animal" ], diff --git a/data/presets/traffic_sign/hazard/bump.json b/data/presets/traffic_sign/hazard/bump.json index 449da316c..fd35709d2 100644 --- a/data/presets/traffic_sign/hazard/bump.json +++ b/data/presets/traffic_sign/hazard/bump.json @@ -1,4 +1,5 @@ { + "icon": "temaki-speed_bump", "fields": [ "maxspeed/advisory" ], diff --git a/data/presets/traffic_sign/hazard/children.json b/data/presets/traffic_sign/hazard/children.json index 94da04488..368a93d78 100644 --- a/data/presets/traffic_sign/hazard/children.json +++ b/data/presets/traffic_sign/hazard/children.json @@ -1,4 +1,5 @@ { + "icon": "temaki-seesaw", "fields": [ "maxspeed/advisory" ], diff --git a/data/presets/traffic_sign/hazard/dip.json b/data/presets/traffic_sign/hazard/dip.json index 421a92bb3..ba7d86e82 100644 --- a/data/presets/traffic_sign/hazard/dip.json +++ b/data/presets/traffic_sign/hazard/dip.json @@ -1,4 +1,5 @@ { + "icon": "temaki-speed_dip", "fields": [ "maxspeed/advisory" ], diff --git a/data/presets/traffic_sign/hazard/emergency_vehicles.json b/data/presets/traffic_sign/hazard/emergency_vehicles.json index 62229cefd..5d75904cb 100644 --- a/data/presets/traffic_sign/hazard/emergency_vehicles.json +++ b/data/presets/traffic_sign/hazard/emergency_vehicles.json @@ -1,4 +1,5 @@ { + "icon": "fas-truck-medical", "geometry": [ "point", "vertex" diff --git a/data/presets/traffic_sign/hazard/falling_rocks.json b/data/presets/traffic_sign/hazard/falling_rocks.json index f04f110d1..ea90fdfe6 100644 --- a/data/presets/traffic_sign/hazard/falling_rocks.json +++ b/data/presets/traffic_sign/hazard/falling_rocks.json @@ -1,4 +1,5 @@ { + "icon": "fas-hill-rockslide", "geometry": [ "point", "vertex" diff --git a/data/presets/traffic_sign/hazard/horse_riders.json b/data/presets/traffic_sign/hazard/horse_riders.json index c6bb06b0b..bc180111a 100644 --- a/data/presets/traffic_sign/hazard/horse_riders.json +++ b/data/presets/traffic_sign/hazard/horse_riders.json @@ -1,4 +1,5 @@ { + "icon": "maki-horse-riding", "geometry": [ "point", "vertex" diff --git a/data/presets/traffic_sign/hazard/pedestrians.json b/data/presets/traffic_sign/hazard/pedestrians.json index 165d6a287..742ae4335 100644 --- a/data/presets/traffic_sign/hazard/pedestrians.json +++ b/data/presets/traffic_sign/hazard/pedestrians.json @@ -1,4 +1,5 @@ { + "icon": "temaki-pedestrian", "geometry": [ "point", "vertex" diff --git a/data/presets/traffic_sign/hazard/roundabout.json b/data/presets/traffic_sign/hazard/roundabout.json index e61d34d3e..95789ce12 100644 --- a/data/presets/traffic_sign/hazard/roundabout.json +++ b/data/presets/traffic_sign/hazard/roundabout.json @@ -1,4 +1,5 @@ { + "icon": "fas-rotate", "fields": [ "maxspeed/advisory" ], diff --git a/data/presets/traffic_sign/hazard/school_zone.json b/data/presets/traffic_sign/hazard/school_zone.json index 55aa6f712..4ca2a48bc 100644 --- a/data/presets/traffic_sign/hazard/school_zone.json +++ b/data/presets/traffic_sign/hazard/school_zone.json @@ -1,4 +1,5 @@ { + "icon": "fas-school-flag", "geometry": [ "point", "vertex" diff --git a/data/presets/traffic_sign/hazard/turn.json b/data/presets/traffic_sign/hazard/turn.json index 67120b76e..6e48a38f5 100644 --- a/data/presets/traffic_sign/hazard/turn.json +++ b/data/presets/traffic_sign/hazard/turn.json @@ -1,4 +1,5 @@ { + "icon": "fas-diamond-turn-right", "fields": [ "maxspeed/advisory" ], From 1a17031ff6ab0a37d4e852a912c71419eac5a7ef Mon Sep 17 00:00:00 2001 From: arch0345 Date: Mon, 19 Jun 2023 23:18:44 -0700 Subject: [PATCH 3/6] Use more specific icon --- data/presets/traffic_sign/hazard.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/presets/traffic_sign/hazard.json b/data/presets/traffic_sign/hazard.json index 4309d4565..259f41a83 100644 --- a/data/presets/traffic_sign/hazard.json +++ b/data/presets/traffic_sign/hazard.json @@ -1,4 +1,5 @@ { + "icon": "fas-triangle-exclamation", "fields": [ "hazard" ], From 5f5ff68c79a35c45ecc9be298b6084f427cfa56a Mon Sep 17 00:00:00 2001 From: arch0345 Date: Tue, 20 Jun 2023 12:43:42 -0700 Subject: [PATCH 4/6] 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 bd97af9f3..6c18cc1fa 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 f4b61aa59..0f1288096 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 dc94f5fe8..25c4c977b 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 46f800d37..c65a2b4cf 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 702dec9fc..ad43ac01a 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 259f41a83..14c22e5b5 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 0bd284eb1..91181a510 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 fd35709d2..6635f50eb 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 368a93d78..e2f5ba0ea 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 c60fba536..04e2dc95e 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 71f111683..31b569282 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 af0797461..faca26aee 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 ba7d86e82..2940a1755 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 bc180111a..898e6126e 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 742ae4335..16f040cad 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 3fcdd3ae8..dacb31b4f 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 f955165fa..ab443dd99 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 6e48a38f5..b98423562 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 28ab4e33d..e2363df9d 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" } From 15254351c7922ab548ccf08345abbc1cab29f118 Mon Sep 17 00:00:00 2001 From: arch0345 Date: Tue, 20 Jun 2023 12:45:44 -0700 Subject: [PATCH 5/6] Add terms --- data/presets/traffic_sign/hazard/curves.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/presets/traffic_sign/hazard/curves.json b/data/presets/traffic_sign/hazard/curves.json index 31b569282..aff0baed5 100644 --- a/data/presets/traffic_sign/hazard/curves.json +++ b/data/presets/traffic_sign/hazard/curves.json @@ -16,5 +16,9 @@ "key": "hazard", "value": "curves" }, + "terms": [ + "reverse curve", + "winding road" + ], "name": "Curves Warning Sign" } From 98c75c886736615e8f834c1312a13dc5a00c1bf5 Mon Sep 17 00:00:00 2001 From: arch0345 Date: Fri, 7 Jul 2023 15:36:16 -0700 Subject: [PATCH 6/6] Add translatable options for hazard_traffic field --- data/fields/hazard.json | 5 --- data/fields/hazard_traffic.json | 35 +++++++++++++++++++ data/presets/boundary/hazard.json | 14 -------- .../presets/landuse/military/danger_area.json | 2 +- data/presets/traffic_sign/hazard.json | 2 +- .../presets/traffic_sign/hazard/cyclists.json | 3 ++ 6 files changed, 40 insertions(+), 21 deletions(-) delete mode 100644 data/fields/hazard.json create mode 100644 data/fields/hazard_traffic.json delete mode 100644 data/presets/boundary/hazard.json diff --git a/data/fields/hazard.json b/data/fields/hazard.json deleted file mode 100644 index 764a0b7bf..000000000 --- a/data/fields/hazard.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "key": "hazard", - "type": "combo", - "label": "Hazard" -} diff --git a/data/fields/hazard_traffic.json b/data/fields/hazard_traffic.json new file mode 100644 index 000000000..001218200 --- /dev/null +++ b/data/fields/hazard_traffic.json @@ -0,0 +1,35 @@ +{ + "key": "hazard", + "type": "combo", + "strings": { + "options": { + "animal_crossing": "Animal Crossing", + "cyclists": "Bicycle / Cyclist", + "bump": "Bump", + "children": "Children", + "queues_likely": "Congestion / Stoped Traffic", + "curve": "Curve", + "curves": "Curves", + "dangerous_junction": "Dangerous Intersection", + "dip": "Dip", + "emergency_vehicles": "Emergency Vehicles", + "falling_rocks": "Falling Rocks", + "flooding": "Flooding", + "fog": "Fog", + "horse_riders": "Horseback Rider", + "ice": "Ice", + "landslide": "Landslide", + "loose_gravel": "Loose Gravel", + "ground_clearance": "Low Ground Clearance", + "road_narrows": "Narrow Road", + "pedestrians": "Pedestrian", + "roundabout": "Roundabout", + "school_zone": "School Zone", + "turn": "Sharp Turn", + "turns": "Sharp Turns", + "slippery": "Slippery Road", + "traffic_signals": "Traffic Signal" + } + }, + "label": "Hazard" +} diff --git a/data/presets/boundary/hazard.json b/data/presets/boundary/hazard.json deleted file mode 100644 index ad43ac01a..000000000 --- a/data/presets/boundary/hazard.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "icon": "fas-triangle-exclamation", - "fields": [ - "name", - "hazard" - ], - "geometry": [ - "area" - ], - "tags": { - "boundary": "hazard" - }, - "name": "Hazardous Area" -} diff --git a/data/presets/landuse/military/danger_area.json b/data/presets/landuse/military/danger_area.json index c175261d8..e5a08072c 100644 --- a/data/presets/landuse/military/danger_area.json +++ b/data/presets/landuse/military/danger_area.json @@ -29,5 +29,5 @@ "troop", "war" ], - "name": "Military Danger Area" + "name": "Danger Zone, Access Prohibited" } diff --git a/data/presets/traffic_sign/hazard.json b/data/presets/traffic_sign/hazard.json index 14c22e5b5..db11246e5 100644 --- a/data/presets/traffic_sign/hazard.json +++ b/data/presets/traffic_sign/hazard.json @@ -2,7 +2,7 @@ "icon": "fas-triangle-exclamation", "fields": [ "{traffic_sign}", - "hazard" + "hazard_traffic" ], "geometry": [ "point", diff --git a/data/presets/traffic_sign/hazard/cyclists.json b/data/presets/traffic_sign/hazard/cyclists.json index cbc5a70ba..da5b9f83e 100644 --- a/data/presets/traffic_sign/hazard/cyclists.json +++ b/data/presets/traffic_sign/hazard/cyclists.json @@ -15,5 +15,8 @@ "Bike Warning Sign", "Cyclist Warning Sign" ], + "terms": [ + "share the road" + ], "name": "Bicycle Warning Sign" }