Remove roamingRenderings as feature, overrideAll is easier to use
This commit is contained in:
parent
1fb45ad75a
commit
4153193500
5 changed files with 934 additions and 925 deletions
|
|
@ -343,9 +343,10 @@
|
||||||
},
|
},
|
||||||
"viewpoint"
|
"viewpoint"
|
||||||
],
|
],
|
||||||
"roamingRenderings": [
|
"overrideAll": {
|
||||||
|
"tagRenderings+": [
|
||||||
{
|
{
|
||||||
"#": "Access tag",
|
"id": "Access tag",
|
||||||
"condition": {
|
"condition": {
|
||||||
"and": [
|
"and": [
|
||||||
"tourism!~viewpoint"
|
"tourism!~viewpoint"
|
||||||
|
|
@ -452,7 +453,7 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"#": "Operator tag",
|
"id": "Operator tag",
|
||||||
"render": {
|
"render": {
|
||||||
"nl": "Beheer door {operator}"
|
"nl": "Beheer door {operator}"
|
||||||
},
|
},
|
||||||
|
|
@ -531,7 +532,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"#": "Non-editable description {description}",
|
"id": "Non-editable description {description}",
|
||||||
"render": {
|
"render": {
|
||||||
"nl": "Extra info: <i>{description}</i>"
|
"nl": "Extra info: <i>{description}</i>"
|
||||||
},
|
},
|
||||||
|
|
@ -540,7 +541,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"#": "Editable description {description:0}",
|
"id": "Editable description {description:0}",
|
||||||
"question": "Is er extra info die je kwijt wil?<br/><span class='subtle'>De <i>naam</i> van het gebied wordt in de volgende vraag gesteld</span>",
|
"question": "Is er extra info die je kwijt wil?<br/><span class='subtle'>De <i>naam</i> van het gebied wordt in de volgende vraag gesteld</span>",
|
||||||
"render": {
|
"render": {
|
||||||
"nl": "Extra info via buurtnatuur.be: <i>{description:0}</i>"
|
"nl": "Extra info via buurtnatuur.be: <i>{description:0}</i>"
|
||||||
|
|
@ -550,7 +551,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"#": "Name:nl-tag",
|
"id": "Name:nl-tag",
|
||||||
"render": {
|
"render": {
|
||||||
"nl": "Dit gebied heet {name:nl}"
|
"nl": "Dit gebied heet {name:nl}"
|
||||||
},
|
},
|
||||||
|
|
@ -568,7 +569,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"#": "Name tag",
|
"id": "Name tag",
|
||||||
"render": {
|
"render": {
|
||||||
"nl": "Dit gebied heet {name}"
|
"nl": "Dit gebied heet {name}"
|
||||||
},
|
},
|
||||||
|
|
@ -603,3 +604,4 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
@ -1078,8 +1078,10 @@
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"roamingRenderings": [
|
"overrideAll": {
|
||||||
|
"tagRenderings+": [
|
||||||
{
|
{
|
||||||
|
"id": "operator",
|
||||||
"render": {
|
"render": {
|
||||||
"en": "This place is operated by {operator}",
|
"en": "This place is operated by {operator}",
|
||||||
"ja": "この場所は{operator}によって運営されます",
|
"ja": "この場所は{operator}によって運営されます",
|
||||||
|
|
@ -1099,6 +1101,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"id": "power_supply",
|
||||||
"question": {
|
"question": {
|
||||||
"en": "Does this place have a power supply?",
|
"en": "Does this place have a power supply?",
|
||||||
"ja": "この場所に電源はありますか?",
|
"ja": "この場所に電源はありますか?",
|
||||||
|
|
@ -1141,3 +1144,4 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -43,105 +43,6 @@
|
||||||
"maxZoom": 12,
|
"maxZoom": 12,
|
||||||
"minNeededElements": 200
|
"minNeededElements": 200
|
||||||
},
|
},
|
||||||
"roamingRenderings": [
|
|
||||||
{
|
|
||||||
"question": {
|
|
||||||
"nl": "Is deze straat een fietsstraat?",
|
|
||||||
"en": "Is this street a cyclestreet?",
|
|
||||||
"ja": "この通りはcyclestreetですか?",
|
|
||||||
"nb_NO": "Er denne gaten en sykkelvei?",
|
|
||||||
"de": "Ist diese Straße eine Fahrradstraße?"
|
|
||||||
},
|
|
||||||
"mappings": [
|
|
||||||
{
|
|
||||||
"if": {
|
|
||||||
"and": [
|
|
||||||
"cyclestreet=yes",
|
|
||||||
"maxspeed=30",
|
|
||||||
"overtaking:motor_vehicle=no",
|
|
||||||
"proposed:cyclestreet="
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"then": {
|
|
||||||
"nl": "Deze straat is een fietsstraat (en dus zone 30)",
|
|
||||||
"en": "This street is a cyclestreet (and has a speed limit of 30 km/h)",
|
|
||||||
"ja": "cyclestreet(最高速度は30km/h)",
|
|
||||||
"nb_NO": "Denne gaten er en sykkelvei (og har en fartsgrense på 30 km/t)",
|
|
||||||
"de": "Diese Straße ist eine Fahrradstraße (mit einer Geschwindigkeitsbegrenzung von 30 km/h)"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"if": {
|
|
||||||
"and": [
|
|
||||||
"cyclestreet=yes",
|
|
||||||
"proposed:cyclestreet="
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"then": {
|
|
||||||
"nl": "Deze straat i een fietsstraat",
|
|
||||||
"en": "This street is a cyclestreet",
|
|
||||||
"ja": "この通りはcyclestreetだ",
|
|
||||||
"nb_NO": "Denne gaten er en sykkelvei",
|
|
||||||
"de": "Diese Straße ist eine Fahrradstraße"
|
|
||||||
},
|
|
||||||
"hideInAnswer": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"if": {
|
|
||||||
"and": [
|
|
||||||
"cyclestreet=",
|
|
||||||
"proposed:cyclestreet=yes"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"then": {
|
|
||||||
"nl": "Deze straat wordt binnenkort een fietsstraat",
|
|
||||||
"en": "This street will become a cyclstreet soon",
|
|
||||||
"ja": "この通りはまもなくcyclstreetになるだろう",
|
|
||||||
"nb_NO": "Denne gaten vil bli sykkelvei ganske snart",
|
|
||||||
"de": "Diese Straße wird bald eine Fahrradstraße sein"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"if": {
|
|
||||||
"and": [
|
|
||||||
"cyclestreet=",
|
|
||||||
"proposed:cyclestreet=",
|
|
||||||
"overtaking:motor_vehicle="
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"then": {
|
|
||||||
"nl": "Deze straat is geen fietsstraat",
|
|
||||||
"en": "This street is not a cyclestreet",
|
|
||||||
"ja": "この通りはcyclestreetではない",
|
|
||||||
"nb_NO": "Denne gaten er ikke en sykkelvei",
|
|
||||||
"it": "Questa strada non è una strada ciclabile",
|
|
||||||
"de": "Diese Straße ist keine Fahrradstraße"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"question": {
|
|
||||||
"nl": "Wanneer wordt deze straat een fietsstraat?",
|
|
||||||
"en": "When will this street become a cyclestreet?",
|
|
||||||
"ja": "この通りはいつcyclestreetになるんですか?",
|
|
||||||
"it": "Questa strada diventerà una strada ciclabile quando?",
|
|
||||||
"de": "Wann wird diese Straße eine Fahrradstraße?"
|
|
||||||
},
|
|
||||||
"render": {
|
|
||||||
"nl": "Deze straat wordt fietsstraat op {cyclestreet:start_date}",
|
|
||||||
"en": "This street will become a cyclestreet at {cyclestreet:start_date}",
|
|
||||||
"ja": "この通りは{cyclestreet:start_date}に、cyclestreetになります",
|
|
||||||
"it": "Questa strada diventerà una strada ciclabile dal {cyclestreet:start_date}",
|
|
||||||
"de": "Diese Straße wird am {cyclestreet:start_date} zu einer Fahrradstraße"
|
|
||||||
},
|
|
||||||
"condition": "proposed:cyclestreet=yes",
|
|
||||||
"freeform": {
|
|
||||||
"type": "date",
|
|
||||||
"key": "cyclestreet:start_date"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"layers": [
|
"layers": [
|
||||||
{
|
{
|
||||||
"id": "fietsstraat",
|
"id": "fietsstraat",
|
||||||
|
|
@ -304,6 +205,105 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"overrideAll": {
|
"overrideAll": {
|
||||||
"allowSplit": true
|
"allowSplit": true,
|
||||||
|
"tagRenderings+": [
|
||||||
|
{"id": "is_cyclestreet",
|
||||||
|
"question": {
|
||||||
|
"nl": "Is deze straat een fietsstraat?",
|
||||||
|
"en": "Is this street a cyclestreet?",
|
||||||
|
"ja": "この通りはcyclestreetですか?",
|
||||||
|
"nb_NO": "Er denne gaten en sykkelvei?",
|
||||||
|
"de": "Ist diese Straße eine Fahrradstraße?"
|
||||||
|
},
|
||||||
|
"mappings": [
|
||||||
|
{
|
||||||
|
"if": {
|
||||||
|
"and": [
|
||||||
|
"cyclestreet=yes",
|
||||||
|
"maxspeed=30",
|
||||||
|
"overtaking:motor_vehicle=no",
|
||||||
|
"proposed:cyclestreet="
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"then": {
|
||||||
|
"nl": "Deze straat is een fietsstraat (en dus zone 30)",
|
||||||
|
"en": "This street is a cyclestreet (and has a speed limit of 30 km/h)",
|
||||||
|
"ja": "cyclestreet(最高速度は30km/h)",
|
||||||
|
"nb_NO": "Denne gaten er en sykkelvei (og har en fartsgrense på 30 km/t)",
|
||||||
|
"de": "Diese Straße ist eine Fahrradstraße (mit einer Geschwindigkeitsbegrenzung von 30 km/h)"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"if": {
|
||||||
|
"and": [
|
||||||
|
"cyclestreet=yes",
|
||||||
|
"proposed:cyclestreet="
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"then": {
|
||||||
|
"nl": "Deze straat i een fietsstraat",
|
||||||
|
"en": "This street is a cyclestreet",
|
||||||
|
"ja": "この通りはcyclestreetだ",
|
||||||
|
"nb_NO": "Denne gaten er en sykkelvei",
|
||||||
|
"de": "Diese Straße ist eine Fahrradstraße"
|
||||||
|
},
|
||||||
|
"hideInAnswer": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"if": {
|
||||||
|
"and": [
|
||||||
|
"cyclestreet=",
|
||||||
|
"proposed:cyclestreet=yes"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"then": {
|
||||||
|
"nl": "Deze straat wordt binnenkort een fietsstraat",
|
||||||
|
"en": "This street will become a cyclstreet soon",
|
||||||
|
"ja": "この通りはまもなくcyclstreetになるだろう",
|
||||||
|
"nb_NO": "Denne gaten vil bli sykkelvei ganske snart",
|
||||||
|
"de": "Diese Straße wird bald eine Fahrradstraße sein"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"if": {
|
||||||
|
"and": [
|
||||||
|
"cyclestreet=",
|
||||||
|
"proposed:cyclestreet=",
|
||||||
|
"overtaking:motor_vehicle="
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"then": {
|
||||||
|
"nl": "Deze straat is geen fietsstraat",
|
||||||
|
"en": "This street is not a cyclestreet",
|
||||||
|
"ja": "この通りはcyclestreetではない",
|
||||||
|
"nb_NO": "Denne gaten er ikke en sykkelvei",
|
||||||
|
"it": "Questa strada non è una strada ciclabile",
|
||||||
|
"de": "Diese Straße ist keine Fahrradstraße"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{"id": "future_cyclestreet",
|
||||||
|
"question": {
|
||||||
|
"nl": "Wanneer wordt deze straat een fietsstraat?",
|
||||||
|
"en": "When will this street become a cyclestreet?",
|
||||||
|
"ja": "この通りはいつcyclestreetになるんですか?",
|
||||||
|
"it": "Questa strada diventerà una strada ciclabile quando?",
|
||||||
|
"de": "Wann wird diese Straße eine Fahrradstraße?"
|
||||||
|
},
|
||||||
|
"render": {
|
||||||
|
"nl": "Deze straat wordt fietsstraat op {cyclestreet:start_date}",
|
||||||
|
"en": "This street will become a cyclestreet at {cyclestreet:start_date}",
|
||||||
|
"ja": "この通りは{cyclestreet:start_date}に、cyclestreetになります",
|
||||||
|
"it": "Questa strada diventerà una strada ciclabile dal {cyclestreet:start_date}",
|
||||||
|
"de": "Diese Straße wird am {cyclestreet:start_date} zu einer Fahrradstraße"
|
||||||
|
},
|
||||||
|
"condition": "proposed:cyclestreet=yes",
|
||||||
|
"freeform": {
|
||||||
|
"type": "date",
|
||||||
|
"key": "cyclestreet:start_date"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -118,6 +118,9 @@ class LayerOverviewUtils {
|
||||||
if (themeFile["units"] !== undefined) {
|
if (themeFile["units"] !== undefined) {
|
||||||
themeErrorCount.push("The theme " + themeFile.id + " has units defined - these should be defined on the layer instead. (Hint: use overrideAll: { '+units': ... }) ")
|
themeErrorCount.push("The theme " + themeFile.id + " has units defined - these should be defined on the layer instead. (Hint: use overrideAll: { '+units': ... }) ")
|
||||||
}
|
}
|
||||||
|
if (themeFile["roamingRenderings"] !== undefined) {
|
||||||
|
themeErrorCount.push("Theme " + themeFile.id + " contains an old 'roamingRenderings'. Use an 'overrideAll' instead")
|
||||||
|
}
|
||||||
for (const layer of themeFile.layers) {
|
for (const layer of themeFile.layers) {
|
||||||
if (typeof layer === "string") {
|
if (typeof layer === "string") {
|
||||||
if (!knownLayerIds.has(layer)) {
|
if (!knownLayerIds.has(layer)) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue