diff --git a/data/presets.yaml b/data/presets.yaml index 02ec78526..5f87bb3b9 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -876,6 +876,9 @@ en: internet_access/ssid: # 'internet_access:ssid=*' label: SSID (Network Name) + interval: + # interval=* + label: Interval junction/ref_oneway: # 'junction:ref=*' label: Junction Number diff --git a/data/presets/fields.json b/data/presets/fields.json index 226b06d22..3c3ba27ad 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -166,6 +166,7 @@ "internet_access": {"key": "internet_access", "type": "combo", "label": "Internet Access", "strings": {"options": {"yes": "Yes", "no": "No", "wlan": "Wifi", "wired": "Wired", "terminal": "Terminal"}}}, "internet_access/fee": {"key": "internet_access:fee", "type": "check", "label": "Internet Access Fee", "prerequisiteTag": {"key": "internet_access", "valueNot": "no"}}, "internet_access/ssid": {"key": "internet_access:ssid", "type": "text", "label": "SSID (Network Name)", "prerequisiteTag": {"key": "internet_access", "valueNot": "no"}}, + "interval": {"key": "interval", "type": "text", "label": "Interval"}, "junction_line": {"key": "junction", "type": "combo", "label": "Junction", "strings": {"options": {"roundabout": "Roundabout", "circular": "Traffic Circle", "jughandle": "Jughandle"}}}, "junction/ref_oneway": {"key": "junction:ref", "type": "text", "label": "Junction Number", "prerequisiteTag": {"key": "oneway", "value": "yes"}}, "kerb": {"key": "kerb", "type": "combo", "label": "Curb"}, diff --git a/data/presets/fields/interval.json b/data/presets/fields/interval.json new file mode 100644 index 000000000..72c21b4eb --- /dev/null +++ b/data/presets/fields/interval.json @@ -0,0 +1,5 @@ +{ + "key": "interval", + "type": "text", + "label": "Interval" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index e67f89c46..a53196a70 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1044,23 +1044,23 @@ "type/restriction/only_right_turn": {"icon": "iD-restriction-only-right-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_right_turn"}, "name": "Only Right Turn"}, "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"], "geometry": ["relation"], "tags": {"type": "route_master"}, "name": "Route Master"}, + "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"], "geometry": ["relation"], "tags": {"type": "route"}, "name": "Route"}, "type/route/bicycle": {"icon": "iD-route-bicycle", "fields": ["name", "ref_route", "network_bicycle", "cycle_network", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "bicycle"}, "name": "Cycle Route"}, - "type/route/bus": {"icon": "iD-route-bus", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "bus"}, "name": "Bus Route"}, + "type/route/bus": {"icon": "iD-route-bus", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "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/ferry": {"icon": "iD-route-ferry", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "ferry"}, "name": "Ferry Route"}, + "type/route/ferry": {"icon": "iD-route-ferry", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "ferry"}, "name": "Ferry Route"}, "type/route/foot": {"icon": "iD-route-foot", "fields": ["name", "ref_route", "operator", "network_foot", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "foot"}, "name": "Foot Route"}, "type/route/hiking": {"icon": "iD-route-foot", "fields": ["name", "ref_route", "operator", "network_foot", "description", "distance", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "hiking"}, "name": "Hiking Route"}, "type/route/horse": {"icon": "iD-route-horse", "fields": ["name", "ref_route", "operator", "network_horse", "description", "distance", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "horse"}, "name": "Riding Route"}, - "type/route/light_rail": {"icon": "iD-route-light-rail", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "light_rail"}, "name": "Light Rail Route"}, + "type/route/light_rail": {"icon": "iD-route-light-rail", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "light_rail"}, "name": "Light Rail Route"}, "type/route/pipeline": {"icon": "iD-route-pipeline", "fields": ["name", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "pipeline"}, "name": "Pipeline Route"}, "type/route/piste": {"icon": "iD-route-piste", "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-route-power", "fields": ["name", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "name": "Power Route"}, "type/route/road": {"icon": "iD-route-road", "fields": ["name", "ref_route", "network_road", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "road"}, "name": "Road Route"}, - "type/route/subway": {"icon": "iD-route-subway", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "subway"}, "name": "Subway Route"}, - "type/route/train": {"icon": "iD-route-train", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "name": "Train Route"}, - "type/route/tram": {"icon": "iD-route-tram", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "tram"}, "name": "Tram Route"}, + "type/route/subway": {"icon": "iD-route-subway", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "subway"}, "name": "Subway Route"}, + "type/route/train": {"icon": "iD-route-train", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "name": "Train Route"}, + "type/route/tram": {"icon": "iD-route-tram", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "tram"}, "name": "Tram Route"}, "type/site": {"icon": "iD-relation", "fields": ["name", "site"], "geometry": ["relation"], "tags": {"type": "site"}, "name": "Site"}, "type/waterway": {"icon": "iD-route-water", "fields": ["name", "waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"}, "vertex": {"moreFields": ["name"], "geometry": ["vertex"], "terms": ["other"], "tags": {}, "name": "Vertex", "matchScore": 0.1}, diff --git a/data/presets/presets/type/route/bus.json b/data/presets/presets/type/route/bus.json index 8f6b97f2b..62ddb64fc 100644 --- a/data/presets/presets/type/route/bus.json +++ b/data/presets/presets/type/route/bus.json @@ -5,9 +5,16 @@ "ref_route", "operator", "network", - "to", + "to", "from" ], + "moreFields" : [ + "colour", + "interval", + "opening_hours", + "duration", + "wheelchair" + ], "geometry": [ "relation" ], diff --git a/data/presets/presets/type/route/ferry.json b/data/presets/presets/type/route/ferry.json index 96c21fe3b..91152dde7 100644 --- a/data/presets/presets/type/route/ferry.json +++ b/data/presets/presets/type/route/ferry.json @@ -5,9 +5,15 @@ "ref_route", "operator", "network", - "to", + "to", "from" ], + "moreFields" : [ + "interval", + "opening_hours", + "duration", + "wheelchair" + ], "geometry": [ "relation" ], diff --git a/data/presets/presets/type/route/light_rail.json b/data/presets/presets/type/route/light_rail.json index 6e9f505b3..1dad43bf8 100644 --- a/data/presets/presets/type/route/light_rail.json +++ b/data/presets/presets/type/route/light_rail.json @@ -5,9 +5,16 @@ "ref_route", "operator", "network", - "to", + "to", "from" ], + "moreFields" : [ + "colour", + "interval", + "opening_hours", + "duration", + "wheelchair" + ], "geometry": [ "relation" ], diff --git a/data/presets/presets/type/route/subway.json b/data/presets/presets/type/route/subway.json index 209b63c72..b8a302457 100644 --- a/data/presets/presets/type/route/subway.json +++ b/data/presets/presets/type/route/subway.json @@ -5,9 +5,16 @@ "ref_route", "operator", "network", - "to", + "to", "from" ], + "moreFields" : [ + "colour", + "interval", + "opening_hours", + "duration", + "wheelchair" + ], "geometry": [ "relation" ], diff --git a/data/presets/presets/type/route/train.json b/data/presets/presets/type/route/train.json index d4766262c..0f40f7a07 100644 --- a/data/presets/presets/type/route/train.json +++ b/data/presets/presets/type/route/train.json @@ -5,9 +5,16 @@ "ref_route", "operator", "network", - "to", + "to", "from" ], + "moreFields" : [ + "colour", + "interval", + "opening_hours", + "duration", + "wheelchair" + ], "geometry": [ "relation" ], diff --git a/data/presets/presets/type/route/tram.json b/data/presets/presets/type/route/tram.json index 3970a1ac2..5f19120d9 100644 --- a/data/presets/presets/type/route/tram.json +++ b/data/presets/presets/type/route/tram.json @@ -5,9 +5,16 @@ "ref_route", "operator", "network", - "to", + "to", "from" ], + "moreFields" : [ + "colour", + "interval", + "opening_hours", + "duration", + "wheelchair" + ], "geometry": [ "relation" ], diff --git a/data/presets/presets/type/route_master.json b/data/presets/presets/type/route_master.json index 1a350bbd4..df59e4d6c 100644 --- a/data/presets/presets/type/route_master.json +++ b/data/presets/presets/type/route_master.json @@ -7,6 +7,12 @@ "operator", "network" ], + "moreFields" : [ + "colour", + "interval", + "opening_hours", + "wheelchair" + ], "geometry": [ "relation" ], diff --git a/data/taginfo.json b/data/taginfo.json index 8efe7c1da..4373a5607 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1305,6 +1305,7 @@ {"key": "internet_access", "value": "terminal", "description": "🄵 Internet Access"}, {"key": "internet_access:fee", "description": "🄵 Internet Access Fee"}, {"key": "internet_access:ssid", "description": "🄵 SSID (Network Name)"}, + {"key": "interval", "description": "🄵 Interval"}, {"key": "junction:ref", "description": "🄵 Junction Number"}, {"key": "kerb", "description": "🄵 Curb"}, {"key": "label", "description": "🄵 Label"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 6431831fb..f3321e7d7 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2876,6 +2876,9 @@ "internet_access/ssid": { "label": "SSID (Network Name)" }, + "interval": { + "label": "Interval" + }, "junction_line": { "label": "Junction", "options": {