Skip to content

Commit

Permalink
Add Monorail Route, Turnstile, and Transit Stop Area Group presets (c…
Browse files Browse the repository at this point in the history
…lose #5757)
  • Loading branch information
quincylvania committed Apr 16, 2019
1 parent 5a4283b commit 3a27575
Show file tree
Hide file tree
Showing 8 changed files with 96 additions and 0 deletions.
13 changes: 13 additions & 0 deletions data/presets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3404,6 +3404,11 @@ en:
# barrier=toll_booth
name: Toll Booth
terms: '<translate with synonyms or related terms for ''Toll Booth'', separated by commas>'
barrier/turnstile:
# barrier=turnstile
name: Turnstile
# 'terms: baffle gate,turnstyle'
terms: '<translate with synonyms or related terms for ''Turnstile'', separated by commas>'
barrier/wall:
# barrier=wall
name: Wall
Expand Down Expand Up @@ -7164,6 +7169,10 @@ en:
type/multipolygon:
# type=multipolygon
name: Multipolygon
type/public_transport/stop_area_group:
# 'type=public_transport, public_transport=stop_area_group'
name: Transit Stop Area Group
terms: '<translate with synonyms or related terms for ''Transit Stop Area Group'', separated by commas>'
type/restriction:
# type=restriction
name: Restriction
Expand Down Expand Up @@ -7236,6 +7245,10 @@ en:
# 'type=route, route=light_rail'
name: Light Rail Route
terms: '<translate with synonyms or related terms for ''Light Rail Route'', separated by commas>'
type/route/monorail:
# 'type=route, route=monorail'
name: Monorail Route
terms: '<translate with synonyms or related terms for ''Monorail Route'', separated by commas>'
type/route/pipeline:
# 'type=route, route=pipeline'
name: Pipeline Route
Expand Down
3 changes: 3 additions & 0 deletions data/presets/presets.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@
"barrier/retaining_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"},
"barrier/stile": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "stile"}, "name": "Stile"},
"barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area", "payment_multi", "currency_multi"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"},
"barrier/turnstile": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "terms": ["baffle gate", "turnstyle"], "tags": {"barrier": "turnstile"}, "name": "Turnstile"},
"barrier/wall": {"icon": "temaki-wall", "fields": ["wall", "height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "wall"}, "name": "Wall", "matchScore": 0.25},
"boundary/administrative": {"fields": ["name", "admin_level"], "geometry": ["line"], "tags": {"boundary": "administrative"}, "name": "Administrative Boundary", "matchScore": 0.5},
"bridge/support": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"},
Expand Down Expand Up @@ -1087,6 +1088,7 @@
"type/boundary": {"icon": "iD-boundary", "fields": ["name", "boundary"], "geometry": ["relation"], "tags": {"type": "boundary"}, "name": "Boundary"},
"type/boundary/administrative": {"icon": "iD-boundary", "fields": ["name", "admin_level"], "geometry": ["relation"], "tags": {"type": "boundary", "boundary": "administrative"}, "reference": {"key": "boundary", "value": "administrative"}, "name": "Administrative Boundary"},
"type/enforcement": {"icon": "iD-relation", "fields": ["name", "enforcement"], "geometry": ["relation"], "tags": {"type": "enforcement"}, "name": "Enforcement"},
"type/public_transport/stop_area_group": {"icon": "iD-relation", "fields": ["name", "ref", "network", "operator"], "geometry": ["relation"], "tags": {"type": "public_transport", "public_transport": "stop_area_group"}, "reference": {"key": "public_transport", "value": "stop_area_group"}, "name": "Transit Stop Area Group"},
"type/restriction": {"icon": "iD-restriction", "fields": ["restriction", "except"], "geometry": ["relation"], "tags": {"type": "restriction"}, "name": "Restriction"},
"type/restriction/no_left_turn": {"icon": "iD-restriction-no-left-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_left_turn"}, "name": "No Left Turn"},
"type/restriction/no_right_turn": {"icon": "iD-restriction-no-right-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_right_turn"}, "name": "No Right Turn"},
Expand All @@ -1106,6 +1108,7 @@
"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/light_rail": {"icon": "temaki-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/monorail": {"icon": "temaki-monorail", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "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"},
Expand Down
17 changes: 17 additions & 0 deletions data/presets/presets/barrier/turnstile.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"icon": "maki-roadblock",
"fields": [
"access"
],
"geometry": [
"vertex"
],
"terms": [
"baffle gate",
"turnstyle"
],
"tags": {
"barrier": "turnstile"
},
"name": "Turnstile"
}
21 changes: 21 additions & 0 deletions data/presets/presets/type/public_transport/stop_area_group.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"icon": "iD-relation",
"fields": [
"name",
"ref",
"network",
"operator"
],
"geometry": [
"relation"
],
"tags": {
"type": "public_transport",
"public_transport": "stop_area_group"
},
"reference": {
"key": "public_transport",
"value": "stop_area_group"
},
"name": "Transit Stop Area Group"
}
26 changes: 26 additions & 0 deletions data/presets/presets/type/route/monorail.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"icon": "temaki-monorail",
"fields": [
"name",
"ref_route",
"operator",
"network",
"to",
"from"
],
"moreFields" : [
"colour",
"interval",
"opening_hours",
"duration",
"wheelchair"
],
"geometry": [
"relation"
],
"tags": {
"type": "route",
"route": "monorail"
},
"name": "Monorail Route"
}
3 changes: 3 additions & 0 deletions data/taginfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@
{"key": "barrier", "value": "retaining_wall", "description": "🄿 Retaining Wall", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/wall.svg?sanitize=true"},
{"key": "barrier", "value": "stile", "description": "🄿 Stile", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"},
{"key": "barrier", "value": "toll_booth", "description": "🄿 Toll Booth", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"},
{"key": "barrier", "value": "turnstile", "description": "🄿 Turnstile", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"},
{"key": "barrier", "value": "wall", "description": "🄿 Wall", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/wall.svg?sanitize=true"},
{"key": "boundary", "value": "administrative", "description": "🄿 Administrative Boundary", "object_types": ["way"]},
{"key": "bridge:support", "description": "🄿 Bridge Support, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-archway.svg?sanitize=true"},
Expand Down Expand Up @@ -1025,6 +1026,7 @@
{"key": "type", "value": "multipolygon", "description": "🄿 Multipolygon (unsearchable)", "object_types": ["area", "relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/multipolygon.svg?sanitize=true"},
{"key": "type", "value": "boundary", "description": "🄿 Boundary", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/boundary.svg?sanitize=true"},
{"key": "type", "value": "enforcement", "description": "🄿 Enforcement", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/relation.svg?sanitize=true"},
{"key": "public_transport", "value": "stop_area_group", "description": "🄿 Transit Stop Area Group", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/relation.svg?sanitize=true"},
{"key": "type", "value": "restriction", "description": "🄿 Restriction", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/restriction.svg?sanitize=true"},
{"key": "restriction", "value": "no_left_turn", "description": "🄿 No Left Turn", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/restriction-no-left-turn.svg?sanitize=true"},
{"key": "restriction", "value": "no_right_turn", "description": "🄿 No Right Turn", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/restriction-no-right-turn.svg?sanitize=true"},
Expand All @@ -1043,6 +1045,7 @@
{"key": "route", "value": "hiking", "description": "🄿 Hiking Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-hiking.svg?sanitize=true"},
{"key": "route", "value": "horse", "description": "🄿 Riding Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/horse-riding-15.svg?sanitize=true"},
{"key": "route", "value": "light_rail", "description": "🄿 Light Rail Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/light_rail.svg?sanitize=true"},
{"key": "route", "value": "monorail", "description": "🄿 Monorail Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/monorail.svg?sanitize=true"},
{"key": "route", "value": "pipeline", "description": "🄿 Pipeline Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/pipeline-line.svg?sanitize=true"},
{"key": "route", "value": "piste", "description": "🄿 Piste/Ski Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-skiing.svg?sanitize=true"},
{"key": "route", "value": "power", "description": "🄿 Power Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/power-line.svg?sanitize=true"},
Expand Down
12 changes: 12 additions & 0 deletions dist/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -5138,6 +5138,10 @@
"name": "Toll Booth",
"terms": ""
},
"barrier/turnstile": {
"name": "Turnstile",
"terms": "baffle gate,turnstyle"
},
"barrier/wall": {
"name": "Wall",
"terms": ""
Expand Down Expand Up @@ -8410,6 +8414,10 @@
"name": "Enforcement",
"terms": ""
},
"type/public_transport/stop_area_group": {
"name": "Transit Stop Area Group",
"terms": ""
},
"type/restriction": {
"name": "Restriction",
"terms": ""
Expand Down Expand Up @@ -8486,6 +8494,10 @@
"name": "Light Rail Route",
"terms": ""
},
"type/route/monorail": {
"name": "Monorail Route",
"terms": ""
},
"type/route/pipeline": {
"name": "Pipeline Route",
"terms": ""
Expand Down
1 change: 1 addition & 0 deletions modules/ui/preset_icon.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ export function uiPresetIcon(context) {
hiking: ['highway/path', 'highway/path', 'highway/path'],
horse: ['highway/bridleway', 'highway/bridleway', 'highway/bridleway'],
light_rail: ['railway/light_rail', 'railway/light_rail', 'railway/light_rail'],
monorail: ['railway/monorail', 'railway/monorail', 'railway/monorail'],
pipeline: ['man_made/pipeline', 'man_made/pipeline', 'man_made/pipeline'],
piste: ['piste/downhill', 'piste/hike', 'piste/nordic'],
power: ['power/line', 'power/line', 'power/line'],
Expand Down

0 comments on commit 3a27575

Please sign in to comment.