Borrow artwork questions in bench and vice versa

This commit is contained in:
Pieter Vander Vennet 2022-12-06 03:59:33 +01:00
parent 9e97eba519
commit 569179ba4f
2 changed files with 114 additions and 18 deletions

View file

@ -127,6 +127,7 @@
"tagRenderings": [ "tagRenderings": [
"images", "images",
{ {
"labels": ["artwork-question"],
"render": { "render": {
"en": "This is a {artwork_type}", "en": "This is a {artwork_type}",
"nl": "Dit is een {artwork_type}", "nl": "Dit is een {artwork_type}",
@ -448,6 +449,7 @@
}, },
{ {
"id": "artwork-artist-wikidata", "id": "artwork-artist-wikidata",
"labels": ["artwork-question"],
"render": { "render": {
"en": "This artwork was made by {wikidata_label(artist:wikidata):font-weight:bold}<br/>{wikipedia(artist:wikidata)}", "en": "This artwork was made by {wikidata_label(artist:wikidata):font-weight:bold}<br/>{wikipedia(artist:wikidata)}",
"de": "Dieses Kunstwerk wurde geschaffen von {wikidata_label(artist:wikidata):font-weight:bold}<br/>{wikipedia(artist:wikidata)}", "de": "Dieses Kunstwerk wurde geschaffen von {wikidata_label(artist:wikidata):font-weight:bold}<br/>{wikipedia(artist:wikidata)}",
@ -518,7 +520,8 @@
"key": "artist_name" "key": "artist_name"
}, },
"condition": "artist:wikidata=", "condition": "artist:wikidata=",
"id": "artwork-artist_name" "id": "artwork-artist_name",
"labels": ["artwork-question"]
}, },
{ {
"question": { "question": {
@ -561,7 +564,8 @@
"key": "website", "key": "website",
"type": "url" "type": "url"
}, },
"id": "artwork-website" "id": "artwork-website",
"labels": ["artwork-question"]
}, },
"wikipedia", "wikipedia",
{ {
@ -586,6 +590,40 @@
"cs": "Toto dílo zobrazuje {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}", "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)}", "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)}" "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": [ "filter": [
"has_image" "has_image"
] ]
} }

View file

@ -131,7 +131,10 @@
"da": "Har denne bænk et ryglæn?", "da": "Har denne bænk et ryglæn?",
"cs": "Má tato lavička opěradlo?" "cs": "Má tato lavička opěradlo?"
}, },
"id": "bench-backrest" "id": "bench-backrest",
"labels": [
"bench-questions"
]
}, },
{ {
"render": { "render": {
@ -177,6 +180,9 @@
"cs": "Kolik má tato lavice míst k sezení?" "cs": "Kolik má tato lavice míst k sezení?"
}, },
"id": "bench-seats", "id": "bench-seats",
"labels": [
"bench-questions"
],
"mappings": [ "mappings": [
{ {
"if": "seats:separated=no", "if": "seats:separated=no",
@ -375,7 +381,10 @@
"da": "Hvad er bænken (sædet) lavet af?", "da": "Hvad er bænken (sædet) lavet af?",
"cs": "Z čeho je vyrobena lavice (sedadlo)?" "cs": "Z čeho je vyrobena lavice (sedadlo)?"
}, },
"id": "bench-material" "id": "bench-material",
"labels": [
"bench-questions"
]
}, },
{ {
"question": { "question": {
@ -416,6 +425,9 @@
"key": "direction", "key": "direction",
"type": "direction" "type": "direction"
}, },
"labels": [
"bench-questions"
],
"id": "bench-direction" "id": "bench-direction"
}, },
{ {
@ -656,6 +668,9 @@
} }
} }
], ],
"labels": [
"bench-questions"
],
"id": "bench-colour" "id": "bench-colour"
}, },
{ {
@ -699,15 +714,21 @@
{ {
"if": "survey:date:={_now:date}", "if": "survey:date:={_now:date}",
"then": { "then": {
"en": "Surveyed today!", "en": "Surveyed today!",
"nl": "Vandaag nagekeken!" "nl": "Vandaag nagekeken!"
} }
} }
], ],
"labels": [
"bench-questions"
],
"id": "bench-survey:date" "id": "bench-survey:date"
}, },
{ {
"id": "bench-inscription", "id": "bench-inscription",
"labels": [
"bench-questions"
],
"render": { "render": {
"en": "This bench does have the following inscription:<br/><p><i>{inscription}</i></p>", "en": "This bench does have the following inscription:<br/><p><i>{inscription}</i></p>",
"nl": "Deze bank heeft een inscriptie: <br/><p><i>{inscription}</i></p>" "nl": "Deze bank heeft een inscriptie: <br/><p><i>{inscription}</i></p>"
@ -744,13 +765,40 @@
} }
] ]
}, },
{
"id": "bench-artwork",
"question": {
"en": "Does this bench have an artistic element?<div class='subtle text-lg'>E.g. it has an integrated painting, statue or other non-trivial, creative work</div>",
"nl": "Heeft deze bank een geïntegreerd kunstwerk?<div class='subtle text-lg'>Bijvoorbeeld een standbeeld, schildering of ander, niet-triviaal kunstwerk</div>"
},
"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", "id": "bench-memorial",
"labels": [
"bench-questions"
],
"condition": { "condition": {
"or": [ "or": [
"historic=memorial", "historic=memorial",
"inscription~*", "inscription~*",
"memorial=bench" "memorial=bench",
"tourism=artwork"
] ]
}, },
"question": { "question": {
@ -772,7 +820,6 @@
"if": { "if": {
"and": [ "and": [
"historic=", "historic=",
"memorial=",
"not:historic=memorial" "not:historic=memorial"
] ]
}, },
@ -781,11 +828,18 @@
"nl": "Deze bank is <b>geen</b> gedenkteken aan iemand of iets" "nl": "Deze bank is <b>geen</b> gedenkteken aan iemand of iets"
}, },
"addExtraTags": [ "addExtraTags": [
"memorial=bench" "memorial="
] ]
} }
] ]
},
{
"builtin": "artwork.*artwork-question",
"override": {
"condition": "tourism=artwork"
}
} }
], ],
"presets": [ "presets": [
{ {
@ -847,15 +901,19 @@
"filter": [ "filter": [
{ {
"id": "bench_is_memorial", "id": "bench_is_memorial",
"options": [{ "options": [
"osmTags": { {
"or": ["historic=memorial","memorial=bench"] "osmTags": {
}, "or": [
"question": { "historic=memorial",
"en": "is a memorial", "memorial=bench"
"nl": "is een gedenkteken" ]
},
"question": {
"en": "is a memorial",
"nl": "is een gedenkteken"
}
} }
}
] ]
}, },
{ {
@ -863,7 +921,7 @@
"options": [ "options": [
{ {
"question": { "question": {
"en":"With and without backrest", "en": "With and without backrest",
"nl": "Met en zonder rugleuning" "nl": "Met en zonder rugleuning"
} }
}, },