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

Merge pull request 'Some fixes' (#2364) from Robin-patch-2 into develop

Browse source 
Reviewed-on: MapComplete/MapComplete#2364
Reviewed-by: Pieter Vander Vennet <pietervdvn@posteo.net>
This commit is contained in:
Pieter Vander Vennet 2025-03-30 23:54:02 +02:00
commit aa09b21bcb
27 changed files with 387 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

26
assets/layers/atm/atm.json
View file

@ -241,6 +241,30 @@
}
},
"opening_hours_24_7",
{
"builtin": "indoor",
"override": {
"question": {
"en": "Is this ATM located indoors?",
"nl": "Bevindt deze geldautomaat zich binnen?"
},
"mappings": [
{
"then": {
"en": "This ATM is located indoors",
"nl": "Deze geldautomaat bevindt zich binnen"
}
},
{
"if": "indoor=no",
"then": {
"en": "This ATM is located outdoors",
"nl": "Deze geldautomaat bevindt zich buiten"
}
}
]
}
},
{
"id": "cash_out",
"question": {
@ -650,4 +674,4 @@
"enableImproveAccuracy": true,
"enableRelocation": false
}
}
}

25
assets/layers/hydrant/hydrant.json
View file

@ -574,6 +574,29 @@
"es": "Diámetro de los acoplamientos: {couplings:diameters}"
}
},
{
"id": "ref",
"question": {
"en": "What is the reference number of this hydrant?",
"nl": "Wat is het referentienummer van deze brandkraan?"
},
"questionHint": {
"en": "This can usually be found on the hydrant or on a nearby sign.",
"nl": "Dit nummer is meestal te vinden op de brandkraan of op een nabijgelegen bord."
},
"freeform": {
"key": "ref",
"placeholder": {
"en": "Reference number of the hydrant",
"nl": "Referentienummer van de brandkraan"
},
"type": "string"
},
"render": {
"en": "Reference number: {ref}",
"nl": "Referentienummer: {ref}"
}
},
"images"
],
"allowMove": {
@ -590,4 +613,4 @@
}
}
]
}
}

58
assets/layers/street_lamps/street_lamps.json
View file

@ -82,6 +82,26 @@
],
"tagRenderings": [
"images",
{
"id": "utility_pole",
"question": {
"en": "Is this lamp mounted on a utility pole?"
},
"mappings": [
{
"if": "man_made=utility_pole",
"then": {
"en": "This lamp is mounted on a utility pole"
}
},
{
"if": "man_made=",
"then": {
"en": "This lamp is not mounted on a utility pole"
}
}
]
},
{
"id": "ref",
"render": {
@ -104,7 +124,10 @@
},
"freeform": {
"key": "ref"
}
},
"labels": [
"street_lamp_question"
]
},
{
"id": "support",
@ -194,6 +217,10 @@
"cs": "Toto svítidlo se montuje na stěnu pomocí kovové tyče"
}
}
],
"condition": "man_made!=utility_pole",
"labels": [
"street_lamp_question"
]
},
{
@ -206,7 +233,12 @@
"ca": "Com està muntat aquest fanal al pal?",
"cs": "Jak se tato lampa montuje na sloup?"
},
"condition": "support=pole",
"condition": {
"and": [
"support=pole",
"man_made!=utility_pole"
]
},
"mappings": [
{
"if": "lamp_mount=straight_mast",
@ -230,6 +262,9 @@
"cs": "Tato lampa je umístěna na konci ohnutého stožáru"
}
}
],
"labels": [
"street_lamp_question"
]
},
{
@ -376,6 +411,9 @@
"cs": "Tato lampa svítí pomocí plynu"
}
}
],
"labels": [
"street_lamp_question"
]
},
{
@ -434,6 +472,9 @@
"cs": "Tato lampa vydává oranžové světlo"
}
}
],
"labels": [
"street_lamp_question"
]
},
{
@ -482,6 +523,9 @@
"es": "Esta lámpara tiene 2 accesorios"
}
}
],
"labels": [
"street_lamp_question"
]
},
{
@ -539,6 +583,9 @@
"cs": "Tato lampa se rozsvítí na základě požadavku (např. pomocí tlačítka)"
}
}
],
"labels": [
"street_lamp_question"
]
},
{
@ -563,7 +610,10 @@
"freeform": {
"key": "light:direction",
"type": "direction"
}
},
"labels": [
"street_lamp_question"
]
}
],
"deletion": {},
@ -571,4 +621,4 @@
"enableImproveAccuracy": true,
"enableRelocation": false
}
}
}

10
assets/layers/utility_pole/license_info.json Normal file
View file

@ -0,0 +1,10 @@
[
{
"path": "utility_pole.svg",
"license": "CC0-1.0",
"authors": [
"Robin van der Linde"
],
"sources": []
}
]

