midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Add icons of toerisme_vlaanderen styling; make maxspeed=30 and motor_vehicle:overtaking=no a belgian-only preset for cyclestreets, fix various consistency bugs and styling tweaks

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-02-04 00:40:30 +01:00
parent e38b14b77a
commit 62b646da99
48 changed files with 1107 additions and 460 deletions
Download patch file Download diff file Expand all files Collapse all files

279
assets/layers/bicycle_rental/bicycle_rental.json Normal file
View file

@ -0,0 +1,279 @@
{
"id": "bicycle_rental",
"name": {
"en": "Bicycle rental",
"nl": "Fietsverhuur"
},
"source": {
"osmTags": {
"or": [
"amenity=bicycle_rental",
"bicycle_rental~*",
"service:bicycle:rental=yes",
"rental~.*bicycle.*"
]
}
},
"minzoom": 12,
"title": {
"render": {
"en": "Bicycle rental",
"nl": "Fietsverhuur"
},
"mappings": [
{
"if": {
"and": [
"name~*"
]
},
"then": {
"en": "{name}",
"nl": "{name}"
}
}
]
},
"description": {
"en": "Bicycle rental stations",
"nl": "Fietsverhuustations"
},
"tagRenderings": [
{
"id": "bicycle_rental_type",
"question": {
"en": "What kind of bicycle rental is this?",
"nl": "Wat voor fietsverhuur is dit?"
},
"mappings": [
{
"if": {
"and": [
"shop=bicycle_rental",
"bicycle_rental=shop"
]
},
"then": {
"en": "This is a shop whose main focus is bicycle rental",
"nl": "Dit is een zaak die focust op fietsverhuur"
}
},
{
"if": {
"and": [
"shop=rental"
]
},
"then": {
"en": "This is a rental buisiness which rents out various objects and/or vehicles. It rents out bicycles too, but this is not the main focus",
"nl": "Dit is een zaak die verschillende voorwerpen en/of voertuigen verhuurt, waaronder ook fietsen; al zijn fietsen niet de hoofdfocus"
},
"hideInAnswer": true
},
{
"if": {
"and": [
"service:bicycle:rental=yes",
"shop=bicycle"
]
},
"then": {
"en": "This is a shop which sells or repairs bicycles, but also rents out bicycles",
"nl": "Dit is een fietsenmaker of fietswinkel die ook fietsen veruurt"
}
},
{
"if": "bicycle_rental=docking_station",
"then": {
"en": "This is an automated docking station, where a bicycle is mechanically locked into a structure",
"nl": "Dit is een docking station waar de fietsen mechanisch in een grotere structuur worden vastgemaakt"
}
},
{
"if": "bicycle_rental=key_dispensing_machine",
"then": {
"en": "A machine is present which dispenses and accepts keys, eventually after authentication and/or payment. The bicycles are parked nearby",
"nl": "Hier is een machine die fietssleutels verdeelt en terugneemt, eventueel na aanmelden of betaling. De fietsen staan in de buurt geparkeerd"
}
},
{
"if": "bicycle_rental=dropoff_point",
"then": {
"en": "This is a dropoff point: a designated bicycle parking for this cycle rental",
"nl": "Dit is een afzetpunt: een parking met duidelijke signalisatie waar (enkel) fietsen van deze fietsverhuur gezet worden"
}
}
]
},
"website",
"email",
"phone",
{
"builtin": "opening_hours",
"override": {
"condition": {
"or": [
"shop~*",
"opening_hours~*"
]
}
}
},
{
"builtin": "payment-options",
"override": {
"condition": "shop~*"
}
},
{
"builtin": "payment-options-advanced",
"override": {
"condition": "shop="
}
},
{
"id": "bicycle-types",
"question": {
"en": "What kind of bicycles and accessories are rented here?",
"nl": "Wat voor soort fietsen en fietstoebehren worden hier verhuurd?"
},
"render": {
"en": "{rental} is rented here",
"nl": "{rental} wordt hier uitgeleend"
},
"freeform": {
"key": "rental"
},
"multiAnswer": true,
"mappings": [
{
"if": "rental=city_bike",
"then": {
"en": "Normal city bikes can be rented here",
"nl": "Gewone stadsfietsen kunnen hier gehuurd worden"
}
},
{
"if": "rental=ebike",
"then": {
"en": "Electrical bikes can be rented here",
"nl": "Elektrische fietsen kunnen hier gehuurd worden"
}
},
{
"if": "rental=bmx",
"then": {
"en": "BMX bikes can be rented here",
"nl": "BMX-fietsen kunnen hier gehuurd worden"
}
},
{
"if": "rental=mtb",
"then": {
"en": "Mountainbikes can be rented here",
"nl": "Mountainbikes kunnen hier gehuurd worden"
}
},
{
"if": "rental=kid_bike",
"then": {
"en": "Bikes for childs can be rented here",
"nl": "Kinderfietsen kunnen hier gehuurd worden"
}
}
]
},
{
"rewrite": {
"sourceString": [
"bicycle_type",
"type_plural"
],
"into": [
[
"city_bike",
{
"en": "city bikes",
"nl": "Stadsfietsen"
}
],
[
"ebike",
{
"en": "electrical bikes",
"nl": "elektrische fietsen"
}
],
[
"kid_bike",
{
"en": "bikes for children",
"nl": "Kinderfietsen"
}
],
[
"bmx",
{
"en": "BMX bikes",
"nl": "BMX-fietsen"
}
],
[
"mtb",
{
"en": "mountainbike",
"nl": "mountainbike"
}
],
[
"bicycle_pannier",
{
"en": "bicycle panniers",
"nl": "Fietstassen"
}
]
]
},
"renderings": [
{
"id": "rental-capacity-bicycle-type",
"group": "",
"question": {
"en": "How much type_plural can be rented here? ",
"nl": "Hoeveel type_plural kunnen hier uitgeleend worden?"
},
"render": {
"en": "{capacity:bicycle_type} type_plural can be rented here",
"nl": "{capacity:bicycle_type} type_plural kunnen hier uitgeleend worden"
},
"freeform": {
"key": "capacity:bicycle_type",
"type": "pnat"
},
"condition": "rental~.*bicycle_type.*"
}
]
}
],
"presets": [],
"mapRendering": [
{
"icon": "./assets/themes/bicycle_rental/logo.svg",
"iconSize": {
"render": "40,40,center"
},
"location": [
"point",
"centroid"
]
},
{
"color": {
"render": "#3333aa88"
},
"width": {
"render": "2"
}
}
]
}

