Merge develop

This commit is contained in:
Pieter Vander Vennet 2023-10-30 16:32:43 +01:00
commit 29ff09024f
287 changed files with 14955 additions and 4036 deletions

View file

@ -27,19 +27,14 @@
"startLat": 51.755515,
"startLon": 14.327545,
"startZoom": 11,
"widenFactor": 0.05,
"clustering": {
"maxZoom": 11,
"minNeededElements": 1000000
},
"layers": [
{
"id": "node2node",
"name": {
"en": "node to node links",
"en": "Node to node links",
"de": "Knotenpunktverbindungen",
"es": "enlaces nodo a nodo",
"nl": "verbindingen van node naar node",
"nl": "Verbindingen van node naar node",
"fr": "liens noeud à noeud",
"ca": "enllaços node a node",
"cs": "propojení mezi uzly",
@ -57,10 +52,10 @@
"minzoom": 12,
"title": {
"render": {
"en": "node to node link",
"en": "Node to node link",
"de": "Knotenpunktverbindung",
"es": "enlace nodo a nodo",
"nl": "node-naar-node verbinding",
"nl": "Node-naar-node verbinding",
"fr": "lien noeud à noeud",
"ca": "Enllaç node a node",
"cs": "propojení mezi uzly",
@ -70,10 +65,10 @@
{
"if": "ref~*",
"then": {
"en": "node to node link <strong>{ref}</strong>",
"en": "Node to node link <strong>{ref}</strong>",
"de": "Knotenpunktverbindung <strong>{ref}</strong>",
"es": "enlace nodo a nodo <strong>{ref}</strong>",
"nl": "node-naar-node verbinding <strong>{ref}</strong>",
"nl": "Node-naar-node verbinding <strong>{ref}</strong>",
"fr": "lien noeud à noeud <strong>{ref}</strong>",
"ca": "Enllaç node a node <strong>{ref}</strong>",
"cs": "propojení mezi uzly <strong>{ref}</strong>",
@ -84,54 +79,47 @@
},
"tagRenderings": [
{
"question": {
"en": "When was this node to node link last surveyed?",
"de": "Wann wurde diese Knotenpunktverbindung zuletzt überprüft?",
"es": "¿Cuándo se sondeó este enlace nodo a nodo por última vez?",
"nl": "Wanneer werd deze node-naar-node verbinding het laast gesurveyed?",
"fr": "Quand cette liaison de nœud à nœud a-t-elle été contrôlée sur le terrain pour la dernière fois ?",
"ca": "Quan es va comprovar per última vegada aquest enllaç node a node presencialment?",
"cs": "Kdy bylo toto propojení mezi uzly naposledy zkontrolováno?",
"pl": "Kiedy ostatnio badano to połączenie węzła z węzłem?"
},
"render": {
"en": "This node to node link was last surveyed on {survey:date}",
"de": "Diese Knotenpunktverbindung wurde zuletzt am {survey:date} überprüft",
"es": "Este enlace nodo a nodo se sondeó por última vez el {survey:date}",
"nl": "Deze node-naar-node verbinding werd het laast gesurveyed op {survey:date}",
"fr": "Cette lien de nœud à nœud a été vérifié sur le terrain le {survey:date}",
"ca": "Aquest enllaç node a node es va sondejar per última vegada el {survey:date}",
"cs": "Toto propojení mezi uzly bylo naposledy zkontrolováno dne {survey:date}",
"pl": "To połączenie węzła z węzłem było ostatnio sprawdzane w dniu {survey:date}"
},
"freeform": {
"key": "survey:date",
"type": "date"
},
"mappings": [
{
"if": "survey:date:={_now:date}",
"then": "Surveyed today!"
"builtin": "survey_date",
"override": {
"question": {
"en": "When was this node to node link last surveyed?",
"de": "Wann wurde diese Knotenpunktverbindung zuletzt überprüft?",
"es": "¿Cuándo se sondeó este enlace nodo a nodo por última vez?",
"nl": "Wanneer werd deze node-naar-node verbinding het laast gesurveyed?",
"fr": "Quand cette liaison de nœud à nœud a-t-elle été contrôlée sur le terrain pour la dernière fois ?",
"ca": "Quan es va comprovar per última vegada aquest enllaç node a node presencialment?",
"cs": "Kdy bylo toto propojení mezi uzly naposledy zkontrolováno?",
"pl": "Kiedy ostatnio badano to połączenie węzła z węzłem?"
},
"render": {
"en": "This node to node link was last surveyed on {survey:date}",
"de": "Diese Knotenpunktverbindung wurde zuletzt am {survey:date} überprüft",
"es": "Este enlace nodo a nodo se sondeó por última vez el {survey:date}",
"nl": "Deze node-naar-node verbinding werd het laast gesurveyed op {survey:date}",
"fr": "Cette lien de nœud à nœud a été vérifié sur le terrain le {survey:date}",
"ca": "Aquest enllaç node a node es va sondejar per última vegada el {survey:date}",
"cs": "Toto propojení mezi uzly bylo naposledy zkontrolováno dne {survey:date}",
"pl": "To połączenie węzła z węzłem było ostatnio sprawdzane w dniu {survey:date}"
}
],
},
"id": "node2node-survey:date"
},
"export_as_gpx"
],
"pointRendering": [],
"lineRendering": [
{}
]
"lineRendering":[{
"width": "4",
"color": "#00a703"
}]
},
{
"id": "node",
"name": {
"en": "nodes",
"en": "Nodes",
"de": "Knotenpunkte",
"ca": "nodes",
"es": "nodos",
"nb_NO": "noder",
"nl": "knooppunten",
"nl": "Knooppunten",
"fr": "noeuds",
"pa_PK": "نوڈ",
"cs": "uzly",
@ -145,14 +133,34 @@
]
}
},
"pointRendering": [
{
"location": [
"point",
"centroid"
],
"label": {
"mappings": [
{
"if": "rcn_ref~*",
"then": "<div style='position: absolute; top: -10px; right: -10px; color: white; background-color: #00a703; width: 20px; height: 20px; border-radius: 100%'>{rcn_ref}</div>"
},
{
"if": "rcn_ref=",
"then": "<div style='position: absolute; top: -10px; right: -10px; color: white; background-color: #00a703; width: 20px; height: 20px; border-radius: 100%'>?</div>"
}
]
}
}
],
"minzoom": 12,
"title": {
"render": {
"en": "cycle node <strong>{rcn_ref}</strong>",
"en": "Cycle node <strong>{rcn_ref}</strong>",
"de": "Knotenpunkt <strong>{rcn_ref}</strong>",
"es": "nodo ciclista <strong>{rcn_ref}</strong>",
"nb_NO": "sykkelnode <strong>{rcn_ref}</strong>",
"nl": "fietsknooppunt <strong>{rcn_ref}</strong>",
"nl": "Fietsknooppunt <strong>{rcn_ref}</strong>",
"fr": "nœud cycliste <strong>{rcn_ref}</strong>",
"ca": "node ciclista <strong>{rcn_ref}</strong>",
"cs": "uzel cyklu <strong>{rcn_ref}</strong>",
@ -161,36 +169,48 @@
},
"tagRenderings": [
{
"id": "node-rxn_ref",
"question": {
"en": "When was this cycle node last surveyed?",
"de": "Wann wurde dieser Fahrradknotenpunkt zuletzt überprüft?",
"es": "¿Cuándo fue sondeado este nodo ciclista por última vez?",
"nl": "Wanneer is dit fietsknooppunt voor het laatst gecontroleerd?",
"fr": "Quand ce nœud cyclable a-t-il été vérifié sur le terrain pour la dernière fois ?",
"ca": "Quan va ser sondejat aquest node ciclista per última vegada?",
"cs": "Kdy byl tento uzel cyklu naposledy zkontrolován?",
"pl": "Kiedy ostatni raz badano ten węzeł rowerowy?"
},
"render": {
"en": "This cycle node was last surveyed on {survey:date}",
"de": "Dieser Fahrradknoten wurde zuletzt überprüft am {survey:date}",
"es": "Este nodo ciclista se sondeó por última vez el {survey:date}",
"nl": "Dit fietsknooppunt is voor het laatst gecontroleerd op {survey:date}",
"fr": "Ce nœud cycliste a été verifié pour la dernière fois le {survey:date}",
"ca": "Aquest node ciclista es va sondejar per última vegada el {survey:date}",
"cs": "Tento uzel cyklu byl naposledy zkontrolován dne {survey:date}",
"pl": "Ten węzeł rowerowy był ostatnio badany w dniu {survey:date}"
"en": "What is the reference number of this cycling node?",
"nl": "Wat is het referentienummer van dit fietsknooppunt?"
},
"freeform": {
"key": "survey:date",
"type": "date"
},
"mappings": [
{
"if": "survey:date:={_now:date}",
"then": "Surveyed today!"
"key": "rcn_ref",
"type": "int",
"placeholder": {
"en": "e.g. 1",
"nl": "bijv. 1"
}
],
},
"render": {
"en": "This cycling node has reference number {rcn_ref}",
"nl": "Dit fietsknooppunt heeft referentienummer {rcn_ref}"
}
},
{
"builtin": "survey_date",
"override": {
"question": {
"en": "When was this cycle node last surveyed?",
"de": "Wann wurde dieser Fahrradknotenpunkt zuletzt überprüft?",
"es": "¿Cuándo fue sondeado este nodo ciclista por última vez?",
"nl": "Wanneer is dit fietsknooppunt voor het laatst gecontroleerd?",
"fr": "Quand ce nœud cyclable a-t-il été vérifié sur le terrain pour la dernière fois ?",
"ca": "Quan va ser sondejat aquest node ciclista per última vegada?",
"cs": "Kdy byl tento uzel cyklu naposledy zkontrolován?",
"pl": "Kiedy ostatni raz badano ten węzeł rowerowy?"
},
"render": {
"en": "This cycle node was last surveyed on {survey:date}",
"de": "Dieser Fahrradknoten wurde zuletzt überprüft am {survey:date}",
"es": "Este nodo ciclista se sondeó por última vez el {survey:date}",
"nl": "Dit fietsknooppunt is voor het laatst gecontroleerd op {survey:date}",
"fr": "Ce nœud cycliste a été verifié pour la dernière fois le {survey:date}",
"ca": "Aquest node ciclista es va sondejar per última vegada el {survey:date}",
"cs": "Tento uzel cyklu byl naposledy zkontrolován dne {survey:date}",
"pl": "Ten węzeł rowerowy był ostatnio badany w dniu {survey:date}"
}
},
"id": "node-survey:date"
},
{
@ -216,19 +236,104 @@
},
"freeform": {
"key": "expected_rcn_route_relations",
"type": "int"
"type": "int",
"placeholder": {
"en": "e.g. 3",
"nl": "bijv. 3"
}
},
"id": "node-expected_rcn_route_relations"
},
"images"
],
"pointRendering": [],
"lineRendering": [
{}
"presets": [
{
"tags": [
"rcn_ref=?",
"network:type=node_network"
],
"title": {
"en": "a cycling node",
"nl": "een fietsknooppunt"
},
"snapToLayer": [
"cycleways_and_roads"
]
}
]
},
{
"builtin": [
"guidepost"
],
"override": {
"minzoom": 16,
"source": {
"osmTags": {
"and": [
"information=guidepost",
"bicycle=yes"
]
}
},
"presets": [
{
"tags": [
"tourism=information",
"information=guidepost",
"bicycle=yes"
]
}
],
"name": {
"en": "Cycling guideposts"
},
"title": {
"render": {
"en": "Cycling guidepost"
}
}
},
"hideTagRenderingsWithLabels": [
"type"
]
},
{
"builtin": "route_marker",
"override": {
"minzoom": 16,
"pointRendering": [
{
"icon": "./assets/themes/cyclenodes/route_marker.svg"
}
],
"presets": [
{
"tags": [
"tourism=information",
"information=route_marker",
"network:type=node_network",
"bicycle=yes"
],
"title": {
"en": "a route marker for a node to node link"
},
"=exampleImages": [
"./assets/layers/route_marker/bicycle_route_marker.jpg"
]
}
]
}
},
{
"builtin": "cycleways_and_roads",
"override": {
"name": null,
"shownByDefault": false
}
}
],
"credits": [
"Sebastian Kürten"
]
}
}

View file

@ -8,5 +8,16 @@
"sources": [
"https://github.com/mobanisto/MapComplete/commit/1aeb1fdb5b09908d67907f3c816152bfebfdcc79"
]
},
{
"path": "route_marker.svg",
"license": "CC0-1.0",
"authors": [
"Robin van der Linde",
"MarianSigler"
],
"sources": [
"https://commons.wikimedia.org/wiki/File:Sinnbild_Radfahrer,_StVO_1992.svg"
]
}
]