65
assets/layers/utility_pole/utility_pole.json Normal file
View file

@ -0,0 +1,65 @@
{
"id": "utility_pole",
"name": {
"en": "Utility Poles"
},
"source": {
"osmTags": "man_made=utility_pole"
},
"title": {
"en": "Utility Pole"
},
"description": {
"en": "Layer showing various types of utility poles."
},
"tagRenderings": [
{
"id": "street_lamp",
"question": {
"en": "Does this utility pole have a street lamp mounted on it?"
},
"mappings": [
{
"if": "highway=street_lamp",
"then": {
"en": "This utility pole has a street lamp mounted on it."
}
},
{
"if": "highway=",
"then": {
"en": "This utility pole does not have a street lamp mounted on it."
}
}
]
}
],
"presets": [
{
"tags": [
"man_made=utility_pole"
],
"title": {
"en": "a utility pole"
}
}
],
"pointRendering": [
{
"marker": [
{
"icon": "./assets/layers/utility_pole/utility_pole.svg"
}
],
"location": [
"point",
"centroid"
]
}
],
"minzoom": 18,
"allowMove": {
"enableImproveAccuracy": true,
"enableRelocation": false
}
}

82
assets/layers/utility_pole/utility_pole.svg Normal file
View file

@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="500"
height="500"
viewBox="0 0 500 500"
fill="none"
version="1.1"
id="svg6"
sodipodi:docname="utility_pole.svg"
inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
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="defs6" />
<sodipodi:namedview
id="namedview6"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="0.46831027"
inkscape:cx="25.624038"
inkscape:cy="541.30779"
inkscape:window-width="1704"
inkscape:window-height="996"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg6" />
<g
id="g6"
transform="matrix(1.3262599,0,0,1.3262599,150.53051,8.85e-6)">
<rect
x="62"
y="27"
width="25"
height="350"
fill="#000000"
id="rect1" />
<rect
y="0"
width="15"
height="150"
transform="rotate(-90)"
fill="#000000"
id="rect2"
x="-27" />
<rect
x="4"
width="8"
height="12"
fill="#000000"
id="rect3"
y="0" />
<rect
x="15"
width="8"
height="12"
fill="#000000"
id="rect4"
y="0" />
<rect
x="127"
width="8"
height="12"
fill="#000000"
id="rect5"
y="0" />
<rect
x="138"
width="8"
height="12"
fill="#000000"
id="rect6"
y="0" />
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

2
assets/layers/utility_pole/utility_pole.svg.license Normal file
View file

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

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

@ -280,7 +280,11 @@
"render": {
"en": "This shrine is {religion}"
},
"condition": "historic!=wayside_cross"
"condition": {
"and": [
"historic!=wayside_cross"
]
}
},
{
"question": {
@ -493,4 +497,4 @@
},
"credits": "Bastian Greshake Tzovaras",
"credits:uid": 20617622
}
}

31
assets/themes/pets/pets.json
View file

@ -98,6 +98,35 @@
"name": null
}
},
{
"builtin": "shops",
"override": {
"id": "pet_shops",
"name": {
"en": "Pet stores",
"nl": "Dierenwinkels"
},
"=presets": [
{
"tags": [
"shop=pet"
],
"title": {
"en": "a pet shop",
"nl": "een dierenwinkel"
}
}
],
"source": {
"osmTags": {
"and": [
"shop=pet"
]
}
},
"=filter": []
}
},
{
"builtin": "shops",
"override": {
@ -185,4 +214,4 @@
}
}
]
}
}

14
assets/themes/street_lighting/street_lighting.json
View file

@ -45,6 +45,20 @@
],
"layers": [
"street_lamps",
{
"builtin": "utility_pole",
"override": {
"tagRenderings+": [
{
"builtin": "street_lamps.street_lamp_question",
"override": {
"condition": "highway=street_lamp"
}
}
],
"shownByDefault": false
}
},
{
"id": "lit_streets",
"name": {

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

@ -15,7 +15,13 @@
],
"hideFromOverview": true,
"layers": [
"street_lamps",
{
"builtin": "street_lamps",
"hideTagRenderingsWithLabels": [
"utility_pole"
],
"override": {}
},
{
"id": "assen",
"name": "Dataset Assen",
@ -76,4 +82,4 @@
}
}
]
}
}

6
langs/themes/ca.json
View file

