midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-19 03:02:08 +02:00
commit 2c480eb9d8
28 changed files with 984 additions and 1324 deletions
Download patch file Download diff file Expand all files Collapse all files

16
assets/layers/bike_shop/bike_shop.json
View file

@ -157,6 +157,10 @@
] ]
}, },
"titleIcons": [ "titleIcons": [
{
"render": "<a href='https://fietsambassade.gent.be/' target='_blank'><img src='./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg'/></a>",
"condition": "operator=De Fietsambassade Gent"
},
{ {
"render": "<a href='https://fietsambassade.gent.be/' target='_blank'><img src='./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg'/></a>", "render": "<a href='https://fietsambassade.gent.be/' target='_blank'><img src='./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg'/></a>",
"condition": "operator=De Fietsambassade Gent" "condition": "operator=De Fietsambassade Gent"
@ -310,6 +314,13 @@
}, },
"id": "bike_shop-access" "id": "bike_shop-access"
}, },
{
"render": "Enkel voor {access}",
"freeform": {
"key": "access"
},
"id": "bike_shop-access"
},
{ {
"id": "bike_repair_sells-bikes", "id": "bike_repair_sells-bikes",
"question": { "question": {
@ -691,6 +702,11 @@
] ]
}, },
"iconOverlays": [ "iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
},
{ {
"if": "opening_hours~*", "if": "opening_hours~*",
"then": "isOpen", "then": "isOpen",

3
assets/themes/benches/benches.json
View file

@ -58,6 +58,5 @@
"bench", "bench",
"bench_at_pt", "bench_at_pt",
"picnic_table" "picnic_table"
], ]
"roamingRenderings": []
} }

1
assets/themes/bicyclelib/bicyclelib.json
View file

