From d178dca41280a48cddbb7ea74e3a27229e4e60e8 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Fri, 28 Mar 2025 22:36:02 +0100 Subject: [PATCH 1/8] Theme(hailhydrant): add ref question (#1454) --- assets/layers/hydrant/hydrant.json | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/assets/layers/hydrant/hydrant.json b/assets/layers/hydrant/hydrant.json index 66a5f2bd50..9532f217df 100644 --- a/assets/layers/hydrant/hydrant.json +++ b/assets/layers/hydrant/hydrant.json @@ -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 @@ } } ] -} +} \ No newline at end of file From 693114b3d6c29a13d01a1eebd71e3821764560ad Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Fri, 28 Mar 2025 23:16:12 +0100 Subject: [PATCH 2/8] Theme(street_lighting): Add utility poles (#1642) --- assets/layers/street_lamps/street_lamps.json | 58 ++++++++++++- assets/layers/utility_pole/license_info.json | 10 +++ assets/layers/utility_pole/utility_pole.json | 65 +++++++++++++++ assets/layers/utility_pole/utility_pole.svg | 82 +++++++++++++++++++ .../utility_pole/utility_pole.svg.license | 2 + .../street_lighting/street_lighting.json | 13 +++ .../street_lighting_assen.json | 10 ++- 7 files changed, 234 insertions(+), 6 deletions(-) create mode 100644 assets/layers/utility_pole/license_info.json create mode 100644 assets/layers/utility_pole/utility_pole.json create mode 100644 assets/layers/utility_pole/utility_pole.svg create mode 100644 assets/layers/utility_pole/utility_pole.svg.license diff --git a/assets/layers/street_lamps/street_lamps.json b/assets/layers/street_lamps/street_lamps.json index ddcc1be946..0f618e8133 100644 --- a/assets/layers/street_lamps/street_lamps.json +++ b/assets/layers/street_lamps/street_lamps.json @@ -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 } -} +} \ No newline at end of file diff --git a/assets/layers/utility_pole/license_info.json b/assets/layers/utility_pole/license_info.json new file mode 100644 index 0000000000..4814fcc566 --- /dev/null +++ b/assets/layers/utility_pole/license_info.json @@ -0,0 +1,10 @@ +[ + { + "path": "utility_pole.svg", + "license": "CC0-1.0", + "authors": [ + "Robin van der Linde" + ], + "sources": [] + } +] \ No newline at end of file diff --git a/assets/layers/utility_pole/utility_pole.json b/assets/layers/utility_pole/utility_pole.json new file mode 100644 index 0000000000..cfda46bab4 --- /dev/null +++ b/assets/layers/utility_pole/utility_pole.json @@ -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 + } +} \ No newline at end of file diff --git a/assets/layers/utility_pole/utility_pole.svg b/assets/layers/utility_pole/utility_pole.svg new file mode 100644 index 0000000000..81c22e227d --- /dev/null +++ b/assets/layers/utility_pole/utility_pole.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + diff --git a/assets/layers/utility_pole/utility_pole.svg.license b/assets/layers/utility_pole/utility_pole.svg.license new file mode 100644 index 0000000000..75299f8845 --- /dev/null +++ b/assets/layers/utility_pole/utility_pole.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/street_lighting/street_lighting.json b/assets/themes/street_lighting/street_lighting.json index 133d3536f0..f4405d8b5e 100644 --- a/assets/themes/street_lighting/street_lighting.json +++ b/assets/themes/street_lighting/street_lighting.json @@ -45,6 +45,19 @@ ], "layers": [ "street_lamps", + { + "builtin": "utility_pole", + "override": { + "tagRenderings+": [ + { + "builtin": "street_lamps.street_lamp_question", + "override": { + "condition": "highway=street_lamp" + } + } + ] + } + }, { "id": "lit_streets", "name": { diff --git a/assets/themes/street_lighting_assen/street_lighting_assen.json b/assets/themes/street_lighting_assen/street_lighting_assen.json index 1cca1a0ad5..c4ec176d5e 100644 --- a/assets/themes/street_lighting_assen/street_lighting_assen.json +++ b/assets/themes/street_lighting_assen/street_lighting_assen.json @@ -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 @@ } } ] -} +} \ No newline at end of file From cb9c48a0d4fd8e7a5c266194564df7de8304128d Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 29 Mar 2025 11:15:52 +0100 Subject: [PATCH 3/8] Chore: Reset translations --- langs/themes/ca.json | 4 ++-- langs/themes/cs.json | 4 ++-- langs/themes/da.json | 4 ++-- langs/themes/de.json | 4 ++-- langs/themes/en.json | 4 ++-- langs/themes/es.json | 4 ++-- langs/themes/fr.json | 4 ++-- langs/themes/hu.json | 4 ++-- langs/themes/it.json | 4 ++-- langs/themes/ko.json | 4 ++-- langs/themes/nb_NO.json | 4 ++-- langs/themes/nl.json | 4 ++-- langs/themes/pa_PK.json | 2 +- langs/themes/pl.json | 4 ++-- langs/themes/zh_Hant.json | 4 ++-- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/langs/themes/ca.json b/langs/themes/ca.json index 7313559afe..158149060e 100644 --- a/langs/themes/ca.json +++ b/langs/themes/ca.json @@ -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": { diff --git a/langs/themes/cs.json b/langs/themes/cs.json index d08ee07348..b05f5e2998 100644 --- a/langs/themes/cs.json +++ b/langs/themes/cs.json @@ -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": { diff --git a/langs/themes/da.json b/langs/themes/da.json index 5c7dd8b286..070670df3d 100644 --- a/langs/themes/da.json +++ b/langs/themes/da.json @@ -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": { diff --git a/langs/themes/de.json b/langs/themes/de.json index 988fd937e5..4bfaf03090 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -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": { diff --git a/langs/themes/en.json b/langs/themes/en.json index bf5720e340..218528132f 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -1255,7 +1255,7 @@ "street_lighting": { "description": "On this map you can find everything about street lighting", "layers": { - "1": { + "2": { "name": "Lit streets", "tagRenderings": { "lit": { @@ -1280,7 +1280,7 @@ "render": "Lit street" } }, - "2": { + "3": { "override": { "tagRenderings+": { "0": { diff --git a/langs/themes/es.json b/langs/themes/es.json index f6bc95ee11..cb93421d9d 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -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": { diff --git a/langs/themes/fr.json b/langs/themes/fr.json index 0686170e04..e0314c7e03 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -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": { diff --git a/langs/themes/hu.json b/langs/themes/hu.json index c4e89bb5c7..e77abe32b4 100644 --- a/langs/themes/hu.json +++ b/langs/themes/hu.json @@ -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": { diff --git a/langs/themes/it.json b/langs/themes/it.json index fc77a01064..4cf88737aa 100644 --- a/langs/themes/it.json +++ b/langs/themes/it.json @@ -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": { diff --git a/langs/themes/ko.json b/langs/themes/ko.json index 1e1e49476b..6c33842fc5 100644 --- a/langs/themes/ko.json +++ b/langs/themes/ko.json @@ -1142,7 +1142,7 @@ "street_lighting": { "description": "이 지도에서 가로등에 관한 모든 것을 찾을 수 있습니다", "layers": { - "1": { + "2": { "name": "조명이 있는 거리", "tagRenderings": { "lit": { @@ -1167,7 +1167,7 @@ "render": "밝은 거리" } }, - "2": { + "3": { "override": { "tagRenderings+": { "0": { diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json index 46055c0f66..caab9bbb7f 100644 --- a/langs/themes/nb_NO.json +++ b/langs/themes/nb_NO.json @@ -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": { diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 6597630507..bc4b0c69cb 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -1291,7 +1291,7 @@ "street_lighting": { "description": "Op deze kaart vind je alles over straatlantaarns", "layers": { - "1": { + "2": { "name": "Verlichte straten", "tagRenderings": { "lit": { @@ -1316,7 +1316,7 @@ "render": "Verlichte straat" } }, - "2": { + "3": { "override": { "tagRenderings+": { "0": { diff --git a/langs/themes/pa_PK.json b/langs/themes/pa_PK.json index c5879317aa..4ef9e6aee8 100644 --- a/langs/themes/pa_PK.json +++ b/langs/themes/pa_PK.json @@ -153,7 +153,7 @@ }, "street_lighting": { "layers": { - "1": { + "2": { "name": "روشنی والیاں سڑکاں", "title": { "render": "روشنی والی سڑک" diff --git a/langs/themes/pl.json b/langs/themes/pl.json index adc045a154..6c0397395b 100644 --- a/langs/themes/pl.json +++ b/langs/themes/pl.json @@ -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": { diff --git a/langs/themes/zh_Hant.json b/langs/themes/zh_Hant.json index 3278776d81..4c03faa2fa 100644 --- a/langs/themes/zh_Hant.json +++ b/langs/themes/zh_Hant.json @@ -781,7 +781,7 @@ "street_lighting": { "description": "在這份地圖你可以找到任何有關路燈的事情", "layers": { - "1": { + "2": { "name": "有照明的道路", "tagRenderings": { "lit": { @@ -806,7 +806,7 @@ "render": "照明道路" } }, - "2": { + "3": { "override": { "tagRenderings+": { "0": { From 4bc987a4830727c28b7cffb3e16b9f2dc2f55fcb Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Mar 2025 19:01:56 +0200 Subject: [PATCH 4/8] Fix: change condition to and --- assets/layers/wayside_shrine/wayside_shrine.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/assets/layers/wayside_shrine/wayside_shrine.json b/assets/layers/wayside_shrine/wayside_shrine.json index 7b6de4a462..af9a5fc90b 100644 --- a/assets/layers/wayside_shrine/wayside_shrine.json +++ b/assets/layers/wayside_shrine/wayside_shrine.json @@ -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 -} +} \ No newline at end of file From 48ead3aeec26463573e6df3a046d7f59716f6b30 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Mar 2025 20:02:59 +0200 Subject: [PATCH 5/8] Theme(pets): add pet shops (#2363) --- assets/themes/pets/pets.json | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/assets/themes/pets/pets.json b/assets/themes/pets/pets.json index bf5e6476ce..7754ef03ef 100644 --- a/assets/themes/pets/pets.json +++ b/assets/themes/pets/pets.json @@ -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 @@ } } ] -} +} \ No newline at end of file From b60027e1cd13ee45462d7d43e8e281447524b6b4 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Mar 2025 20:14:06 +0200 Subject: [PATCH 6/8] Chore: reset translations --- langs/themes/ca.json | 2 +- langs/themes/cs.json | 4 ++-- langs/themes/da.json | 2 +- langs/themes/de.json | 4 ++-- langs/themes/en.json | 12 +++++++++++- langs/themes/es.json | 2 +- langs/themes/fr.json | 2 +- langs/themes/it.json | 2 +- langs/themes/ko.json | 2 +- langs/themes/nb_NO.json | 2 +- langs/themes/nl.json | 12 +++++++++++- langs/themes/pa_PK.json | 2 +- langs/themes/pl.json | 2 +- langs/themes/uk.json | 4 ++-- langs/themes/zh_Hant.json | 2 +- 15 files changed, 38 insertions(+), 18 deletions(-) diff --git a/langs/themes/ca.json b/langs/themes/ca.json index 158149060e..b3945108b1 100644 --- a/langs/themes/ca.json +++ b/langs/themes/ca.json @@ -755,7 +755,7 @@ "name": "Restaurants que accepten gossos" } }, - "6": { + "7": { "override": { "name": "Botigues amigues dels gossos" } diff --git a/langs/themes/cs.json b/langs/themes/cs.json index b05f5e2998..05648107f4 100644 --- a/langs/themes/cs.json +++ b/langs/themes/cs.json @@ -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" } diff --git a/langs/themes/da.json b/langs/themes/da.json index 070670df3d..143de74828 100644 --- a/langs/themes/da.json +++ b/langs/themes/da.json @@ -598,7 +598,7 @@ "name": "Hundevenlige madsteder" } }, - "6": { + "7": { "override": { "name": "hundevenlig butik" } diff --git a/langs/themes/de.json b/langs/themes/de.json index 4bfaf03090..47946dc198 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -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" } diff --git a/langs/themes/en.json b/langs/themes/en.json index 218528132f..1adaea5006 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -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" } diff --git a/langs/themes/es.json b/langs/themes/es.json index cb93421d9d..ed6855f782 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -1008,7 +1008,7 @@ "name": "Restaurantes que admiten perros" } }, - "6": { + "7": { "override": { "name": "Tiendas que admiten perros" } diff --git a/langs/themes/fr.json b/langs/themes/fr.json index e0314c7e03..1035857e68 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -834,7 +834,7 @@ "name": "Restaurants acceptant les chiens" } }, - "6": { + "7": { "override": { "name": "Magasins acceptant les chiens" } diff --git a/langs/themes/it.json b/langs/themes/it.json index 4cf88737aa..3721bf7dd3 100644 --- a/langs/themes/it.json +++ b/langs/themes/it.json @@ -471,7 +471,7 @@ "name": "Ristoranti che accettano i cani" } }, - "6": { + "7": { "override": { "name": "Negozi che accettano i cani" } diff --git a/langs/themes/ko.json b/langs/themes/ko.json index 6c33842fc5..7302f5ada3 100644 --- a/langs/themes/ko.json +++ b/langs/themes/ko.json @@ -994,7 +994,7 @@ "name": "반려견 친화적 식당" } }, - "6": { + "7": { "override": { "name": "반려견 친화적 상점" } diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json index caab9bbb7f..9d0d67a790 100644 --- a/langs/themes/nb_NO.json +++ b/langs/themes/nb_NO.json @@ -349,7 +349,7 @@ "name": "Hundevennlige spisesteder" } }, - "6": { + "7": { "override": { "name": "Hundevennlige butikker" } diff --git a/langs/themes/nl.json b/langs/themes/nl.json index bc4b0c69cb..6daef08702 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -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" } diff --git a/langs/themes/pa_PK.json b/langs/themes/pa_PK.json index 4ef9e6aee8..27775f49c4 100644 --- a/langs/themes/pa_PK.json +++ b/langs/themes/pa_PK.json @@ -131,7 +131,7 @@ }, "pets": { "layers": { - "6": { + "7": { "override": { "name": "کُتیاں دی اِجازت دیاں دکاناں" } diff --git a/langs/themes/pl.json b/langs/themes/pl.json index 6c0397395b..699d12bbd2 100644 --- a/langs/themes/pl.json +++ b/langs/themes/pl.json @@ -711,7 +711,7 @@ "name": "Restauracje przyjazne psom" } }, - "6": { + "7": { "override": { "name": "Sklepy przyjazne psom" } diff --git a/langs/themes/uk.json b/langs/themes/uk.json index 01738ca571..6214bf12df 100644 --- a/langs/themes/uk.json +++ b/langs/themes/uk.json @@ -514,12 +514,12 @@ "name": "Заклади харчування, дружні до собак" } }, - "6": { + "7": { "override": { "name": "Магазини, дружні до собак" } }, - "8": { + "9": { "override": { "name=": "Кошики для сміття з дозаторами для пакетів для екскрементів" } diff --git a/langs/themes/zh_Hant.json b/langs/themes/zh_Hant.json index 4c03faa2fa..63b761424f 100644 --- a/langs/themes/zh_Hant.json +++ b/langs/themes/zh_Hant.json @@ -678,7 +678,7 @@ "name": "寵物友善餐廳" } }, - "6": { + "7": { "override": { "name": "寵物友善商家" } From 16700a2af664c3af10adfb2018edc872204696b6 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Mar 2025 20:15:15 +0200 Subject: [PATCH 7/8] Theme(street_lighting): disable utility_pole by default --- assets/themes/street_lighting/street_lighting.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/themes/street_lighting/street_lighting.json b/assets/themes/street_lighting/street_lighting.json index f4405d8b5e..f114f83212 100644 --- a/assets/themes/street_lighting/street_lighting.json +++ b/assets/themes/street_lighting/street_lighting.json @@ -55,7 +55,8 @@ "condition": "highway=street_lamp" } } - ] + ], + "shownByDefault": false } }, { From 9165963ed9a06a7f1a0c6f2d68ac33918f2a63f6 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Mar 2025 20:58:47 +0200 Subject: [PATCH 8/8] Theme(ATM): Include indoor question --- assets/layers/atm/atm.json | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/assets/layers/atm/atm.json b/assets/layers/atm/atm.json index c0df058aa0..251915e39c 100644 --- a/assets/layers/atm/atm.json +++ b/assets/layers/atm/atm.json @@ -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 } -} +} \ No newline at end of file