@ -755,7 +755,7 @@
"name": "Restaurants que accepten gossos"
}
},
"6": {
"7": {
"override": {
"name": "Botigues amigues dels gossos"
}
@ -873,7 +873,7 @@
"street_lighting": {
"description": "En aquest mapa pots trobar tot el relacionat amb l'enllumenat públic",
"layers": {
"1": {
"2": {
"name": "Il·luminació de carrers",
"tagRenderings": {
"lit": {
@ -898,7 +898,7 @@
"render": "Il·luminació del carrer"
}
},
"2": {
"3": {
"override": {
"tagRenderings+": {
"0": {

8
langs/themes/cs.json
View file

@ -1048,12 +1048,12 @@
"name": "Restaurace vhodné pro vstup se psy"
}
},
"6": {
"7": {
"override": {
"name": "Obchody vhodné pro vstup se psy"
}
},
"8": {
"9": {
"override": {
"name=": "Odpadkové koše se sáčky na exkrementy"
}
@ -1231,7 +1231,7 @@
"street_lighting": {
"description": "Na této mapě najdete vše o pouličním osvětlení",
"layers": {
"1": {
"2": {
"name": "Osvětlené ulice",
"tagRenderings": {
"lit": {
@ -1256,7 +1256,7 @@
"render": "Osvětlená ulice"
}
},
"2": {
"3": {
"override": {
"tagRenderings+": {
"0": {

6
langs/themes/da.json
View file

@ -598,7 +598,7 @@
"name": "Hundevenlige madsteder"
}
},
"6": {
"7": {
"override": {
"name": "hundevenlig butik"
}
@ -684,7 +684,7 @@
"street_lighting": {
"description": "På dette kort kan du finde alt om gadebelysning",
"layers": {
"1": {
"2": {
"name": "Oplyste gader",
"tagRenderings": {
"lit": {
@ -709,7 +709,7 @@
"render": "Oplyst gade"
}
},
"2": {
"3": {
"override": {
"tagRenderings+": {
"0": {

8
langs/themes/de.json
View file

@ -1034,12 +1034,12 @@
"name": "Hundefreundliche Restaurants"
}
},
"6": {
"7": {
"override": {
"name": "Hundefreundliche Geschäfte"
}
},
"8": {
"9": {
"override": {
"name=": "Mülleimer mit Spender für Kotbeutel"
}
@ -1212,7 +1212,7 @@
"street_lighting": {
"description": "Eine Karte für alles zum Thema Straßenbeleuchtung",
"layers": {
"1": {
"2": {
"name": "Beleuchtete Straßen",
"tagRenderings": {
"lit": {
@ -1237,7 +1237,7 @@
"render": "Beleuchtete Straße"
}
},
"2": {
"3": {
"override": {
"tagRenderings+": {
"0": {

16
langs/themes/en.json
View file

@ -1073,11 +1073,21 @@
}
},
"6": {
"override": {
"=presets": {
"0": {
"title": "a pet shop"
}
},
"name": "Pet stores"
}
},
"7": {
"override": {
"name": "Dog-friendly shops"
}
},
"8": {
"9": {
"override": {
"name=": "Waste baskets with excrement bag dispensers"
}
@ -1255,7 +1265,7 @@
"street_lighting": {
"description": "On this map you can find everything about street lighting",
"layers": {
"1": {
"2": {
"name": "Lit streets",
"tagRenderings": {
"lit": {
@ -1280,7 +1290,7 @@
"render": "Lit street"
}
},
"2": {
"3": {
"override": {
"tagRenderings+": {
"0": {

6
langs/themes/es.json
View file

@ -1008,7 +1008,7 @@
"name": "Restaurantes que admiten perros"
}
},
"6": {
"7": {
"override": {
"name": "Tiendas que admiten perros"
}
@ -1156,7 +1156,7 @@
"street_lighting": {
"description": "En este mapa puedes encontrar todo sobre el alumbrado público",
"layers": {
"1": {
"2": {
"name": "Calles iluminadas",
"tagRenderings": {
"lit": {
@ -1181,7 +1181,7 @@
"render": "Calle iluminada"
}
},
"2": {
"3": {
"override": {
"tagRenderings+": {
"0": {

6
langs/themes/fr.json
View file

@ -834,7 +834,7 @@
"name": "Restaurants acceptant les chiens"
}
},
"6": {
"7": {
"override": {
"name": "Magasins acceptant les chiens"
}
@ -956,7 +956,7 @@
"street_lighting": {
"description": "Retrouvez tout ce qui touche à l’éclairage de rue sur cette carte",
"layers": {
"1": {
"2": {
"name": "Rues éclairées",
"tagRenderings": {
"lit": {
@ -981,7 +981,7 @@
"render": "Rue éclairée"
}
},
"2": {
"3": {
"override": {
"tagRenderings+": {
"0": {

4
langs/themes/hu.json
View file

@ -405,7 +405,7 @@
"street_lighting": {
"description": "Ezen a térképen minden megtalálható, ami a közvilágítással kapcsolatos",
"layers": {
"1": {
"2": {
"name": "Kivilágított utcák",
"tagRenderings": {
"lit": {
@ -430,7 +430,7 @@
"render": "Kivilágított utca"
}
},
"2": {
"3": {
"override": {
"tagRenderings+": {
"0": {

6
langs/themes/it.json
View file

@ -471,7 +471,7 @@
"name": "Ristoranti che accettano i cani"
}
},
"6": {
"7": {
"override": {
"name": "Negozi che accettano i cani"
}
@ -540,7 +540,7 @@
"street_lighting": {
"description": "Su questa mappa puoi trovare tutto ciò che riguarda l'illuminazione stradale",
"layers": {
"1": {
"2": {
"name": "Strade illuminate",
"tagRenderings": {
"lit": {
@ -565,7 +565,7 @@
"render": "Strada illuminata"
}
},
"2": {
"3": {
"override": {
"tagRenderings+": {
"0": {

6
langs/themes/ko.json
View file

@ -994,7 +994,7 @@
"name": "반려견 친화적 식당"
}
},
"6": {
"7": {
"override": {
"name": "반려견 친화적 상점"
}
@ -1142,7 +1142,7 @@
"street_lighting": {
"description": "이 지도에서 가로등에 관한 모든 것을 찾을 수 있습니다",
"layers": {
"1": {
"2": {
"name": "조명이 있는 거리",
"tagRenderings": {
"lit": {
@ -1167,7 +1167,7 @@
"render": "밝은 거리"
}
},
"2": {
"3": {
"override": {
"tagRenderings+": {
"0": {

6
langs/themes/nb_NO.json
View file

@ -349,7 +349,7 @@
"name": "Hundevennlige spisesteder"
}
},
"6": {
"7": {
"override": {
"name": "Hundevennlige butikker"
}
@ -414,7 +414,7 @@
"street_lighting": {
"description": "Alt om gatebelysning",
"layers": {
"1": {
"2": {
"name": "Belyste gater",
"tagRenderings": {
"lit": {
@ -439,7 +439,7 @@
"render": "Belyst gate"
}
},
"2": {
"3": {
"override": {
"tagRenderings+": {
"0": {

16
langs/themes/nl.json
View file

@ -1093,11 +1093,21 @@
}
},
"6": {
"override": {
"=presets": {
"0": {
"title": "een dierenwinkel"
}
},
"name": "Dierenwinkels"
}
},
"7": {
"override": {
"name": "Hondvriendelijke winkels"
}
},
"8": {
"9": {
"override": {
"name=": "Vuilnisbakken met verdelers voor hondenpoepzakjes"
}
@ -1291,7 +1301,7 @@
"street_lighting": {
"description": "Op deze kaart vind je alles over straatlantaarns",
"layers": {
"1": {
"2": {
"name": "Verlichte straten",
"tagRenderings": {
"lit": {
@ -1316,7 +1326,7 @@
"render": "Verlichte straat"
}
},
"2": {
"3": {
"override": {
"tagRenderings+": {
"0": {

4
langs/themes/pa_PK.json
View file

@ -131,7 +131,7 @@
},
"pets": {
"layers": {
"6": {
"7": {
"override": {
"name": "کُتیاں دی اِجازت دیاں دکاناں"
}
@ -153,7 +153,7 @@
},
"street_lighting": {
"layers": {
"1": {
"2": {
"name": "روشنی والیاں سڑکاں",
"title": {
"render": "روشنی والی سڑک"

6
langs/themes/pl.json
View file

@ -711,7 +711,7 @@
"name": "Restauracje przyjazne psom"
}
},
"6": {
"7": {
"override": {
"name": "Sklepy przyjazne psom"
}
@ -829,7 +829,7 @@
"street_lighting": {
"description": "Na tej mapie możesz znaleźć wszystko o oświetleniu ulicznym",
"layers": {
"1": {
"2": {
"name": "Oświetlone ulice",
"tagRenderings": {
"lit": {
@ -854,7 +854,7 @@
"render": "Ulica oświetlona"
}
},
"2": {
"3": {
"override": {
"tagRenderings+": {
"0": {

4
langs/themes/uk.json
View file

@ -514,12 +514,12 @@
"name": "Заклади харчування, дружні до собак"
}
},
"6": {
"7": {
"override": {
"name": "Магазини, дружні до собак"
}
},
"8": {
"9": {
"override": {
"name=": "Кошики для сміття з дозаторами для пакетів для екскрементів"
}

6
langs/themes/zh_Hant.json
View file

@ -678,7 +678,7 @@
"name": "寵物友善餐廳"
}
},
"6": {
"7": {
"override": {
"name": "寵物友善商家"
}
@ -781,7 +781,7 @@
"street_lighting": {
"description": "在這份地圖你可以找到任何有關路燈的事情",
"layers": {
"1": {
"2": {
"name": "有照明的道路",
"tagRenderings": {
"lit": {
@ -806,7 +806,7 @@
"render": "照明道路"
}
},
"2": {
"3": {
"override": {
"tagRenderings+": {
"0": {