midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added crossing to bicycle_infra

Browse source
This commit is contained in:
Robin van der Linde 2021-07-14 11:40:00 +02:00
parent 6a269a2c6e
commit f4d5557534
6 changed files with 171 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Svg.ts
View file

File diff suppressed because one or more lines are too long

99
assets/layers/crossings/crossings.json Normal file
View file

@ -0,0 +1,99 @@
{
"id": "crossings",
"name": {
"en": "Crossings",
"nl": "Oversteekplaatsen"
},
"description": {
"en": "Crossings for pedestrians and cyclists",
"nl": "Oversteekplaatsen voor voetgangers en fietsers"
},
"source": {
"osmTags": {
"or": ["highway=traffic_signals", "highway=crossing"]
}
},
"minzoom": 14,
"title": {
"render": {
"en": "Crossing",
"nl": "Oversteekplaats"
},
"mappings": [
{
"if": "highway=traffic_signals",
"then": {
"en": "Traffic signal",
"nl": "Verkeerslicht"
}
},
{
"if": "crossing=traffic_signals",
"then": {
"en": "Crossing with traffic signals",
"nl": "Oversteektplaats met verkeerslichten"
}
}
]
},
"icon": {
"render": "./assets/svg/pedestrian_crossing.svg",
"mappings": [
{
"if": {
"or": ["highway=traffic_signals", "crossing=traffic_signals"]
},
"then": "./assets/svg/traffic_lights.svg"
}
]
},
"width": "5",
"tagRenderings": [
{
"question": {
"en": "What kind of crossing is this?",
"nl": "Wat voor oversteekplaats is dit?"
},
"condition": "highway=crossing",
"mappings": [
{
"if": "crossing=uncontrolled",
"then": {
"en": "Crossing, without traffic lights",
"nl": "Oversteekplaats, zonder verkeerslichten"
}
},
{
"if": "crossing=traffic_signals",
"then": {
"en": "Crossing with traffic signals",
"nl": "Oversteekplaats met verkeerslichten"
}
}
]
},
{
"question": {
"en": "Is this crossing also for bicycles?",
"nl": "Is deze oversteekplaats ook voor fietsers"
},
"condition": "highway=crossing",
"mappings": [
{
"if": "bicycle=yes",
"then": {
"en": "A cyclist can use this crossing",
"nl": "Een fietser kan deze oversteekplaats gebruiken"
}
},
{
"if": "bicycle=no",
"then": {
"en": "A cyclist can not use this crossing",
"nl": "Een fietser kan niet deze oversteekplaats gebruiken"
}
}
]
}
]
}

24
assets/svg/license_info.json
View file

