From 988d0bc913e8b21900b587a34f328fbcc9d62e21 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Tue, 29 Oct 2024 21:33:16 +0100 Subject: [PATCH] Add extra questions to clock layer (#1962 + #1963) --- assets/layers/clock/clock.json | 61 +++++++++++++++++++++++--- assets/layers/questions/questions.json | 25 ++++++++++- langs/layers/ca.json | 15 +------ langs/layers/cs.json | 6 +-- langs/layers/de.json | 6 +-- langs/layers/en.json | 7 ++- langs/layers/fr.json | 6 +-- langs/layers/nl.json | 7 ++- langs/layers/pl.json | 4 +- langs/layers/uk.json | 4 +- 10 files changed, 104 insertions(+), 37 deletions(-) diff --git a/assets/layers/clock/clock.json b/assets/layers/clock/clock.json index 5c159a579..20a91e0e6 100644 --- a/assets/layers/clock/clock.json +++ b/assets/layers/clock/clock.json @@ -97,8 +97,8 @@ "support=wall_mounted" ], "title": { - "en": "a wall-mounted clock", - "nl": "een klok aan een muur", + "en": "a wall-mounted clock, mounted using a support perpendicular to the wall", + "nl": "een klok aan een muur, bevestigd met een steun loodrecht op de muur", "de": "eine an der Wand montierte Uhr", "ca": "un rellotge muntat en un paret", "fr": "une horloge fixée au mur", @@ -117,6 +117,23 @@ "snapToLayer": [ "walls_and_buildings" ] + }, + { + "tags": [ + "amenity=clock", + "support=wall" + ], + "title": { + "en": "a wall-mounted clock, mounted directly on a wall", + "nl": "een klok aan een muur, rechtstreeks bevestigd aan een muur" + }, + "description": { + "en": "A publicly visible clock mounted directly on a wall", + "nl": "Een publiekelijk zichtbare klok rechtstreeks bevestigd aan een muur" + }, + "snapToLayer": [ + "walls_and_buildings" + ] } ], "tagRenderings": [ @@ -148,8 +165,8 @@ { "if": "support=wall_mounted", "then": { - "en": "This clock is mounted on a wall", - "nl": "Deze klok is bevestigd aan een muur", + "en": "This clock is mounted on a wall, usually through a support perpendicular to the wall", + "nl": "Deze klok is bevestigd aan een muur, meestal met een steun loodrecht op de muur", "de": "Diese Uhr ist an einer Wand montiert", "ca": "Aquest rellotge està muntat en una paret", "fr": "Cette horloge est fixée sur un mur", @@ -157,6 +174,13 @@ "cs": "Tyto hodiny jsou namontovány na stěně" } }, + { + "if": "support=wall", + "then": { + "en": "This clock is mounted directly on a wall", + "nl": "Deze klok is rechtstreeks aan een muur bevestigd" + } + }, { "if": "support=billboard", "then": { @@ -245,6 +269,30 @@ } ] }, + { + "builtin": "indoor", + "override": { + "question": { + "en": "Is this clock indoors?", + "nl": "Is deze klok binnen?" + }, + "mappings": [ + { + "then": { + "en": "This clock is indoors", + "nl": "Deze klok is binnen" + } + }, + { + "if": "indoor=no", + "then": { + "en": "This clock is outdoors", + "nl": "Deze klok is buiten" + } + } + ] + } + }, { "id": "visibility", "question": { @@ -293,7 +341,8 @@ "cs": "Tyto hodiny jsou viditelné ze vzdálenosti větší než 20 metrů (např. kostelní nebo nádražní hodiny)" } } - ] + ], + "condition": "indoor!=yes" }, { "id": "date", @@ -572,4 +621,4 @@ ], "deletion": true, "allowMove": true -} +} \ No newline at end of file diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json index 5c3f92532..63029e2a5 100644 --- a/assets/layers/questions/questions.json +++ b/assets/layers/questions/questions.json @@ -2972,7 +2972,30 @@ } } ] + }, + { + "id": "indoor", + "question": { + "en": "Is this object located indoors?", + "nl": "Bevindt dit object zich binnen?" + }, + "mappings": [ + { + "if": "indoor=yes", + "then": { + "en": "This object is located indoors", + "nl": "Dit object bevindt zich binnen" + } + }, + { + "if": "indoor=no", + "then": { + "en": "This object is located outdoors", + "nl": "Dit object bevindt zich buiten" + } + } + ] } ], "allowMove": false -} +} \ No newline at end of file diff --git a/langs/layers/ca.json b/langs/layers/ca.json index e6a5d6c34..dd5b6f42e 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -2398,10 +2398,10 @@ "1": { "then": "Aquest rellotge està muntat en una paret" }, - "2": { + "3": { "then": "Aquest rellotge està muntat en una tanca publicitària" }, - "3": { + "4": { "then": "Aquest rellotge està al sòl" } }, @@ -2512,17 +2512,6 @@ }, "question": "Aquest creuament té una illa al mig?" }, - "crossing-is-zebra": { - "mappings": { - "0": { - "then": "Açò és un pas de vianants" - }, - "1": { - "then": "Açò no és un pas de vianants" - } - }, - "question": "Açò és un pas de vianants?" - }, "crossing-minimap": { "mappings": { "0": { diff --git a/langs/layers/cs.json b/langs/layers/cs.json index 2d7870173..bfe44f4dc 100644 --- a/langs/layers/cs.json +++ b/langs/layers/cs.json @@ -2752,10 +2752,10 @@ "1": { "then": "Tyto hodiny jsou namontovány na stěně" }, - "2": { + "3": { "then": "Tyto hodiny jsou součástí billboardu" }, - "3": { + "4": { "then": "Tyto hodiny jsou na zemi" } }, @@ -10198,4 +10198,4 @@ "render": "větrná turbína" } } -} +} \ No newline at end of file diff --git a/langs/layers/de.json b/langs/layers/de.json index eb37d7a5f..fbad2cede 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -3296,10 +3296,10 @@ "1": { "then": "Diese Uhr ist an einer Wand montiert" }, - "2": { + "3": { "then": "Diese Uhr ist Teil einer Werbetafel" }, - "3": { + "4": { "then": "Diese Uhr befindet sich auf dem Boden" } }, @@ -12502,4 +12502,4 @@ "render": "Windrad" } } -} +} \ No newline at end of file diff --git a/langs/layers/en.json b/langs/layers/en.json index 40a36590c..17e217655 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -3294,12 +3294,15 @@ "then": "This clock is mounted on a pole" }, "1": { - "then": "This clock is mounted on a wall" + "then": "This clock is mounted on a wall, usually through a support perpendicular to the wall" }, "2": { - "then": "This clock is part of a billboard" + "then": "This clock is mounted directly on a wall" }, "3": { + "then": "This clock is part of a billboard" + }, + "4": { "then": "This clock is on the ground" } }, diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 9884fee7b..11acf1a16 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -2272,10 +2272,10 @@ "1": { "then": "Cette horloge est fixée sur un mur" }, - "2": { + "3": { "then": "Cette horloge fait partie d'un panneau publicitaire" }, - "3": { + "4": { "then": "Cette horloge est posée au sol" } }, @@ -7567,4 +7567,4 @@ "render": "éolienne" } } -} +} \ No newline at end of file diff --git a/langs/layers/nl.json b/langs/layers/nl.json index a385b3b2e..50f911246 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -2748,12 +2748,15 @@ "then": "Deze klok is bevestigd aan een paal" }, "1": { - "then": "Deze klok is bevestigd aan een muur" + "then": "Deze klok is bevestigd aan een muur, meestal met een steun loodrecht op de muur" }, "2": { - "then": "Deze klok is onderdeel van een reclamebord" + "then": "Deze klok is rechtstreeks aan een muur bevestigd" }, "3": { + "then": "Deze klok is onderdeel van een reclamebord" + }, + "4": { "then": "Deze klok staat op de grond" } }, diff --git a/langs/layers/pl.json b/langs/layers/pl.json index e7ae159ec..218dd4664 100644 --- a/langs/layers/pl.json +++ b/langs/layers/pl.json @@ -1356,10 +1356,10 @@ "1": { "then": "Ten zegar jest zamontowany na ścianie" }, - "2": { + "3": { "then": "Ten zegar jest częścią bilbordu" }, - "3": { + "4": { "then": "Ten zegar jest na ziemi" } }, diff --git a/langs/layers/uk.json b/langs/layers/uk.json index 3a3482d49..7e1437b5c 100644 --- a/langs/layers/uk.json +++ b/langs/layers/uk.json @@ -479,7 +479,7 @@ "tagRenderings": { "support": { "mappings": { - "2": { + "3": { "then": "Цей годинник є частиною білборду" } } @@ -1338,4 +1338,4 @@ "render": "Утилізація відходів" } } -} +} \ No newline at end of file