From 5afb2ce11c928eca5d4fce879c8b93bec7c57d38 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 31 Mar 2020 13:22:21 -0700 Subject: [PATCH] Remove Network Type field from incompatible route types (close #7493) --- data/presets.yaml | 1 - data/presets/presets.json | 6 +++--- data/presets/presets/route/ferry.json | 1 - data/presets/presets/type/route/road.json | 1 - data/presets/presets/type/route/train.json | 1 - dist/locales/en.json | 3 +-- 6 files changed, 4 insertions(+), 9 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index e4a4fa1c0..2a8e31537 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1493,7 +1493,6 @@ en: 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 Class diff --git a/data/presets/presets.json b/data/presets/presets.json index ee5a48068..e2ebbf0e4 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1022,7 +1022,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", "network/type", "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", "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"}, @@ -1285,9 +1285,9 @@ "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", "network/type", "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", "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": "maki-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/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/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 48b424566..b5f1b3b0c 100644 --- a/data/presets/presets/route/ferry.json +++ b/data/presets/presets/route/ferry.json @@ -19,7 +19,6 @@ "maxheight", "maxweight", "network", - "network/type", "opening_hours", "ref_route", "wheelchair" diff --git a/data/presets/presets/type/route/road.json b/data/presets/presets/type/route/road.json index cfbefb003..bf874982b 100644 --- a/data/presets/presets/type/route/road.json +++ b/data/presets/presets/type/route/road.json @@ -4,7 +4,6 @@ "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 9f0c85b87..ef2cc46e5 100644 --- a/data/presets/presets/type/route/train.json +++ b/data/presets/presets/type/route/train.json @@ -5,7 +5,6 @@ "ref_route", "operator", "network", - "network/type", "to", "from" ], diff --git a/dist/locales/en.json b/dist/locales/en.json index e1c9de88e..62fa4008f 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3924,8 +3924,7 @@ "terms": "" }, "network/type": { - "label": "Network Type", - "terms": "" + "label": "Network Type" }, "not/name": { "label": "Incorrect Names",