@ -42,7 +42,6 @@
"startLon": 0, "startLon": 0,
"startZoom": 1, "startZoom": 1,
"widenFactor": 1.5, "widenFactor": 1.5,
"roamingRenderings": [],
"layers": [ "layers": [
{ {
"builtin": "bicycle_library", "builtin": "bicycle_library",

1
assets/themes/bookcases/bookcases.json
View file

@ -40,7 +40,6 @@
"startLon": 0, "startLon": 0,
"startZoom": 1, "startZoom": 1,
"widenFactor": 1, "widenFactor": 1,
"roamingRenderings": [],
"layers": [ "layers": [
"public_bookcase" "public_bookcase"
] ]

527
assets/themes/buurtnatuur/buurtnatuur.json
View file

@ -124,19 +124,6 @@
"nl": "Voeg een ontbrekend, erkend natuurreservaat toe, bv. een gebied dat beheerd wordt door het ANB of natuurpunt" "nl": "Voeg een ontbrekend, erkend natuurreservaat toe, bv. een gebied dat beheerd wordt door het ANB of natuurpunt"
} }
} }
],
"mapRendering": [
{
"icon": {
"render": "circle:#ffffff;./assets/themes/buurtnatuur/nature_reserve.svg"
},
"iconSize": {
"render": "50,50,center"
},
"location": [
"point"
]
}
] ]
}, },
{ {
@ -235,19 +222,6 @@
"nl": "Voeg een ontbrekend park toe" "nl": "Voeg een ontbrekend park toe"
} }
} }
],
"mapRendering": [
{
"icon": {
"render": "circle:#ffffff;./assets/themes/buurtnatuur/park.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
] ]
}, },
{ {
@ -365,280 +339,269 @@
"nl": "Voeg een ontbrekend bos toe aan de kaart" "nl": "Voeg een ontbrekend bos toe aan de kaart"
} }
} }
],
"mapRendering": [
{
"icon": {
"render": "circle:#ffffff;./assets/themes/buurtnatuur/forest.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
] ]
}, },
"viewpoint" "viewpoint"
], ],
"roamingRenderings": [ "overrideAll": {
{ "tagRenderings+": [
"#": "Access tag", {
"condition": { "id": "Access tag",
"and": [ "condition": {
"tourism!~viewpoint" "and": [
"tourism!~viewpoint"
]
},
"render": {
"nl": "De toegankelijkheid van dit gebied is: {access:description}"
},
"question": {
"nl": "Is dit gebied toegankelijk?"
},
"freeform": {
"key": "access:description",
"addExtraTags": [
"access="
]
},
"mappings": [
{
"if": {
"and": [
"access:description=",
"access=",
"leisure=park"
]
},
"then": {
"nl": "Dit gebied is vrij toegankelijk"
},
"hideInAnswer": true
},
{
"if": {
"and": [
"access:description=",
"access=yes",
"fee="
]
},
"then": {
"nl": "Vrij toegankelijk"
}
},
{
"if": {
"and": [
"access:description=",
"access=no",
"fee="
]
},
"then": {
"nl": "Niet toegankelijk"
}
},
{
"if": {
"and": [
"access:description=",
"access=private",
"fee="
]
},
"then": {
"nl": "Niet toegankelijk, want privégebied"
}
},
{
"if": {
"and": [
"access:description=",
"access=permissive",
"fee="
]
},
"then": {
"nl": "Toegankelijk, ondanks dat het privegebied is"
}
},
{
"if": {
"and": [
"access:description=",
"access=guided",
"fee="
]
},
"then": {
"nl": "Enkel toegankelijk met een gids of tijdens een activiteit"
}
},
{
"if": {
"and": [
"access:description=",
"access=yes",
"fee=yes"
]
},
"then": {
"nl": "Toegankelijk mits betaling"
}
}
] ]
}, },
"render": { {
"nl": "De toegankelijkheid van dit gebied is: {access:description}" "id": "Operator tag",
}, "render": {
"question": { "nl": "Beheer door {operator}"
"nl": "Is dit gebied toegankelijk?"
},
"freeform": {
"key": "access:description",
"addExtraTags": [
"access="
]
},
"mappings": [
{
"if": {
"and": [
"access:description=",
"access=",
"leisure=park"
]
},
"then": {
"nl": "Dit gebied is vrij toegankelijk"
},
"hideInAnswer": true
}, },
{ "question": {
"if": { "nl": "Wie beheert dit gebied?"
"and": [
"access:description=",
"access=yes",
"fee="
]
},
"then": {
"nl": "Vrij toegankelijk"
}
}, },
{ "freeform": {
"if": { "key": "operator"
"and": [
"access:description=",
"access=no",
"fee="
]
},
"then": {
"nl": "Niet toegankelijk"
}
}, },
{ "mappings": [
"if": { {
"and": [ "if": {
"access:description=", "and": [
"access=private", "leisure=park",
"fee=" "operator="
] ]
},
"then": "Beheer door de gemeente",
"hideInAnswer": true
}, },
"then": { {
"nl": "Niet toegankelijk, want privégebied" "if": {
} "and": [
}, "operator=Natuurpunt"
{ ]
"if": { },
"and": [ "then": {
"access:description=", "nl": "<img src=\"./assets/themes/buurtnatuur/Natuurpunt.jpg\" style=\"width:1.5em\">Dit gebied wordt beheerd door Natuurpunt"
"access=permissive", }
"fee="
]
}, },
"then": { {
"nl": "Toegankelijk, ondanks dat het privegebied is" "if": {
} "and": [
}, "operator~(n|N)atuurpunt.*"
{ ]
"if": { },
"and": [ "then": {
"access:description=", "nl": "<img src=\"./assets/themes/buurtnatuur/Natuurpunt.jpg\" style=\"width:1.5em\">Dit gebied wordt beheerd door {operator}"
"access=guided", },
"fee=" "hideInAnswer": true
]
}, },
"then": { {
"nl": "Enkel toegankelijk met een gids of tijdens een activiteit" "if": {
} "and": [
}, "operator=Agentschap Natuur en Bos"
{ ]
"if": { },
"and": [ "then": {
"access:description=", "nl": "<img src=\"./assets/themes/buurtnatuur/ANB.jpg\" style=\"width:1.5em\">Dit gebied wordt beheerd door het Agentschap Natuur en Bos"
"access=yes", }
"fee=yes"
]
}, },
"then": { {
"nl": "Toegankelijk mits betaling" "if": {
"and": [
"operator:type=private"
]
},
"then": "Beheer door een privépersoon",
"hideInAnswer": true
},
{
"if": {
"and": [
"operator:type=private",
"operator="
]
},
"then": "Beheer door een privépersoon"
} }
],
"condition": {
"and": [
"leisure!~park",
"tourism!~viewpoint"
]
} }
]
},
{
"#": "Operator tag",
"render": {
"nl": "Beheer door {operator}"
}, },
"question": { {
"nl": "Wie beheert dit gebied?" "id": "Non-editable description {description}",
}, "render": {
"freeform": { "nl": "Extra info: <i>{description}</i>"
"key": "operator"
},
"mappings": [
{
"if": {
"and": [
"leisure=park",
"operator="
]
},
"then": "Beheer door de gemeente",
"hideInAnswer": true
}, },
{ "freeform": {
"if": { "key": "description"
"and": [
"operator=Natuurpunt"
]
},
"then": {
"nl": "<img src=\"./assets/themes/buurtnatuur/Natuurpunt.jpg\" style=\"width:1.5em\">Dit gebied wordt beheerd door Natuurpunt"
}
},
{
"if": {
"and": [
"operator~(n|N)atuurpunt.*"
]
},
"then": {
"nl": "<img src=\"./assets/themes/buurtnatuur/Natuurpunt.jpg\" style=\"width:1.5em\">Dit gebied wordt beheerd door {operator}"
},
"hideInAnswer": true
},
{
"if": {
"and": [
"operator=Agentschap Natuur en Bos"
]
},
"then": {
"nl": "<img src=\"./assets/themes/buurtnatuur/ANB.jpg\" style=\"width:1.5em\">Dit gebied wordt beheerd door het Agentschap Natuur en Bos"
}
},
{
"if": {
"and": [
"operator:type=private"
]
},
"then": "Beheer door een privépersoon",
"hideInAnswer": true
},
{
"if": {
"and": [
"operator:type=private",
"operator="
]
},
"then": "Beheer door een privépersoon"
} }
],
"condition": {
"and": [
"leisure!~park",
"tourism!~viewpoint"
]
}
},
{
"#": "Non-editable description {description}",
"render": {
"nl": "Extra info: <i>{description}</i>"
}, },
"freeform": { {
"key": "description" "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>",
}, "render": {
{ "nl": "Extra info via buurtnatuur.be: <i>{description:0}</i>"
"#": "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>", "freeform": {
"render": { "key": "description:0"
"nl": "Extra info via buurtnatuur.be: <i>{description:0}</i>"
},
"freeform": {
"key": "description:0"
}
},
{
"#": "Name:nl-tag",
"render": {
"nl": "Dit gebied heet {name:nl}"
},
"question": {
"nl": "Wat is de Nederlandstalige naam van dit gebied?"
},
"freeform": {
"key": "name:nl"
},
"condition": {
"and": [
"name:nl~*",
"viewpoint!~tourism"
]
}
},
{
"#": "Name tag",
"render": {
"nl": "Dit gebied heet {name}"
},
"question": {
"nl": "Wat is de naam van dit gebied?"
},
"freeform": {
"key": "name",
"addExtraTags": [
"noname="
]
},
"condition": {
"and": [
"name:nl=",
"tourism!~viewpoint"
]
},
"mappings": [
{
"if": {
"and": [
"noname=yes",
"name="
]
},
"then": {
"nl": "Dit gebied heeft geen naam"
}
} }
] },
} {
] "id": "Name:nl-tag",
"render": {
"nl": "Dit gebied heet {name:nl}"
},
"question": {
"nl": "Wat is de Nederlandstalige naam van dit gebied?"
},
"freeform": {
"key": "name:nl"
},
"condition": {
"and": [
"name:nl~*",
"viewpoint!~tourism"
]
}
},
{
"id": "Name tag",
"render": {
"nl": "Dit gebied heet {name}"
},
"question": {
"nl": "Wat is de naam van dit gebied?"
},
"freeform": {
"key": "name",
"addExtraTags": [
"noname="
]
},
"condition": {
"and": [
"name:nl=",
"tourism!~viewpoint"
]
},
"mappings": [
{
"if": {
"and": [
"noname=yes",
"name="
]
},
"then": {
"nl": "Dit gebied heeft geen naam"
}
}
]
}
]
}
} }

