diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 794824f3f..28b42e3b8 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -274,6 +274,13 @@
"ru": "Недоступно пользователям кресел-колясок",
"es": "Sin acceso para sillas de ruedas"
}
+ },
+ {
+ "if": "wheelchair=designated",
+ "then": {
+ "en": "There is only a dedicated toilet for wheelchair users",
+ "nl": "Er is alleen een toilet voor rolstoelgebruikers"
+ }
}
]
},
@@ -533,7 +540,9 @@
"de": "Rollstuhlgerecht",
"es": "Accesible con sillas de ruedas"
},
- "osmTags": "wheelchair=yes"
+ "osmTags": {
+ "or": ["wheelchair=yes", "wheelchair=designated"]
+ }
}
]
},
@@ -609,7 +618,9 @@
"render": "./assets/layers/toilet/toilets.svg",
"mappings": [
{
- "if": "wheelchair=yes",
+ "if": {
+ "or": ["wheelchair=yes", "wheelchair=designated"]
+ },
"then": "circle:white;./assets/layers/toilet/wheelchair.svg"
},
{
@@ -623,6 +634,7 @@
}
]
},
+
"iconBadges": [
{
"if": "opening_hours~*",
diff --git a/assets/themes/onwheels/bicycle_pump.svg b/assets/themes/onwheels/bicycle_pump.svg
new file mode 100644
index 000000000..98d33fb00
--- /dev/null
+++ b/assets/themes/onwheels/bicycle_pump.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/onwheels/cafe.svg b/assets/themes/onwheels/cafe.svg
new file mode 100644
index 000000000..266130911
--- /dev/null
+++ b/assets/themes/onwheels/cafe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/onwheels/hotel.svg b/assets/themes/onwheels/hotel.svg
new file mode 100644
index 000000000..3f76a6ad8
--- /dev/null
+++ b/assets/themes/onwheels/hotel.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/onwheels/license_info.json b/assets/themes/onwheels/license_info.json
index dab6006e7..77105e53d 100644
--- a/assets/themes/onwheels/license_info.json
+++ b/assets/themes/onwheels/license_info.json
@@ -1,4 +1,24 @@
[
+ {
+ "path": "bicycle_pump.svg",
+ "license": "CC-BY-SA",
+ "authors": [
+ "CT Steward"
+ ],
+ "sources": [
+ "https://www.ctsteward.com/"
+ ]
+ },
+ {
+ "path": "cafe.svg",
+ "license": "CC-BY-SA",
+ "authors": [
+ "CT Steward"
+ ],
+ "sources": [
+ "https://www.ctsteward.com/"
+ ]
+ },
{
"path": "crest.svg",
"license": "CC0",
@@ -7,6 +27,16 @@
],
"sources": []
},
+ {
+ "path": "hotel.svg",
+ "license": "CC-BY-SA",
+ "authors": [
+ "CT Steward"
+ ],
+ "sources": [
+ "https://www.ctsteward.com/"
+ ]
+ },
{
"path": "parking.svg",
"license": "CC-BY-SA",
@@ -16,5 +46,45 @@
"sources": [
"https://www.ctsteward.com/"
]
+ },
+ {
+ "path": "repair.svg",
+ "license": "CC-BY-SA",
+ "authors": [
+ "CT Steward"
+ ],
+ "sources": [
+ "https://www.ctsteward.com/"
+ ]
+ },
+ {
+ "path": "restaurant.svg",
+ "license": "CC-BY-SA",
+ "authors": [
+ "CT Steward"
+ ],
+ "sources": [
+ "https://www.ctsteward.com/"
+ ]
+ },
+ {
+ "path": "shop.svg",
+ "license": "CC-BY-SA",
+ "authors": [
+ "CT Steward"
+ ],
+ "sources": [
+ "https://www.ctsteward.com/"
+ ]
+ },
+ {
+ "path": "toilet.svg",
+ "license": "CC-BY-SA",
+ "authors": [
+ "CT Steward"
+ ],
+ "sources": [
+ "https://www.ctsteward.com/"
+ ]
}
]
\ No newline at end of file
diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json
index a8a0d4b8d..e5cab61f7 100644
--- a/assets/themes/onwheels/onwheels.json
+++ b/assets/themes/onwheels/onwheels.json
@@ -16,26 +16,92 @@
"widenFactor": 2,
"hideFromOverview": true,
"layers": [
- "bike_repair_station",
+ {
+ "builtin": "bike_repair_station",
+ "override": {
+ "mapRendering": [
+ {
+ "icon": {
+ "render": "./assets/themes/onwheels/repair.svg",
+ "mappings": [
+ {
+ "if": "service:bicycle:pump=yes",
+ "then": "./assets/themes/onwheels/bicycle_pump.svg"
+ }
+ ]
+ },
+ "iconSize": "40,40,bottom"
+ }
+ ]
+ }
+ },
"bike_shop",
- "cafe_pub",
+ {
+ "builtin": "cafe_pub",
+ "override": {
+ "mapRendering": [
+ {
+ "icon": "./assets/themes/onwheels/cafe.svg",
+ "iconSize": "40,40,bottom"
+ }
+ ]
+ }
+ },
"entrance",
- "food",
+ {
+ "builtin": "food",
+ "override": {
+ "mapRendering": [
+ {
+ "icon": "./assets/themes/onwheels/restaurant.svg",
+ "iconSize": "40,40,bottom"
+ }
+ ]
+ }
+ },
"kerbs",
{
"builtin": "parking",
"override": {
"mapRendering": [
{
- "icon": "./assets/themes/onwheels/parking.svg"
+ "icon": "./assets/themes/onwheels/parking.svg",
+ "iconSize": "40,40,bottom"
+ },
+ {
+ "color": "#225f92"
}
]
}
},
"picnic_table",
"school",
- "shops",
- "toilet",
+ {
+ "builtin": "shops",
+ "override": {
+ "mapRendering": [
+ {
+ "icon": "./assets/themes/onwheels/shop.svg",
+ "iconSize": "40,40,bottom",
+ "label": null
+ },
+ {
+ "color": "#ea4a94"
+ }
+ ]
+ }
+ },
+ {
+ "builtin": "toilet",
+ "override": {
+ "mapRendering": [
+ {
+ "icon": "./assets/themes/onwheels/toilet.svg",
+ "iconSize": "40,40,bottom"
+ }
+ ]
+ }
+ },
"viewpoint",
"doctors",
"reception_desk",
diff --git a/assets/themes/onwheels/repair.svg b/assets/themes/onwheels/repair.svg
new file mode 100644
index 000000000..b0924247c
--- /dev/null
+++ b/assets/themes/onwheels/repair.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/onwheels/restaurant.svg b/assets/themes/onwheels/restaurant.svg
new file mode 100644
index 000000000..86fe5c5b1
--- /dev/null
+++ b/assets/themes/onwheels/restaurant.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/onwheels/shop.svg b/assets/themes/onwheels/shop.svg
new file mode 100644
index 000000000..01ce20a09
--- /dev/null
+++ b/assets/themes/onwheels/shop.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/onwheels/toilet.svg b/assets/themes/onwheels/toilet.svg
new file mode 100644
index 000000000..81d9abdf4
--- /dev/null
+++ b/assets/themes/onwheels/toilet.svg
@@ -0,0 +1 @@
+
\ No newline at end of file