diff --git a/assets/layers/etymology/etymology.json b/assets/layers/etymology/etymology.json
index 5e819a3eec..d49b456705 100644
--- a/assets/layers/etymology/etymology.json
+++ b/assets/layers/etymology/etymology.json
@@ -1,154 +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": "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"
},
- {
- "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"
+ "minzoom": 12,
+ "source": {
+ "osmTags": {
+ "or": [
+ "name:etymology:wikidata~*",
+ "name:etymology~*"
]
- }
- ]
- },
- "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="
+ },
+ "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"
+ }
]
- }
},
- {
- "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)}"
- }
+ "width": {
+ "render": "8"
},
- "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"
- }
- ]
- }
-}
+ "iconSize": {
+ "render": "40,40,center"
+ },
+ "color": {
+ "render": "#05d7fcaa",
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "name:etymology=",
+ "name:etymology:wikidata="
+ ]
+ },
+ "then": "#fcca05aa"
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/langs/layers/en.json b/langs/layers/en.json
index f9b43a8fbd..86eac29b29 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -1231,6 +1231,10 @@
"question": "What current do the plugs with Bosch Active Connect with 3 pins and cable 
offer?",
"render": "Bosch Active Connect with 3 pins and cable 
outputs at most {socket:bosch_3pin:current}A"
},
+ "current-15": {
+ "question": "What current do the plugs with Bosch Active Connect with 5 pins and cable 
offer?",
+ "render": "Bosch Active Connect with 5 pins and cable 
outputs at most {socket:bosch_5pin:current}A"
+ },
"current-2": {
"mappings": {
"0": {
@@ -1384,6 +1388,10 @@
"question": "How much plugs of type Bosch Active Connect with 3 pins and cable 
are available here?",
"render": "There are {socket:bosch_3pin} plugs of type Bosch Active Connect with 3 pins and cable 
available here"
},
+ "plugs-15": {
+ "question": "How much plugs of type Bosch Active Connect with 5 pins and cable 
are available here?",
+ "render": "There are {socket:bosch_5pin} plugs of type Bosch Active Connect with 5 pins and cable 
available here"
+ },
"plugs-2": {
"question": "How much plugs of type Chademo 
are available here?",
"render": "There are {socket:chademo} plugs of type Chademo 
available here"
@@ -1489,6 +1497,10 @@
"question": "What power output does a single plug of type Bosch Active Connect with 3 pins and cable 
offer?",
"render": "Bosch Active Connect with 3 pins and cable 
outputs at most {socket:bosch_3pin:output}"
},
+ "power-output-15": {
+ "question": "What power output does a single plug of type Bosch Active Connect with 5 pins and cable 
offer?",
+ "render": "Bosch Active Connect with 5 pins and cable 
outputs at most {socket:bosch_5pin:output}"
+ },
"power-output-2": {
"mappings": {
"0": {
@@ -1662,6 +1674,10 @@
"question": "What voltage do the plugs with Bosch Active Connect with 3 pins and cable 
offer?",
"render": "Bosch Active Connect with 3 pins and cable 
outputs {socket:bosch_3pin:voltage} volt"
},
+ "voltage-15": {
+ "question": "What voltage do the plugs with Bosch Active Connect with 5 pins and cable 
offer?",
+ "render": "Bosch Active Connect with 5 pins and cable 
outputs {socket:bosch_5pin:voltage} volt"
+ },
"voltage-2": {
"mappings": {
"0": {
@@ -1755,22 +1771,6 @@
"website": {
"question": "What is the website of the operator?",
"render": "More info on {website}"
- },
- "voltage-15": {
- "question": "What voltage do the plugs with Bosch Active Connect with 5 pins and cable 
offer?",
- "render": "Bosch Active Connect with 5 pins and cable 
outputs {socket:bosch_5pin:voltage} volt"
- },
- "power-output-15": {
- "question": "What power output does a single plug of type Bosch Active Connect with 5 pins and cable 
offer?",
- "render": "Bosch Active Connect with 5 pins and cable 
outputs at most {socket:bosch_5pin:output}"
- },
- "plugs-15": {
- "question": "How much plugs of type Bosch Active Connect with 5 pins and cable 
are available here?",
- "render": "There are {socket:bosch_5pin} plugs of type Bosch Active Connect with 5 pins and cable 
available here"
- },
- "current-15": {
- "question": "What current do the plugs with Bosch Active Connect with 5 pins and cable 
offer?",
- "render": "Bosch Active Connect with 5 pins and cable 
outputs at most {socket:bosch_5pin:current}A"
}
},
"title": {
@@ -2500,6 +2500,31 @@
"render": "Drinking water"
}
},
+ "etymology": {
+ "description": "All objects which have an etymology known",
+ "name": "Has etymolgy",
+ "tagRenderings": {
+ "simple etymology": {
+ "mappings": {
+ "0": {
+ "then": "The origin of this name is unknown in all literature"
+ }
+ },
+ "question": "What is this object named after?
This might be written on the street name sign",
+ "render": "Named after {name:etymology}"
+ },
+ "street-name-sign-image": {
+ "render": "{image_carousel(image:streetsign)}
{image_upload(image:streetsign, Add image of a street name sign)}"
+ },
+ "wikipedia-etymology": {
+ "question": "What is the Wikidata-item that this object is named after?",
+ "render": "Wikipedia article of the name giver
{wikipedia(name:etymology:wikidata):max-height:20rem}"
+ },
+ "zoeken op inventaris onroerend erfgoed": {
+ "render": "Search on inventaris onroerend erfgoed"
+ }
+ }
+ },
"food": {
"filter": {
"0": {
@@ -3715,25 +3740,5 @@
},
"watermill": {
"name": "Watermill"
- },
- "etymology": {
- "description": "All objects which have an etymology known",
- "name": "Has etymolgy",
- "tagRenderings": {
- "simple etymology": {
- "question": "What is this object named after?
This might be written on the street name sign",
- "render": "Named after {name:etymology}"
- },
- "street-name-sign-image": {
- "render": "{image_carousel(image:streetsign)}
{image_upload(image:streetsign, Add image of a street name sign)}"
- },
- "wikipedia-etymology": {
- "question": "What is the Wikidata-item that this object is named after?",
- "render": "Wikipedia article of the name giver
{wikipedia(name:etymology:wikidata):max-height:20rem}"
- },
- "zoeken op inventaris onroerend erfgoed": {
- "render": "Search on inventaris onroerend erfgoed"
- }
- }
}
}
\ No newline at end of file
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 6533d745a7..6bd476a7ec 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -1229,6 +1229,10 @@
"question": "Welke stroom levert de stekker van type Bosch Active Connect met 3 pinnen aan een kabel 
?",
"render": "Bosch Active Connect met 3 pinnen aan een kabel 
levert een stroom van maximaal {socket:bosch_3pin:current}A"
},
+ "current-15": {
+ "question": "Welke stroom levert de stekker van type Bosch Active Connect met 5 pinnen aan een kabel 
?",
+ "render": "Bosch Active Connect met 5 pinnen aan een kabel 
levert een stroom van maximaal {socket:bosch_5pin:current}A"
+ },
"current-2": {
"mappings": {
"0": {
@@ -1374,6 +1378,10 @@
"question": "Hoeveel stekkers van type Bosch Active Connect met 3 pinnen aan een kabel 
heeft dit oplaadpunt?",
"render": "Hier zijn {socket:bosch_3pin} stekkers van het type Bosch Active Connect met 3 pinnen aan een kabel 
"
},
+ "plugs-15": {
+ "question": "Hoeveel stekkers van type Bosch Active Connect met 5 pinnen aan een kabel 
heeft dit oplaadpunt?",
+ "render": "Hier zijn {socket:bosch_5pin} stekkers van het type Bosch Active Connect met 5 pinnen aan een kabel 
"
+ },
"plugs-2": {
"question": "Hoeveel stekkers van type Chademo 
heeft dit oplaadpunt?",
"render": "Hier zijn {socket:chademo} stekkers van het type Chademo 
"
@@ -1479,6 +1487,10 @@
"question": "Welk vermogen levert een enkele stekker van type Bosch Active Connect met 3 pinnen aan een kabel 
?",
"render": "Bosch Active Connect met 3 pinnen aan een kabel 
levert een vermogen van maximaal {socket:bosch_3pin:output}"
},
+ "power-output-15": {
+ "question": "Welk vermogen levert een enkele stekker van type Bosch Active Connect met 5 pinnen aan een kabel 
?",
+ "render": "Bosch Active Connect met 5 pinnen aan een kabel 
levert een vermogen van maximaal {socket:bosch_5pin:output}"
+ },
"power-output-2": {
"mappings": {
"0": {
@@ -1648,6 +1660,10 @@
"question": "Welke spanning levert de stekker van type Bosch Active Connect met 3 pinnen aan een kabel 
",
"render": "Bosch Active Connect met 3 pinnen aan een kabel 
heeft een spanning van {socket:bosch_3pin:voltage} volt"
},
+ "voltage-15": {
+ "question": "Welke spanning levert de stekker van type Bosch Active Connect met 5 pinnen aan een kabel 
",
+ "render": "Bosch Active Connect met 5 pinnen aan een kabel 
heeft een spanning van {socket:bosch_5pin:voltage} volt"
+ },
"voltage-2": {
"mappings": {
"0": {
@@ -1737,22 +1753,6 @@
},
"question": "Welke spanning levert de stekker van type Type 2 met kabel (J1772) 
",
"render": "Type 2 met kabel (J1772) 
heeft een spanning van {socket:type2_cable:voltage} volt"
- },
- "voltage-15": {
- "question": "Welke spanning levert de stekker van type Bosch Active Connect met 5 pinnen aan een kabel 
",
- "render": "Bosch Active Connect met 5 pinnen aan een kabel 
heeft een spanning van {socket:bosch_5pin:voltage} volt"
- },
- "power-output-15": {
- "question": "Welk vermogen levert een enkele stekker van type Bosch Active Connect met 5 pinnen aan een kabel 
?",
- "render": "Bosch Active Connect met 5 pinnen aan een kabel 
levert een vermogen van maximaal {socket:bosch_5pin:output}"
- },
- "plugs-15": {
- "question": "Hoeveel stekkers van type Bosch Active Connect met 5 pinnen aan een kabel 
heeft dit oplaadpunt?",
- "render": "Hier zijn {socket:bosch_5pin} stekkers van het type Bosch Active Connect met 5 pinnen aan een kabel 
"
- },
- "current-15": {
- "question": "Welke stroom levert de stekker van type Bosch Active Connect met 5 pinnen aan een kabel 
?",
- "render": "Bosch Active Connect met 5 pinnen aan een kabel 
levert een stroom van maximaal {socket:bosch_5pin:current}A"
}
},
"units": {
@@ -2446,6 +2446,31 @@
"render": "Drinkbaar water"
}
},
+ "etymology": {
+ "description": "Alle lagen met een gelinkt etymology",
+ "name": "Heeft etymology info",
+ "tagRenderings": {
+ "simple etymology": {
+ "mappings": {
+ "0": {
+ "then": "De oorsprong van deze naam is onbekend in de literatuur"
+ }
+ },
+ "question": "Naar wat is dit object vernoemd?
Dit staat mogelijks vermeld op het straatnaambordje",
+ "render": "Vernoemd naar {name:etymology}"
+ },
+ "street-name-sign-image": {
+ "render": "{image_carousel(image:streetsign)}
{image_upload(image:streetsign, Voeg afbeelding van straatnaambordje toe)}"
+ },
+ "wikipedia-etymology": {
+ "question": "Wat is het Wikidata-item van hetgeen dit object is naar vernoemd?",
+ "render": "Wikipedia artikel van de naamgever
{wikipedia(name:etymology:wikidata):max-height:20rem}"
+ },
+ "zoeken op inventaris onroerend erfgoed": {
+ "render": "Zoeken op inventaris onroerend erfgoed"
+ }
+ }
+ },
"food": {
"filter": {
"0": {
@@ -4077,25 +4102,5 @@
},
"render": "Watermolens"
}
- },
- "etymology": {
- "description": "Alle lagen met een gelinkt etymology",
- "name": "Heeft etymology info",
- "tagRenderings": {
- "simple etymology": {
- "question": "Naar wat is dit object vernoemd?
Dit staat mogelijks vermeld op het straatnaambordje",
- "render": "Vernoemd naar {name:etymology}"
- },
- "street-name-sign-image": {
- "render": "{image_carousel(image:streetsign)}
{image_upload(image:streetsign, Voeg afbeelding van straatnaambordje toe)}"
- },
- "wikipedia-etymology": {
- "question": "Wat is het Wikidata-item van hetgeen dit object is naar vernoemd?",
- "render": "Wikipedia artikel van de naamgever
{wikipedia(name:etymology:wikidata):max-height:20rem}"
- },
- "zoeken op inventaris onroerend erfgoed": {
- "render": "Zoeken op inventaris onroerend erfgoed"
- }
- }
}
}
\ No newline at end of file
diff --git a/langs/shared-questions/en.json b/langs/shared-questions/en.json
index 384d57e97a..0de90284ad 100644
--- a/langs/shared-questions/en.json
+++ b/langs/shared-questions/en.json
@@ -79,6 +79,14 @@
},
"question": "Is this place accessible with a wheelchair?"
},
+ "wikipedia": {
+ "mappings": {
+ "0": {
+ "then": "No Wikipedia page has been linked yet"
+ }
+ },
+ "question": "What is the corresponding Wikidata entity?"
+ },
"wikipedialink": {
"mappings": {
"0": {
diff --git a/langs/shared-questions/nl.json b/langs/shared-questions/nl.json
index 4335126033..f3345bcb7e 100644
--- a/langs/shared-questions/nl.json
+++ b/langs/shared-questions/nl.json
@@ -79,6 +79,14 @@
},
"question": "Is deze plaats rolstoeltoegankelijk?"
},
+ "wikipedia": {
+ "mappings": {
+ "0": {
+ "then": "Er werd nog geen Wikipedia-pagina gekoppeld"
+ }
+ },
+ "question": "Welk Wikidata-item komt overeen met dit object?"
+ },
"wikipedialink": {
"mappings": {
"0": {