Merge pull request 'Few patches, small winter_service theme' (#2356) from Robin-patch-1 into develop

Reviewed-on: MapComplete/MapComplete#2356
This commit is contained in:
Pieter Vander Vennet 2025-03-17 12:23:14 +01:00
commit 214e419e50
38 changed files with 917 additions and 667 deletions

View file

@ -0,0 +1,86 @@
{
"id": "all_streets",
"isCounted": false,
"name": {
"en": "All streets",
"nl": "Alle straten",
"ru": "Все улицы",
"zh_Hant": "所有道路",
"hu": "Minden utca",
"de": "Alle Straßen",
"ca": "Tots els carrers",
"es": "Todas las calles",
"fr": "Toutes les rues",
"nb_NO": "Alle gater",
"da": "Alle gader",
"pa_PK": "ساریاں سڑکاں",
"cs": "Všechny ulice",
"it": "Tutte le strade",
"pl": "Wszystkie ulice",
"ko": "모든 거리"
},
"description": {
"en": "Layer with (almost) all streets",
"nl": "Laag met (bijna) alle straten"
},
"source": {
"osmTags": {
"and": [
"highway!=",
"service!=driveway",
"highway!=platform"
]
}
},
"minzoom": 18,
"title": {
"render": {
"en": "Street",
"nl": "Straat",
"ru": "Улица",
"zh_Hant": "照明",
"hu": "Utca",
"de": "Straße",
"ca": "Carrer",
"nb_NO": "Gate",
"fr": "Rue",
"da": "Gade",
"pa_PK": "سڑک",
"es": "Calle",
"cs": "Ulice",
"eu": "Kalea",
"it": "Strada",
"pl": "Ulica",
"ko": "거리"
},
"mappings": [
{
"if": "name~*",
"then": "{name}"
}
]
},
"tagRenderings": [
"images"
],
"allowSplit": true,
"pointRendering": null,
"lineRendering": [
{
"color": {
"render": "#a9a9a9",
"mappings": [
{
"if": "lit=no",
"then": "#303030"
},
{
"if": "lit=yes",
"then": "#ff0"
}
]
}
}
],
"allowMove": false
}

View file

@ -166,69 +166,44 @@
"tagRenderings": [
"images",
{
"id": "crossing-type",
"id": "signals",
"question": {
"en": "What kind of crossing is this?",
"nl": "Wat voor oversteekplaats is dit?",
"de": "Was ist das für eine Kreuzung?",
"es": "¿Qué tipo de cruce es este?",
"fr": "Quel type de passage piéton est-ce ?",
"ca": "Quin tipus de creuament és aquest?",
"cs": "Co je to za přechod?"
"en": "Are there traffic signals at this crossing?",
"nl": "Zijn er verkeerslichten bij deze oversteekplaats?"
},
"condition": "highway=crossing",
"mappings": [
{
"if": "crossing=uncontrolled",
"if": "crossing:signals=no",
"then": {
"en": "Crossing, without traffic lights",
"nl": "Oversteekplaats, zonder verkeerslichten",
"de": "Kreuzungen ohne Ampeln",
"es": "Cruce, sin semáforos",
"fr": "Passage piéton, sans feux de signalisation",
"ca": "Creuament, sense semàfors",
"cs": "Přechod bez světelné signalizace"
"en": "There are no traffic signals at this crossing",
"nl": "Er zijn geen verkeerslichten bij deze oversteekplaats"
}
},
{
"if": "crossing:signals=yes",
"then": {
"en": "There are traffic signals at this crossing",
"nl": "Er zijn verkeerslichten bij deze oversteekplaats"
},
"icon": {
"class": "small",
"path": "./assets/layers/crossings/traffic_lights.svg"
}
},
{
"if": "crossing=traffic_signals",
"then": {
"en": "Crossing with traffic signals",
"nl": "Oversteekplaats met verkeerslichten",
"de": "Kreuzungen mit Ampeln",
"es": "Cruce con semáforos",
"fr": "Passage piéton avec des feux de signalisation",
"ca": "Creuament amb semàfors",
"cs": "Přechod se světelnou signalizací"
}
},
{
"if": "crossing=zebra",
"then": {
"en": "Zebra crossing",
"nl": "Zebrapad",
"de": "Zebrastreifen",
"ca": "Pas de zebra",
"es": "Paso de peatones",
"fr": "Passage piéton",
"cs": "Zebra přechod"
"en": "There are traffic signals at this crossing",
"nl": "Er zijn verkeerslichten bij deze oversteekplaats"
},
"hideInAnswer": true
},
{
"if": "crossing=unmarked",
"then": {
"en": "Crossing without crossing markings",
"nl": "Oversteekplaats zonder kruispuntmarkeringen",
"de": "Kreuzung ohne Kreuzungsmarkierungen",
"es": "Cruce sin marcas de cruce",
"fr": "Passage piéton sans marquages",
"ca": "Creuament sense senyalitzar",
"cs": "Přechod bez označení přechodu"
"icon": {
"class": "small",
"path": "./assets/layers/crossings/traffic_lights.svg"
},
"hideInAnswer": true
}
]
],
"condition": "highway=crossing"
},
{
"id": "markings",
@ -467,7 +442,9 @@
"fixme=Free-form value used in MapComplete for crossing:markings"
]
},
"multiAnswer": true
"multiAnswer": true,
"condition": "highway=crossing",
"invalidValues": "crossing:markings=yes"
},
{
"id": "crossing-bicycle-allowed",
@ -599,6 +576,13 @@
"cs": "Tento přechod má hmatovou dlažbu, ale ne správně"
},
"hideInAnswer": true
},
{
"if": "tactile_paving=partial",
"then": {
"en": "This crrosing has tactile paving, but only on one side",
"nl": "Deze oversteekplaats heeft een geleidelijn, maar slechts aan één kant"
}
}
]
},
@ -949,4 +933,4 @@
"enableImproveAccuracy": true,
"enableRelocation": false
}
}
}