13
assets/layers/bicycle_rental/license_info.json Normal file
View file

@ -0,0 +1,13 @@
[
{
"path": "rental.svg",
"license": "CC0",
"authors": [
"Toerisme Vlaanderen"
],
"sources": [
"https://toerismevlaanderen.be/pinjepunt",
"https://mapcomplete.osm.be/toerisme_vlaanderenn"
]
}
]

1
assets/layers/bicycle_rental/rental.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 141.73 141.73"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#3c3d3c;}</style></defs><g id="Laag_1" data-name="Laag 1"><circle class="cls-1" cx="70.87" cy="70.87" r="70.87"/></g><g id="Laag_2" data-name="Laag 2"><path class="cls-2" d="M102.39,75a18.18,18.18,0,0,0-3.92.43L92.87,57a7,7,0,0,0-6.77-5H80.67v2.59H86.1a4.45,4.45,0,0,1,4.29,3.19l1.72,5.66H55.54l-2-4.89h3.72S62,57.77,62,54.14H46.39v4.33h4.35l2.55,6.25L47.67,76.27A18.31,18.31,0,1,0,59,96.27h8l1-.43L93.33,67.37,96,76.15a18.28,18.28,0,1,0,6.4-1.17ZM41,109a15.72,15.72,0,1,1,5.58-30.4l-7.69,15.8L40,96.27H56.38A15.74,15.74,0,0,1,41,109Zm15.7-15.33H42.07l6.8-14a15.71,15.71,0,0,1,7.8,13.56C56.67,93.42,56.66,93.55,56.65,93.68ZM50,77.39l4.61-9.45,10.5,25.74H59.24c0-.13,0-.26,0-.39A18.33,18.33,0,0,0,50,77.39ZM67.45,92.56,56.59,66H91.13ZM102.39,109a15.71,15.71,0,0,1-5.65-30.38l4.56,15,2.48-.76-4.56-15A15.72,15.72,0,1,1,102.39,109Z"/><path class="cls-2" d="M78.72,40.26a13.89,13.89,0,0,1-5.58,1.25,9.86,9.86,0,0,1-5.6-1.61,9,9,0,0,1-3.39-4.41h9.4l1.07-2.89-.13-.36h-11a2.91,2.91,0,0,1,0-.4v-.57c0-.4,0-.79.05-1.17h12l1.08-2.93L76.36,27H64.13a8.69,8.69,0,0,1,3.48-4.43A10.82,10.82,0,0,1,73.55,21a16.47,16.47,0,0,1,4.55.68l.13,0,1.08-3-.15-.05a16.56,16.56,0,0,0-5.3-.81,14.91,14.91,0,0,0-8.42,2.35A11.73,11.73,0,0,0,60.66,27h-2.3l-1.08,2.93.19.19h2.69c0,.16,0,.32,0,.49v1.23c0,.14,0,.29,0,.42h-1.8L57.28,35.3l.19.19h3.21a12.2,12.2,0,0,0,4.48,6.72,12.47,12.47,0,0,0,7.64,2.46A16.44,16.44,0,0,0,79,43.39l.09,0v-3l-.28-.16Z"/></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

