Restructure layer, added barrier basics

This commit is contained in:
Robin van der Linde 2021-07-13 14:35:29 +02:00
parent fed2936336
commit 7a73f6416b
4 changed files with 299 additions and 186 deletions

12
Svg.ts

File diff suppressed because one or more lines are too long

10
assets/svg/barrier.svg Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg version="1.1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
<path class="st0" d="m128 64a64 64 0 0 1-64 64 64 64 0 0 1-64-64 64 64 0 0 1 64-64 64 64 0 0 1 64 64" fill="#529add"/>
<path d="m31.992 32.08v87.273a64 64 0 0 0 16 6.5293v-93.803z" fill="#666"/>
<path d="m79.992 32.08v93.84a64 64 0 0 0 16-6.582v-87.258z" fill="#666"/>
<path d="m23.992 44.08c-4.456 0-8.0429 3.587-8.0429 8.043v31.914c0 4.456 3.5869 8.043 8.0429 8.043h79.914c4.456 0 8.043-3.587 8.043-8.043v-31.914c0-4.456-3.587-8.043-8.043-8.043z" fill-opacity=".2"/>
<path d="m24.036 40.08h79.913c4.456 0 8.0433 3.5873 8.0433 8.0433v31.913c0 4.456-3.5873 8.0433-8.0433 8.0433h-79.913c-4.456 0-8.0433-3.5873-8.0433-8.0433v-31.913c0-4.456 3.5873-8.0433 8.0433-8.0433z" fill="#fff" style="paint-order:normal"/>
<path d="m23.992 40.08c-3.8167 0-6.9867 2.6476-7.7949 6.2129l28.746 41.787h14.143l-32.332-48zm16.619 0 32.332 48h14.143l-32.332-48zm28 0 32.332 48h3.0488c3.6926 0 6.7759-2.4795 7.7051-5.8691l-28.943-42.131zm28 0 15.381 22v-14c0-4.432-3.568-8-8-8zm-80.619 26v14c0 4.432 3.568 8 8 8h7.0938z" fill="#dd2e44" style="paint-order:normal"/>
<path d="m24.03 40.08h79.924c4.4531 0 8.038 3.5849 8.038 8.038v31.924c0 4.453-3.5849 8.038-8.038 8.038h-79.924c-4.4531 0-8.038-3.5849-8.038-8.038v-31.924c0-4.453 3.5849-8.038 8.038-8.038z" fill="none" stroke="#555" stroke-linecap="round" stroke-linejoin="round" stroke-width="4" style="paint-order:stroke markers fill"/>
</svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

View file