163
assets/themes/campersite/campersite.json
View file

@ -676,31 +676,7 @@
} }
} }
], ],
"wayHandling": 2, "wayHandling": 2
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/themes/campersite/caravan.svg",
"mappings": [
{
"if": {
"and": [
"fee=no"
]
},
"then": "circle:white;./assets/themes/campersite/caravan_green.svg"
}
]
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point",
"centroid"
]
}
]
}, },
{ {
"id": "dumpstations", "id": "dumpstations",
@ -1099,82 +1075,73 @@
"de": "Fügen Sie eine neue sanitäre Entsorgungsstation hinzu. Hier können Camper Abwasser oder chemischen Toilettenabfälle entsorgen. Oft gibt es auch Trinkwasser und Strom." "de": "Fügen Sie eine neue sanitäre Entsorgungsstation hinzu. Hier können Camper Abwasser oder chemischen Toilettenabfälle entsorgen. Oft gibt es auch Trinkwasser und Strom."
} }
} }
],
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/themes/campersite/sanitary_dump_station.svg"
},
"iconSize": {
"render": "32,32,center"
},
"location": [
"point"
]
}
] ]
} }
], ],
"roamingRenderings": [ "overrideAll": {
{ "tagRenderings+": [
"render": { {
"en": "This place is operated by {operator}", "id": "operator",
"ja": "この場所は{operator}によって運営されます", "render": {
"it": "Questo luogo è gestito da {operator}", "en": "This place is operated by {operator}",
"fr": "Ce site est exploité par {operator}", "ja": "この場所は{operator}によって運営されます",
"de": "Dieser Ort wird betrieben von {operator}" "it": "Questo luogo è gestito da {operator}",
}, "fr": "Ce site est exploité par {operator}",
"question": { "de": "Dieser Ort wird betrieben von {operator}"
"en": "Who operates this place?",
"ja": "この店は誰が経営しているんですか?",
"it": "Chi gestisce questo luogo?",
"fr": "Qui est l’exploitant du site ?",
"de": "Wer betreibt diesen Ort?"
},
"freeform": {
"key": "operator"
}
},
{
"question": {
"en": "Does this place have a power supply?",
"ja": "この場所に電源はありますか?",
"it": "Questo luogo fornisce corrente elettrica?",
"fr": "Ce site a-t’il une source d’électricité ?",
"de": "Hat dieser Ort eine Stromversorgung?"
},
"mappings": [
{
"if": {
"and": [
"power_supply=yes"
]
},
"then": {
"en": "This place has a power supply",
"id": "Tempat ini memiliki catu daya",
"ja": "この場所には電源があります",
"it": "Questo luogo fornisce corrente elettrica",
"fr": "Ce site a une source d’alimentation",
"de": "Dieser Ort hat eine Stromversorgung"
}
}, },
{ "question": {
"if": { "en": "Who operates this place?",
"and": [ "ja": "この店は誰が経営しているんですか?",
"power_supply=no" "it": "Chi gestisce questo luogo?",
] "fr": "Qui est l’exploitant du site ?",
}, "de": "Wer betreibt diesen Ort?"
"then": { },
"en": "This place does not have power supply", "freeform": {
"id": "Tempat ini tidak memiliki sumber listrik", "key": "operator"
"ja": "この場所には電源がありません",
"it": "Questo luogo non fornisce corrente elettrica",
"fr": "Ce site n’a pas de source d’alimentation",
"de": "Dieser Ort hat keine Stromversorgung"
}
} }
] },
} {
] "id": "power_supply",
"question": {
"en": "Does this place have a power supply?",
"ja": "この場所に電源はありますか?",
"it": "Questo luogo fornisce corrente elettrica?",
"fr": "Ce site a-t’il une source d’électricité ?",
"de": "Hat dieser Ort eine Stromversorgung?"
},
"mappings": [
{
"if": {
"and": [
"power_supply=yes"
]
},
"then": {
"en": "This place has a power supply",
"id": "Tempat ini memiliki catu daya",
"ja": "この場所には電源があります",
"it": "Questo luogo fornisce corrente elettrica",
"fr": "Ce site a une source d’alimentation",
"de": "Dieser Ort hat eine Stromversorgung"
}
},
{
"if": {
"and": [
"power_supply=no"
]
},
"then": {
"en": "This place does not have power supply",
"id": "Tempat ini tidak memiliki sumber listrik",
"ja": "この場所には電源がありません",
"it": "Questo luogo non fornisce corrente elettrica",
"fr": "Ce site n’a pas de source d’alimentation",
"de": "Dieser Ort hat keine Stromversorgung"
}
}
]
}
]
}
} }