View file

@ -133,6 +133,98 @@
}
}
]
},
{
"id": "name",
"question": {
"en": "What is the name noted on this guidepost?"
},
"freeform": {
"key": "name",
"type": "string",
"placeholder": {
"en": "Name on the guidepost"
},
"addExtraTags": [
"noname="
]
},
"render": {
"en": "Name noted on the guidepost: {name}"
},
"mappings": [
{
"if": "noname=yes",
"then": {
"en": "There is no name noted on this guidepost"
}
},
{
"addExtraTags": [
"name="
]
}
]
},
{
"id": "ref",
"question": {
"en": "What is the reference number of this guidepost?"
},
"freeform": {
"key": "ref",
"type": "string",
"placeholder": {
"en": "Reference number of the guidepost"
},
"addExtraTags": [
"noref="
]
},
"render": {
"en": "Reference number of the guidepost: {ref}"
},
"mappings": [
{
"if": "noref=yes",
"then": {
"en": "There is no reference number noted on this guidepost"
},
"addExtraTags": [
"ref="
]
}
]
},
{
"id": "ele",
"question": {
"en": "What is the elevation noted on this guidepost?"
},
"freeform": {
"key": "ele",
"type": "float",
"placeholder": {
"en": "Elevation on the guidepost (in meters)"
},
"addExtraTags": [
"noele="
]
},
"render": {
"en": "Elevation noted on the guidepost: {ele} m"
},
"mappings": [
{
"if": "noele=yes",
"then": {
"en": "There is no elevation noted on this guidepost"
},
"addExtraTags": [
"ele="
]
}
]
}
],
"deletion": true,
@ -140,4 +232,4 @@
"enableImproveAccuracy": true,
"enableRelocation": false
}
}
}

View file

@ -21,17 +21,7 @@
"es": "Capa que muestra taquillas para recoger y enviar paquetes."
},
"source": {
"osmTags": {
"or": [
"amenity=parcel_locker",
{
"and": [
"amenity=vending_machine",
"vending=parcel_pickup;parcel_mail_in"
]
}
]
}
"osmTags": "amenity=parcel_locker"
},
"minzoom": 12,
"title": {
@ -259,9 +249,15 @@
"cs": "Z této schránky na balíky <b>nemůžete posílat balíky</b>",
"es": "No puedes enviar paquetes desde esta taquilla"
}
},
{
"if": "parcel_mail_in=returns_only",
"then": {
"en": "You can send packages from this parcel locker, but only for returns",
"nl": "Je kan pakk etten versturen vanuit deze pakketautomaat, maar alleen voor retouren"
}
}
],
"condition": "amenity=parcel_locker"
]
},
{
"id": "pickup",
@ -302,8 +298,7 @@
"es": "No puedes recoger paquetes de esta taquilla"
}
}
],
"condition": "amenity=parcel_locker"
]
}
],
"filter": [
@ -313,4 +308,4 @@
"allowMove": {
"enableImproveAccuracy": true
}
}
}