Robin-van-der-Linde/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

First version of transit/bus theme

Browse source
This commit is contained in:
Robin van der Linde 2022-04-06 21:37:31 +02:00
parent f9e68f5710
commit b4052b8f63
No known key found for this signature in database
GPG key ID: 4B0074A1A79F6BED
12 changed files with 788 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
assets/layers/shelter/license_info.json Normal file
View file

@ -0,0 +1,12 @@
[
{
"path": "shelter.svg",
"license": "MIT",
"authors": [
"Diemen Design"
],
"sources": [
"https://icon-icons.com/icon/map-shelter/158301"
]
}
]

88
assets/layers/shelter/shelter.json Normal file
View file

@ -0,0 +1,88 @@
{
"id": "shelter",
"name": {
"en": "Shelter"
},
"description": {
"en": "Layer showing shelter structures"
},
"source": {
"osmTags": {
"and": [
"amenity=shelter"
]
}
},
"minzoom": 13,
"title": {
"render": {
"en": "Shelter"
}
},
"mapRendering": [
{
"location": [
"point",
"centroid"
],
"icon": "./assets/layers/shelter/shelter.svg"
}
],
"tagRenderings": [
{
"id": "shelter-type",
"mappings": [
{
"if": "shelter_type=public_transport",
"then": {
"en": "This is a shelter at a public transport stop."
}
},
{
"if": "shelter_type=picnic_shelter",
"then": {
"en": "This is a shelter protecting from rain at a picnic site."
}
},
{
"if": "shelter_type=gazebo",
"then": {
"en": "This is a gazebo."
}
},
{
"if": "shelter_type=weather_shelter",
"then": {
"en": "This is a small shelter, primarily intended for short breaks. Usually found in the mountains or alongside roads."
}
},
{
"if": "shelter_type=lean_to",
"then": {
"en": "This is a shed with 3 walls, primarily intended for camping."
}
},
{
"if": "shelter_type=pavilion",
"then": {
"en": "This is a pavilion"
}
},
{
"if": "shelter_type=basic_hut",
"then": "This is a basic hut, providing basic shelter and sleeping facilities."
}
],
"question": {
"en": "What kind of shelter is this?"
},
"render": {
"en": "Shelter type: {shelter_type}"
},
"freeform": {
"key": "shelter_type",
"type": "string"
}
}
]
}

1
assets/layers/shelter/shelter.svg Normal file
View file

@ -0,0 +1 @@
<svg role="img" focusable="false" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 14"><path d="M 4.4352679,0.99999571 3.578125,2.7143027 l 0.4017857,0 0.8973214,-1.71430699 -0.4419642,0 z m 3.4285714,0 -0.8571429,1.71430699 0.4017857,0 0.8973215,-1.71430699 -0.4419643,0 z m 3.4285707,0 -0.857143,1.71430699 0.401786,0 0.897322,-1.71430699 -0.441965,0 z M 1.8571429,2.7143027 1,4.4286098 l 0.4017857,0 0.8989955,-1.7143071 -0.4436383,0 z m 3.4352678,0 -0.8571428,1.7143071 0.4017857,0 0.8973214,-1.7143071 -0.4419643,0 z m 3.4285714,0 -0.8571428,1.7143071 0.4017857,0 0.8973214,-1.7143071 -0.4419643,0 z m 3.4285709,0 -0.857143,1.7143071 0.401786,0 0.897322,-1.7143071 -0.441965,0 z m -9.0066959,1.7143071 -0.8571428,1.714307 0.4017857,0 0.8989955,-1.714307 -0.4436384,0 z m 6.842076,0 -0.8571429,1.714307 0.4017857,0 0.8989951,-1.714307 -0.4436379,0 z M 7,5.2857633 l -6,3.428614 1.7142857,0 0.8571429,-0.3431962 0,4.1853199 0,0.01507 a 0.42857143,0.42857675 0 0 0 0.2059152,0.366634 0.42857143,0.42857675 0 0 0 0.4319196,0.0067 0.42857143,0.42857675 0 0 0 0.219308,-0.373322 l 0,-4.5435832 L 7,7.0000703 l 2.5714286,1.0279145 0,4.5435832 a 0.42857143,0.42857675 0 0 0 0.2059148,0.366634 0.42857143,0.42857675 0 0 0 0.4319206,0.0067 0.42857143,0.42857675 0 0 0 0.219307,-0.37332 l 0,-4.2003869 0.857143,0.3431962 1.714286,0 -6,-3.428614 z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