3
assets/themes/charging_stations/charging_stations.json
View file

@ -46,6 +46,5 @@
"defaultBackgroundId": "CartoDB.Voyager", "defaultBackgroundId": "CartoDB.Voyager",
"layers": [ "layers": [
"charging_station" "charging_station"
], ]
"roamingRenderings": []
} }

1126
assets/themes/climbing/climbing.json
View file

File diff suppressed because it is too large Load diff

226
assets/themes/cyclestreets/cyclestreets.json
View file

@ -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",
@ -183,14 +84,6 @@
"width": "10", "width": "10",
"tagRenderings": [ "tagRenderings": [
"images" "images"
],
"mapRendering": [
{
"icon": "./assets/themes/cyclestreets/F111.svg",
"location": [
"point"
]
}
] ]
}, },
{ {
@ -243,14 +136,6 @@
"width": "5", "width": "5",
"tagRenderings": [ "tagRenderings": [
"images" "images"
],
"mapRendering": [
{
"icon": "./assets/themes/cyclestreets/F113.svg",
"location": [
"point"
]
}
] ]
}, },
{ {
@ -316,18 +201,111 @@
}, },
"tagRenderings": [ "tagRenderings": [
"images" "images"
],
"mapRendering": [
{
"icon": "./assets/svg/pencil.svg",
"location": [
"point"
]
}
] ]
} }
], ],
"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"
}
}
]
} }
} }

