From ed161afc7e5f6600169f0204b08f84ebb9da16d3 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Sun, 10 Oct 2021 00:56:08 +0200 Subject: [PATCH] Formatting, add possibility to link wikipedia in the 'wikipedia'-question --- assets/layers/etymology/etymology.json | 300 +++++++++++++------------ assets/tagRenderings/questions.json | 21 +- 2 files changed, 170 insertions(+), 151 deletions(-) diff --git a/assets/layers/etymology/etymology.json b/assets/layers/etymology/etymology.json index 216e9a87da..5e819a3eec 100644 --- a/assets/layers/etymology/etymology.json +++ b/assets/layers/etymology/etymology.json @@ -1,152 +1,154 @@ { - "id": "etymology", - "#": "A layer showing all objects having etymology info (either via `name:etymology:wikidata` or `name:etymology`. The intention is that this layer is reused for a certain category to also _ask_ for information", - "name": { - "en": "Has etymolgy", - "nl": "Heeft etymology info" - }, - "minzoom": 12, - "source": { - "osmTags": { - "or": [ - "name:etymology:wikidata~*", - "name:etymology~*" - ] - } - }, - "title": { - "render": { - "*": "{name}" - } - }, - "description": { - "en": "All objects which have an etymology known", - "nl": "Alle lagen met een gelinkt etymology" - }, - "tagRenderings": [ - { - "id":"etymology-images-from-wikipedia", - "render": { - "*": "{image_carousel(name:etymology:wikidata)}" - } - }, - { - "id": "wikipedia-etymology", - "question": { - "en": "What is the Wikidata-item that this object is named after?", - "nl": "Wat is het Wikidata-item van hetgeen dit object is naar vernoemd?" - }, - "freeform": { - "key": "name:etymology:wikidata", - "type": "wikidata", - "helperArgs": [ - "name", - { - "removePostfixes": [ - "steenweg", - "heirbaan", - "baan", - "straat", - "street", - "weg", - "dreef", - "laan", - "boulevard", - "pad", - "path", - "plein", - "square", - "plaza", - "wegel", - "kerk", - "church", - "kaai" - ] - } - ] - }, - "render": { - "en": "

Wikipedia article of the name giver

{wikipedia(name:etymology:wikidata):max-height:20rem}", - "nl": "

Wikipedia artikel van de naamgever

{wikipedia(name:etymology:wikidata):max-height:20rem}" - }, - "condition":"name:etymology!=unknown" - }, - { - "id": "zoeken op inventaris onroerend erfgoed", - "render": { - "nl": "Zoeken op inventaris onroerend erfgoed", - "en": "Search on inventaris onroerend erfgoed" - }, - "conditions": "_country=be" - }, - { - "id": "simple etymology", - "question": { - "en": "What is this object named after?
This might be written on the street name sign", - "nl": "Naar wat is dit object vernoemd?
Dit staat mogelijks vermeld op het straatnaambordje" - }, - "render": { - "en": "Named after {name:etymology}", - "nl": "Vernoemd naar {name:etymology}" - }, - "freeform": { - "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": { - "or": [ - "name:etymology~*", - "name:etymology:wikidata=" - ] - } - }, - { - "id": "street-name-sign-image", - "render": { - "en": "{image_carousel(image:streetsign)}
{image_upload(image:streetsign, Add image of a street name sign)}", - "nl": "{image_carousel(image:streetsign)}
{image_upload(image:streetsign, Voeg afbeelding van straatnaambordje toe)}" - } - }, - "wikipedia" - ], - "icon": { - "render": "pin:#05d7fcaa;./assets/layers/etymology/logo.svg", - "mappings": [ - { - "if": { - "and": [ - "name:etymology=", - "name:etymology:wikidata=" - ] - }, - "then": "pin:#fcca05aa;./assets/layers/etymology/logo.svg" - } - ] - }, - "width": { - "render": "8" - }, - "iconSize": { - "render": "40,40,center" - }, - "color": { - "render": "#05d7fcaa", - "mappings": [ - { - "if": { - "and": [ - "name:etymology=", - "name:etymology:wikidata=" - ] - }, - "then": "#fcca05aa" - } - ] + "id": "etymology", + "#": "A layer showing all objects having etymology info (either via `name:etymology:wikidata` or `name:etymology`. The intention is that this layer is reused for a certain category to also _ask_ for information", + "name": { + "en": "Has etymolgy", + "nl": "Heeft etymology info" + }, + "minzoom": 12, + "source": { + "osmTags": { + "or": [ + "name:etymology:wikidata~*", + "name:etymology~*" + ] } + }, + "title": { + "render": { + "*": "{name}" + } + }, + "description": { + "en": "All objects which have an etymology known", + "nl": "Alle lagen met een gelinkt etymology" + }, + "tagRenderings": [ + { + "id": "etymology-images-from-wikipedia", + "render": { + "*": "{image_carousel(name:etymology:wikidata)}" + } + }, + { + "id": "wikipedia-etymology", + "question": { + "en": "What is the Wikidata-item that this object is named after?", + "nl": "Wat is het Wikidata-item van hetgeen dit object is naar vernoemd?" + }, + "freeform": { + "key": "name:etymology:wikidata", + "type": "wikidata", + "helperArgs": [ + "name", + { + "removePostfixes": [ + "steenweg", + "heirbaan", + "baan", + "straat", + "street", + "weg", + "dreef", + "laan", + "boulevard", + "pad", + "path", + "plein", + "square", + "plaza", + "wegel", + "kerk", + "church", + "kaai" + ] + } + ] + }, + "render": { + "en": "

Wikipedia article of the name giver

{wikipedia(name:etymology:wikidata):max-height:20rem}", + "nl": "

Wikipedia artikel van de naamgever

{wikipedia(name:etymology:wikidata):max-height:20rem}" + }, + "condition": "name:etymology!=unknown" + }, + { + "id": "zoeken op inventaris onroerend erfgoed", + "render": { + "nl": "Zoeken op inventaris onroerend erfgoed", + "en": "Search on inventaris onroerend erfgoed" + }, + "conditions": "_country=be" + }, + { + "id": "simple etymology", + "question": { + "en": "What is this object named after?
This might be written on the street name sign", + "nl": "Naar wat is dit object vernoemd?
Dit staat mogelijks vermeld op het straatnaambordje" + }, + "render": { + "en": "Named after {name:etymology}", + "nl": "Vernoemd naar {name:etymology}" + }, + "freeform": { + "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": { + "or": [ + "name:etymology~*", + "name:etymology:wikidata=" + ] + } + }, + { + "id": "street-name-sign-image", + "render": { + "en": "{image_carousel(image:streetsign)}
{image_upload(image:streetsign, Add image of a street name sign)}", + "nl": "{image_carousel(image:streetsign)}
{image_upload(image:streetsign, Voeg afbeelding van straatnaambordje toe)}" + } + }, + "wikipedia" + ], + "icon": { + "render": "pin:#05d7fcaa;./assets/layers/etymology/logo.svg", + "mappings": [ + { + "if": { + "and": [ + "name:etymology=", + "name:etymology:wikidata=" + ] + }, + "then": "pin:#fcca05aa;./assets/layers/etymology/logo.svg" + } + ] + }, + "width": { + "render": "8" + }, + "iconSize": { + "render": "40,40,center" + }, + "color": { + "render": "#05d7fcaa", + "mappings": [ + { + "if": { + "and": [ + "name:etymology=", + "name:etymology:wikidata=" + ] + }, + "then": "#fcca05aa" + } + ] + } } diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json index 22edf91994..a317a96454 100644 --- a/assets/tagRenderings/questions.json +++ b/assets/tagRenderings/questions.json @@ -4,7 +4,24 @@ }, "wikipedia": { "render": "{wikipedia():max-height:25rem}", - "condition": "wikidata~*" + "question": { + "en": "What is the corresponding Wikidata entity?", + "nl": "Welk Wikidata-item komt overeen met dit object?" + }, + "freeform": { + "key": "wikidata", + "type": "wikidata" + }, + "mappings": [ + { + "if": "wikidata=", + "then": { + "en": "No Wikipedia page has been linked yet", + "nl": "Er werd nog geen Wikipedia-pagina gekoppeld" + }, + "hideInAnswer": true + } + ] }, "reviews": { "render": "{reviews()}" @@ -50,7 +67,7 @@ "type": "wikidata" }, "question": { - "en": "What is the corresponding item on Wikipedia?", + "en": "What is the corresponding item on Wikipedia?", "nl": "Welk Wikipedia-artikel beschrijft dit object?" }, "mappings": [