From c5a21724c075ad1d0d9f4b43073fd23778f5b282 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sat, 23 Jun 2018 00:47:45 -0400 Subject: [PATCH] Add "road" and "street" as search terms for all road presets (closes #5103) --- data/presets.yaml | 23 +++++++++---- data/presets/presets.json | 32 +++++++++---------- data/presets/presets/highway/bridleway.json | 3 +- data/presets/presets/highway/motorway.json | 2 ++ .../presets/highway/motorway_junction.json | 9 ++++-- .../presets/highway/motorway_link.json | 3 ++ data/presets/presets/highway/primary.json | 5 ++- .../presets/presets/highway/primary_link.json | 6 ++-- data/presets/presets/highway/residential.json | 5 ++- data/presets/presets/highway/road.json | 5 ++- data/presets/presets/highway/secondary.json | 5 ++- .../presets/highway/secondary_link.json | 6 ++-- data/presets/presets/highway/service.json | 5 ++- data/presets/presets/highway/tertiary.json | 5 ++- .../presets/highway/tertiary_link.json | 6 ++-- data/presets/presets/highway/trunk.json | 5 ++- data/presets/presets/highway/trunk_link.json | 6 ++-- .../presets/presets/highway/unclassified.json | 5 ++- dist/locales/en.json | 32 +++++++++---------- 19 files changed, 109 insertions(+), 59 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index cdcd5d3cd..1784179b3 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3282,7 +3282,7 @@ en: highway/bridleway: # highway=bridleway name: Bridle Path - # 'terms: bridleway,equestrian,horse' + # 'terms: bridleway,equestrian,horse,trail' terms: '' highway/bus_guideway: # highway=bus_guideway @@ -3346,16 +3346,17 @@ en: highway/motorway: # highway=motorway name: Motorway - # 'terms: autobahn,expressway,freeway,highway,interstate,parkway,thruway,turnpike' + # 'terms: autobahn,expressway,freeway,highway,interstate,parkway,road,street,thruway,turnpike' terms: '' highway/motorway_junction: # highway=motorway_junction name: Motorway Junction / Exit + # 'terms: exit' terms: '' highway/motorway_link: # highway=motorway_link name: Motorway Link - # 'terms: ramp,on ramp,off ramp' + # 'terms: exit,ramp,road,street,on ramp,off ramp' terms: '' highway/passing_place: # highway=passing_place @@ -3380,11 +3381,12 @@ en: highway/primary: # highway=primary name: Primary Road + # 'terms: road,street' terms: '' highway/primary_link: # highway=primary_link name: Primary Link - # 'terms: ramp,on ramp,off ramp' + # 'terms: on ramp,off ramp,ramp,road,street' terms: '' highway/raceway: # highway=raceway @@ -3394,6 +3396,7 @@ en: highway/residential: # highway=residential name: Residential Road + # 'terms: road,street' terms: '' highway/rest_area: # highway=rest_area @@ -3403,19 +3406,22 @@ en: highway/road: # highway=road name: Unknown Road + # 'terms: road,street' terms: '' highway/secondary: # highway=secondary name: Secondary Road + # 'terms: road,street' terms: '' highway/secondary_link: # highway=secondary_link name: Secondary Link - # 'terms: ramp,on ramp,off ramp' + # 'terms: on ramp,off ramp,ramp,road,street' terms: '' highway/service: # highway=service name: Service Road + # 'terms: road,street' terms: '' highway/service/alley: # 'highway=service, service=alley' @@ -3464,11 +3470,12 @@ en: highway/tertiary: # highway=tertiary name: Tertiary Road + # 'terms: road,street' terms: '' highway/tertiary_link: # highway=tertiary_link name: Tertiary Link - # 'terms: ramp,on ramp,off ramp' + # 'terms: on ramp,off ramp,ramp,road,street' terms: '' highway/track: # highway=track @@ -3488,11 +3495,12 @@ en: highway/trunk: # highway=trunk name: Trunk Road + # 'terms: road,street' terms: '' highway/trunk_link: # highway=trunk_link name: Trunk Link - # 'terms: ramp,on ramp,off ramp' + # 'terms: on ramp,off ramp,ramp,road,street' terms: '' highway/turning_circle: # highway=turning_circle @@ -3507,6 +3515,7 @@ en: highway/unclassified: # highway=unclassified name: Minor/Unclassified Road + # 'terms: road,street' terms: '' historic: # historic=* diff --git a/data/presets/presets.json b/data/presets/presets.json index 42771ffe4..81768a3df 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -353,7 +353,7 @@ "healthcare/rehabilitation": {"icon": "maki-hospital", "fields": ["name", "operator", "healthcare/speciality", "building_area", "address", "opening_hours"], "geometry": ["point", "area"], "terms": ["rehab", "therapist", "therapy"], "tags": {"healthcare": "rehabilitation"}, "name": "Rehabilitation Facility"}, "healthcare/speech_therapist": {"icon": "maki-hospital", "fields": ["name", "operator", "healthcare/speciality", "building_area", "address", "opening_hours"], "geometry": ["point", "area"], "terms": ["speech", "therapist", "therapy", "voice"], "tags": {"healthcare": "speech_therapist"}, "name": "Speech Therapist"}, "highway/bus_stop": {"icon": "maki-bus", "fields": ["name", "network", "operator", "bench", "shelter"], "geometry": ["point", "vertex"], "tags": {"highway": "bus_stop"}, "name": "Bus Stop / Platform", "searchable": false}, - "highway/bridleway": {"fields": ["name", "surface", "width", "structure", "access"], "icon": "iD-highway-bridleway", "geometry": ["line"], "tags": {"highway": "bridleway"}, "terms": ["bridleway", "equestrian", "horse"], "name": "Bridle Path"}, + "highway/bridleway": {"fields": ["name", "surface", "width", "structure", "access"], "icon": "iD-highway-bridleway", "geometry": ["line"], "tags": {"highway": "bridleway"}, "terms": ["bridleway", "equestrian", "horse", "trail"], "name": "Bridle Path"}, "highway/bus_guideway": {"icon": "iD-highway-bus-guideway", "fields": ["name", "operator", "oneway"], "geometry": ["line"], "tags": {"highway": "bus_guideway"}, "addTags": {"highway": "bus_guideway", "access": "no", "bus": "designated"}, "removeTags": {"highway": "bus_guideway", "access": "no", "bus": "designated"}, "terms": [], "name": "Bus Guideway"}, "highway/corridor": {"icon": "iD-highway-footway", "fields": ["name", "width", "level", "access_simple"], "geometry": ["line"], "tags": {"highway": "corridor"}, "terms": ["gallery", "hall", "hallway", "indoor", "passage", "passageway"], "name": "Indoor Corridor"}, "highway/crossing-raised": {"fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"highway": "crossing", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Raised Street Crossing"}, @@ -366,22 +366,22 @@ "highway/give_way": {"icon": "temaki-yield", "fields": ["direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "give_way"}, "terms": ["give way", "yield", "sign"], "name": "Yield Sign"}, "highway/living_street": {"icon": "iD-highway-living-street", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "access", "cycleway"], "geometry": ["line"], "tags": {"highway": "living_street"}, "name": "Living Street"}, "highway/mini_roundabout": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "mini_roundabout"}, "fields": ["direction_clock"], "name": "Mini-Roundabout"}, - "highway/motorway_junction": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"highway": "motorway_junction"}, "fields": ["ref_highway_junction", "name"], "name": "Motorway Junction / Exit"}, - "highway/motorway_link": {"icon": "iD-highway-motorway-link", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "maxheight", "access"], "geometry": ["line"], "tags": {"highway": "motorway_link"}, "addTags": {"highway": "motorway_link", "oneway": "yes"}, "removeTags": {"highway": "motorway_link", "oneway": "yes"}, "terms": ["ramp", "on ramp", "off ramp"], "name": "Motorway Link"}, - "highway/motorway": {"icon": "iD-highway-motorway", "fields": ["name", "ref_road_number", "oneway_yes", "maxspeed", "lanes", "surface", "structure", "maxheight", "toll", "access"], "geometry": ["line"], "tags": {"highway": "motorway"}, "terms": ["autobahn", "expressway", "freeway", "highway", "interstate", "parkway", "thruway", "turnpike"], "name": "Motorway"}, + "highway/motorway_junction": {"icon": "temaki-junction", "fields": ["ref_highway_junction", "name"], "geometry": ["vertex"], "tags": {"highway": "motorway_junction"}, "terms": ["exit"], "name": "Motorway Junction / Exit"}, + "highway/motorway_link": {"icon": "iD-highway-motorway-link", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "maxheight", "access"], "geometry": ["line"], "tags": {"highway": "motorway_link"}, "addTags": {"highway": "motorway_link", "oneway": "yes"}, "removeTags": {"highway": "motorway_link", "oneway": "yes"}, "terms": ["exit", "ramp", "road", "street", "on ramp", "off ramp"], "name": "Motorway Link"}, + "highway/motorway": {"icon": "iD-highway-motorway", "fields": ["name", "ref_road_number", "oneway_yes", "maxspeed", "lanes", "surface", "structure", "maxheight", "toll", "access"], "geometry": ["line"], "tags": {"highway": "motorway"}, "terms": ["autobahn", "expressway", "freeway", "highway", "interstate", "parkway", "road", "street", "thruway", "turnpike"], "name": "Motorway"}, "highway/passing_place": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "passing_place"}, "terms": ["turnout, pullout"], "name": "Passing Place"}, "highway/path": {"icon": "iD-highway-path", "fields": ["name", "surface", "width", "structure", "access", "incline", "sac_scale", "trail_visibility", "mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", "horse_scale", "ref"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "path"}, "name": "Path"}, "highway/pedestrian_area": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "lit", "width", "structure", "access"], "geometry": ["area"], "tags": {"highway": "pedestrian", "area": "yes"}, "terms": ["center", "centre", "plaza", "quad", "square", "walkway"], "name": "Pedestrian Area"}, "highway/pedestrian_line": {"icon": "iD-highway-footway", "fields": ["name", "surface", "lit", "width", "oneway", "structure", "access"], "geometry": ["line"], "tags": {"highway": "pedestrian"}, "terms": ["center", "centre", "plaza", "quad", "square", "walkway"], "name": "Pedestrian Street"}, - "highway/primary_link": {"icon": "iD-highway-primary-link", "fields": ["name", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "maxheight", "ref_road_number", "cycleway", "structure", "access"], "geometry": ["line"], "tags": {"highway": "primary_link"}, "terms": ["ramp", "on ramp", "off ramp"], "name": "Primary Link"}, - "highway/primary": {"icon": "iD-highway-primary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "ref_road_number", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "primary"}, "terms": [], "name": "Primary Road"}, + "highway/primary_link": {"icon": "iD-highway-primary-link", "fields": ["name", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "maxheight", "ref_road_number", "cycleway", "structure", "access"], "geometry": ["line"], "tags": {"highway": "primary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Primary Link"}, + "highway/primary": {"icon": "iD-highway-primary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "ref_road_number", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "primary"}, "terms": ["road", "street"], "name": "Primary Road"}, "highway/raceway": {"icon": "iD-highway-unclassified", "fields": ["name", "oneway", "surface", "sport_racing_motor", "lit", "width", "lanes", "structure"], "geometry": ["point", "line", "area"], "tags": {"highway": "raceway"}, "addTags": {"highway": "raceway", "sport": "motor"}, "terms": ["auto*", "formula one", "kart", "motocross", "nascar", "race*", "track"], "name": "Racetrack (Motorsport)"}, - "highway/residential": {"icon": "iD-highway-residential", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "residential"}, "terms": [], "name": "Residential Road"}, + "highway/residential": {"icon": "iD-highway-residential", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "residential"}, "terms": ["road", "street"], "name": "Residential Road"}, "highway/rest_area": {"icon": "maki-car", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "rest_area"}, "terms": ["rest stop"], "name": "Rest Area"}, - "highway/road": {"icon": "iD-highway-road", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "access"], "geometry": ["line"], "tags": {"highway": "road"}, "terms": [], "name": "Unknown Road"}, - "highway/secondary_link": {"icon": "iD-highway-secondary-link", "fields": ["name", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "maxheight", "ref_road_number", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "secondary_link"}, "terms": ["ramp", "on ramp", "off ramp"], "name": "Secondary Link"}, - "highway/secondary": {"icon": "iD-highway-secondary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "ref_road_number", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "secondary"}, "terms": [], "name": "Secondary Road"}, - "highway/service": {"icon": "iD-highway-service", "fields": ["name", "service", "oneway", "maxspeed", "surface", "structure", "maxheight", "access"], "geometry": ["line"], "tags": {"highway": "service"}, "terms": [], "name": "Service Road"}, + "highway/road": {"icon": "iD-highway-road", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "access"], "geometry": ["line"], "tags": {"highway": "road"}, "terms": ["road", "street"], "name": "Unknown Road"}, + "highway/secondary_link": {"icon": "iD-highway-secondary-link", "fields": ["name", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "maxheight", "ref_road_number", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "secondary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Secondary Link"}, + "highway/secondary": {"icon": "iD-highway-secondary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "ref_road_number", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "secondary"}, "terms": ["road", "street"], "name": "Secondary Road"}, + "highway/service": {"icon": "iD-highway-service", "fields": ["name", "service", "oneway", "maxspeed", "surface", "structure", "maxheight", "access"], "geometry": ["line"], "tags": {"highway": "service"}, "terms": ["road", "street"], "name": "Service Road"}, "highway/service/alley": {"icon": "iD-highway-service", "fields": ["name", "oneway", "maxspeed", "structure", "access", "surface", "maxheight"], "geometry": ["line"], "tags": {"highway": "service", "service": "alley"}, "reference": {"key": "service", "value": "alley"}, "name": "Alley"}, "highway/service/drive-through": {"icon": "iD-highway-service", "fields": ["name", "oneway", "covered", "maxheight", "maxspeed", "structure", "access", "surface"], "geometry": ["line"], "tags": {"highway": "service", "service": "drive-through"}, "reference": {"key": "service", "value": "drive-through"}, "name": "Drive-Through"}, "highway/service/driveway": {"icon": "iD-highway-service", "fields": ["name", "oneway", "maxspeed", "structure", "access", "surface", "maxheight"], "geometry": ["line"], "tags": {"highway": "service", "service": "driveway"}, "reference": {"key": "service", "value": "driveway"}, "name": "Driveway"}, @@ -392,16 +392,16 @@ "highway/steps": {"icon": "iD-highway-steps", "fields": ["surface", "lit", "width", "incline_steps", "handrail", "step_count"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase"], "name": "Steps"}, "highway/stop": {"icon": "temaki-stop", "fields": ["stop", "direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "stop"}, "terms": ["stop", "halt", "sign"], "name": "Stop Sign"}, "highway/street_lamp": {"icon": "temaki-bulb", "geometry": ["point", "vertex"], "tags": {"highway": "street_lamp"}, "fields": ["lamp_type", "direction", "ref"], "terms": ["streetlight", "street light", "lamp", "light", "gaslight"], "name": "Street Lamp"}, - "highway/tertiary_link": {"icon": "iD-highway-tertiary-link", "fields": ["name", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "maxheight", "ref_road_number", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "tertiary_link"}, "terms": ["ramp", "on ramp", "off ramp"], "name": "Tertiary Link"}, - "highway/tertiary": {"icon": "iD-highway-tertiary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "ref_road_number", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "tertiary"}, "terms": [], "name": "Tertiary Road"}, + "highway/tertiary_link": {"icon": "iD-highway-tertiary-link", "fields": ["name", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "maxheight", "ref_road_number", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "tertiary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Tertiary Link"}, + "highway/tertiary": {"icon": "iD-highway-tertiary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "ref_road_number", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "tertiary"}, "terms": ["road", "street"], "name": "Tertiary Road"}, "highway/track": {"icon": "iD-highway-track", "fields": ["name", "tracktype", "surface", "width", "structure", "access", "incline", "smoothness", "mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", "horse_scale"], "geometry": ["line"], "tags": {"highway": "track"}, "terms": ["woods road", "forest road", "logging road", "fire road", "farm road", "agricultural road", "ranch road", "carriage road", "primitive", "unmaintained", "rut", "offroad", "4wd", "4x4", "four wheel drive", "atv", "quad", "jeep", "double track", "two track"], "name": "Unmaintained Track Road"}, "highway/traffic_mirror": {"geometry": ["point", "vertex"], "fields": ["direction"], "tags": {"highway": "traffic_mirror"}, "terms": ["blind spot", "convex", "corner", "curved", "roadside", "round", "safety", "sphere", "visibility"], "name": "Traffic Mirror"}, "highway/traffic_signals": {"icon": "temaki-traffic_signals", "geometry": ["vertex"], "tags": {"highway": "traffic_signals"}, "fields": ["traffic_signals", "traffic_signals/direction"], "terms": ["light", "stoplight", "traffic light"], "name": "Traffic Signals"}, - "highway/trunk_link": {"icon": "iD-highway-trunk-link", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "maxheight", "access"], "geometry": ["line"], "tags": {"highway": "trunk_link"}, "terms": ["ramp", "on ramp", "off ramp"], "name": "Trunk Link"}, - "highway/trunk": {"icon": "iD-highway-trunk", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "toll", "access"], "geometry": ["line"], "tags": {"highway": "trunk"}, "terms": [], "name": "Trunk Road"}, + "highway/trunk_link": {"icon": "iD-highway-trunk-link", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "maxheight", "access"], "geometry": ["line"], "tags": {"highway": "trunk_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Trunk Link"}, + "highway/trunk": {"icon": "iD-highway-trunk", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "toll", "access"], "geometry": ["line"], "tags": {"highway": "trunk"}, "terms": ["road", "street"], "name": "Trunk Road"}, "highway/turning_circle": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "turning_circle"}, "terms": ["cul-de-sac"], "name": "Turning Circle"}, "highway/turning_loop": {"icon": "maki-circle", "geometry": ["vertex"], "tags": {"highway": "turning_loop"}, "terms": ["cul-de-sac"], "name": "Turning Loop (Island)"}, - "highway/unclassified": {"icon": "iD-highway-unclassified", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "unclassified"}, "terms": [], "name": "Minor/Unclassified Road"}, + "highway/unclassified": {"icon": "iD-highway-unclassified", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "unclassified"}, "terms": ["road", "street"], "name": "Minor/Unclassified Road"}, "historic": {"icon": "temaki-ruins", "fields": ["historic", "inscription"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "*"}, "name": "Historic Site"}, "historic/archaeological_site": {"icon": "temaki-ruins", "fields": ["name", "historic/civilization", "inscription"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "archaeological_site"}, "name": "Archaeological Site"}, "historic/boundary_stone": {"icon": "temaki-milestone", "fields": ["name", "inscription"], "geometry": ["point", "vertex"], "tags": {"historic": "boundary_stone"}, "name": "Boundary Stone"}, diff --git a/data/presets/presets/highway/bridleway.json b/data/presets/presets/highway/bridleway.json index c701c6098..10c85183c 100644 --- a/data/presets/presets/highway/bridleway.json +++ b/data/presets/presets/highway/bridleway.json @@ -16,7 +16,8 @@ "terms": [ "bridleway", "equestrian", - "horse" + "horse", + "trail" ], "name": "Bridle Path" } diff --git a/data/presets/presets/highway/motorway.json b/data/presets/presets/highway/motorway.json index b15afb2b3..af6573955 100644 --- a/data/presets/presets/highway/motorway.json +++ b/data/presets/presets/highway/motorway.json @@ -25,6 +25,8 @@ "highway", "interstate", "parkway", + "road", + "street", "thruway", "turnpike" ], diff --git a/data/presets/presets/highway/motorway_junction.json b/data/presets/presets/highway/motorway_junction.json index 0ec89a75f..4ebb18ce6 100644 --- a/data/presets/presets/highway/motorway_junction.json +++ b/data/presets/presets/highway/motorway_junction.json @@ -1,14 +1,17 @@ { "icon": "temaki-junction", + "fields": [ + "ref_highway_junction", + "name" + ], "geometry": [ "vertex" ], "tags": { "highway": "motorway_junction" }, - "fields": [ - "ref_highway_junction", - "name" + "terms": [ + "exit" ], "name": "Motorway Junction / Exit" } diff --git a/data/presets/presets/highway/motorway_link.json b/data/presets/presets/highway/motorway_link.json index 4dc91b42c..133de12c3 100644 --- a/data/presets/presets/highway/motorway_link.json +++ b/data/presets/presets/highway/motorway_link.json @@ -27,7 +27,10 @@ "oneway": "yes" }, "terms": [ + "exit", "ramp", + "road", + "street", "on ramp", "off ramp" ], diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json index 61f4e8e32..f3e8aeac6 100644 --- a/data/presets/presets/highway/primary.json +++ b/data/presets/presets/highway/primary.json @@ -18,6 +18,9 @@ "tags": { "highway": "primary" }, - "terms": [], + "terms": [ + "road", + "street" + ], "name": "Primary Road" } diff --git a/data/presets/presets/highway/primary_link.json b/data/presets/presets/highway/primary_link.json index 306e203ed..0cc82aa01 100644 --- a/data/presets/presets/highway/primary_link.json +++ b/data/presets/presets/highway/primary_link.json @@ -20,9 +20,11 @@ "highway": "primary_link" }, "terms": [ - "ramp", "on ramp", - "off ramp" + "off ramp", + "ramp", + "road", + "street" ], "name": "Primary Link" } diff --git a/data/presets/presets/highway/residential.json b/data/presets/presets/highway/residential.json index 0e06ed151..9fe10dde2 100644 --- a/data/presets/presets/highway/residential.json +++ b/data/presets/presets/highway/residential.json @@ -17,6 +17,9 @@ "tags": { "highway": "residential" }, - "terms": [], + "terms": [ + "road", + "street" + ], "name": "Residential Road" } diff --git a/data/presets/presets/highway/road.json b/data/presets/presets/highway/road.json index adfb6a0b9..ca8b94360 100644 --- a/data/presets/presets/highway/road.json +++ b/data/presets/presets/highway/road.json @@ -16,6 +16,9 @@ "tags": { "highway": "road" }, - "terms": [], + "terms": [ + "road", + "street" + ], "name": "Unknown Road" } diff --git a/data/presets/presets/highway/secondary.json b/data/presets/presets/highway/secondary.json index d5c9db230..1412bebc1 100644 --- a/data/presets/presets/highway/secondary.json +++ b/data/presets/presets/highway/secondary.json @@ -18,6 +18,9 @@ "tags": { "highway": "secondary" }, - "terms": [], + "terms": [ + "road", + "street" + ], "name": "Secondary Road" } diff --git a/data/presets/presets/highway/secondary_link.json b/data/presets/presets/highway/secondary_link.json index 029ace65b..526e2e7b3 100644 --- a/data/presets/presets/highway/secondary_link.json +++ b/data/presets/presets/highway/secondary_link.json @@ -20,9 +20,11 @@ "highway": "secondary_link" }, "terms": [ - "ramp", "on ramp", - "off ramp" + "off ramp", + "ramp", + "road", + "street" ], "name": "Secondary Link" } diff --git a/data/presets/presets/highway/service.json b/data/presets/presets/highway/service.json index 6e7ec4dca..1631bb2fe 100644 --- a/data/presets/presets/highway/service.json +++ b/data/presets/presets/highway/service.json @@ -16,6 +16,9 @@ "tags": { "highway": "service" }, - "terms": [], + "terms": [ + "road", + "street" + ], "name": "Service Road" } diff --git a/data/presets/presets/highway/tertiary.json b/data/presets/presets/highway/tertiary.json index aef7a8467..67616b542 100644 --- a/data/presets/presets/highway/tertiary.json +++ b/data/presets/presets/highway/tertiary.json @@ -18,6 +18,9 @@ "tags": { "highway": "tertiary" }, - "terms": [], + "terms": [ + "road", + "street" + ], "name": "Tertiary Road" } diff --git a/data/presets/presets/highway/tertiary_link.json b/data/presets/presets/highway/tertiary_link.json index 12ed9bf1a..87423a125 100644 --- a/data/presets/presets/highway/tertiary_link.json +++ b/data/presets/presets/highway/tertiary_link.json @@ -20,9 +20,11 @@ "highway": "tertiary_link" }, "terms": [ - "ramp", "on ramp", - "off ramp" + "off ramp", + "ramp", + "road", + "street" ], "name": "Tertiary Link" } diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json index c315fe3ca..b93d6d18e 100644 --- a/data/presets/presets/highway/trunk.json +++ b/data/presets/presets/highway/trunk.json @@ -18,6 +18,9 @@ "tags": { "highway": "trunk" }, - "terms": [], + "terms": [ + "road", + "street" + ], "name": "Trunk Road" } diff --git a/data/presets/presets/highway/trunk_link.json b/data/presets/presets/highway/trunk_link.json index 69972a4ef..ea27d76c4 100644 --- a/data/presets/presets/highway/trunk_link.json +++ b/data/presets/presets/highway/trunk_link.json @@ -19,9 +19,11 @@ "highway": "trunk_link" }, "terms": [ - "ramp", "on ramp", - "off ramp" + "off ramp", + "ramp", + "road", + "street" ], "name": "Trunk Link" } diff --git a/data/presets/presets/highway/unclassified.json b/data/presets/presets/highway/unclassified.json index 592c17f5b..3e0f6dd5b 100644 --- a/data/presets/presets/highway/unclassified.json +++ b/data/presets/presets/highway/unclassified.json @@ -17,6 +17,9 @@ "tags": { "highway": "unclassified" }, - "terms": [], + "terms": [ + "road", + "street" + ], "name": "Minor/Unclassified Road" } diff --git a/dist/locales/en.json b/dist/locales/en.json index 043a2434a..04781cbbf 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4242,7 +4242,7 @@ }, "highway/bridleway": { "name": "Bridle Path", - "terms": "bridleway,equestrian,horse" + "terms": "bridleway,equestrian,horse,trail" }, "highway/bus_guideway": { "name": "Bus Guideway", @@ -4294,15 +4294,15 @@ }, "highway/motorway_junction": { "name": "Motorway Junction / Exit", - "terms": "" + "terms": "exit" }, "highway/motorway_link": { "name": "Motorway Link", - "terms": "ramp,on ramp,off ramp" + "terms": "exit,ramp,road,street,on ramp,off ramp" }, "highway/motorway": { "name": "Motorway", - "terms": "autobahn,expressway,freeway,highway,interstate,parkway,thruway,turnpike" + "terms": "autobahn,expressway,freeway,highway,interstate,parkway,road,street,thruway,turnpike" }, "highway/passing_place": { "name": "Passing Place", @@ -4322,11 +4322,11 @@ }, "highway/primary_link": { "name": "Primary Link", - "terms": "ramp,on ramp,off ramp" + "terms": "on ramp,off ramp,ramp,road,street" }, "highway/primary": { "name": "Primary Road", - "terms": "" + "terms": "road,street" }, "highway/raceway": { "name": "Racetrack (Motorsport)", @@ -4334,7 +4334,7 @@ }, "highway/residential": { "name": "Residential Road", - "terms": "" + "terms": "road,street" }, "highway/rest_area": { "name": "Rest Area", @@ -4342,19 +4342,19 @@ }, "highway/road": { "name": "Unknown Road", - "terms": "" + "terms": "road,street" }, "highway/secondary_link": { "name": "Secondary Link", - "terms": "ramp,on ramp,off ramp" + "terms": "on ramp,off ramp,ramp,road,street" }, "highway/secondary": { "name": "Secondary Road", - "terms": "" + "terms": "road,street" }, "highway/service": { "name": "Service Road", - "terms": "" + "terms": "road,street" }, "highway/service/alley": { "name": "Alley", @@ -4398,11 +4398,11 @@ }, "highway/tertiary_link": { "name": "Tertiary Link", - "terms": "ramp,on ramp,off ramp" + "terms": "on ramp,off ramp,ramp,road,street" }, "highway/tertiary": { "name": "Tertiary Road", - "terms": "" + "terms": "road,street" }, "highway/track": { "name": "Unmaintained Track Road", @@ -4418,11 +4418,11 @@ }, "highway/trunk_link": { "name": "Trunk Link", - "terms": "ramp,on ramp,off ramp" + "terms": "on ramp,off ramp,ramp,road,street" }, "highway/trunk": { "name": "Trunk Road", - "terms": "" + "terms": "road,street" }, "highway/turning_circle": { "name": "Turning Circle", @@ -4434,7 +4434,7 @@ }, "highway/unclassified": { "name": "Minor/Unclassified Road", - "terms": "" + "terms": "road,street" }, "historic": { "name": "Historic Site",