Skip to content

Commit

Permalink
Merge pull request #5142 from AndreasHae/passenger-information-display
Browse files Browse the repository at this point in the history
Add passenger information display to bus and tram presets
  • Loading branch information
bhousel authored Jul 14, 2018
2 parents f783fbb + d9f9f6e commit 46ece75
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 139 deletions.
3 changes: 3 additions & 0 deletions data/presets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1080,6 +1080,9 @@ en:
surface: Surface
# parking=underground
underground: Underground
passenger_information_display:
# passenger_information_display=*
label: Passenger information display
payment_multi:
# 'payment:=*'
label: Payment Types
Expand Down
1 change: 1 addition & 0 deletions data/presets/fields.json
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@
"par": {"key": "par", "type": "number", "minValue": 1, "label": "Par", "placeholder": "3, 4, 5..."},
"park_ride": {"key": "park_ride", "type": "check", "label": "Park and Ride"},
"parking": {"key": "parking", "type": "combo", "label": "Type", "strings": {"options": {"surface": "Surface", "multi-storey": "Multilevel", "underground": "Underground", "sheds": "Sheds", "carports": "Carports", "garage_boxes": "Garage Boxes", "lane": "Roadside Lane"}}},
"passenger_information_display": {"key": "passenger_information_display", "type": "check", "label": "Passenger information display"},
"payment_multi": {"key": "payment:", "type": "multiCombo", "label": "Payment Types", "universal": true},
"phases": {"key": "phases", "type": "number", "minValue": 1, "label": "Phases", "placeholder": "1, 2, 3..."},
"phone": {"key": "phone", "type": "tel", "icon": "maki-telephone", "universal": true, "label": "Telephone", "placeholder": "+31 42 123 4567"},
Expand Down
5 changes: 5 additions & 0 deletions data/presets/fields/passenger_information_display.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"key": "passenger_information_display",
"type": "check",
"label": "Passenger information display"
}
8 changes: 4 additions & 4 deletions data/presets/presets.json
Original file line number Diff line number Diff line change
Expand Up @@ -675,23 +675,23 @@
"power/tower": {"fields": ["ref"], "geometry": ["vertex"], "tags": {"power": "tower"}, "name": "High-Voltage Tower"},
"power/transformer": {"icon": "temaki-power", "fields": ["transformer", "operator", "location", "rating", "devices", "phases", "frequency", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration", "ref"], "geometry": ["point", "vertex", "area"], "tags": {"power": "transformer"}, "name": "Transformer"},
"public_transport/linear_platform_aerialway": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["line"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stop / Platform"},
"public_transport/linear_platform_bus": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["line"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stop / Platform"},
"public_transport/linear_platform_bus": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter", "passenger_information_display"], "geometry": ["line"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stop / Platform"},
"public_transport/linear_platform_ferry": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["line"], "tags": {"public_transport": "platform", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["boat", "dock", "ferry", "pier", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Ferry Stop / Platform"},
"public_transport/linear_platform_light_rail": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["line"], "tags": {"public_transport": "platform", "light_rail": "yes"}, "addTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "track", "tram", "trolley", "transit", "transportation"], "name": "Light Rail Stop / Platform"},
"public_transport/linear_platform_monorail": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["line"], "tags": {"public_transport": "platform", "monorail": "yes"}, "addTags": {"public_transport": "platform", "monorail": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "monorail": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["monorail", "platform", "public transit", "public transportation", "rail", "transit", "transportation"], "name": "Monorail Stop / Platform"},
"public_transport/linear_platform_subway": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["line"], "tags": {"public_transport": "platform", "subway": "yes"}, "addTags": {"public_transport": "platform", "subway": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "subway": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["metro", "platform", "public transit", "public transportation", "rail", "subway", "track", "transit", "transportation", "underground"], "name": "Subway Stop / Platform"},
"public_transport/linear_platform_train": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["line"], "tags": {"public_transport": "platform", "train": "yes"}, "addTags": {"public_transport": "platform", "train": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "train": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["platform", "public transit", "public transportation", "rail", "track", "train", "transit", "transportation"], "name": "Train Stop / Platform"},
"public_transport/linear_platform_tram": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["line"], "tags": {"public_transport": "platform", "tram": "yes"}, "addTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Stop / Platform"},
"public_transport/linear_platform_tram": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter", "passenger_information_display"], "geometry": ["line"], "tags": {"public_transport": "platform", "tram": "yes"}, "addTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Stop / Platform"},
"public_transport/linear_platform_trolleybus": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["line"], "tags": {"public_transport": "platform", "trolleybus": "yes"}, "addTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "electric", "platform", "public transit", "public transportation", "streetcar", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Stop / Platform"},
"public_transport/linear_platform": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["line"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.2},
"public_transport/platform_aerialway": {"icon": "maki-aerialway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stop / Platform"},
"public_transport/platform_bus": {"icon": "maki-bus", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stop / Platform"},
"public_transport/platform_bus": {"icon": "maki-bus", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter", "passenger_information_display"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stop / Platform"},
"public_transport/platform_ferry": {"icon": "maki-ferry", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["boat", "dock", "ferry", "pier", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Ferry Stop / Platform"},
"public_transport/platform_light_rail": {"icon": "temaki-light_rail", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "light_rail": "yes"}, "addTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "track", "tram", "trolley", "transit", "transportation"], "name": "Light Rail Stop / Platform"},
"public_transport/platform_monorail": {"icon": "temaki-monorail", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "monorail": "yes"}, "addTags": {"public_transport": "platform", "monorail": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "monorail": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["monorail", "platform", "public transit", "public transportation", "rail", "transit", "transportation"], "name": "Monorail Stop / Platform"},
"public_transport/platform_subway": {"icon": "temaki-subway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "subway": "yes"}, "addTags": {"public_transport": "platform", "subway": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "subway": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["metro", "platform", "public transit", "public transportation", "rail", "subway", "track", "transit", "transportation", "underground"], "name": "Subway Stop / Platform"},
"public_transport/platform_train": {"icon": "maki-rail", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "train": "yes"}, "addTags": {"public_transport": "platform", "train": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "train": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["platform", "public transit", "public transportation", "rail", "track", "train", "transit", "transportation"], "name": "Train Stop / Platform"},
"public_transport/platform_tram": {"icon": "temaki-tram", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "tram": "yes"}, "addTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Stop / Platform"},
"public_transport/platform_tram": {"icon": "temaki-tram", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter", "passenger_information_display"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "tram": "yes"}, "addTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Stop / Platform"},
"public_transport/platform_trolleybus": {"icon": "temaki-trolleybus", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "trolleybus": "yes"}, "addTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "electric", "platform", "public transit", "public transportation", "streetcar", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Stop / Platform"},
"public_transport/platform": {"icon": "maki-bus", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["point", "area"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.2},
"public_transport/station_aerialway": {"icon": "maki-aerialway", "fields": ["name", "network", "operator", "aerialway/access", "aerialway/summer/access", "elevation", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "aerialway": "yes"}, "reference": {"key": "aerialway", "value": "station"}, "terms": ["aerialway", "cable car", "public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Aerialway Station"},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"surface",
"lit",
"bench",
"shelter"
"shelter",
"passenger_information_display"
],
"geometry": [
"line"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"surface",
"lit",
"bench",
"shelter"
"shelter",
"passenger_information_display"
],
"geometry": [
"line"
Expand Down
3 changes: 2 additions & 1 deletion data/presets/presets/public_transport/platform_bus.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"surface",
"lit",
"bench",
"shelter"
"shelter",
"passenger_information_display"
],
"geometry": [
"point",
Expand Down
3 changes: 2 additions & 1 deletion data/presets/presets/public_transport/platform_tram.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"surface",
"lit",
"bench",
"shelter"
"shelter",
"passenger_information_display"
],
"geometry": [
"point",
Expand Down
4 changes: 4 additions & 0 deletions data/taginfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -6762,6 +6762,10 @@
{"key": "parking", "value": "carports", "description": "Type"},
{"key": "parking", "value": "garage_boxes", "description": "Type"},
{"key": "parking", "value": "lane", "description": "Type"},
{
"key": "passenger_information_display",
"description": "Passenger information display"
},
{"key": "payment:", "description": "Payment Types"},
{"key": "phases", "description": "Phases"},
{"key": "phone", "description": "Telephone"},
Expand Down
Loading

0 comments on commit 46ece75

Please sign in to comment.