3
assets/themes/cyclofix/cyclofix.json
View file

@ -57,6 +57,5 @@
"bike_themed_object", "bike_themed_object",
"bike_cleaning", "bike_cleaning",
"bike_parking" "bike_parking"
], ]
"roamingRenderings": []
} }

3
assets/themes/drinking_water/drinking_water.json
View file

@ -40,6 +40,5 @@
"widenFactor": 2, "widenFactor": 2,
"layers": [ "layers": [
"drinking_water" "drinking_water"
], ]
"roamingRenderings": []
} }

76
assets/themes/facadegardens/facadegardens.json
View file

@ -454,79 +454,7 @@
} }
} }
], ],
"wayHandling": 1, "wayHandling": 1
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/themes/facadegardens/geveltuin.svg",
"mappings": [
{
"if": {
"and": [
"direct_sunlight=yes"
]
},
"then": "circle:white;./assets/themes/facadegardens/zon.svg"
},
{
"if": {
"and": [
"direct_sunlight=partial"
]
},
"then": "circle:white;./assets/themes/facadegardens/halfzon.svg"
},
{
"if": {
"and": [
"direct_sunlight=no"
]
},
"then": "circle:white;./assets/themes/facadegardens/schaduw.svg"
}
]
},
"iconOverlays": [
{
"if": "plant~.*vine.*",
"then": "circle:white;./assets/themes/facadegardens/klimplant.svg",
"badge": true
},
{
"if": "plant~.*groundcover.*",
"then": "circle:white;./assets/themes/facadegardens/bodembedekker.svg",
"badge": true
},
{
"if": "edible=true",
"then": "circle:white;./assets/themes/facadegardens/eetbaar.svg",
"badge": true
},
{
"if": "rain_barel=yes",
"then": "circle:white;./assets/themes/facadegardens/gevelton.svg",
"badge": true
},
{
"if": "plant~.*shrub.*",
"then": "circle:white;./assets/themes/facadegardens/struik.svg",
"badge": true
},
{
"if": "plant~.*flower.*",
"then": "circle:white;./assets/themes/facadegardens/bloei.svg",
"badge": true
}
],
"iconSize": {
"render": "50,50,center"
},
"location": [
"point"
]
}
]
} }
], ]
"roamingRenderings": []
} }