8
assets/layers/bike_repair_station/bike_repair_station.json
View file

@ -760,14 +760,6 @@
"point",
"centroid"
]
},
{
"color": {
"render": "#00f"
},
"width": {
"render": "1"
}
}
],
"description": {

51
assets/layers/binocular/telescope.svg
View file

@ -1,8 +1,45 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<svg xmlns="http://www.w3.org/2000/svg" width="374px" height="342px" viewBox="0 0 374 342" version="1.1">
<g id="surface1">
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.980395%,50.980395%,50.980395%);fill-opacity:1;" d="M 293.472656 24.730469 C 292.90625 23.320312 291.773438 22.21875 290.351562 21.695312 C 288.929688 21.183594 287.347656 21.277344 286.015625 21.984375 L 158.789062 89.125 C 156.394531 90.382812 155.328125 93.238281 156.300781 95.761719 L 158.917969 102.609375 L 85.476562 142.890625 C 83.070312 144.207031 82.054688 147.113281 83.101562 149.625 L 85.539062 155.492188 L 7.542969 192.769531 C 4.980469 194 3.824219 197.011719 4.914062 199.640625 L 20.921875 238.222656 C 21.777344 240.277344 23.753906 241.527344 25.859375 241.527344 C 26.457031 241.527344 27.054688 241.429688 27.644531 241.21875 L 109.121094 212.351562 L 111.558594 218.21875 C 112.402344 220.257812 114.378906 221.519531 116.496094 221.519531 C 116.988281 221.519531 117.480469 221.457031 117.980469 221.304688 L 195.730469 198.894531 L 198.058594 204.976562 C 198.851562 207.082031 200.871094 208.40625 203.027344 208.40625 C 203.550781 208.40625 204.074219 208.332031 204.597656 208.171875 L 343.511719 165.421875 C 344.945312 164.984375 346.121094 163.96875 346.761719 162.621094 C 347.402344 161.273438 347.457031 159.714844 346.902344 158.335938 Z M 28.851562 229.449219 L 16.734375 200.230469 L 89.640625 165.378906 L 105.019531 202.464844 Z M 119.582031 209.722656 L 117.039062 203.585938 L 97.347656 156.082031 L 94.804688 149.957031 L 162.507812 112.816406 L 187.875 178.375 L 191.882812 188.859375 Z M 206.234375 196.488281 L 204.066406 190.816406 C 204.03125 190.695312 204.054688 190.558594 204 190.441406 L 197.398438 173.371094 L 167.96875 96.359375 L 285.757812 34.210938 L 334.824219 156.902344 Z M 206.234375 196.488281 "/>
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.980395%,50.980395%,50.980395%);fill-opacity:1;" d="M 309.5 3.355469 C 308.402344 0.609375 305.28125 -0.714844 302.554688 0.375 C 299.820312 1.476562 298.484375 4.585938 299.574219 7.320312 L 363.6875 167.632812 C 364.53125 169.726562 366.542969 171 368.65625 171 C 369.320312 171 369.992188 170.882812 370.644531 170.617188 C 373.378906 169.515625 374.714844 166.40625 373.625 163.667969 Z M 309.5 3.355469 "/>
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.980395%,50.980395%,50.980395%);fill-opacity:1;" d="M 192.34375 224.4375 L 160.285156 224.4375 C 148.105469 224.4375 138.914062 233.628906 138.914062 245.8125 L 138.914062 259.867188 L 76.09375 333.171875 C 74.167969 335.40625 74.425781 338.78125 76.671875 340.707031 C 77.675781 341.574219 78.914062 342 80.144531 342 C 81.648438 342 83.144531 341.371094 84.191406 340.128906 L 146.714844 267.1875 L 170.972656 267.1875 L 170.972656 336.65625 C 170.972656 339.605469 173.363281 342 176.3125 342 C 179.261719 342 181.65625 339.605469 181.65625 336.65625 L 181.65625 267.1875 L 205.914062 267.1875 L 268.425781 340.128906 C 269.484375 341.371094 270.980469 342 272.484375 342 C 273.714844 342 274.953125 341.574219 275.957031 340.707031 C 278.203125 338.78125 278.460938 335.417969 276.535156 333.171875 L 213.714844 259.867188 L 213.714844 246.613281 C 213.714844 234.183594 204.332031 224.4375 192.34375 224.4375 Z M 203.027344 256.5 L 149.601562 256.5 L 149.601562 245.8125 C 149.601562 239.515625 153.992188 235.125 160.285156 235.125 L 192.34375 235.125 C 198.433594 235.125 203.027344 240.0625 203.027344 246.613281 Z M 203.027344 256.5 "/>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="374"
height="374"
viewBox="0 0 374 374"
version="1.1"
id="svg9"
sodipodi:docname="telescope.svg"
inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs13" />
<sodipodi:namedview
id="namedview11"
pagecolor="#505050"
bordercolor="#eeeeee"
borderopacity="1"
inkscape:pageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="0.55505638"
inkscape:cx="-104.49389"
inkscape:cy="272.04443"
inkscape:current-layer="svg9" />
<g
id="surface1"
transform="translate(0,15.499046)">
<path
style="fill:#7f7f7f;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 293.47266,24.730469 c -0.56641,-1.410157 -1.69922,-2.511719 -3.1211,-3.035157 -1.42187,-0.511718 -3.0039,-0.417968 -4.33594,0.289063 L 158.78906,89.125 c -2.39453,1.257812 -3.46094,4.113281 -2.48828,6.636719 l 2.61719,6.847661 -73.441408,40.28124 c -2.40625,1.31641 -3.421874,4.22266 -2.375,6.73438 l 2.4375,5.86719 -77.996093,37.27734 c -2.5625,1.23047 -3.71875,4.24219 -2.628907,6.87109 l 16.007813,38.58204 c 0.855469,2.05468 2.832031,3.30468 4.9375,3.30468 0.597656,0 1.195313,-0.0977 1.785156,-0.30859 l 81.476559,-28.86719 2.4375,5.86719 c 0.84375,2.03906 2.82032,3.30078 4.9375,3.30078 0.49219,0 0.98438,-0.0625 1.48438,-0.21484 l 77.75,-22.41016 2.32812,6.08203 c 0.79297,2.10547 2.8125,3.42969 4.96875,3.42969 0.52344,0 1.04688,-0.0742 1.57032,-0.23438 l 138.91406,-42.75 c 1.43359,-0.4375 2.60937,-1.45312 3.25,-2.80078 0.64062,-1.34765 0.69531,-2.90625 0.14062,-4.28515 z M 28.851562,229.44922 16.734375,200.23047 l 72.90625,-34.85156 15.378905,37.08593 z m 90.730468,-19.72656 -2.54297,-6.13672 -19.691404,-47.50391 -2.542968,-6.125 67.703122,-37.14062 25.36719,65.55859 4.00781,10.48437 z m 86.65234,-13.23438 -2.16796,-5.67187 c -0.0352,-0.1211 -0.0117,-0.25782 -0.0664,-0.375 L 197.39844,173.37109 167.96875,96.359375 285.75781,34.210938 334.82422,156.90234 Z m 0,0"
id="path2" />
<path
style="fill:#7f7f7f;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 309.5,3.355469 c -1.09766,-2.746094 -4.21875,-4.070313 -6.94531,-2.980469 -2.73438,1.101562 -4.07032,4.210938 -2.98047,6.945312 L 363.6875,167.63281 c 0.84375,2.09375 2.85547,3.36719 4.96875,3.36719 0.66406,0 1.33594,-0.11719 1.98828,-0.38281 2.73438,-1.10157 4.07031,-4.21094 2.98047,-6.94922 z m 0,0"
id="path4" />
<path
style="fill:#7f7f7f;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 192.34375,224.4375 h -32.05859 c -12.17969,0 -21.3711,9.19141 -21.3711,21.375 v 14.05469 l -62.82031,73.30468 c -1.925781,2.23438 -1.667969,5.60938 0.578125,7.53516 1.003906,0.86719 2.242187,1.29297 3.472656,1.29297 1.503907,0 3,-0.62891 4.046875,-1.87109 L 146.71484,267.1875 h 24.25782 v 69.46875 c 0,2.94922 2.39062,5.34375 5.33984,5.34375 2.94922,0 5.34375,-2.39453 5.34375,-5.34375 V 267.1875 h 24.25781 l 62.51172,72.94141 c 1.05859,1.24218 2.55469,1.87109 4.05859,1.87109 1.23047,0 2.46875,-0.42578 3.47266,-1.29297 2.24609,-1.92578 2.50391,-5.28906 0.57813,-7.53516 l -62.82032,-73.30468 v -13.25391 c 0,-12.42969 -9.38281,-22.17578 -21.37109,-22.17578 z M 203.02734,256.5 h -53.42578 v -10.6875 c 0,-6.29688 4.39063,-10.6875 10.6836,-10.6875 h 32.05859 c 6.08984,0 10.68359,4.9375 10.68359,11.48828 z m 0,0"
id="path6" />
</g>
</svg>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Before After
Before After

