diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json index 3f47bf4b5..9c7af91cc 100644 --- a/assets/layers/artwork/artwork.json +++ b/assets/layers/artwork/artwork.json @@ -127,6 +127,7 @@ "tagRenderings": [ "images", { + "labels": ["artwork-question"], "render": { "en": "This is a {artwork_type}", "nl": "Dit is een {artwork_type}", @@ -448,6 +449,7 @@ }, { "id": "artwork-artist-wikidata", + "labels": ["artwork-question"], "render": { "en": "This artwork was made by {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}", "de": "Dieses Kunstwerk wurde geschaffen von {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}", @@ -518,7 +520,8 @@ "key": "artist_name" }, "condition": "artist:wikidata=", - "id": "artwork-artist_name" + "id": "artwork-artist_name", + "labels": ["artwork-question"] }, { "question": { @@ -561,7 +564,8 @@ "key": "website", "type": "url" }, - "id": "artwork-website" + "id": "artwork-website", + "labels": ["artwork-question"] }, "wikipedia", { @@ -586,6 +590,40 @@ "cs": "Toto dílo zobrazuje {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}", "pt": "A obra de arte representa {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}", "es": "Esta obra de arte representa {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}" + }, + "labels": ["artwork-question"] + }, + { + "id": "doubles_as_bench", + "question": { + "en": "Does this artwork serve as a bench?" + }, + "mappings": [ + { + "if": "amenity=bench", + "then": { + "en": "This artwork also serves as a bench" + } + }, + { + "if": "amenity=", + "then": { + "en": "This artwork does not serve as a bench" + } + }, + { + "if": "amenity!=bench", + "then": { + "en": "This artwork does not serve as a bench" + }, + "hideInAnswer": true + } + ] + }, + { + "builtin": "bench.*bench-questions", + "override": { + "condition": "amenity=bench" } } ], @@ -624,4 +662,4 @@ "filter": [ "has_image" ] -} \ No newline at end of file +} diff --git a/assets/layers/bench/bench.json b/assets/layers/bench/bench.json index 01e640e1c..709a2f838 100644 --- a/assets/layers/bench/bench.json +++ b/assets/layers/bench/bench.json @@ -131,7 +131,10 @@ "da": "Har denne bænk et ryglæn?", "cs": "Má tato lavička opěradlo?" }, - "id": "bench-backrest" + "id": "bench-backrest", + "labels": [ + "bench-questions" + ] }, { "render": { @@ -177,6 +180,9 @@ "cs": "Kolik má tato lavice míst k sezení?" }, "id": "bench-seats", + "labels": [ + "bench-questions" + ], "mappings": [ { "if": "seats:separated=no", @@ -375,7 +381,10 @@ "da": "Hvad er bænken (sædet) lavet af?", "cs": "Z čeho je vyrobena lavice (sedadlo)?" }, - "id": "bench-material" + "id": "bench-material", + "labels": [ + "bench-questions" + ] }, { "question": { @@ -416,6 +425,9 @@ "key": "direction", "type": "direction" }, + "labels": [ + "bench-questions" + ], "id": "bench-direction" }, { @@ -656,6 +668,9 @@ } } ], + "labels": [ + "bench-questions" + ], "id": "bench-colour" }, { @@ -699,15 +714,21 @@ { "if": "survey:date:={_now:date}", "then": { - "en": "Surveyed today!", + "en": "Surveyed today!", "nl": "Vandaag nagekeken!" } } ], + "labels": [ + "bench-questions" + ], "id": "bench-survey:date" }, { "id": "bench-inscription", + "labels": [ + "bench-questions" + ], "render": { "en": "This bench does have the following inscription:

{inscription}

", "nl": "Deze bank heeft een inscriptie:

{inscription}

" @@ -744,13 +765,40 @@ } ] }, + { + "id": "bench-artwork", + "question": { + "en": "Does this bench have an artistic element?
E.g. it has an integrated painting, statue or other non-trivial, creative work
", + "nl": "Heeft deze bank een geïntegreerd kunstwerk?
Bijvoorbeeld een standbeeld, schildering of ander, niet-triviaal kunstwerk
" + }, + "mappings": [ + { + "if": "tourism=artwork", + "then": { + "en": "This bench has an integrated artwork", + "nl": "Deze bank heeft een geïntegreerd kunstwerk" + } + }, + { + "if": "tourism=", + "then": { + "en": "This bench does not have an integrated artwork", + "nl": "Deze bank heeft geen geïntegreerd kunstwerk" + } + } + ] + }, { "id": "bench-memorial", + "labels": [ + "bench-questions" + ], "condition": { "or": [ "historic=memorial", "inscription~*", - "memorial=bench" + "memorial=bench", + "tourism=artwork" ] }, "question": { @@ -772,7 +820,6 @@ "if": { "and": [ "historic=", - "memorial=", "not:historic=memorial" ] }, @@ -781,11 +828,18 @@ "nl": "Deze bank is geen gedenkteken aan iemand of iets" }, "addExtraTags": [ - "memorial=bench" + "memorial=" ] } ] + }, + { + "builtin": "artwork.*artwork-question", + "override": { + "condition": "tourism=artwork" + } } + ], "presets": [ { @@ -847,15 +901,19 @@ "filter": [ { "id": "bench_is_memorial", - "options": [{ - "osmTags": { - "or": ["historic=memorial","memorial=bench"] - }, - "question": { - "en": "is a memorial", - "nl": "is een gedenkteken" + "options": [ + { + "osmTags": { + "or": [ + "historic=memorial", + "memorial=bench" + ] + }, + "question": { + "en": "is a memorial", + "nl": "is een gedenkteken" + } } - } ] }, { @@ -863,7 +921,7 @@ "options": [ { "question": { - "en":"With and without backrest", + "en": "With and without backrest", "nl": "Met en zonder rugleuning" } },