3
assets/themes/fritures/fritures.json
View file

@ -54,6 +54,5 @@
"filter": null "filter": null
} }
} }
], ]
"roamingRenderings": []
} }

29
assets/themes/fruit_trees/fruit_trees.json
View file

@ -68,19 +68,6 @@
"nl": "Voeg een boomgaard toe (als punt - omtrek nog te tekenen)" "nl": "Voeg een boomgaard toe (als punt - omtrek nog te tekenen)"
} }
} }
],
"mapRendering": [
{
"icon": {
"render": "./assets/themes/buurtnatuur/forest.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
] ]
}, },
{ {
@ -183,21 +170,7 @@
"nl": "Voeg hier een boom toe" "nl": "Voeg hier een boom toe"
} }
} }
],
"mapRendering": [
{
"icon": {
"render": "./assets/themes/fruit_trees/fruit_tree.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
] ]
} }
], ]
"roamingRenderings": []
} }

22
assets/themes/grb.json
View file

@ -197,29 +197,9 @@
"render": "#00f" "render": "#00f"
}, },
"wayHandling": 2, "wayHandling": 2,
"presets": [], "presets": []
"mapRendering": [
{
"label": {
"mappings": [
{
"if": "addr:housenumber~*",
"then": "<div style='background-color: white; font: large; width: 1.5em; height: 1.5em; border-radius: 100%'>{addr:housenumber}</div>"
}
]
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point",
"centroid"
]
}
]
} }
], ],
"hideFromOverview": true, "hideFromOverview": true,
"roamingRenderings": [],
"defaultBackgroundId": "AGIVFlandersGRB" "defaultBackgroundId": "AGIVFlandersGRB"
} }

3
assets/themes/maps/maps.json
View file

@ -40,6 +40,5 @@
"socialImage": "", "socialImage": "",
"layers": [ "layers": [
"map" "map"
], ]
"roamingRenderings": []
} }

3
assets/themes/nature/nature.json
View file

@ -26,6 +26,5 @@
"map", "map",
"information_board", "information_board",
"nature_reserve" "nature_reserve"
], ]
"roamingRenderings": []
} }

3
assets/themes/parkings/parkings.json
View file

@ -26,6 +26,5 @@
"socialImage": "", "socialImage": "",
"layers": [ "layers": [
"parking" "parking"
], ]
"roamingRenderings": []
} }

3
assets/themes/personal/personal.json
View file

