From 266756bd9dbdfecdf9451579fed82a31be6fb97b Mon Sep 17 00:00:00 2001 From: castriganoj Date: Wed, 17 Oct 2018 20:29:46 -0400 Subject: [PATCH 1/2] Add fields for To and From and add fields to all route presets. --- data/presets.yaml | 6 ++++ data/presets/fields.json | 2 ++ data/presets/fields/from.json | 5 +++ data/presets/fields/to.json | 5 +++ data/presets/presets.json | 32 +++++++++---------- data/presets/presets/route/ferry.json | 4 ++- data/presets/presets/type/route/bicycle.json | 4 ++- data/presets/presets/type/route/bus.json | 4 ++- data/presets/presets/type/route/detour.json | 4 ++- data/presets/presets/type/route/ferry.json | 4 ++- data/presets/presets/type/route/foot.json | 4 ++- data/presets/presets/type/route/hiking.json | 4 ++- data/presets/presets/type/route/horse.json | 4 ++- .../presets/type/route/light_rail.json | 4 ++- data/presets/presets/type/route/pipeline.json | 4 ++- data/presets/presets/type/route/piste.json | 4 ++- data/presets/presets/type/route/power.json | 4 ++- data/presets/presets/type/route/road.json | 4 ++- data/presets/presets/type/route/subway.json | 4 ++- data/presets/presets/type/route/train.json | 4 ++- data/presets/presets/type/route/tram.json | 4 ++- data/taginfo.json | 2 ++ dist/locales/en.json | 20 ++++++++++++ 23 files changed, 104 insertions(+), 32 deletions(-) create mode 100644 data/presets/fields/from.json create mode 100644 data/presets/fields/to.json diff --git a/data/presets.yaml b/data/presets.yaml index 3bc1570653..201c354510 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -633,6 +633,9 @@ en: frequency: # frequency=* label: Operating Frequency + from: + # from=* + label: From fuel: # fuel=* label: Fuel @@ -1800,6 +1803,9 @@ en: 'yes': 'Yes' # takeaway field placeholder placeholder: 'Yes, No, Takeaway Only...' + to: + # to =* + label: To toilets/disposal: # 'toilets:disposal=*' label: Disposal diff --git a/data/presets/fields.json b/data/presets/fields.json index 2a8bb55a6d..5ad079d205 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -109,6 +109,7 @@ "flag/type": {"key": "flag:type", "type": "combo", "label": "Flag Type"}, "ford": {"key": "ford", "type": "typeCombo", "label": "Type", "placeholder": "Default"}, "frequency": {"key": "frequency", "type": "combo", "label": "Operating Frequency"}, + "from": {"key": "from", "type": "text", "label": "From"}, "fuel_multi": {"key": "fuel:", "type": "multiCombo", "label": "Fuel Types"}, "fuel": {"key": "fuel", "type": "combo", "label": "Fuel"}, "gauge": {"key": "gauge", "type": "combo", "label": "Gauge"}, @@ -303,6 +304,7 @@ "switch": {"key": "switch", "type": "combo", "label": "Type", "strings": {"options": {"mechanical": "Mechanical", "circuit_breaker": "Circuit Breaker", "disconnector": "Disconnector", "earthing": "Earthing"}}}, "tactile_paving": {"key": "tactile_paving", "type": "check", "label": "Tactile Paving"}, "takeaway": {"key": "takeaway", "type": "combo", "label": "Takeaway", "placeholder": "Yes, No, Takeaway Only...", "strings": {"options": {"yes": "Yes", "no": "No", "only": "Takeaway Only"}}}, + "to": {"key": "to ", "type": "text", "label": "To"}, "toilets/disposal": {"key": "toilets:disposal", "type": "combo", "label": "Disposal", "strings": {"options": {"flush": "Flush", "pitlatrine": "Pit/Latrine", "chemical": "Chemical", "bucket": "Bucket"}}}, "toll": {"key": "toll", "type": "check", "label": "Toll"}, "tomb": {"key": "tomb", "type": "typeCombo", "label": "Type"}, diff --git a/data/presets/fields/from.json b/data/presets/fields/from.json new file mode 100644 index 0000000000..5a96cc4696 --- /dev/null +++ b/data/presets/fields/from.json @@ -0,0 +1,5 @@ +{ + "key": "from", + "type": "text", + "label": "From" +} \ No newline at end of file diff --git a/data/presets/fields/to.json b/data/presets/fields/to.json new file mode 100644 index 0000000000..c3236efbad --- /dev/null +++ b/data/presets/fields/to.json @@ -0,0 +1,5 @@ +{ + "key": "to ", + "type": "text", + "label": "To" +} \ No newline at end of file diff --git a/data/presets/presets.json b/data/presets/presets.json index 9e2def04c2..b71ea08a76 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -776,7 +776,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": "iD-railway-light-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail", "voltage", "frequency"], "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": "iD-ferry-line", "geometry": ["line"], "fields": ["name", "operator", "duration", "access"], "tags": {"route": "ferry"}, "name": "Ferry Route"}, + "route/ferry": {"icon": "iD-ferry-line", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "to", "from"], "tags": {"route": "ferry"}, "name": "Ferry Route"}, "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape"], "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"], "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"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral"}, "name": "Channel Buoy"}, @@ -971,21 +971,21 @@ "type/restriction/only_u_turn": {"icon": "iD-restriction-only-u-turn", "fields": ["except"], "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": {"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"], "geometry": ["relation"], "tags": {"type": "route", "route": "bicycle"}, "name": "Cycle Route"}, - "type/route/bus": {"icon": "iD-route-bus", "fields": ["name", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route", "route": "bus"}, "name": "Bus Route"}, - "type/route/detour": {"icon": "iD-route-detour", "fields": ["name", "ref_route"], "geometry": ["relation"], "tags": {"type": "route", "route": "detour"}, "name": "Detour Route"}, - "type/route/ferry": {"icon": "iD-route-ferry", "fields": ["name", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route", "route": "ferry"}, "name": "Ferry Route"}, - "type/route/foot": {"icon": "iD-route-foot", "fields": ["name", "ref_route", "operator", "network_foot"], "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"], "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"], "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"], "geometry": ["relation"], "tags": {"type": "route", "route": "light_rail"}, "name": "Light Rail Route"}, - "type/route/pipeline": {"icon": "iD-route-pipeline", "fields": ["name", "ref_route", "operator"], "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"], "geometry": ["relation"], "tags": {"type": "route", "route": "piste"}, "name": "Piste/Ski Route"}, - "type/route/power": {"icon": "iD-route-power", "fields": ["name", "ref_route", "operator"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "name": "Power Route"}, - "type/route/road": {"icon": "iD-route-road", "fields": ["name", "ref_route", "network_road"], "geometry": ["relation"], "tags": {"type": "route", "route": "road"}, "name": "Road Route"}, - "type/route/subway": {"icon": "iD-route-subway", "fields": ["name", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route", "route": "subway"}, "name": "Subway Route"}, - "type/route/train": {"icon": "iD-route-train", "fields": ["name", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "name": "Train Route"}, - "type/route/tram": {"icon": "iD-route-tram", "fields": ["name", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route", "route": "tram"}, "name": "Tram 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/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/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/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/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": {"fields": ["name"], "geometry": ["vertex"], "tags": {}, "name": "Other", "matchScore": 0.1}, diff --git a/data/presets/presets/route/ferry.json b/data/presets/presets/route/ferry.json index 4a33de9052..8be49a0696 100644 --- a/data/presets/presets/route/ferry.json +++ b/data/presets/presets/route/ferry.json @@ -7,7 +7,9 @@ "name", "operator", "duration", - "access" + "access", + "to", + "from" ], "tags": { "route": "ferry" diff --git a/data/presets/presets/type/route/bicycle.json b/data/presets/presets/type/route/bicycle.json index 6efc659a53..2a26657e73 100644 --- a/data/presets/presets/type/route/bicycle.json +++ b/data/presets/presets/type/route/bicycle.json @@ -4,7 +4,9 @@ "name", "ref_route", "network_bicycle", - "cycle_network" + "cycle_network", + "to", + "from" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/bus.json b/data/presets/presets/type/route/bus.json index b62cc5fc1c..8f6b97f2b6 100644 --- a/data/presets/presets/type/route/bus.json +++ b/data/presets/presets/type/route/bus.json @@ -4,7 +4,9 @@ "name", "ref_route", "operator", - "network" + "network", + "to", + "from" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/detour.json b/data/presets/presets/type/route/detour.json index 879ada780e..3966df1a97 100644 --- a/data/presets/presets/type/route/detour.json +++ b/data/presets/presets/type/route/detour.json @@ -2,7 +2,9 @@ "icon": "iD-route-detour", "fields": [ "name", - "ref_route" + "ref_route", + "to", + "from" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/ferry.json b/data/presets/presets/type/route/ferry.json index eacec19d85..96c21fe3b9 100644 --- a/data/presets/presets/type/route/ferry.json +++ b/data/presets/presets/type/route/ferry.json @@ -4,7 +4,9 @@ "name", "ref_route", "operator", - "network" + "network", + "to", + "from" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/foot.json b/data/presets/presets/type/route/foot.json index 91c5706bee..f8c841a919 100644 --- a/data/presets/presets/type/route/foot.json +++ b/data/presets/presets/type/route/foot.json @@ -4,7 +4,9 @@ "name", "ref_route", "operator", - "network_foot" + "network_foot", + "to", + "from" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/hiking.json b/data/presets/presets/type/route/hiking.json index db0c04889d..a18d19517a 100644 --- a/data/presets/presets/type/route/hiking.json +++ b/data/presets/presets/type/route/hiking.json @@ -6,7 +6,9 @@ "operator", "network_foot", "description", - "distance" + "distance", + "to", + "from" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/horse.json b/data/presets/presets/type/route/horse.json index a524346d8c..d4501ff030 100644 --- a/data/presets/presets/type/route/horse.json +++ b/data/presets/presets/type/route/horse.json @@ -6,7 +6,9 @@ "operator", "network_horse", "description", - "distance" + "distance", + "to", + "from" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/light_rail.json b/data/presets/presets/type/route/light_rail.json index 8bf10a7adf..6e9f505b3f 100644 --- a/data/presets/presets/type/route/light_rail.json +++ b/data/presets/presets/type/route/light_rail.json @@ -4,7 +4,9 @@ "name", "ref_route", "operator", - "network" + "network", + "to", + "from" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/pipeline.json b/data/presets/presets/type/route/pipeline.json index 5f6cadbdc2..d15c7547b0 100644 --- a/data/presets/presets/type/route/pipeline.json +++ b/data/presets/presets/type/route/pipeline.json @@ -3,7 +3,9 @@ "fields": [ "name", "ref_route", - "operator" + "operator", + "to", + "from" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/piste.json b/data/presets/presets/type/route/piste.json index 42993a7963..7f478bd04c 100644 --- a/data/presets/presets/type/route/piste.json +++ b/data/presets/presets/type/route/piste.json @@ -5,7 +5,9 @@ "piste/type", "colour", "ref_route", - "operator" + "operator", + "to", + "from" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/power.json b/data/presets/presets/type/route/power.json index d3f4d18650..9689d02bb9 100644 --- a/data/presets/presets/type/route/power.json +++ b/data/presets/presets/type/route/power.json @@ -3,7 +3,9 @@ "fields": [ "name", "ref_route", - "operator" + "operator", + "to", + "from" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/road.json b/data/presets/presets/type/route/road.json index 875c1d57c0..21908c4066 100644 --- a/data/presets/presets/type/route/road.json +++ b/data/presets/presets/type/route/road.json @@ -3,7 +3,9 @@ "fields": [ "name", "ref_route", - "network_road" + "network_road", + "to", + "from" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/subway.json b/data/presets/presets/type/route/subway.json index 013bd804c4..209b63c72c 100644 --- a/data/presets/presets/type/route/subway.json +++ b/data/presets/presets/type/route/subway.json @@ -4,7 +4,9 @@ "name", "ref_route", "operator", - "network" + "network", + "to", + "from" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/train.json b/data/presets/presets/type/route/train.json index 64d7404785..d4766262c0 100644 --- a/data/presets/presets/type/route/train.json +++ b/data/presets/presets/type/route/train.json @@ -4,7 +4,9 @@ "name", "ref_route", "operator", - "network" + "network", + "to", + "from" ], "geometry": [ "relation" diff --git a/data/presets/presets/type/route/tram.json b/data/presets/presets/type/route/tram.json index 0706d2b683..3970a1ac28 100644 --- a/data/presets/presets/type/route/tram.json +++ b/data/presets/presets/type/route/tram.json @@ -4,7 +4,9 @@ "name", "ref_route", "operator", - "network" + "network", + "to", + "from" ], "geometry": [ "relation" diff --git a/data/taginfo.json b/data/taginfo.json index 2f7b886cfe..9d364ebf90 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -6860,6 +6860,7 @@ {"key": "flag:type", "description": "Flag Type"}, {"key": "ford", "description": "Type"}, {"key": "frequency", "description": "Operating Frequency"}, + {"key": "from", "description": "From"}, {"key": "fuel:", "description": "Fuel Types"}, {"key": "fuel", "description": "Fuel"}, {"key": "gauge", "description": "Gauge"}, @@ -7493,6 +7494,7 @@ {"key": "takeaway", "value": "yes", "description": "Takeaway"}, {"key": "takeaway", "value": "no", "description": "Takeaway"}, {"key": "takeaway", "value": "only", "description": "Takeaway"}, + {"key": "to ", "description": "To"}, {"key": "toilets:disposal", "value": "flush", "description": "Disposal"}, { "key": "toilets:disposal", diff --git a/dist/locales/en.json b/dist/locales/en.json index 81e861d3cf..5152e14f24 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2004,6 +2004,9 @@ "frequency": { "label": "Operating Frequency" }, + "from": { + "label": "From" + }, "fuel_multi": { "label": "Fuel Types" }, @@ -2954,6 +2957,9 @@ "only": "Takeaway Only" } }, + "to": { + "label": "To" + }, "toilets/disposal": { "label": "Disposal", "options": { @@ -7412,6 +7418,13 @@ "description": "Japan GSI Standard Map. Widely covered.", "name": "Japan GSI Standard Map" }, + "helsingborg-orto": { + "attribution": { + "text": "© Helsingborg municipality" + }, + "description": "Orthophotos from the municipality of Helsingborg 2016, public domain", + "name": "Helsingborg Orthophoto" + }, "hike_n_bike": { "attribution": { "text": "© OpenStreetMap contributors" @@ -7503,6 +7516,13 @@ }, "name": "Stamen Terrain" }, + "stockholm-orto": { + "attribution": { + "text": "© Stockholm municipality, CC0" + }, + "description": "Orthophotos from the municipality of Stockholm 2015, CC0 license", + "name": "Stockholm Orthophoto" + }, "tf-cycle": { "attribution": { "text": "Maps © Thunderforest, Data © OpenStreetMap contributors" From 10dbbbe3302ccace60b567ee06e527dd8e81a887 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 24 Oct 2018 11:05:53 -0400 Subject: [PATCH 2/2] Update data/presets/fields/to.json Co-Authored-By: castriganoj --- data/presets/fields/to.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/presets/fields/to.json b/data/presets/fields/to.json index c3236efbad..b95ac745d8 100644 --- a/data/presets/fields/to.json +++ b/data/presets/fields/to.json @@ -1,5 +1,5 @@ { - "key": "to ", + "key": "to", "type": "text", "label": "To" -} \ No newline at end of file +}