Merge branch 'alpha' of github.com:pietervdvn/MapComplete into alpha

This commit is contained in:
Pieter Vander Vennet 2021-10-10 00:53:31 +02:00
commit 6ca2471361

View file

@ -24,6 +24,12 @@
"nl": "Alle lagen met een gelinkt etymology" "nl": "Alle lagen met een gelinkt etymology"
}, },
"tagRenderings": [ "tagRenderings": [
{
"id":"etymology-images-from-wikipedia",
"render": {
"*": "{image_carousel(name:etymology:wikidata)}"
}
},
{ {
"id": "wikipedia-etymology", "id": "wikipedia-etymology",
"question": { "question": {
@ -62,7 +68,8 @@
"render": { "render": {
"en": "<h3>Wikipedia article of the name giver</h3>{wikipedia(name:etymology:wikidata):max-height:20rem}", "en": "<h3>Wikipedia article of the name giver</h3>{wikipedia(name:etymology:wikidata):max-height:20rem}",
"nl": "<h3>Wikipedia artikel van de naamgever</h3>{wikipedia(name:etymology:wikidata):max-height:20rem}" "nl": "<h3>Wikipedia artikel van de naamgever</h3>{wikipedia(name:etymology:wikidata):max-height:20rem}"
} },
"condition":"name:etymology!=unknown"
}, },
{ {
"id": "zoeken op inventaris onroerend erfgoed", "id": "zoeken op inventaris onroerend erfgoed",
@ -85,6 +92,13 @@
"freeform": { "freeform": {
"key": "name:etymology" "key": "name:etymology"
}, },
"mappings": [
{"if":"name:etymology=unknown",
"then": {
"en": "The origin of this name is unknown in all literature",
"nl": "De oorsprong van deze naam is onbekend in de literatuur"
}}
],
"condition": { "condition": {
"or": [ "or": [
"name:etymology~*", "name:etymology~*",