3
assets/layers/charging_station/charging_station.json
View file

@ -8,12 +8,15 @@
"minzoom": 10,
"source": {
"osmTags": {
"and": [
{
"or": [
"amenity=charging_station",
"disused:amenity=charging_station",
"planned:amenity=charging_station",
"construction:amenity=charging_station"
]
} ]
}
},
"title": {

14
assets/layers/charging_station/charging_station.protojson
View file

@ -7,11 +7,15 @@
"minzoom": 10,
"source": {
"osmTags": {
"or": [
"amenity=charging_station",
"disused:amenity=charging_station",
"planned:amenity=charging_station",
"construction:amenity=charging_station"
"and": [
{
"or": [
"amenity=charging_station",
"disused:amenity=charging_station",
"planned:amenity=charging_station",
"construction:amenity=charging_station"
]
}
]
}
},

10
assets/layers/etymology/etymology.json
View file

@ -9,9 +9,13 @@
"minzoom": 12,
"source": {
"osmTags": {
"or": [
"name:etymology:wikidata~*",
"name:etymology~*"
"and": [
{
"or": [
"name:etymology:wikidata~*",
"name:etymology~*"
]
}
]
}
},

42
assets/layers/play_forest/icon.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before After
Before After

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

@ -321,6 +321,7 @@
},
"id": "shops-opening_hours"
},
"payment-options",
"questions",
"reviews"
],