@ -79,6 +79,16 @@
"license": "CC0",
"sources": []
},
{
"authors": [
"westnordost"
],
"path": "barrier.svg",
"license": "GPL-3.0",
"sources": [
"https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/quest%20icons/barrier.svg"
]
},
{
"authors": [
"Github"

View file

@ -28,7 +28,7 @@
"en": "Cycleways",
"nl": "Fietspaden"
},
"minzoom": 12,
"minzoom": 14,
"source": {
"osmTags": {
"or": [
@ -77,6 +77,66 @@
},
"description": {},
"tagRenderings": [
{
"freeform": {
"key": "cycleway",
"addExtraTags": []
},
"question": {
"en": "What kind of cycleway is there?",
"nl": "Wat voor fietspad is hier?"
},
"condition": "highway!=cycleway",
"mappings": [
{
"if": "cycleway=shared_lane",
"then": {
"en": "There is a shared lane",
"nl": "Er is een fietssugestiestrook"
}
},
{
"if": "cycleway=lane",
"then": {
"en": "There is a lane next to the road (seperated with paint)",
"nl": "Er is een fietspad aangrenzend aan de weg (gescheiden met verf)"
}
},
{
"if": "cycleway=track",
"then": {
"en": "There is a track, but no cycleway drawn seperately from this road on the map.",
"nl": "Er is een fietspad (los van de weg), maar geen fietspad afzonderlijk getekend naast deze weg."
}
},
{
"if": "cycleway=seperate",
"then": {
"en": "There is a seperately drawn cycleway",
"nl": "Er is een apart getekend fietspad."
}
},
{
"if": "cyclestreet=yes",
"then": {
"nl": "Dit is een fietsstraat.",
"en": "This is a cyclestreet."
}
},
{
"if": "cycleway=",
"then": {
"en": "There is no cycleway",
"nl": "Er is geen fietspad"
},
"hideInAnswer": true
}
],
"render": {
"en": "Unknown cycleway situation",
"nl": "Onbekende fietspad situatie"
}
},
{
"render": {
"en": "The maximum speed on this road is {maxspeed} km/h",
@ -269,146 +329,6 @@
"en": "What is the carriage width of this road (in meters)?",
"nl": "Hoe breed is de rijbaan in deze straat (in meters)?"
}
}
],
"hideUnderlayingFeaturesMinPercentage": 0,
"icon": {
"render": "./assets/svg/bug.svg"
},
"width": {
"render": "8"
},
"iconSize": {
"render": "40,40,center"
},
"color": {
"render": "#aaaaaa",
"mappings": [
{
"if": "highway=cycleway",
"then": "#00ff00"
},
{
"if": "cycleway=shared_lane",
"then": "#ff0000"
},
{
"if": "cycleway=lane",
"then": "#ff9900"
},
{
"if": "cyclestreet=yes",
"then": "#0000ff"
}
]
},
"presets": []
},
{
"id": "all_streets",
"name": {
"nl": "Alle straten",
"en": "All streets"
},
"description": {
"nl": "Laag waar je nieuwe fietspaden kan aanduiden",
"en": "Layer to mark new cycleways"
},
"source": {
"osmTags": {
"or": [
"highway=residential",
"highway=tertiary",
"highway=unclassified",
"highway=primary",
"highway=secondary"
]
}
},
"minzoom": 18,
"wayHandling": 0,
"title": {
"render": {
"nl": "Straat",
"en": "Street"
},
"mappings": [
{
"if": "name~*",
"then": "{name}"
}
]
},
"icon": "./assets/svg/bug.svg",
"width": "5",
"color": {
"render": "#aaaaaa",
"mappings": []
},
"tagRenderings": []
}
],
"overrideAll": {
"+tagRenderings": [
{
"freeform": {
"key": "cycleway",
"addExtraTags": []
},
"question": {
"en": "Is there a cycleway?",
"nl": "Is er een fietspad?"
},
"condition": "highway!=cycleway",
"mappings": [
{
"if": "cycleway=shared_lane",
"then": {
"en": "There is a shared lane",
"nl": "Er is een fietssugestiestrook"
}
},
{
"if": "cycleway=lane",
"then": {
"en": "There is a lane next to the road (seperated with paint)",
"nl": "Er is een fietspad aangrenzend aan de weg (gescheiden met verf)"
}
},
{
"if": "cycleway=track",
"then": {
"en": "There is a track, but no cycleway drawn seperately from this road on the map.",
"nl": "Er is een fietspad (los van de weg), maar geen fietspad afzonderlijk getekend naast deze weg."
}
},
{
"if": "cycleway=seperate",
"then": {
"en": "There is a seperately drawn cycleway",
"nl": "Er is een apart getekend fietspad."
}
},
{
"if": "cyclestreet=yes",
"then": {
"nl": "Dit is een fietsstraat.",
"en": "This is a cyclestreet."
}
},
{
"if": "cycleway=",
"then": {
"en": "There is no cycleway",
"nl": "Er is geen fietspad"
},
"hideInAnswer": true
}
],
"render": {
"en": "Unknown cycleway situation",
"nl": "Onbekende fietspad situatie"
}
},
{
"render": {
@ -528,6 +448,169 @@
"nl": "Waaruit is het oppervlak van de straat gemaakt?"
}
}
],
"hideUnderlayingFeaturesMinPercentage": 0,
"icon": {
"render": "./assets/svg/bug.svg"
},
"width": {
"render": "8"
},
"iconSize": {
"render": "40,40,center"
},
"color": {
"render": "#aaaaaa",
"mappings": [
{
"if": "highway=cycleway",
"then": "#00ff00"
},
{
"if": "cycleway=shared_lane",
"then": "#ff0000"
},
{
"if": "cycleway=lane",
"then": "#ff9900"
},
{
"if": "cyclestreet=yes",
"then": "#0000ff"
}
]
},
"presets": []
},
{
"id": "all_streets",
"name": {
"nl": "Alle straten",
"en": "All streets"
},
"description": {
"nl": "Laag waar je nieuwe fietspaden kan aanduiden",
"en": "Layer to mark new cycleways"
},
"source": {
"osmTags": {
"or": [
"highway=residential",
"highway=tertiary",
"highway=unclassified",
"highway=primary",
"highway=secondary"
]
}
},
"minzoom": 19,
"wayHandling": 0,
"title": {
"render": {
"nl": "Straat",
"en": "Street"
},
"mappings": [
{
"if": "name~*",
"then": "{name}"
}
]
},
"icon": "./assets/svg/bug.svg",
"width": "5",
"color": {
"render": "#aaaaaa",
"mappings": []
},
"tagRenderings": [
{
"freeform": {
"key": "cycleway",
"addExtraTags": []
},
"question": {
"en": "Is there a cycleway?",
"nl": "Is er een fietspad?"
},
"condition": "highway!=cycleway",
"mappings": [
{
"if": "cycleway=shared_lane",
"then": {
"en": "There is a shared lane",
"nl": "Er is een fietssugestiestrook"
}
},
{
"if": "cycleway=lane",
"then": {
"en": "There is a lane next to the road (seperated with paint)",
"nl": "Er is een fietspad aangrenzend aan de weg (gescheiden met verf)"
}
},
{
"if": "cycleway=track",
"then": {
"en": "There is a track, but no cycleway drawn seperately from this road on the map.",
"nl": "Er is een fietspad (los van de weg), maar geen fietspad afzonderlijk getekend naast deze weg."
}
},
{
"if": "cycleway=seperate",
"then": {
"en": "There is a seperately drawn cycleway",
"nl": "Er is een apart getekend fietspad."
}
},
{
"if": "cyclestreet=yes",
"then": {
"nl": "Dit is een fietsstraat.",
"en": "This is a cyclestreet."
}
},
{
"if": "cycleway=",
"then": {
"en": "There is no cycleway",
"nl": "Er is geen fietspad"
},
"hideInAnswer": true
}
],
"render": {
"en": "Unknown cycleway situation",
"nl": "Onbekende fietspad situatie"
}
}
]
},
{
"id": "barriers",
"name": {
"en": "Barriers",
"nl": "Barrières"
},
"description": {
"en": "Obstacles while cycling, such as bollards and cycle barriers",
"nl": "Hindernissen tijdens het fietsen, zoals paaltjes en fietshekjes"
},
"source": {
"osmTags": {
"or": ["barrier=bollard", "barrier=cycle_barrier"]
}
},
"minzoom": 14,
"title": {
"render": {
"en": "Barrier",
"nl": "Barrière"
}
},
"icon": "./assets/svg/barrier.svg",
"width": "5",
"tagRenderings": []
}
]
}