diff --git a/data/presets.yaml b/data/presets.yaml index ec72c075c..ec972bf0b 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1361,6 +1361,10 @@ en: # network=* label: Network terms: '[translate with synonyms or related terms for ''Network'', separated by commas]' + network/type: + # 'network:type=*' + label: Network Type + terms: '[translate with synonyms or related terms for ''Network Type'', separated by commas]' network_bicycle: # network=* label: Network Type diff --git a/data/presets/fields.json b/data/presets/fields.json index 41c070139..b2c676d74 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -249,6 +249,7 @@ "network_horse": {"key": "network", "type": "combo", "label": "Network Type", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lhn": "Local", "rhn": "Regional", "nhn": "National", "ihn": "International"}}}, "network_road": {"key": "network", "type": "networkCombo", "label": "Network"}, "network": {"key": "network", "type": "text", "label": "Network"}, + "network/type": {"key": "network:type", "type": "combo", "label": "Network Type", "prerequisiteTag": {"key": "network"}}, "not/name": {"key": "not:name", "type": "semiCombo", "label": "Incorrect Names", "terms": ["common mistake names", "wrong names"]}, "note": {"key": "note", "type": "textarea", "universal": true, "icon": "note", "label": "Note", "terms": ["comment"]}, "office": {"key": "office", "type": "typeCombo", "label": "Type"}, diff --git a/data/presets/fields/network/type.json b/data/presets/fields/network/type.json new file mode 100644 index 000000000..6798d0327 --- /dev/null +++ b/data/presets/fields/network/type.json @@ -0,0 +1,8 @@ +{ + "key": "network:type", + "type": "combo", + "label": "Network Type", + "prerequisiteTag": { + "key": "network" + } +} diff --git a/data/presets/presets.json b/data/presets/presets.json index ca074e762..b80b46624 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -989,7 +989,7 @@ "railway/train_wash": {"icon": "maki-rail", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"}, "railway/tram": {"icon": "temaki-tram", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram"}, "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", "to", "from"], "moreFields": ["charge_toll", "dog", "interval", "maxheight", "maxweight", "network", "network/type", "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": {"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"}, @@ -1225,22 +1225,22 @@ "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"], "geometry": ["relation"], "tags": {"type": "route"}, "name": "Route"}, - "type/route/bicycle": {"icon": "maki-bicycle", "fields": ["name", "ref_route", "network_bicycle", "cycle_network", "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"], "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/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/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", "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", "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", "description", "distance", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "horse"}, "name": "Riding 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/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/road": {"icon": "iD-highway-unclassified", "fields": ["name", "ref_route", "network_road", "network/type", "to", "from"], "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": "iD-railway-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": "iD-railway-rail", "fields": ["name", "ref_route", "operator", "network", "network/type", "to", "from"], "moreFields": ["colour", "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/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"}, diff --git a/data/presets/presets/route/ferry.json b/data/presets/presets/route/ferry.json index b5f1b3b0c..48b424566 100644 --- a/data/presets/presets/route/ferry.json +++ b/data/presets/presets/route/ferry.json @@ -19,6 +19,7 @@ "maxheight", "maxweight", "network", + "network/type", "opening_hours", "ref_route", "wheelchair" diff --git a/data/presets/presets/type/route.json b/data/presets/presets/type/route.json index b6ef80bbc..94634ce4e 100644 --- a/data/presets/presets/type/route.json +++ b/data/presets/presets/type/route.json @@ -5,7 +5,8 @@ "route", "ref_route", "operator", - "network" + "network", + "network/type" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/bicycle.json b/data/presets/presets/type/route/bicycle.json index e905a29eb..0458d3264 100644 --- a/data/presets/presets/type/route/bicycle.json +++ b/data/presets/presets/type/route/bicycle.json @@ -5,6 +5,7 @@ "ref_route", "network_bicycle", "cycle_network", + "network/type", "to", "from" ], diff --git a/data/presets/presets/type/route/foot.json b/data/presets/presets/type/route/foot.json index 3bb4739a0..08743a086 100644 --- a/data/presets/presets/type/route/foot.json +++ b/data/presets/presets/type/route/foot.json @@ -5,6 +5,7 @@ "ref_route", "operator", "network_foot", + "network/type", "to", "from" ], diff --git a/data/presets/presets/type/route/hiking.json b/data/presets/presets/type/route/hiking.json index c13f52e71..1db0b46f2 100644 --- a/data/presets/presets/type/route/hiking.json +++ b/data/presets/presets/type/route/hiking.json @@ -5,6 +5,7 @@ "ref_route", "operator", "network_foot", + "network/type", "description", "distance", "to", diff --git a/data/presets/presets/type/route/horse.json b/data/presets/presets/type/route/horse.json index 9b8789351..2e23389f7 100644 --- a/data/presets/presets/type/route/horse.json +++ b/data/presets/presets/type/route/horse.json @@ -5,6 +5,7 @@ "ref_route", "operator", "network_horse", + "network/type", "description", "distance", "to", diff --git a/data/presets/presets/type/route/road.json b/data/presets/presets/type/route/road.json index bf874982b..cfbefb003 100644 --- a/data/presets/presets/type/route/road.json +++ b/data/presets/presets/type/route/road.json @@ -4,6 +4,7 @@ "name", "ref_route", "network_road", + "network/type", "to", "from" ], diff --git a/data/presets/presets/type/route/train.json b/data/presets/presets/type/route/train.json index a392297d0..33bf2c90e 100644 --- a/data/presets/presets/type/route/train.json +++ b/data/presets/presets/type/route/train.json @@ -5,6 +5,7 @@ "ref_route", "operator", "network", + "network/type", "to", "from" ], diff --git a/data/taginfo.json b/data/taginfo.json index 16009b845..057c3451c 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1577,6 +1577,7 @@ {"key": "network", "value": "nhn", "description": "🄵 Network Type"}, {"key": "network", "value": "ihn", "description": "🄵 Network Type"}, {"key": "network", "description": "🄵 Network"}, + {"key": "network:type", "description": "🄵 Network Type"}, {"key": "not:name", "description": "🄵 Incorrect Names"}, {"key": "note", "description": "🄵 Note"}, {"key": "oneway", "value": "yes", "description": "🄵 One Way"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 4b3bf392c..67f7d8eb5 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3675,6 +3675,10 @@ "label": "Network", "terms": "" }, + "network/type": { + "label": "Network Type", + "terms": "" + }, "not/name": { "label": "Incorrect Names", "terms": "common mistake names,wrong names"