@ -46,6 +46,5 @@
"startZoom": 16, "startZoom": 16,
"widenFactor": 1.2, "widenFactor": 1.2,
"overpassMaxZoom": 0, "overpassMaxZoom": 0,
"layers": [], "layers": []
"roamingRenderings": []
} }

3
assets/themes/play_forests/play_forests.json
View file

@ -23,6 +23,5 @@
"socialImage": "", "socialImage": "",
"layers": [ "layers": [
"play_forest" "play_forest"
], ]
"roamingRenderings": []
} }

3
assets/themes/playgrounds/playgrounds.json
View file

@ -42,6 +42,5 @@
"socialImage": "", "socialImage": "",
"layers": [ "layers": [
"playground" "playground"
], ]
"roamingRenderings": []
} }

3
assets/themes/sport_pitches/sport_pitches.json
View file

@ -41,6 +41,5 @@
"socialImage": "", "socialImage": "",
"layers": [ "layers": [
"sport_pitch" "sport_pitch"
], ]
"roamingRenderings": []
} }

3
assets/themes/surveillance/surveillance.json
View file

@ -43,6 +43,5 @@
"layers": [ "layers": [
"direction", "direction",
"surveillance_camera" "surveillance_camera"
], ]
"roamingRenderings": []
} }

1
assets/themes/trees/trees.json
View file

@ -55,6 +55,5 @@
"layers": [ "layers": [
"tree_node" "tree_node"
], ],
"roamingRenderings": [],
"defaultBackgroundId": "AGIV" "defaultBackgroundId": "AGIV"
} }

66
assets/themes/uk_addresses/uk_addresses.json
View file

@ -108,29 +108,6 @@
} }
] ]
} }
],
"mapRendering": [
{
"icon": {
"render": "./assets/themes/uk_addresses/housenumber_unknown.svg",
"mappings": [
{
"if": "_embedding_object:id~*",
"then": "./assets/themes/uk_addresses/housenumber_unknown_small.svg"
},
{
"if": "_imported=yes",
"then": "./assets/themes/uk_addresses/housenumber_unknown_small.svg"
}
]
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
] ]
}, },
{ {
@ -277,36 +254,7 @@
"then": "#ff0" "then": "#ff0"
} }
] ]
}, }
"mapRendering": [
{
"icon": {
"render": "./assets/themes/uk_addresses/housenumber_ok.svg",
"mappings": [
{
"if": {
"or": [
{
"and": [
"addr:housenumber=",
"nohousenumber!=yes"
]
},
"addr:street="
]
},
"then": "./assets/themes/uk_addresses/housenumber_unknown.svg"
}
]
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
}, },
{ {
"id": "named_streets", "id": "named_streets",
@ -324,15 +272,7 @@
}, },
"width": { "width": {
"render": "0" "render": "0"
}, }
"mapRendering": [
{
"location": [
"point"
]
}
]
} }
], ]
"roamingRenderings": []
} }

3
assets/themes/waste_basket/waste_basket.json
View file

@ -33,6 +33,5 @@
"minzoom": 12 "minzoom": 12
} }
} }
], ]
"roamingRenderings": []
} }

5
scripts/generateLayerOverview.ts
View file

@ -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)) {
@ -213,4 +216,4 @@ class LayerOverviewUtils {
} }
} }
new LayerOverviewUtils().main(process.argv) new LayerOverviewUtils().main(process.argv)

7
scripts/lint.ts
View file

@ -63,6 +63,11 @@ for (const themeFile of themeFiles) {
// @ts-ignore // @ts-ignore
fixLayerConfig(layerConfig) fixLayerConfig(layerConfig)
} }
if(themeFile.parsed["roamingRenderings"] !== undefined && themeFile.parsed["roamingRenderings"].length == 0){
delete themeFile.parsed["roamingRenderings"]
}
writeFileSync(themeFile.path, JSON.stringify(themeFile.parsed, null, " ")) writeFileSync(themeFile.path, JSON.stringify(themeFile.parsed, null, " "))
} }
//*/ //*/