diff --git a/data/presets.yaml b/data/presets.yaml index 9c8817bd4..f1a816fc9 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -752,6 +752,8 @@ en: distance: # distance=* label: Distance + # 'terms: length,mileage' + terms: '[translate with synonyms or related terms for ''Distance'', separated by commas]' disused/railway: # 'disused:railway=*' label: Type @@ -8725,6 +8727,10 @@ en: # 'type=route, route=tram' name: Tram Route terms: '' + type/route/trolleybus: + # 'type=route, route=trolleybus' + name: Trolleybus Route + terms: '' type/route_master: # type=route_master name: Route Master diff --git a/data/presets/fields.json b/data/presets/fields.json index 4f7deeffc..1de3a5de4 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -124,7 +124,7 @@ "direction": {"key": "direction", "type": "number", "label": "Direction (Degrees Clockwise)", "placeholder": "45, 90, 180, 270"}, "dispensing": {"key": "dispensing", "type": "check", "label": "Dispenses Prescriptions", "default": "yes"}, "display": {"key": "display", "type": "combo", "label": "Display", "options": ["analog", "digital", "sundial", "unorthodox"]}, - "distance": {"key": "distance", "type": "text", "label": "Distance"}, + "distance": {"key": "distance", "type": "text", "label": "Distance", "terms": ["length", "mileage"]}, "disused/railway": {"key": "disused:railway", "type": "typeCombo", "label": "Type"}, "disused/shop": {"key": "disused:shop", "type": "typeCombo", "label": "Type"}, "dock": {"key": "dock", "type": "combo", "label": "Type"}, diff --git a/data/presets/fields/distance.json b/data/presets/fields/distance.json index 40ffbcf87..ed24ed3d7 100644 --- a/data/presets/fields/distance.json +++ b/data/presets/fields/distance.json @@ -1,5 +1,9 @@ { "key": "distance", "type": "text", - "label": "Distance" + "label": "Distance", + "terms": [ + "length", + "mileage" + ] } diff --git a/data/presets/presets.json b/data/presets/presets.json index 3f56ac392..315648109 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -954,7 +954,7 @@ "power/switch": {"icon": "temaki-power_switch", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex"], "tags": {"power": "switch"}, "name": "Power Switch"}, "power/tower": {"icon": "temaki-power_tower", "fields": ["ref", "operator", "design", "height", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "matchScore": 1.05, "name": "High-Voltage Tower"}, "power/transformer": {"icon": "temaki-power_transformer", "fields": ["ref", "operator", "transformer", "location", "rating", "devices", "phases"], "moreFields": ["frequency", "manufacturer", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration"], "geometry": ["point", "vertex"], "tags": {"power": "transformer"}, "name": "Transformer"}, - "public_transport/platform_point": {"icon": "temaki-sign_and_bench", "fields": ["name", "network", "operator", "departures_board", "shelter"], "moreFields": ["bench", "bin", "gnis/feature_id", "level", "lit", "tactile_paving", "wheelchair"], "geometry": ["point"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.6}, + "public_transport/platform_point": {"icon": "temaki-sign_and_bench", "fields": ["name", "ref_stop_position", "network", "operator", "departures_board", "shelter"], "moreFields": ["bench", "bin", "gnis/feature_id", "level", "lit", "tactile_paving", "wheelchair"], "geometry": ["point"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.6}, "public_transport/platform": {"icon": "temaki-sign_and_pedestrian", "fields": ["ref_platform", "network", "operator", "departures_board", "surface"], "moreFields": ["access", "covered", "indoor", "layer", "level", "lit", "wheelchair"], "geometry": ["line", "area"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Platform", "matchScore": 0.6}, "public_transport/platform/aerialway_point": {"icon": "maki-aerialway", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "searchable": false, "name": "Aerialway Stop / Platform"}, "public_transport/platform/ferry_point": {"icon": "maki-ferry", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "searchable": false, "name": "Ferry Stop / Platform"}, @@ -995,7 +995,7 @@ "public_transport/stop_position_train": {"icon": "maki-rail", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "train": "yes"}, "addTags": {"public_transport": "stop_position", "train": "yes", "railway": "stop"}, "reference": {"key": "railway", "value": "stop"}, "terms": ["public transit", "public transportation", "rail", "track", "train", "transit", "transportation"], "name": "Train Stopping Location"}, "public_transport/stop_position_tram": {"icon": "temaki-tram", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "tram": "yes"}, "addTags": {"public_transport": "stop_position", "tram": "yes", "railway": "tram_stop"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Stopping Location"}, "public_transport/stop_position_trolleybus": {"icon": "temaki-trolleybus", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "trolleybus": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["bus", "electric", "public transit", "public transportation", "streetcar", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Stopping Location"}, - "public_transport/stop_position": {"icon": "maki-bus", "fields": ["name", "ref_stop_position", "network", "operator"], "moreFields": ["level"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position"}, "terms": ["public transit", "public transportation", "transit", "transportation"], "name": "Transit Stopping Location", "matchScore": 0.2}, + "public_transport/stop_position": {"icon": "maki-bus", "fields": ["name", "ref_stop_position", "network", "operator"], "moreFields": [], "geometry": ["vertex"], "tags": {"public_transport": "stop_position"}, "terms": ["public transit", "public transportation", "transit", "transportation"], "name": "Transit Stopping Location", "matchScore": 0.2}, "railway/halt": {"icon": "maki-rail", "geometry": ["point", "vertex"], "tags": {"railway": "halt"}, "name": "Train Station (Halt / Request)", "searchable": false}, "railway/platform": {"icon": "temaki-sign_and_pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"railway": "platform"}, "name": "Train Platform", "searchable": false}, "railway/station": {"icon": "maki-rail", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "vertex", "area"], "tags": {"railway": "station"}, "matchScore": 0.95, "name": "Train Station", "searchable": false}, @@ -1023,7 +1023,7 @@ "railway/tram": {"icon": "temaki-tram", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["electric street railway", "light rail", "streetcar", "tramway", "trolley"], "name": "Tram Track"}, "railway/yard": {"icon": "temaki-freight_car", "fields": ["name", "operator"], "moreFields": ["gnis/feature_id"], "geometry": ["point"], "tags": {"railway": "yard"}, "terms": ["freight car stop", "freight train station", "rail freight station", "railroad yard", "railway yard"], "name": "Rail Yard"}, "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"}, - "route/ferry": {"icon": "maki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "toll", "to", "from"], "moreFields": ["charge_toll", "dog", "interval", "maxheight", "maxweight", "network", "opening_hours", "ref_route", "wheelchair"], "tags": {"route": "ferry"}, "terms": ["boat", "merchant vessel", "ship", "water bus", "water shuttle", "water taxi"], "name": "Ferry Route"}, + "route/ferry": {"icon": "maki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "toll", "from", "to"], "moreFields": ["charge_toll", "distance", "dog", "interval", "maxheight", "maxweight", "network", "opening_hours", "ref_route", "wheelchair"], "tags": {"route": "ferry"}, "terms": ["boat", "merchant vessel", "ship", "water bus", "water shuttle", "water taxi"], "name": "Ferry Route"}, "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"}, "seamark/beacon_lateral": {"fields": ["ref", "operator", "seamark/beacon_lateral/colour", "seamark/beacon_lateral/category", "seamark/beacon_lateral/shape", "seamark/beacon_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral beacon", "beacon lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "beacon_lateral"}, "name": "Channel Beacon"}, "seamark/buoy_lateral": {"icon": "temaki-buoy", "fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral"}, "name": "Channel Buoy"}, @@ -1273,23 +1273,24 @@ "type/restriction/only_straight_on": {"icon": "iD-restriction-only-straight-on", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_straight_on"}, "name": "Only Straight On"}, "type/restriction/only_u_turn": {"icon": "iD-restriction-only-u-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_u_turn"}, "name": "Only U-turn"}, "type/route_master": {"icon": "iD-route-master", "fields": ["name", "route_master", "ref", "operator", "network"], "moreFields": ["colour", "interval", "opening_hours", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route_master"}, "name": "Route Master"}, - "type/route": {"icon": "iD-route", "fields": ["name", "route", "ref_route", "operator", "network", "network/type"], "geometry": ["relation"], "tags": {"type": "route"}, "name": "Route"}, - "type/route/bicycle": {"icon": "maki-bicycle", "fields": ["name", "ref_route", "network_bicycle", "cycle_network", "network/type", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "bicycle"}, "name": "Cycle Route"}, + "type/route": {"icon": "iD-route", "fields": ["name", "route", "ref_route", "operator", "network", "network/type"], "moreFields": ["distance"], "geometry": ["relation"], "tags": {"type": "route"}, "name": "Route"}, + "type/route/bicycle": {"icon": "maki-bicycle", "fields": ["name", "ref_route", "network_bicycle", "cycle_network", "network/type", "from", "to"], "moreFields": ["colour", "distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "bicycle"}, "name": "Cycle Route"}, "type/route/bus": {"icon": "maki-bus", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "bus"}, "name": "Bus Route"}, - "type/route/detour": {"icon": "iD-route-detour", "fields": ["name", "ref_route", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "detour"}, "name": "Detour Route"}, + "type/route/detour": {"icon": "iD-route-detour", "fields": ["name", "ref_route", "from", "to"], "geometry": ["relation"], "tags": {"type": "route", "route": "detour"}, "name": "Detour Route"}, "type/route/ferry": {"icon": "maki-ferry", "fields": ["{route/ferry}"], "moreFields": ["{route/ferry}"], "geometry": ["relation"], "tags": {"type": "route", "route": "ferry"}, "name": "Ferry Route"}, - "type/route/foot": {"icon": "temaki-pedestrian", "fields": ["name", "ref_route", "operator", "network_foot", "network/type", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "foot"}, "name": "Foot Route"}, - "type/route/hiking": {"icon": "fas-hiking", "fields": ["name", "ref_route", "operator", "network_foot", "network/type", "description", "distance", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "hiking"}, "name": "Hiking Route"}, - "type/route/horse": {"icon": "maki-horse-riding", "fields": ["name", "ref_route", "operator", "network_horse", "network/type", "description", "distance", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "horse"}, "name": "Riding Route"}, + "type/route/foot": {"icon": "temaki-pedestrian", "fields": ["{type/route/hiking}"], "moreFields": ["{type/route/hiking}"], "geometry": ["relation"], "tags": {"type": "route", "route": "foot"}, "name": "Foot Route"}, + "type/route/hiking": {"icon": "fas-hiking", "fields": ["name", "ref_route", "operator", "network_foot", "network/type", "from", "to"], "moreFields": ["colour", "distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "hiking"}, "name": "Hiking Route"}, + "type/route/horse": {"icon": "maki-horse-riding", "fields": ["name", "ref_route", "operator", "network_horse", "network/type", "from", "to"], "moreFields": ["colour", "distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "horse"}, "name": "Riding Route"}, "type/route/light_rail": {"icon": "temaki-light_rail", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "light_rail"}, "name": "Light Rail Route"}, "type/route/monorail": {"icon": "temaki-monorail", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "monorail"}, "name": "Monorail Route"}, - "type/route/pipeline": {"icon": "iD-pipeline-line", "fields": ["name", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "pipeline"}, "name": "Pipeline Route"}, - "type/route/piste": {"icon": "fas-skiing", "fields": ["name", "piste/type", "colour", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "piste"}, "name": "Piste/Ski Route"}, - "type/route/power": {"icon": "iD-power-line", "fields": ["name", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "name": "Power Route"}, - "type/route/road": {"icon": "iD-highway-unclassified", "fields": ["name", "ref_route", "network_road", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "road"}, "name": "Road Route"}, + "type/route/pipeline": {"icon": "iD-pipeline-line", "fields": ["{type/route/power}"], "moreFields": ["{type/route/power}"], "geometry": ["relation"], "tags": {"type": "route", "route": "pipeline"}, "name": "Pipeline Route"}, + "type/route/piste": {"icon": "fas-skiing", "fields": ["name", "piste/type", "ref_route", "operator", "from", "to"], "moreFields": ["colour", "distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "piste"}, "name": "Piste/Ski Route"}, + "type/route/power": {"icon": "iD-power-line", "fields": ["name", "ref_route", "operator", "from", "to"], "moreFields": ["distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "name": "Power Route"}, + "type/route/road": {"icon": "iD-highway-unclassified", "fields": ["name", "ref_route", "network_road", "from", "to"], "moreFields": ["colour", "distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "road"}, "name": "Road Route"}, "type/route/subway": {"icon": "temaki-subway", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "subway"}, "name": "Subway Route"}, - "type/route/train": {"icon": "maki-rail", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "duration", "interval", "opening_hours", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "name": "Train Route"}, + "type/route/train": {"icon": "maki-rail", "fields": ["name", "ref_route", "operator", "network", "from", "to"], "moreFields": ["colour", "distance", "duration", "interval", "opening_hours", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "name": "Train Route"}, "type/route/tram": {"icon": "temaki-tram", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "tram"}, "name": "Tram Route"}, + "type/route/trolleybus": {"icon": "temaki-trolleybus", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "trolleybus"}, "name": "Trolleybus Route"}, "type/site": {"icon": "iD-relation", "fields": ["name", "site"], "geometry": ["relation"], "tags": {"type": "site"}, "name": "Site"}, "type/waterway": {"icon": "iD-waterway-stream", "fields": ["name", "waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"}, "waterway/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank", "searchable": false}, diff --git a/data/presets/presets/public_transport/platform_point.json b/data/presets/presets/public_transport/platform_point.json index 7988c877e..ce252eddc 100644 --- a/data/presets/presets/public_transport/platform_point.json +++ b/data/presets/presets/public_transport/platform_point.json @@ -2,6 +2,7 @@ "icon": "temaki-sign_and_bench", "fields": [ "name", + "ref_stop_position", "network", "operator", "departures_board", diff --git a/data/presets/presets/public_transport/stop_position.json b/data/presets/presets/public_transport/stop_position.json index 72d35cc03..b94b5ff23 100644 --- a/data/presets/presets/public_transport/stop_position.json +++ b/data/presets/presets/public_transport/stop_position.json @@ -6,9 +6,7 @@ "network", "operator" ], - "moreFields": [ - "level" - ], + "moreFields": [], "geometry": [ "vertex" ], diff --git a/data/presets/presets/route/ferry.json b/data/presets/presets/route/ferry.json index b5f1b3b0c..b74ebad34 100644 --- a/data/presets/presets/route/ferry.json +++ b/data/presets/presets/route/ferry.json @@ -9,11 +9,12 @@ "duration", "access", "toll", - "to", - "from" + "from", + "to" ], "moreFields": [ "charge_toll", + "distance", "dog", "interval", "maxheight", diff --git a/data/presets/presets/type/route.json b/data/presets/presets/type/route.json index 94634ce4e..2e0c24c9d 100644 --- a/data/presets/presets/type/route.json +++ b/data/presets/presets/type/route.json @@ -8,6 +8,9 @@ "network", "network/type" ], + "moreFields": [ + "distance" + ], "geometry": [ "relation" ], diff --git a/data/presets/presets/type/route/bicycle.json b/data/presets/presets/type/route/bicycle.json index 0458d3264..943af4761 100644 --- a/data/presets/presets/type/route/bicycle.json +++ b/data/presets/presets/type/route/bicycle.json @@ -6,8 +6,12 @@ "network_bicycle", "cycle_network", "network/type", - "to", - "from" + "from", + "to" + ], + "moreFields": [ + "colour", + "distance" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/detour.json b/data/presets/presets/type/route/detour.json index 0fdfe0cd0..8a057d5dc 100644 --- a/data/presets/presets/type/route/detour.json +++ b/data/presets/presets/type/route/detour.json @@ -3,8 +3,8 @@ "fields": [ "name", "ref_route", - "to", - "from" + "from", + "to" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/foot.json b/data/presets/presets/type/route/foot.json index 08743a086..87a8f91f8 100644 --- a/data/presets/presets/type/route/foot.json +++ b/data/presets/presets/type/route/foot.json @@ -1,13 +1,10 @@ { "icon": "temaki-pedestrian", "fields": [ - "name", - "ref_route", - "operator", - "network_foot", - "network/type", - "to", - "from" + "{type/route/hiking}" + ], + "moreFields": [ + "{type/route/hiking}" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/hiking.json b/data/presets/presets/type/route/hiking.json index 1db0b46f2..e45cfb15e 100644 --- a/data/presets/presets/type/route/hiking.json +++ b/data/presets/presets/type/route/hiking.json @@ -6,10 +6,12 @@ "operator", "network_foot", "network/type", - "description", - "distance", - "to", - "from" + "from", + "to" + ], + "moreFields": [ + "colour", + "distance" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/horse.json b/data/presets/presets/type/route/horse.json index 2e23389f7..0623c9047 100644 --- a/data/presets/presets/type/route/horse.json +++ b/data/presets/presets/type/route/horse.json @@ -6,10 +6,12 @@ "operator", "network_horse", "network/type", - "description", - "distance", - "to", - "from" + "from", + "to" + ], + "moreFields": [ + "colour", + "distance" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/pipeline.json b/data/presets/presets/type/route/pipeline.json index b3a666848..14e53162d 100644 --- a/data/presets/presets/type/route/pipeline.json +++ b/data/presets/presets/type/route/pipeline.json @@ -1,11 +1,10 @@ { "icon": "iD-pipeline-line", "fields": [ - "name", - "ref_route", - "operator", - "to", - "from" + "{type/route/power}" + ], + "moreFields": [ + "{type/route/power}" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/piste.json b/data/presets/presets/type/route/piste.json index 0176f2ec6..d2ad7e92d 100644 --- a/data/presets/presets/type/route/piste.json +++ b/data/presets/presets/type/route/piste.json @@ -3,11 +3,14 @@ "fields": [ "name", "piste/type", - "colour", "ref_route", "operator", - "to", - "from" + "from", + "to" + ], + "moreFields": [ + "colour", + "distance" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/power.json b/data/presets/presets/type/route/power.json index 58927f92f..ae23fee25 100644 --- a/data/presets/presets/type/route/power.json +++ b/data/presets/presets/type/route/power.json @@ -4,8 +4,11 @@ "name", "ref_route", "operator", - "to", - "from" + "from", + "to" + ], + "moreFields": [ + "distance" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/road.json b/data/presets/presets/type/route/road.json index bf874982b..97814c121 100644 --- a/data/presets/presets/type/route/road.json +++ b/data/presets/presets/type/route/road.json @@ -4,8 +4,12 @@ "name", "ref_route", "network_road", - "to", - "from" + "from", + "to" + ], + "moreFields": [ + "colour", + "distance" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/train.json b/data/presets/presets/type/route/train.json index ef2cc46e5..6441cb1c4 100644 --- a/data/presets/presets/type/route/train.json +++ b/data/presets/presets/type/route/train.json @@ -5,11 +5,12 @@ "ref_route", "operator", "network", - "to", - "from" + "from", + "to" ], "moreFields": [ "colour", + "distance", "duration", "interval", "opening_hours", diff --git a/data/presets/presets/type/route/trolleybus.json b/data/presets/presets/type/route/trolleybus.json new file mode 100644 index 000000000..cd563f5f2 --- /dev/null +++ b/data/presets/presets/type/route/trolleybus.json @@ -0,0 +1,17 @@ +{ + "icon": "temaki-trolleybus", + "fields": [ + "{type/route/train}" + ], + "moreFields": [ + "{type/route/train}" + ], + "geometry": [ + "relation" + ], + "tags": { + "type": "route", + "route": "trolleybus" + }, + "name": "Trolleybus Route" +} diff --git a/data/taginfo.json b/data/taginfo.json index 82a3f63c8..f39609a92 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1229,6 +1229,7 @@ {"key": "route", "value": "subway", "description": "🄿 Subway Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/subway.svg"}, {"key": "route", "value": "train", "description": "🄿 Train Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-15.svg"}, {"key": "route", "value": "tram", "description": "🄿 Tram Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tram.svg"}, + {"key": "route", "value": "trolleybus", "description": "🄿 Trolleybus Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/trolleybus.svg"}, {"key": "type", "value": "site", "description": "🄿 Site", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/iD-sprite/presets/relation.svg"}, {"key": "type", "value": "waterway", "description": "🄿 Waterway", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/iD-sprite/presets/waterway-stream.svg"}, {"key": "waterway", "value": "riverbank", "description": "🄿 Riverbank (unsearchable), 🄳 ➜ natural=water + water=river", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index ae6aae0b0..efa9a296c 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3247,7 +3247,8 @@ "label": "Display" }, "distance": { - "label": "Distance" + "label": "Distance", + "terms": "length,mileage" }, "disused/railway": { "label": "Type" @@ -10042,6 +10043,10 @@ "name": "Tram Route", "terms": "" }, + "type/route/trolleybus": { + "name": "Trolleybus Route", + "terms": "" + }, "type/site": { "name": "Site", "terms": "" diff --git a/modules/ui/preset_icon.js b/modules/ui/preset_icon.js index d8fe54916..8c61fa3f1 100644 --- a/modules/ui/preset_icon.js +++ b/modules/ui/preset_icon.js @@ -209,6 +209,7 @@ export function uiPresetIcon() { const routeSegments = { bicycle: ['highway/cycleway', 'highway/cycleway', 'highway/cycleway'], bus: ['highway/unclassified', 'highway/secondary', 'highway/primary'], + trolleybus: ['highway/unclassified', 'highway/secondary', 'highway/primary'], detour: ['highway/tertiary', 'highway/residential', 'highway/unclassified'], ferry: ['route/ferry', 'route/ferry', 'route/ferry'], foot: ['highway/footway', 'highway/footway', 'highway/footway'],