44
assets/layers/shops/shops.json
View file

@ -412,29 +412,37 @@
"filter": [
{
"id": "shop-type",
"options": [{
"fields": [{
"name": "search",
"type": "string"
}],
"osmTags": "shop~^.*{search}.*$",
"question": {
"en": "Only show shops selling {search}"
"options": [
{
"fields": [
{
"name": "search",
"type": "string"
}
],
"osmTags": "shop~^.*{search}.*$",
"question": {
"en": "Only show shops selling {search}"
}
}
}
]
},
{
"id": "shop-name",
"options": [{
"fields": [{
"name": "search",
"type": "string"
}],
"osmTags": "name~^.*{search}.*$",
"question": {
"en": "Only show shops with name {search}"
"options": [
{
"fields": [
{
"name": "search",
"type": "string"
}
],
"osmTags": "name~^.*{search}.*$",
"question": {
"en": "Only show shops with name {search}"
}
}
}]}
]
}
]
}

141
assets/layers/transit_routes/transit_routes.json Normal file
View file

@ -0,0 +1,141 @@
{
"id": "transit_routes",
"name": {
"en": "Bus lines"
},
"description": {
"en": "Layer showing bus lines"
},
"source": {
"osmTags": {
"and": [
"type=route",
"route=bus"
]
}
},
"minzoom": 15,
"title": {
"render": {
"en": "Bus line"
},
"mappings": [
{
"if": "name~*",
"then": {
"en": "{name}"
}
}
]
},
"mapRendering": [
{
"color": {
"render": {
"en": "#ff0000"
},
"mappings": [
{
"if": "colour~*",
"then": "{colour}"
}
]
}
}
],
"tagRenderings": [
{
"id": "name",
"freeform": {
"key": "name",
"type": "string",
"placeholder": "Bus XX: From => Via => To"
},
"render": "{name}",
"question": {
"en": "What is the name for this bus line? (i.e. Bus XX: From => Via => To)"
}
},
{
"id": "from",
"freeform": {
"key": "from",
"type": "string",
"placeholder": "City, Stop Name"
},
"render": {
"en": "This bus line begins at {from}"
},
"question": {
"en": "What is the starting point for this bus line?"
}
},
{
"id": "via",
"freeform": {
"key": "via",
"type": "string",
"placeholder": "City, Stop Name"
},
"render": {
"en": "This bus line goes via {via}"
},
"question": {
"en": "What is the via point for this bus line?"
}
},
{
"id": "to",
"freeform": {
"key": "to",
"type": "string",
"placeholder": "City, Stop Name"
},
"render": {
"en": "This bus line ends at {to}"
},
"question": {
"en": "What is the ending point for this bus line?"
}
},
{
"id": "colour",
"freeform": {
"key": "colour",
"type": "color"
},
"render": {
"en": "This bus line has the color {colour}"
},
"question": {
"en": "What is the colour for this bus line?"
}
},
{
"id": "network",
"freeform": {
"key": "network",
"type": "string"
},
"render": {
"en": "This bus line is part of the {network} network"
},
"question": {
"en": "What network does this bus line belong to?"
}
},
{
"id": "operator",
"freeform": {
"key": "operator",
"type": "string"
},
"render": {
"en": "This bus line is operated by {operator}"
},
"question": {
"en": "What company operates this bus line?"
}
}
]
}

3
assets/layers/transit_stops/bus_stop.svg Normal file
View file

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 10 10">
<path d="M 2,0 1,1 v 8 h 0.65625 c 0,0 0.1011489,1 0.81275,1 C 3.1581295,10 3.25,9 3.25,9 h 3.5 c 0,0 0.1143421,1 0.781,1 0.8164686,0 0.81275,-1 0.81275,-1 H 9 V 1 L 8,0 Z M 3,1 H 7 V 2 H 3 Z M 2,3 H 8 V 6 H 2 Z M 2,7 H 3 V 8 H 2 Z M 7,7 H 8 V 8 H 7 Z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 348 B

15
assets/layers/transit_stops/license_info.json Normal file
View file

@ -0,0 +1,15 @@
[
{
"path": "bus_stop.svg",
"license": "CC0",
"authors": [
"Andy Allan",
"Michael Glanznig",
"Paul Norman",
"Paul Dicker"
],
"sources": [
"https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/highway/bus_stop.svg"
]
}
]

260
assets/layers/transit_stops/transit_stops.json Normal file
View file

@ -0,0 +1,260 @@
{
"id": "transit_stops",
"name": {
"en": "Transit Stops"
},
"description": {
"en": "Layer showing different types of transit stops."
},
"source": {
"osmTags": {
"or": [
"highway=bus_stop"
]
}
},
"minzoom": 15,
"title": {
"render": {
"en": "Transit Stop"
},
"mappings": [
{
"if": "name~*",
"then": {
"en": "Stop {name}"
}
}
]
},
"mapRendering": [
{
"location": [
"point",
"centroid"
],
"icon": {
"render": "./assets/layers/transit_stops/bus_stop.svg",
"mappings": []
},
"label": "<div style=\"background: white; display: block\">{name}</div>"
}
],
"calculatedTags": [
"_routes=feat.memberships()",
"_contained_routes_properties=feat.memberships().map(p => {return {id: p.relation.id, name: p.relation.properties.name} }).filter((v,i,a)=>a.findIndex(t=>(JSON.stringify(t) === JSON.stringify(v)))===i)",
"_contained_route_ids=JSON.parse(feat.properties._contained_routes_properties ?? '[]').map(p => p.id)",
"_contained_routes=JSON.parse(feat.properties._contained_routes_properties ?? '[]').map(p => `<li><a href='#relation/${p.id}'>${p.name ?? 'bus route'}</a></li>`).join('')",
"_contained_routes_count=JSON.parse(feat.properties._contained_routes_properties ?? '[]').length"
],
"tagRenderings": [
{
"id": "stop_name",
"render": {
"en": "This stop is called <b>{name}</b>"
},
"freeform": {
"key": "name",
"type": "string",
"addExtraTags": [
"noname="
],
"placeholder": {
"en": "Name of the stop"
}
},
"mappings": [
{
"if": {
"and": [
"noname=yes",
"name="
]
},
"then": {
"en": "This stop has no name"
}
}
],
"question": {
"en": "What is the name of this stop?"
},
"placeholder": "Name of the stop"
},
"images",
{
"id": "shelter",
"mappings": [
{
"if": "shelter=yes",
"then": {
"en": "This stop has a shelter"
}
},
{
"if": "shelter=no",
"then": {
"en": "This stop does not have a shelter"
}
},
{
"if": "shelter=separate",
"then": {
"en": "This stop has a shelter, that's separately mapped"
},
"hideInAnswer": true
}
],
"question": {
"en": "Does this stop have a shelter?"
}
},
{
"id": "bench",
"mappings": [
{
"if": "bench=yes",
"then": {
"en": "This stop has a bench"
}
},
{
"if": "bench=no",
"then": {
"en": "This stop does not have a bench"
}
},
{
"if": "bench=separate",
"then": {
"en": "This stop has a bench, that's separately mapped"
},
"hideInAnswer": true
}
],
"question": {
"en": "Does this stop have a bench?"
}
},
{
"id": "bin",
"mappings": [
{
"if": "bin=yes",
"then": {
"en": "This stop has a bin"
}
},
{
"if": "bin=no",
"then": {
"en": "This stop does not have a bin"
}
},
{
"if": "bin=separate",
"then": {
"en": "This stop has a bin, that's separately mapped"
},
"hideInAnswer": true
}
],
"question": {
"en": "Does this stop have a bin?"
}
},
"wheelchair-access",
{
"id": "tactile_paving",
"mappings": [
{
"if": "tactile_paving=yes",
"then": {
"en": "This stop has tactile paving"
}
},
{
"if": "tactile_paving=no",
"then": {
"en": "This stop does not have tactile paving"
}
}
],
"question": {
"en": "Does this stop have tactile paving?"
}
},
{
"id": "lit",
"mappings": [
{
"if": "lit=yes",
"then": {
"en": "This stop is lit"
}
},
{
"if": "lit=no",
"then": {
"en": "This stop is not lit"
}
}
],
"question": {
"en": "Is this stop lit?"
}
},
{
"id": "departures_board",
"mappings": [
{
"if": "departures_board=yes",
"then": {
"en": "This stop has a departures board of unknown type"
},
"hideInAnswer": true
},
{
"if": "departures_board=realtime",
"then": {
"en": "This stop has a board showing realtime departure information"
}
},
{
"if": "passenger_information_display=yes",
"then": {
"en": "This stop has a board showing realtime departure information"
},
"hideInAnswer": true
},
{
"if": "departures_board=timetable",
"then": {
"en": "This stop has a timetable showing regular departures"
}
},
{
"if": "departures_board=interval",
"then": {
"en": "This stop has a timetable containing just the interval between departures"
}
},
{
"if": "departures_board=no",
"then": {
"en": "This stop does not have a departures board"
}
}
]
},
{
"render": {
"en": "<h3>{_contained_routes_count} routes stop at this stop</h3> <ul>{_contained_routes}</ul>"
},
"condition": "_contained_routes~*",
"id": "contained_routes"
}
],
"filter": [],
"allowMove": false
}

8
assets/themes/mapcomplete-changes/mapcomplete-changes.json
View file

@ -231,10 +231,6 @@
"if": "theme=openwindpowermap",
"then": "./assets/themes/openwindpowermap/logo.svg"
},
{
"if": "theme=parking-lanes",
"then": "./assets/svg/bug.svg"
},
{
"if": "theme=parkings",
"then": "./assets/themes/parkings/parkings.svg"
@ -295,6 +291,10 @@
"if": "theme=toilets",
"then": "./assets/themes/toilets/toilets.svg"
},
{
"if": "theme=transit",
"then": "./assets/layers/transit_stops/bus_stop.svg"
},
{
"if": "theme=trees",
"then": "./assets/themes/trees/logo.svg"

51
assets/themes/transit/transit.json Normal file
View file

@ -0,0 +1,51 @@
{
"id": "transit",
"maintainer": "Robin van der Linde",
"version": "20220406",
"title": {
"en": "Bus routes"
},
"description": {
"en": "Plan your trip with the help of the public transport system."
},
"icon": "./assets/layers/transit_stops/bus_stop.svg",
"startZoom": 20,
"startLat": 53.21333,
"startLon": 6.56963,
"layers": [
"transit_stops",
"transit_routes",
{
"builtin": "bike_parking",
"override": {
"minzoom": 19,
"minzoomVisible": 19
}
},
{
"builtin": "parking",
"override": {
"minzoom": 19,
"minzoomVisible": 19
}
},
{
"builtin": "shelter",
"override": {
"minzoom": 19,
"minzoomVisible": 19,
"source": {
"osmTags": {
"and": [
"amenity=shelter",
"shelter_type=public_transport"
]
}
}
},
"hideTagRenderingsWithLabels": [
"shelter-type"
]
}
]
}

183
langs/layers/en.json
View file

@ -4400,6 +4400,39 @@
"render": "Recycling facility"
}
},
"shelter": {
"description": "Layer showing shelter structures",
"name": "Shelter",
"tagRenderings": {
"shelter-type": {
"mappings": {
"0": {
"then": "This is a shelter at a public transport stop."
},
"1": {
"then": "This is a shelter protecting from rain at a picnic site."
},
"2": {
"then": "This is a gazebo."
},
"3": {
"then": "This is a small shelter, primarily intended for short breaks. Usually found in the mountains or alongside roads."
},
"4": {
"then": "This is a shed with 3 walls, primarily intended for camping."
},
"5": {
"then": "This is a pavilion"
}
},
"question": "What kind of shelter is this?",
"render": "Shelter type: {shelter_type}"
}
},
"title": {
"render": "Shelter"
}
},
"shops": {
"deletion": {
"extraDeleteReasons": {
@ -4409,6 +4442,22 @@
}
},
"description": "A shop",
"filter": {
"0": {
"options": {
"0": {
"question": "Only show shops selling {search}"
}
}
},
"1": {
"options": {
"0": {
"question": "Only show shops with name {search}"
}
}
}
},
"name": "Shop",
"presets": {
"0": {
@ -5082,6 +5131,140 @@
"render": "Trail"
}
},
"transit_routes": {
"description": "Layer showing bus lines",
"mapRendering": {
"0": {
"color": {
"render": "#ff0000"
}
}
},
"name": "Bus lines",
"title": {
"mappings": {
"0": {
"then": "{name}"
}
},
"render": "Bus line"
}
},
"transit_stops": {
"description": "Layer showing different types of transit stops.",
"name": "Transit Stops",
"tagRenderings": {
"bench": {
"mappings": {
"0": {
"then": "This stop has a bench"
},
"1": {
"then": "This stop does not have a bench"
},
"2": {
"then": "This stop has a bench, that's separately mapped"
}
},
"question": "Does this stop have a bench?"
},
"bin": {
"mappings": {
"0": {
"then": "This stop has a bin"
},
"1": {
"then": "This stop does not have a bin"
},
"2": {
"then": "This stop has a bin, that's separately mapped"
}
},
"question": "Does this stop have a bin?"
},
"contained_routes": {
"render": "<h3>{_contained_routes_count} routes stop at this stop</h3> <ul>{_contained_routes}</ul>"
},
"departures_board": {
"mappings": {
"0": {
"then": "This stop has a departures board of unknown type"
},
"1": {
"then": "This stop has a board showing realtime departure information"
},
"2": {
"then": "This stop has a board showing realtime departure information"
},
"3": {
"then": "This stop has a timetable showing regular departures"
},
"4": {
"then": "This stop has a timetable containing just the interval between departures"
},
"5": {
"then": "This stop does not have a departures board"
}
}
},
"lit": {
"mappings": {
"0": {
"then": "This stop is lit"
},
"1": {
"then": "This stop is not lit"
}
},
"question": "Is this stop lit?"
},
"shelter": {
"mappings": {
"0": {
"then": "This stop has a shelter"
},
"1": {
"then": "This stop does not have a shelter"
},
"2": {
"then": "This stop has a shelter, that's separately mapped"
}
},
"question": "Does this stop have a shelter?"
},
"stop_name": {
"freeform": {
"placeholder": "Name of the stop"
},
"mappings": {
"0": {
"then": "This stop has no name"
}
},
"question": "What is the name of this stop?",
"render": "This stop is called <b>{name}</b>"
},
"tactile_paving": {
"mappings": {
"0": {
"then": "This stop has tactile paving"
},
"1": {
"then": "This stop does not have tactile paving"
}
},
"question": "Does this stop have tactile paving?"
}
},
"title": {
"mappings": {
"0": {
"then": "Stop {name}"
}
},
"render": "Transit Stop"
}
},
"tree_node": {
"description": "A layer showing trees",
"name": "Tree",

4
langs/themes/en.json
View file

@ -1312,6 +1312,10 @@
"description": "A map of public toilets",
"title": "Open Toilet Map"
},
"transit": {
"description": "Transit",
"title": "Transit"
},
"trees": {
"description": "Map all the trees!",
"shortDescription": "Map all the trees",