View file

@ -15,13 +15,13 @@
</defs>
<g id="surface1">
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(66.666669%,66.666669%,66.666669%);fill-opacity:1;" d="M 171.210938 241.640625 L 203.789062 241.640625 L 203.789062 375 L 171.210938 375 Z M 171.210938 241.640625 "/>
<path style="fill:none;stroke-width:2.645833;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(66.666669%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 55.107742 115.305972 L 12.351349 115.478227 L 5.899374 106.073116 L 12.297606 96.628042 L 55.055376 96.455787 Z M 55.107742 115.305972 " transform="matrix(2.834646,0,0,2.834646,0.0000216266,0)"/>
<path style="fill:none;stroke-width:2.645833;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(66.666669%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 77.183915 96.628042 L 119.940307 96.455787 L 126.392282 105.860898 L 119.994051 115.305972 L 77.23628 115.478227 Z M 77.183915 96.628042 " transform="matrix(2.834646,0,0,2.834646,0.0000216266,0)"/>
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(66.666669%,0%,0%);fill-opacity:1;" d="M 97.707031 25.722656 L 277.292969 25.722656 C 287.296875 25.722656 295.40625 33.832031 295.40625 43.835938 L 295.40625 223.527344 C 295.40625 233.53125 287.296875 241.640625 277.292969 241.640625 L 97.707031 241.640625 C 87.703125 241.640625 79.59375 233.53125 79.59375 223.527344 L 79.59375 43.835938 C 79.59375 33.832031 87.703125 25.722656 97.707031 25.722656 Z M 97.707031 25.722656 "/>
<path style="fill:none;stroke-width:2.645833;stroke-linecap:round;stroke-linejoin:round;stroke:#00a703;stroke-opacity:1;stroke-miterlimit:4;" d="M 55.107742 115.305972 L 12.351349 115.478227 L 5.899374 106.073116 L 12.297606 96.628042 L 55.055376 96.455787 Z M 55.107742 115.305972 " transform="matrix(2.834646,0,0,2.834646,0.0000216266,0)"/>
<path style="fill:none;stroke-width:2.645833;stroke-linecap:round;stroke-linejoin:round;stroke:#00a703;stroke-opacity:1;stroke-miterlimit:4;" d="M 77.183915 96.628042 L 119.940307 96.455787 L 126.392282 105.860898 L 119.994051 115.305972 L 77.23628 115.478227 Z M 77.183915 96.628042 " transform="matrix(2.834646,0,0,2.834646,0.0000216266,0)"/>
<path style=" stroke:none;fill-rule:nonzero;fill:#00a703;fill-opacity:1;" d="M 97.707031 25.722656 L 277.292969 25.722656 C 287.296875 25.722656 295.40625 33.832031 295.40625 43.835938 L 295.40625 223.527344 C 295.40625 233.53125 287.296875 241.640625 277.292969 241.640625 L 97.707031 241.640625 C 87.703125 241.640625 79.59375 233.53125 79.59375 223.527344 L 79.59375 43.835938 C 79.59375 33.832031 87.703125 25.722656 97.707031 25.722656 Z M 97.707031 25.722656 "/>
<path style="fill:none;stroke-width:1.314561;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(94.509804%,94.509804%,94.509804%);stroke-opacity:1;stroke-miterlimit:4;" d="M 79.472401 210.601225 C 79.472401 220.491246 71.454946 228.508701 61.564925 228.508701 C 51.674905 228.508701 43.657449 220.491246 43.657449 210.601225 C 43.657449 200.71206 51.674905 192.694605 61.564925 192.694605 C 71.454946 192.694605 79.472401 200.71206 79.472401 210.601225 Z M 79.472401 210.601225 " transform="matrix(4.56426,0,0,4.56426,-93.49832,-827.55904)"/>
<g style="fill:rgb(100%,100%,100%);fill-opacity:1;">
<use xlink:href="#glyph0-1" x="135.285156" y="167.144332"/>
<use xlink:href="#glyph0-2" x="190.056275" y="167.144332"/>
</g>
</g>
</svg>
</svg>

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