@ -81,10 +81,10 @@
},
{
"authors": [
"westnordost"
"Tobias Zwick"
],
"path": "barrier.svg",
"license": "GPL-3.0",
"license": "CC-BY-SA 4.0",
"sources": [
"https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/quest%20icons/barrier.svg"
]
@ -342,6 +342,16 @@
"https://www.vecteezy.com/vector-art/226361-ornaments-and-flourishes"
]
},
{
"authors": [
"Tobias Zwick"
],
"path": "pedestrian_crossing.svg",
"license": "CC-BY-SA 4.0",
"sources": [
"https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/quest%20icons/pedestrian_crossing.svg"
]
},
{
"authors": [],
"path": "star.svg",
@ -366,6 +376,16 @@
"license": "CC0; trivial",
"sources": []
},
{
"authors": [
"Tobias Zwick"
],
"path": "traffic_lights.svg",
"license": "CC-BY-SA 4.0",
"sources": [
"https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/quest%20icons/traffic_lights.svg"
]
},
{
"authors": [],
"path": "logo.svg",

11
assets/svg/pedestrian_crossing.svg Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg version="1.1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
<path d="m128 64c0 35.346-28.654 64-64 64-35.346 0-64-28.654-64-64 0-35.346 28.654-64 64-64 35.346 0 64 28.654 64 64" fill="#529add" stroke-width=".2"/>
<path d="m92.422 79.992 16.697 29.377c3.0226-3.0054 5.7459-6.3104 8.123-9.8672l-14.854-19.51zm-66.023 0.007812-15.354 19.957c2.4026 3.5304 5.1551 6.8008 8.1973 9.7773l17.156-29.734zm17.029 0-16.107 36.416c1.8389 1.2898 3.7449 2.4898 5.7188 3.584h8.9609l11-40zm15.572 0-4.0176 40.004h18l-3.9824-40.004zm16.504 0 10.5 40h8.9961c2.327-1.29 4.5634-2.7231 6.7012-4.2832l-16.02-35.717z" fill-opacity=".2" style="paint-order:stroke fill markers"/>
<path d="m59.018 75.996-4.0176 40.004h18l-3.9824-40.004zm-32.59 0.003906-16.77 21.799c2.3519 3.7733 5.0886 7.2789 8.1504 10.473l18.619-32.271zm17 0-17.459 39.471 1.0312 0.5293h15l11-40zm32.072 0 10.5 40h15l2.0352-1.2988-17.357-38.701zm16.941 0 18.121 31.881c3.0397-3.2242 5.7588-6.7537 8.082-10.555l-16.236-21.326z" fill="#fff" style="paint-order:stroke fill markers"/>
<g shape-rendering="auto">
<path d="m71.299 17.922c-6.887 0-12.545 5.655-12.545 12.543 0 3.3248 1.3636 6.3273 3.502 8.5801-0.80144 0.22851-1.5812 0.5488-2.3047 0.99414l0.58984-0.28906c-4.9491 1.851-9.5049 4.3883-12.953 8.041-3.4482 3.6527-5.6738 8.5251-5.7207 14.236v0.02734c0 4.3407 3.5924 7.9316 7.9316 7.9316 1.4032 0 2.6595-0.47614 3.8105-1.1309-1.0607 2.5391-2.982 4.8594-5.3965 6.9102-3.1794 2.7004-7.0921 4.8263-10.18 6.2305-3.9679 1.7629-5.7943 6.5041-4.0312 10.473v2e-3c1.7636 3.9663 6.504 5.7926 10.473 4.0293l0.09766-0.04297 0.09375-0.04883c7.8911-4.1097 17.996-10.303 22.869-19.449 5.0514 3.4579 9.5237 9.0918 10.295 13.514l-0.017581-0.10356c0.61316 4.3 4.6807 7.343 8.9766 6.7305 4.2955-0.61376 7.3465-4.6749 6.7324-8.9727l-0.0118-0.08204c-2.0863-12.414-10.688-21.564-21.055-26.787-0.01225-0.01706-0.06233-0.07308-0.15039-0.24805-0.11944-0.2373-0.23873-0.7591-0.36133-1.2051 7.4762 3.0887 15.486 4.0441 23.312 0.20312l0.01172-0.0059 0.01172-0.0039c3.8853-1.9415 5.4873-6.7625 3.5469-10.645v-2e-3c-1.9409-3.8803-6.759-5.4882-10.641-3.5468-4.163 2.0536-6.7656 1.5075-9.6387 0.13281-1.6546-0.79165-3.2845-1.954-4.957-3.1621 5.8039-1.0901 10.252-6.207 10.252-12.311 0-6.8876-5.6554-12.543-12.543-12.543z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill-opacity=".18824" image-rendering="auto" solid-color="#000000" stop-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;inline-size:0;isolation:auto;mix-blend-mode:normal;paint-order:stroke fill markers;shape-margin:0;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
<path d="m71.781 14.625c-6.671 0-12.143 5.4725-12.143 12.145 0 3.4881 1.5174 6.6223 3.8984 8.8438-0.88458 0.17673-1.746 0.4518-2.5488 0.88477-4.8413 1.8308-9.2786 4.3242-12.627 7.8711-3.3897 3.5907-5.5652 8.35-5.6113 13.965v0.0254c0 4.1249 3.4097 7.5312 7.5332 7.5312 1.7136 0 3.2302-0.68653 4.5039-1.6699-0.9587 3.044-3.0545 5.7932-5.832 8.1523-3.2238 2.7381-7.168 4.8773-10.277 6.291-3.7706 1.6752-5.5034 6.1761-3.8281 9.9473h0.0016c1.6759 3.7691 6.1742 5.5037 9.9453 3.8281l0.08397-0.03909 0.08397-0.043c7.9725-4.1521 18.147-10.47 22.873-19.682 5.3039 3.4687 10.048 9.3267 10.869 14.033l-0.01563-0.09375c0.58265 4.086 4.4431 6.9747 8.5254 6.3926 4.082-0.58325 6.9761-4.4374 6.3926-8.5215l-0.0042-0.03711-0.0077-0.03711c-2.063-12.275-10.566-21.323-20.852-26.502l-0.08201-0.04102-0.08397-0.03711c0.19424 0.08344 0.06977 0.09376-0.14844-0.33984-0.21824-0.4336-0.46052-1.1958-0.61914-2.0508-0.0042-0.02286 0.0026-0.03949-0.0016-0.0625 7.6188 3.3262 15.77 4.489 23.752 0.57227l0.01173-2e-3 0.0098-0.0059c3.6919-1.8449 5.2131-6.4203 3.3691-10.109l-0.0016-0.0021c-1.8445-3.6875-6.4149-5.2102-10.104-3.3652-4.2669 2.1057-7.0441 1.5444-9.9902 0.13476-1.9932-0.95368-3.9283-2.3906-5.918-3.8086 6.1272-0.59675 10.986-5.7478 10.986-12.023 0-6.6716-5.4729-12.145-12.145-12.145z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#529add" image-rendering="auto" solid-color="#000000" stop-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;inline-size:0;isolation:auto;mix-blend-mode:normal;paint-order:stroke fill markers;shape-margin:0;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
<path d="m71.782 17.624c-5.0493 0-9.1445 4.0943-9.1445 9.1445 0 5.0502 4.0952 9.1428 9.1445 9.1428 5.0502 0 9.1445-4.0926 9.1445-9.1428 0-5.0502-4.0943-9.1445-9.1445-9.1445zm-9.5661 21.614c-9.2519 3.4603-16.386 9.3397-16.466 19.121 0 2.5039 2.0294 4.5316 4.5332 4.5316 2.5044 0 4.5343-2.0279 4.5349-4.5316 0.07516-2.4998 1.135-4.6219 2.6841-6.3176 0.04866 2.2271 0.40401 4.7273 1.1702 7.5012-0.47188 0.78559-0.66893 1.9679-0.48304 3.6966-1.5998 9.2061-11.749 15.196-18.292 18.168-2.2886 1.0168-3.3206 3.6972-2.304 5.9857 1.0175 2.2884 3.6972 3.3208 5.9857 2.304 8.6826-4.522 19.726-11.816 22.905-21.393 7.2127 3.3625 13.962 10.917 15.178 17.889 0.3535 2.479 2.6518 4.1995 5.1308 3.846 2.479-0.35422 4.2019-2.6484 3.8477-5.1275-1.8805-11.189-9.6066-19.469-19.243-24.321-2.7914-1.1991-3.0124-7.7148-2.8551-10.064 8.4551 4.7998 17.123 6.9431 25.701 2.7339 2.2402-1.1194 3.1462-3.844 2.0268-6.0836-1.1202-2.2394-3.8407-3.1469-6.0803-2.0268-10.082 4.9845-16.362-2.6485-21.667-5.7383-1.8977-1.3294-4.4203-1.3334-6.306-0.17263z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#fff" image-rendering="auto" solid-color="#000000" stop-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;inline-size:0;isolation:auto;mix-blend-mode:normal;paint-order:stroke fill markers;shape-margin:0;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 6.4 KiB

22
assets/svg/traffic_lights.svg Normal file
View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg version="1.1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
<path d="m119.42 95.995c-17.67 30.605-56.806 41.092-87.411 23.422-30.605-17.67-41.092-56.806-23.422-87.411 17.67-30.605 56.806-41.092 87.411-23.422 30.605 17.67 41.092 56.806 23.422 87.411" fill="#529add" stroke-width=".19997"/>
<g>
<path d="m43.429 20.007v7.9987h-15.997c-1.0546 12.363 6.0163 12.511 15.997 19.997v7.9987h-15.997c-1.0546 12.363 6.0163 12.511 15.997 19.997v7.9987h-15.997c-1.0546 12.363 6.0163 12.511 15.997 19.997v11.998h39.993v-11.998c9.9811-7.4858 17.052-7.6337 15.997-19.997h-15.997v-7.9987c9.9811-7.4858 17.052-7.6337 15.997-19.997h-15.997v-7.9987c9.9811-7.4858 17.052-7.6337 15.997-19.997h-15.997v-7.9987z" fill-opacity=".2" style="paint-order:stroke fill markers"/>
<path d="m43.429 16.008h39.993v95.984h-39.993z" fill="#888" style="paint-order:stroke fill markers"/>
<path d="m75.536 37.46a11.996 11.996 0 0 1-11.996 11.996 11.996 11.996 0 0 1-11.996-11.996 11.996 11.996 0 0 1 11.996-11.996 11.996 11.996 0 0 1 11.996 11.996" fill="#ff6969" stroke="#555" stroke-width="2.9995" style="paint-order:normal"/>
<path d="m75.54 65.483a11.998 11.998 0 0 1-11.998 11.998 11.998 11.998 0 0 1-11.998-11.998 11.998 11.998 0 0 1 11.998-11.998 11.998 11.998 0 0 1 11.998 11.998" fill="#ffff69" stroke="#555" stroke-width="2.9995" style="paint-order:normal"/>
<path d="m75.522 93.509a11.998 11.998 0 0 1-11.998 11.998 11.998 11.998 0 0 1-11.998-11.998 11.998 11.998 0 0 1 11.998-11.998 11.998 11.998 0 0 1 11.998 11.998" fill="#69ff69" stroke="#555" stroke-width="2.9995" style="paint-order:normal"/>
<path d="m43.429 24.007h-15.997c-1.0546 12.363 6.0163 12.511 15.997 19.997z" fill="#555" fill-rule="evenodd"/>
<path d="m43.429 52.002h-15.997c-1.0546 12.363 6.0163 12.511 15.997 19.997z" fill="#555" fill-rule="evenodd"/>
<path d="m43.429 79.997h-15.997c-1.0546 12.363 6.0163 12.511 15.997 19.997z" fill="#555" fill-rule="evenodd"/>
<path d="m83.422 24.007h15.997c1.0546 12.363-6.0163 12.511-15.997 19.997z" fill="#555" fill-rule="evenodd"/>
<path d="m83.422 52.002h15.997c1.0546 12.363-6.0163 12.511-15.997 19.997z" fill="#555" fill-rule="evenodd"/>
<path d="m83.422 79.997h15.997c1.0546 12.363-6.0163 12.511-15.997 19.997z" fill="#555" fill-rule="evenodd"/>
<path d="m75.529 93.475s-5.3717 7.9483-11.998 7.9483c-6.6263 0-11.987-7.906-11.987-7.906 0 6.6263 5.3606 11.987 11.987 11.987 6.6263 0 11.998-5.4029 11.998-12.029z" fill="#fff" fill-opacity=".37647" style="paint-order:stroke fill markers"/>
<path d="m57.427 111.99h12.063v15.997h-12.063z" fill="#555" style="paint-order:stroke fill markers"/>
<path d="m75.517 65.437s-5.3717 7.9483-11.998 7.9483-11.987-7.906-11.987-7.906c0 6.6263 5.3606 11.987 11.987 11.987s11.998-5.4029 11.998-12.029z" fill="#fff" fill-opacity=".37647" style="paint-order:stroke fill markers"/>
<path d="m75.517 37.442s-5.3717 7.9483-11.998 7.9483-11.987-7.906-11.987-7.906c0 6.6263 5.3606 11.987 11.987 11.987s11.998-5.4029 11.998-12.029z" fill="#fff" fill-opacity=".37647" style="paint-order:stroke fill markers"/>
<path d="m90.532 64.479a27.66 27.66 0 0 1-27.66 27.66 27.66 27.66 0 0 1-27.66-27.66 27.66 27.66 0 0 1 27.66-27.66 27.66 27.66 0 0 1 27.66 27.66" fill="#ffff69" fill-opacity=".26667" style="paint-order:normal"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

10
assets/themes/cycle_infra/cycle_infra.json
View file

@ -635,15 +635,15 @@
},
{
"render": {
"en": "Maximum width: {maxwidth} m",
"nl": "Maximumbreedte: {maxwidth} m"
"en": "Maximum width: {maxwidth:physical} m",
"nl": "Maximumbreedte: {maxwidth:physical} m"
},
"question": {
"en": "How wide is the gap left over besides the barrier?",
"nl": "Hoe breed is de ruimte naast de barrière?"
},
"freeform": {
"key": "maxwidth",
"key": "maxwidth:physical",
"type": "pfloat"
}
},
@ -652,6 +652,7 @@
"en": "What kind of bollard is this?",
"nl": "Wat voor soort paal is dit?"
},
"condition": "barrier=bollard",
"mappings": [
{
"if": "bollard=removable",
@ -691,6 +692,7 @@
]
}
]
}
},
"crossings"
]
}