diff --git a/Models/ThemeConfig/Conversion/Validation.ts b/Models/ThemeConfig/Conversion/Validation.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/assets/layers/bicycle_rental/bicycle_rental.json b/assets/layers/bicycle_rental/bicycle_rental.json
new file mode 100644
index 000000000..7e3b1acf2
--- /dev/null
+++ b/assets/layers/bicycle_rental/bicycle_rental.json
@@ -0,0 +1,279 @@
+{
+ "id": "bicycle_rental",
+ "name": {
+ "en": "Bicycle rental",
+ "nl": "Fietsverhuur"
+ },
+ "source": {
+ "osmTags": {
+ "or": [
+ "amenity=bicycle_rental",
+ "bicycle_rental~*",
+ "service:bicycle:rental=yes",
+ "rental~.*bicycle.*"
+ ]
+ }
+ },
+ "minzoom": 12,
+ "title": {
+ "render": {
+ "en": "Bicycle rental",
+ "nl": "Fietsverhuur"
+ },
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "name~*"
+ ]
+ },
+ "then": {
+ "en": "{name}",
+ "nl": "{name}"
+ }
+ }
+ ]
+ },
+ "description": {
+ "en": "Bicycle rental stations",
+ "nl": "Fietsverhuustations"
+ },
+ "tagRenderings": [
+ {
+ "id": "bicycle_rental_type",
+ "question": {
+ "en": "What kind of bicycle rental is this?",
+ "nl": "Wat voor fietsverhuur is dit?"
+ },
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "shop=bicycle_rental",
+ "bicycle_rental=shop"
+ ]
+ },
+ "then": {
+ "en": "This is a shop whose main focus is bicycle rental",
+ "nl": "Dit is een zaak die focust op fietsverhuur"
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "shop=rental"
+ ]
+ },
+ "then": {
+ "en": "This is a rental buisiness which rents out various objects and/or vehicles. It rents out bicycles too, but this is not the main focus",
+ "nl": "Dit is een zaak die verschillende voorwerpen en/of voertuigen verhuurt, waaronder ook fietsen; al zijn fietsen niet de hoofdfocus"
+ },
+ "hideInAnswer": true
+ },
+ {
+ "if": {
+ "and": [
+ "service:bicycle:rental=yes",
+ "shop=bicycle"
+ ]
+ },
+ "then": {
+ "en": "This is a shop which sells or repairs bicycles, but also rents out bicycles",
+ "nl": "Dit is een fietsenmaker of fietswinkel die ook fietsen veruurt"
+ }
+ },
+ {
+ "if": "bicycle_rental=docking_station",
+ "then": {
+ "en": "This is an automated docking station, where a bicycle is mechanically locked into a structure",
+ "nl": "Dit is een docking station waar de fietsen mechanisch in een grotere structuur worden vastgemaakt"
+ }
+ },
+ {
+ "if": "bicycle_rental=key_dispensing_machine",
+ "then": {
+ "en": "A machine is present which dispenses and accepts keys, eventually after authentication and/or payment. The bicycles are parked nearby",
+ "nl": "Hier is een machine die fietssleutels verdeelt en terugneemt, eventueel na aanmelden of betaling. De fietsen staan in de buurt geparkeerd"
+ }
+ },
+ {
+ "if": "bicycle_rental=dropoff_point",
+ "then": {
+ "en": "This is a dropoff point: a designated bicycle parking for this cycle rental",
+ "nl": "Dit is een afzetpunt: een parking met duidelijke signalisatie waar (enkel) fietsen van deze fietsverhuur gezet worden"
+ }
+ }
+ ]
+ },
+ "website",
+ "email",
+ "phone",
+ {
+ "builtin": "opening_hours",
+ "override": {
+ "condition": {
+ "or": [
+ "shop~*",
+ "opening_hours~*"
+ ]
+ }
+ }
+ },
+ {
+ "builtin": "payment-options",
+ "override": {
+ "condition": "shop~*"
+ }
+ },
+ {
+ "builtin": "payment-options-advanced",
+ "override": {
+ "condition": "shop="
+ }
+ },
+ {
+ "id": "bicycle-types",
+ "question": {
+ "en": "What kind of bicycles and accessories are rented here?",
+ "nl": "Wat voor soort fietsen en fietstoebehren worden hier verhuurd?"
+ },
+ "render": {
+ "en": "{rental} is rented here",
+ "nl": "{rental} wordt hier uitgeleend"
+ },
+ "freeform": {
+ "key": "rental"
+ },
+ "multiAnswer": true,
+ "mappings": [
+ {
+ "if": "rental=city_bike",
+ "then": {
+ "en": "Normal city bikes can be rented here",
+ "nl": "Gewone stadsfietsen kunnen hier gehuurd worden"
+ }
+ },
+ {
+ "if": "rental=ebike",
+ "then": {
+ "en": "Electrical bikes can be rented here",
+ "nl": "Elektrische fietsen kunnen hier gehuurd worden"
+ }
+ },
+ {
+ "if": "rental=bmx",
+ "then": {
+ "en": "BMX bikes can be rented here",
+ "nl": "BMX-fietsen kunnen hier gehuurd worden"
+ }
+ },
+ {
+ "if": "rental=mtb",
+ "then": {
+ "en": "Mountainbikes can be rented here",
+ "nl": "Mountainbikes kunnen hier gehuurd worden"
+ }
+ },
+ {
+ "if": "rental=kid_bike",
+ "then": {
+ "en": "Bikes for childs can be rented here",
+ "nl": "Kinderfietsen kunnen hier gehuurd worden"
+ }
+ }
+ ]
+ },
+ {
+ "rewrite": {
+ "sourceString": [
+ "bicycle_type",
+ "type_plural"
+ ],
+ "into": [
+ [
+ "city_bike",
+ {
+ "en": "city bikes",
+ "nl": "Stadsfietsen"
+ }
+ ],
+ [
+ "ebike",
+ {
+ "en": "electrical bikes",
+ "nl": "elektrische fietsen"
+ }
+ ],
+ [
+ "kid_bike",
+ {
+ "en": "bikes for children",
+ "nl": "Kinderfietsen"
+ }
+ ],
+ [
+ "bmx",
+ {
+ "en": "BMX bikes",
+ "nl": "BMX-fietsen"
+ }
+ ],
+ [
+ "mtb",
+ {
+ "en": "mountainbike",
+ "nl": "mountainbike"
+ }
+ ],
+ [
+ "bicycle_pannier",
+ {
+ "en": "bicycle panniers",
+ "nl": "Fietstassen"
+ }
+ ]
+ ]
+ },
+ "renderings": [
+ {
+ "id": "rental-capacity-bicycle-type",
+ "group": "",
+ "question": {
+ "en": "How much type_plural can be rented here? ",
+ "nl": "Hoeveel type_plural kunnen hier uitgeleend worden?"
+ },
+ "render": {
+ "en": "{capacity:bicycle_type} type_plural can be rented here",
+ "nl": "{capacity:bicycle_type} type_plural kunnen hier uitgeleend worden"
+ },
+ "freeform": {
+ "key": "capacity:bicycle_type",
+ "type": "pnat"
+ },
+ "condition": "rental~.*bicycle_type.*"
+ }
+ ]
+ }
+ ],
+ "presets": [],
+ "mapRendering": [
+ {
+ "icon": "./assets/themes/bicycle_rental/logo.svg",
+ "iconSize": {
+ "render": "40,40,center"
+ },
+ "location": [
+ "point",
+ "centroid"
+ ]
+ },
+ {
+ "color": {
+ "render": "#3333aa88"
+ },
+ "width": {
+ "render": "2"
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/assets/layers/bicycle_rental/license_info.json b/assets/layers/bicycle_rental/license_info.json
new file mode 100644
index 000000000..099643225
--- /dev/null
+++ b/assets/layers/bicycle_rental/license_info.json
@@ -0,0 +1,13 @@
+[
+ {
+ "path": "rental.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ }
+]
\ No newline at end of file
diff --git a/assets/layers/bicycle_rental/rental.svg b/assets/layers/bicycle_rental/rental.svg
new file mode 100644
index 000000000..b66b2c214
--- /dev/null
+++ b/assets/layers/bicycle_rental/rental.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/layers/bike_repair_station/bike_repair_station.json b/assets/layers/bike_repair_station/bike_repair_station.json
index 558456c48..1486f7a84 100644
--- a/assets/layers/bike_repair_station/bike_repair_station.json
+++ b/assets/layers/bike_repair_station/bike_repair_station.json
@@ -760,14 +760,6 @@
"point",
"centroid"
]
- },
- {
- "color": {
- "render": "#00f"
- },
- "width": {
- "render": "1"
- }
}
],
"description": {
diff --git a/assets/layers/binocular/telescope.svg b/assets/layers/binocular/telescope.svg
index 3cf4a66bc..1bbf1b545 100644
--- a/assets/layers/binocular/telescope.svg
+++ b/assets/layers/binocular/telescope.svg
@@ -1,8 +1,45 @@
-
-
diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index 9ae5c9594..656112032 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -8,12 +8,15 @@
"minzoom": 10,
"source": {
"osmTags": {
+ "and": [
+ {
"or": [
"amenity=charging_station",
"disused:amenity=charging_station",
"planned:amenity=charging_station",
"construction:amenity=charging_station"
]
+ } ]
}
},
"title": {
diff --git a/assets/layers/charging_station/charging_station.protojson b/assets/layers/charging_station/charging_station.protojson
index c91305e3e..a15ec7fe3 100644
--- a/assets/layers/charging_station/charging_station.protojson
+++ b/assets/layers/charging_station/charging_station.protojson
@@ -7,11 +7,15 @@
"minzoom": 10,
"source": {
"osmTags": {
- "or": [
- "amenity=charging_station",
- "disused:amenity=charging_station",
- "planned:amenity=charging_station",
- "construction:amenity=charging_station"
+ "and": [
+ {
+ "or": [
+ "amenity=charging_station",
+ "disused:amenity=charging_station",
+ "planned:amenity=charging_station",
+ "construction:amenity=charging_station"
+ ]
+ }
]
}
},
diff --git a/assets/layers/etymology/etymology.json b/assets/layers/etymology/etymology.json
index 1c0f96c41..46d8a22ba 100644
--- a/assets/layers/etymology/etymology.json
+++ b/assets/layers/etymology/etymology.json
@@ -9,9 +9,13 @@
"minzoom": 12,
"source": {
"osmTags": {
- "or": [
- "name:etymology:wikidata~*",
- "name:etymology~*"
+ "and": [
+ {
+ "or": [
+ "name:etymology:wikidata~*",
+ "name:etymology~*"
+ ]
+ }
]
}
},
diff --git a/assets/layers/play_forest/icon.svg b/assets/layers/play_forest/icon.svg
index 83c51bef8..229042923 100644
--- a/assets/layers/play_forest/icon.svg
+++ b/assets/layers/play_forest/icon.svg
@@ -1,6 +1,38 @@
-
-
-
-
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index b739986fb..c9c4461bf 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -321,6 +321,7 @@
},
"id": "shops-opening_hours"
},
+ "payment-options",
"questions",
"reviews"
],
diff --git a/assets/svg/note.svg b/assets/svg/note.svg
index d4b0cb5f4..34daea006 100644
--- a/assets/svg/note.svg
+++ b/assets/svg/note.svg
@@ -1,16 +1,16 @@
+ width="275px"
+ height="374px"
+ viewBox="0 0 275 374"
+ version="1.1"
+ id="svg7"
+ sodipodi:docname="note.svg"
+ inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg">
+ d="M 135.55664,1.9765625 C 74.593645,2.1922681 20.084472,43.910648 7.2773438,104.37109 4.936895,115.41704 4.1435422,126.42334 4.7265625,137.18555 2.5821353,205.89923 56.815085,269.30423 107.08203,335.96094 c 12.32031,15.26562 30.35156,34.07422 30.35156,34.07422 l 27.64453,-32.61328 C 227.98632,255.40992 319.84389,135.74148 238.04492,49.080078 219.42005,26.853995 193.07863,10.556457 161.97656,4.4921875 153.10693,2.7626953 144.26564,1.9457474 135.55664,1.9765625 Z"
+ sodipodi:nodetypes="scccccccs" />
+ width="275px"
+ height="374px"
+ viewBox="0 0 275 374"
+ version="1.1"
+ id="svg7"
+ sodipodi:docname="resolved.svg"
+ inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg">
+ d="M 135.55664,1.9765625 C 74.593645,2.1922681 20.084472,43.910648 7.2773438,104.37109 4.936895,115.41704 4.1435422,126.42334 4.7265625,137.18555 2.5821353,205.89923 56.815085,269.30423 107.08203,335.96094 c 12.32031,15.26562 30.35156,34.07422 30.35156,34.07422 l 27.64453,-32.61328 C 227.98632,255.40992 319.84389,135.74148 238.04492,49.080078 219.42005,26.853995 193.07863,10.556457 161.97656,4.4921875 153.10693,2.7626953 144.26564,1.9457474 135.55664,1.9765625 Z"
+ sodipodi:nodetypes="scccccccs" />
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/assets/themes/bicycle_rental/bicycle_rental.json b/assets/themes/bicycle_rental/bicycle_rental.json
index 6edb33ca5..55b5bbb40 100644
--- a/assets/themes/bicycle_rental/bicycle_rental.json
+++ b/assets/themes/bicycle_rental/bicycle_rental.json
@@ -21,283 +21,6 @@
"widenFactor": 0.05,
"socialImage": "",
"layers": [
- {
- "id": "bicycle_rental",
- "name": {
- "en": "Bicycle rental",
- "nl": "Fietsverhuur"
- },
- "source": {
- "osmTags": {
- "or": [
- "amenity=bicycle_rental",
- "bicycle_rental~*",
- "service:bicycle:rental=yes",
- "rental~.*bicycle.*"
- ]
- }
- },
- "minzoom": 12,
- "title": {
- "render": {
- "en": "Bicycle rental",
- "nl": "Fietsverhuur"
- },
- "mappings": [
- {
- "if": {
- "and": [
- "name~*"
- ]
- },
- "then": {
- "en": "{name}",
- "nl": "{name}"
- }
- }
- ]
- },
- "description": {
- "en": "Bicycle rental stations",
- "nl": "Fietsverhuustations"
- },
- "tagRenderings": [
- {
- "id": "bicycle_rental_type",
- "question": {
- "en": "What kind of bicycle rental is this?",
- "nl": "Wat voor fietsverhuur is dit?"
- },
- "mappings": [
- {
- "if": {
- "and": [
- "shop=bicycle_rental",
- "bicycle_rental=shop"
- ]
- },
- "then": {
- "en": "This is a shop whose main focus is bicycle rental",
- "nl": "Dit is een zaak die focust op fietsverhuur"
- }
- },
- {
- "if": {
- "and": [
- "shop=rental"
- ]
- },
- "then": {
- "en": "This is a rental buisiness which rents out various objects and/or vehicles. It rents out bicycles too, but this is not the main focus",
- "nl": "Dit is een zaak die verschillende voorwerpen en/of voertuigen verhuurt, waaronder ook fietsen; al zijn fietsen niet de hoofdfocus"
- },
- "hideInAnswer": true
- },
- {
- "if": {
- "and": [
- "service:bicycle:rental=yes",
- "shop=bicycle"
- ]
- },
- "then": {
- "en": "This is a shop which sells or repairs bicycles, but also rents out bicycles",
- "nl": "Dit is een fietsenmaker of fietswinkel die ook fietsen veruurt"
- }
- },
- {
- "if": "bicycle_rental=docking_station",
- "then": {
- "en": "This is an automated docking station, where a bicycle is mechanically locked into a structure",
- "nl": "Dit is een docking station waar de fietsen mechanisch in een grotere structuur worden vastgemaakt"
- }
- },
- {
- "if": "bicycle_rental=key_dispensing_machine",
- "then": {
- "en": "A machine is present which dispenses and accepts keys, eventually after authentication and/or payment. The bicycles are parked nearby",
- "nl": "Hier is een machine die fietssleutels verdeelt en terugneemt, eventueel na aanmelden of betaling. De fietsen staan in de buurt geparkeerd"
- }
- },
- {
- "if": "bicycle_rental=dropoff_point",
- "then": {
- "en": "This is a dropoff point: a designated bicycle parking for this cycle rental",
- "nl": "Dit is een afzetpunt: een parking met duidelijke signalisatie waar (enkel) fietsen van deze fietsverhuur gezet worden"
- }
- }
- ]
- },
- "website",
- "email",
- "phone",
- {
- "builtin": "opening_hours",
- "override": {
- "condition": {
- "or": [
- "shop~*",
- "opening_hours~*"
- ]
- }
- }
- },
- {
- "builtin": "payment-options",
- "override": {
- "condition": "shop~*"
- }
- },
- {
- "builtin": "payment-options-advanced",
- "override": {
- "condition": "shop="
- }
- },
- {
- "id": "bicycle-types",
- "question": {
- "en": "What kind of bicycles and accessories are rented here?",
- "nl": "Wat voor soort fietsen en fietstoebehren worden hier verhuurd?"
- },
- "render": {
- "en": "{rental} is rented here"
- },
- "freeform": {
- "key": "rental"
- },
- "multiAnswer": true,
- "mappings": [
- {
- "if": "rental=city_bike",
- "then": {
- "en": "Normal city bikes can be rented here",
- "nl": "Gewone stadsfietsen kunnen hier gehuurd worden"
- }
- },
- {
- "if": "rental=ebike",
- "then": {
- "en": "Electrical bikes can be rented here",
- "nl": "Elektrische fietsen kunnen hier gehuurd worden"
- }
- },
- {
- "if": "rental=bmx",
- "then": {
- "en": "BMX bikes can be rented here",
- "nl": "BMX-fietsen kunnen hier gehuurd worden"
- }
- },
- {
- "if": "rental=mtb",
- "then": {
- "en": "Mountainbikes can be rented here",
- "nl": "Mountainbikes kunnen hier gehuurd worden"
- }
- },
- {
- "if": "rental=kid_bike",
- "then": {
- "en": "Bikes for childs can be rented here",
- "nl": "Kinderfietsen kunnen hier gehuurd worden"
- }
- }
- ]
- },
- {
- "rewrite": {
- "sourceString": [
- "bicycle_type",
- "type_plural"
- ],
- "into": [
- [
- "city_bike",
- {
- "en": "city bikes",
- "nl": "Stadsfietsen"
- }
- ],
- [
- "ebike",
- {
- "en": "electrical bikes",
- "nl": "elektrische fietsen"
- }
- ],
- [
- "kid_bike",
- {
- "en": "bikes for children",
- "nl": "Kinderfietsen"
- }
- ],
- [
- "bmx",
- {
- "en": "BMX bikes",
- "nl": "BMX-fietsen"
- }
- ],
- [
- "mtb",
- {
- "en": "mountainbike",
- "nl": "mountainbike"
- }
- ],
- [
- "bicycle_pannier",
- {
- "en": "bicycle panniers",
- "nl": "Fietstassen"
- }
- ]
- ]
- },
- "renderings": [
- {
- "id": "rental-capacity-bicycle-type",
- "group": "",
- "question": {
- "en": "How much type_plural can be rented here? ",
- "nl": "Hoeveel type_plural kunnen hier uitgeleend worden?"
- },
- "render": {
- "en": "{capacity:bicycle_type} type_plural can be rented here",
- "nl": "{capacity:bicycle_type} type_plural kunnen hier uitgeleend worden"
- },
- "freeform": {
- "key": "capacity:bicycle_type",
- "type": "pnat"
- },
- "condition": "rental~.*bicycle_type.*"
- }
- ]
- }
- ],
- "presets": [],
- "mapRendering": [
- {
- "icon": "./assets/themes/bicycle_rental/logo.svg",
- "iconSize": {
- "render": "40,40,center"
- },
- "location": [
- "point",
- "centroid"
- ]
- },
- {
- "color": {
- "render": "#3333aa88"
- },
- "width": {
- "render": "2"
- }
- }
- ]
- }
+ "bicycle_rental"
]
}
\ No newline at end of file
diff --git a/assets/themes/bicycle_rental/logo.svg b/assets/themes/bicycle_rental/logo.svg
index db9480dc6..b66b2c214 100644
--- a/assets/themes/bicycle_rental/logo.svg
+++ b/assets/themes/bicycle_rental/logo.svg
@@ -1,35 +1 @@
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/assets/themes/bicycle_rental/rental.svg b/assets/themes/bicycle_rental/rental.svg
index 6b4ba77f4..b66b2c214 100644
--- a/assets/themes/bicycle_rental/rental.svg
+++ b/assets/themes/bicycle_rental/rental.svg
@@ -1,33 +1 @@
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/assets/themes/cycle_highways/fietssnelwegen-logo.svg b/assets/themes/cycle_highways/fietssnelwegen-logo.svg
index 52810e3aa..4d96c32db 100644
--- a/assets/themes/cycle_highways/fietssnelwegen-logo.svg
+++ b/assets/themes/cycle_highways/fietssnelwegen-logo.svg
@@ -1,7 +1,42 @@
-
-
-
-
-
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/assets/themes/cyclestreets/F111.svg b/assets/themes/cyclestreets/F111.svg
index 5187f3692..35d91fb30 100644
--- a/assets/themes/cyclestreets/F111.svg
+++ b/assets/themes/cyclestreets/F111.svg
@@ -1,25 +1,113 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/assets/themes/etymology.json b/assets/themes/etymology.json
index d17b21acb..ceff10d4a 100644
--- a/assets/themes/etymology.json
+++ b/assets/themes/etymology.json
@@ -53,7 +53,7 @@
},
"minzoom": 18,
"source": {
- "osmTags": {
+ "=osmTags": {
"and": [
"name~*",
"highway~*",
diff --git a/assets/themes/fritures/fritures.json b/assets/themes/fritures/fritures.json
index d52e7a320..ce93ccc89 100644
--- a/assets/themes/fritures/fritures.json
+++ b/assets/themes/fritures/fritures.json
@@ -29,7 +29,7 @@
"hu": "Sültkrumplievő-hely"
},
"source": {
- "osmTags": {
+ "=osmTags": {
"and": [
"cuisine=friture",
{
diff --git a/assets/themes/nature/nature.json b/assets/themes/nature/nature.json
index e8768db5d..8dc62a6df 100644
--- a/assets/themes/nature/nature.json
+++ b/assets/themes/nature/nature.json
@@ -1,12 +1,15 @@
{
"id": "nature",
"title": {
+ "en": "Into nature",
"nl": "De Natuur in"
},
"shortDescription": {
+ "en": "A map for nature lovers, with interesting POI's",
"nl": "Deze kaart bevat informatie voor natuurliefhebbers"
},
"description": {
+ "en": "On this map, one can find interesting infromation for tourists and nature lovers, such as ",
"nl": "Op deze kaart vind je informatie voor natuurliefhebbers, zoals info over het natuurgebied waar je inzit, vogelkijkhutten, informatieborden, ..."
},
"maintainer": "",
@@ -20,8 +23,18 @@
"layers": [
"drinking_water",
"birdhide",
- "map",
- "information_board",
- "nature_reserve"
+ "nature_reserve",
+ {
+ "builtin": [
+ "map",
+ "information_board",
+ "bench",
+ "picnic_table",
+ "toilet"
+ ],
+ "override": {
+ "minzoom": 16
+ }
+ }
]
}
\ No newline at end of file
diff --git a/assets/themes/natuurpunt/natuurpunt.json b/assets/themes/natuurpunt/natuurpunt.json
index a5ed7ce15..28663c6f8 100644
--- a/assets/themes/natuurpunt/natuurpunt.json
+++ b/assets/themes/natuurpunt/natuurpunt.json
@@ -30,7 +30,16 @@
"startLat": 51.20875,
"startLon": 3.22435,
"startZoom": 15,
- "lockLocation": [[2.1,50.40],[ 6.4,51.54]],
+ "lockLocation": [
+ [
+ 2.1,
+ 50.4
+ ],
+ [
+ 6.4,
+ 51.54
+ ]
+ ],
"widenFactor": 2,
"socialImage": "",
"defaultBackgroundId": "CartoDB.Positron",
@@ -188,11 +197,11 @@
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 12,
"isOsmCache": true,
- "osmTags": {
- "+and": [
- "operator~.*[nN]atuurpunt.*"
- ]
- }
+ "osmTags": {
+ "+and": [
+ "operator~.*[nN]atuurpunt.*"
+ ]
+ }
},
"mapRendering": [
{
diff --git a/assets/themes/notes/license_info.json b/assets/themes/notes/license_info.json
new file mode 100644
index 000000000..d186e73a2
--- /dev/null
+++ b/assets/themes/notes/license_info.json
@@ -0,0 +1,10 @@
+[
+ {
+ "path": "logo.svg",
+ "license": "CC0",
+ "authors": [
+ "Pieter Vander Vennet"
+ ],
+ "sources": []
+ }
+]
\ No newline at end of file
diff --git a/assets/themes/notes/logo.svg b/assets/themes/notes/logo.svg
new file mode 100644
index 000000000..8c7ab6947
--- /dev/null
+++ b/assets/themes/notes/logo.svg
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/bench.svg b/assets/themes/toerisme_vlaanderen/NEGATIEF/bench.svg
new file mode 100644
index 000000000..b65d668e3
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/bench.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/bicycle_rental.svg b/assets/themes/toerisme_vlaanderen/NEGATIEF/bicycle_rental.svg
new file mode 100644
index 000000000..ca37e6a2b
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/bicycle_rental.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/charging_station_ebike.svg b/assets/themes/toerisme_vlaanderen/NEGATIEF/charging_station_ebike.svg
new file mode 100644
index 000000000..3ad5d40ab
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/charging_station_ebike.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/cycle_pump.svg b/assets/themes/toerisme_vlaanderen/NEGATIEF/cycle_pump.svg
new file mode 100644
index 000000000..395345c30
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/cycle_pump.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/license_info.json b/assets/themes/toerisme_vlaanderen/NEGATIEF/license_info.json
new file mode 100644
index 000000000..45bd4d713
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/license_info.json
@@ -0,0 +1,122 @@
+[
+ {
+ "path": "bench.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
+ {
+ "path": "bicycle_rental.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
+ {
+ "path": "charging_station_ebike.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
+ {
+ "path": "cycle_pump.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
+ {
+ "path": "logo.png",
+ "license": "Logo (all rights reserved)",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://www.toerismevlaanderen.be/"
+ ]
+ },
+ {
+ "path": "observation_platform.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
+ {
+ "path": "observation_tower.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
+ {
+ "path": "picnic_table.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
+ {
+ "path": "playground.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
+ {
+ "path": "toilets.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
+ {
+ "path": "toilets_wheelchair.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ }
+]
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/observation_platform.svg b/assets/themes/toerisme_vlaanderen/NEGATIEF/observation_platform.svg
new file mode 100644
index 000000000..96b3d42ef
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/observation_platform.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/observation_tower.svg b/assets/themes/toerisme_vlaanderen/NEGATIEF/observation_tower.svg
new file mode 100644
index 000000000..dcf91e067
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/observation_tower.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/picnic_table.svg b/assets/themes/toerisme_vlaanderen/NEGATIEF/picnic_table.svg
new file mode 100644
index 000000000..11acf338d
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/picnic_table.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/playground.svg b/assets/themes/toerisme_vlaanderen/NEGATIEF/playground.svg
new file mode 100644
index 000000000..39c675f09
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/playground.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/toilets.svg b/assets/themes/toerisme_vlaanderen/NEGATIEF/toilets.svg
new file mode 100644
index 000000000..86a32fd61
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/toilets.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/toilets_wheelchair.svg b/assets/themes/toerisme_vlaanderen/NEGATIEF/toilets_wheelchair.svg
new file mode 100644
index 000000000..a8037d1d4
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/toilets_wheelchair.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/bench.svg b/assets/themes/toerisme_vlaanderen/bench.svg
new file mode 100644
index 000000000..945d1632b
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/bench.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/bicycle_rental.svg b/assets/themes/toerisme_vlaanderen/bicycle_rental.svg
new file mode 100644
index 000000000..b66b2c214
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/bicycle_rental.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/charging_station_ebike.svg b/assets/themes/toerisme_vlaanderen/charging_station_ebike.svg
new file mode 100644
index 000000000..57c49e71c
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/charging_station_ebike.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/cycle_pump.svg b/assets/themes/toerisme_vlaanderen/cycle_pump.svg
new file mode 100644
index 000000000..1284b8c32
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/cycle_pump.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/license_info.json b/assets/themes/toerisme_vlaanderen/license_info.json
index 374abea1e..45bd4d713 100644
--- a/assets/themes/toerisme_vlaanderen/license_info.json
+++ b/assets/themes/toerisme_vlaanderen/license_info.json
@@ -1,4 +1,48 @@
[
+ {
+ "path": "bench.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
+ {
+ "path": "bicycle_rental.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
+ {
+ "path": "charging_station_ebike.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
+ {
+ "path": "cycle_pump.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
{
"path": "logo.png",
"license": "Logo (all rights reserved)",
@@ -8,5 +52,71 @@
"sources": [
"https://www.toerismevlaanderen.be/"
]
+ },
+ {
+ "path": "observation_platform.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
+ {
+ "path": "observation_tower.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
+ {
+ "path": "picnic_table.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
+ {
+ "path": "playground.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
+ {
+ "path": "toilets.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
+ },
+ {
+ "path": "toilets_wheelchair.svg",
+ "license": "CC0",
+ "authors": [
+ "Toerisme Vlaanderen"
+ ],
+ "sources": [
+ "https://toerismevlaanderen.be/pinjepunt",
+ "https://mapcomplete.osm.be/toerisme_vlaanderenn"
+ ]
}
]
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/observation_platform.svg b/assets/themes/toerisme_vlaanderen/observation_platform.svg
new file mode 100644
index 000000000..6c7e2edd4
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/observation_platform.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/observation_tower.svg b/assets/themes/toerisme_vlaanderen/observation_tower.svg
new file mode 100644
index 000000000..13474c0e9
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/observation_tower.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/picnic_table.svg b/assets/themes/toerisme_vlaanderen/picnic_table.svg
new file mode 100644
index 000000000..a672acb40
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/picnic_table.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/playground.svg b/assets/themes/toerisme_vlaanderen/playground.svg
new file mode 100644
index 000000000..e383835a6
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/playground.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
index 81666bc41..fae51c955 100644
--- a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
+++ b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
@@ -4,6 +4,7 @@
"maintainer": "MapComplete",
"version": "0.0.2",
"customCss": "./assets/themes/toerisme_vlaanderen/custom.css",
+ "defaultBackgroundId": "CartoDB.Voyager",
"mustHaveLanguage": [
"nl"
],
@@ -25,18 +26,136 @@
"startLon": 4.433,
"widenFactor": 1.5,
"layers": [
+ {
+ "builtin": "toilet",
+ "override": {
+ "minzoom": 14,
+ "mapRendering": [
+ {
+ "icon": {
+ "render": "./assets/themes/toerisme_vlaanderen/toilets.svg",
+ "=mappings": [
+ {
+ "if": "wheelchair=yes",
+ "then": "./assets/themes/toerisme_vlaanderen/toilets_wheelchair.svg"
+ }
+ ]
+ }
+ }
+ ]
+ }
+ },
+ {
+ "builtin": "bench",
+ "override": {
+ "minzoom": 14,
+ "mapRendering": [
+ {
+ "icon": {
+ "render": "./assets/themes/toerisme_vlaanderen/bench.svg"
+ }
+ }
+ ]
+ }
+ },
+ {
+ "builtin": "picnic_table",
+ "override": {
+ "minzoom": 14,
+ "mapRendering": [
+ {
+ "icon": {
+ "render": "./assets/themes/toerisme_vlaanderen/picnic_table.svg"
+ }
+ }
+ ]
+ }
+ },
+ {
+ "builtin": "observation_tower",
+ "override": {
+ "minzoom": 14,
+ "mapRendering": [
+ {
+ "icon": {
+ "render": "./assets/themes/toerisme_vlaanderen/observation_tower.svg"
+ }
+ }
+ ]
+ }
+ },
+ {
+ "builtin": "playground",
+ "override": {
+ "minzoom": 14,
+ "mapRendering": [
+ {
+ "icon": {
+ "render": "./assets/themes/toerisme_vlaanderen/playground.svg"
+ }
+ }
+ ]
+ }
+ },
+ "bicycle_rental",
+ {
+ "builtin": "bike_repair_station",
+ "override": {
+ "minzoom": 14,
+ "=mapRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "icon": {
+ "render": "./assets/themes/toerisme_vlaanderen/cycle_pump.svg"
+ },
+ "badges": [
+ {
+ "if": "service:bicycle:pump:operational_status=broken",
+ "then": "close:red"
+ }
+ ]
+ }
+ ]
+ }
+ },
{
"builtin": [
- "toilet",
- "bench",
- "picnic_table",
- "observation_tower",
- "bike_repair_station",
- "playground",
"charging_station"
],
"override": {
- "minzoom": 14
+ "id": "charging_station_ebikes",
+ "minzoom": 14,
+ "source": {
+ "osmTags": {
+ "and+": [
+ "bicycle=yes"
+ ]
+ }
+ },
+ "=filter": null,
+ "=mapRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "icon": "./assets/themes/toerisme_vlaanderen/charging_station_ebike.svg"
+ }
+ ]
+ }
+ },
+ {
+ "#": "All charging stations at a high zoom level, to avoid duplicates",
+ "builtin": "charging_station",
+ "override": {
+ "name": null,
+ "filter": {
+ "sameAs": "charging_station_ebike"
+ },
+ "minzoom": 18
}
}
],
diff --git a/assets/themes/toerisme_vlaanderen/toilets.svg b/assets/themes/toerisme_vlaanderen/toilets.svg
new file mode 100644
index 000000000..22d3dd808
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/toilets.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/toilets_wheelchair.svg b/assets/themes/toerisme_vlaanderen/toilets_wheelchair.svg
new file mode 100644
index 000000000..b2ba5a29c
--- /dev/null
+++ b/assets/themes/toerisme_vlaanderen/toilets_wheelchair.svg
@@ -0,0 +1 @@
+
\ No newline at end of file