Before After
Before After

View file

@ -0,0 +1,8 @@
<svg width="500" height="700" viewBox="0 0 500 700" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="500" height="700" rx="50" fill="#D9D9D9"/>
<rect x="32.5" y="32.5" width="435" height="635" rx="42.5" stroke="#00A703" stroke-width="15"/>
<path d="M125 185C116.716 185 110 191.716 110 200C110 208.284 116.716 215 125 215V185ZM385.607 210.607C391.464 204.749 391.464 195.251 385.607 189.393L290.147 93.934C284.289 88.0761 274.792 88.0761 268.934 93.934C263.076 99.7918 263.076 109.289 268.934 115.147L353.787 200L268.934 284.853C263.076 290.711 263.076 300.208 268.934 306.066C274.792 311.924 284.289 311.924 290.147 306.066L385.607 210.607ZM125 215H375V185H125V215Z" fill="#00A703"/>
<path d="M150.25 599.5C181.371 599.5 206.6 574.271 206.6 543.15C206.6 512.029 181.371 486.8 150.25 486.8C119.129 486.8 93.9 512.029 93.9 543.15C93.9 574.271 119.129 599.5 150.25 599.5Z" stroke="#00A703" stroke-width="14"/>
<path d="M351.5 598.45C382.621 598.45 407.85 573.221 407.85 542.1C407.85 510.979 382.621 485.75 351.5 485.75C320.379 485.75 295.15 510.979 295.15 542.1C295.15 573.221 320.379 598.45 351.5 598.45Z" stroke="#00A703" stroke-width="14"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M225.32 405.413C178.921 405.866 186.79 400.62 161.827 480.845C141.491 544.944 143.706 537.954 143.6 542.45C143.525 545.943 146.345 548.713 149.888 548.95C157.257 548.205 154.158 549.747 179.705 470.413C273.054 568.888 238.032 552.919 288.269 554.919C354.294 554.286 359.66 558.356 360.444 548.678C360.354 545.392 358.816 543.432 313.503 442.586L317.845 430.648L332.768 430.376L332.225 417.895H276.602C271.688 424.618 278.592 424.588 303.464 430.105L299.123 442.315L188.147 442.586C195.623 416.478 191.403 418.106 225.048 418.166L225.32 405.413ZM184.94 455.969L293.532 455.776L262.148 540.108L184.94 455.969ZM306.625 460.975L275.819 541.841L343.207 542.034L306.625 460.975Z" fill="#00A703"/>
</svg>

After

Width:  |  Height:  |  Size: 1.9 KiB

View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Robin van der Linde; MarianSigler
SPDX-License-Identifier: CC0-1.0