diff --git a/app/component/map/tile-layer/PoiVectorTileLayer.js b/app/component/map/tile-layer/PoiVectorTileLayer.js
index 1d52aa2c4e..fc09afb1a6 100644
--- a/app/component/map/tile-layer/PoiVectorTileLayer.js
+++ b/app/component/map/tile-layer/PoiVectorTileLayer.js
@@ -95,6 +95,7 @@ export default class PoiVectorTileLayer {
this.tile,
feature.geom,
this.imageSize,
+ svgElement.style,
);
}
}
diff --git a/app/configurations/layers/hb-layers.json b/app/configurations/layers/hb-layers.json
index 2e434fbd56..9cfbf7c026 100644
--- a/app/configurations/layers/hb-layers.json
+++ b/app/configurations/layers/hb-layers.json
@@ -111,8 +111,8 @@
{
"code": "vehicles",
"translations": {
- "de": "ÖPNV-Positionen",
- "en": "Public transport positions"
+ "de": "Fahrzeugpositionen",
+ "en": "Vehicle positions"
},
"properties": {
"layer": {
@@ -148,7 +148,7 @@
"code": "bike_car",
"translations": {
"de": "Fahrrad & Auto",
- "en": "Bike & Car"
+ "en": "Bicycle & Car"
},
"categories": [
{
@@ -257,7 +257,7 @@
"code": "bike_shops_rental",
"translations": {
"de": "Fahrradläden und -verleih",
- "en": "Bike shops"
+ "en": "Bicycle shops and rental"
},
"categories": [
{
@@ -410,7 +410,7 @@
"code": "parkAndRide",
"translations": {
"de": "Parkplätze/ Parkhäuser",
- "en": "Parkings"
+ "en": "Parking"
},
"properties": {
"layer": {
@@ -535,17 +535,7 @@
"origin": ""
}
}
- }
- ],
- "properties": null
- },
- {
- "code": "workshops",
- "translations": {
- "de": "Werkstätten KFZ",
- "en": "Workshops motor vehicles"
- },
- "categories": [
+ },
{
"code": "workshop_motorcycle_and_scooter",
"translations": {
@@ -703,7 +693,7 @@
"code": "bicycle",
"translations": {
"de": "Bikesharing",
- "en": "Bike sharing"
+ "en": "Bicycle sharing"
},
"properties": {
"layer": {
@@ -899,7 +889,7 @@
{
"code": "restaurants",
"translations": {
- "de": "Restaurants",
+ "de": "Restaurant",
"en": "Restaurant"
},
"properties": {
@@ -1329,8 +1319,8 @@
{
"code": "other",
"translations": {
- "de": "Sonstiges",
- "en": "Other"
+ "de": "Sonstige Unterhaltung",
+ "en": "Other entertainment"
},
"properties": {
"layer": {
@@ -1415,8 +1405,8 @@
{
"code": "other",
"translations": {
- "de": "Sonstiges",
- "en": "Other"
+ "de": "Sonstiger Sport, Park oder Spielplatz",
+ "en": "Other sports, park or playground"
},
"properties": {
"layer": {
@@ -2120,8 +2110,8 @@
{
"code": "other_bench",
"translations": {
- "de": "Sonstige Bank",
- "en": "Other Bench"
+ "de": "Sitzgelegenheit",
+ "en": "Bench"
},
"properties": {
"layer": {
@@ -2165,7 +2155,7 @@
"min_zoom": 15
},
"icon": {
- "svg": "\n",
+ "svg": "\n",
"origin": "https://labs.mapbox.com/maki-icons/ viewpoint",
"background_color": "#803C39",
"color": "#FFFFFF"
@@ -2329,7 +2319,7 @@
"min_zoom": 15
},
"icon": {
- "svg": "",
+ "svg": "",
"origin": "bereits vorhanden",
"background_color": "#803C39",
"color": "#FFFFFF"
@@ -2702,7 +2692,7 @@
"min_zoom": 16
},
"icon": {
- "svg": "",
+ "svg": "\r\n",
"origin": "https://labs.mapbox.com/maki-icons/ clothing-store",
"background_color": "#998A6E",
"color": "#FFFFFF"
@@ -3528,7 +3518,7 @@
"min_zoom": 15
},
"icon": {
- "svg": "",
+ "svg": "\r\n\r\n \r\n \r\n \r\n \r\n image/svg+xml\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n",
"origin": "https://wiki.openstreetmap.org/wiki/File:Charity-14.svg",
"background_color": "#998A6E",
"color": "#FFFFFF"
@@ -3701,7 +3691,7 @@
"min_zoom": 15
},
"icon": {
- "svg": "\n\n\n \n Maki Icons | By Mapbox \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n",
+ "svg": "\n",
"origin": "https://labs.mapbox.com/maki-icons/post",
"background_color": "#998A6E",
"color": "#FFFFFF"
@@ -3837,7 +3827,7 @@
"min_zoom": 15
},
"icon": {
- "svg": "",
+ "svg": "\r\n\r\n \r\n \r\n \r\n image/svg+xml\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n",
"origin": "https://wiki.openstreetmap.org/wiki/File:Town-hall-16.svg",
"background_color": "#868582",
"color": "#FFFFFF"
@@ -4659,7 +4649,7 @@
"min_zoom": 15
},
"icon": {
- "svg": "",
+ "svg": "",
"origin": "",
"background_color": "#C07E26",
"color": "#FFFFFF"
@@ -4674,7 +4664,7 @@
"overpass_query": ""
},
"misc": {
- "comment": "",
+ "comment": "denis.paz@trufi-association.org könnt ihr dazu auch noch was machen, bitte?",
"origin": ""
}
}
@@ -4693,7 +4683,7 @@
"min_zoom": 15
},
"icon": {
- "svg": "Bus mit Colleghut?",
+ "svg": "",
"origin": "",
"background_color": "",
"color": "#FFFFFF"
diff --git a/app/util/mapIconUtils.js b/app/util/mapIconUtils.js
index 5e6ba249eb..83acb610e6 100644
--- a/app/util/mapIconUtils.js
+++ b/app/util/mapIconUtils.js
@@ -954,8 +954,10 @@ export function drawAvailabilityBadge(
});
}
-export function drawIcon(icon, tile, geom, imageSize) {
- return getImageFromSpriteCache(icon, imageSize, imageSize).then(image => {
- drawIconImage(image, tile, geom, imageSize, imageSize);
- });
+export function drawIcon(icon, tile, geom, imageSize, fill) {
+ return getImageFromSpriteCache(icon, imageSize, imageSize, fill).then(
+ image => {
+ drawIconImage(image, tile, geom, imageSize, imageSize);
+ },
+ );
}