diff --git a/Customizations/Layers/BikeParkings.ts b/Customizations/Layers/BikeParkings.ts
index cd5b344d0..2c8a731d0 100644
--- a/Customizations/Layers/BikeParkings.ts
+++ b/Customizations/Layers/BikeParkings.ts
@@ -10,7 +10,7 @@ import {ImageCarouselWithUploadConstructor} from "../../UI/Image/ImageCarouselWi
export default class BikeParkings extends LayerDefinition {
constructor() {
super();
- this.name = "bike_parking";
+ this.name = "bike parking";
this.icon = "./assets/bike/parking.svg";
this.overpassFilter = new Tag("amenity", "bicycle_parking");
this.newElementTags = [
diff --git a/Customizations/Layers/BikeShop.ts b/Customizations/Layers/BikeShop.ts
new file mode 100644
index 000000000..8c68f24d8
--- /dev/null
+++ b/Customizations/Layers/BikeShop.ts
@@ -0,0 +1,33 @@
+import {TagRenderingOptions} from "../TagRendering";
+import {LayerDefinition} from "../LayerDefinition";
+import {Tag} from "../../Logic/TagsFilter";
+
+export class BikeShop extends LayerDefinition{
+
+ constructor() {
+ super(
+ {
+ name: "bike shop or repair",
+ icon: "assets/bike/repair_shop.svg",
+ minzoom: 14,
+ overpassFilter: new Tag("shop","bicycle"),
+ newElementTags: [new Tag("shop","bicycle")]
+ }
+ );
+
+ this.title = new TagRenderingOptions({
+ mappings:[
+ {k:new Tag("service:bicycle:retail","yes"), txt: "Bicycle shop"},
+ {k:new Tag("service:bicycle:retail","no"), txt: "Bicycle repair"},
+ {k:new Tag("service:bicycle:retail",""), txt: "Bicycle repair/shop"},
+ ]
+ })
+
+
+ this.style()
+
+
+ }
+
+
+}
\ No newline at end of file
diff --git a/Customizations/Layers/BikeStations.ts b/Customizations/Layers/BikeStations.ts
index 995ce64ea..258aad98d 100644
--- a/Customizations/Layers/BikeStations.ts
+++ b/Customizations/Layers/BikeStations.ts
@@ -82,7 +82,6 @@ export default class BikeStations extends LayerDefinition {
iconUrl: iconUrl,
iconSize: [50, 50],
iconAnchor: [25,50]
-
})
};
};
diff --git a/Customizations/Layers/DrinkingWater.ts b/Customizations/Layers/DrinkingWater.ts
index 7808b2471..7bdd63240 100644
--- a/Customizations/Layers/DrinkingWater.ts
+++ b/Customizations/Layers/DrinkingWater.ts
@@ -10,7 +10,7 @@ export class DrinkingWater extends LayerDefinition {
constructor() {
super();
- this.name = "drinking_water";
+ this.name = "drinking water";
this.icon = "./assets/bike/drinking_water.svg";
this.overpassFilter = new Or([
diff --git a/Customizations/Layouts/Cyclofix.ts b/Customizations/Layouts/Cyclofix.ts
index b64cf1861..dfc35d056 100644
--- a/Customizations/Layouts/Cyclofix.ts
+++ b/Customizations/Layouts/Cyclofix.ts
@@ -3,6 +3,7 @@ import BikeParkings from "../Layers/BikeParkings";
import BikeServices from "../Layers/BikeStations";
import {GhostBike} from "../Layers/GhostBike";
import {DrinkingWater} from "../Layers/DrinkingWater";
+import {BikeShop} from "../Layers/BikeShop";
export default class Cyclofix extends Layout {
@@ -10,7 +11,7 @@ export default class Cyclofix extends Layout {
super(
"pomp",
"Cyclofix bicycle infrastructure",
- [ new BikeServices(), new BikeParkings(), new DrinkingWater()],
+ [new BikeServices(), new BikeShop(), new DrinkingWater(), new BikeParkings()],
16,
50.8465573,
4.3516970,
diff --git a/Customizations/Questions/bike/StationPumpTools.ts b/Customizations/Questions/bike/StationPumpTools.ts
index be81c8b27..532f24cda 100644
--- a/Customizations/Questions/bike/StationPumpTools.ts
+++ b/Customizations/Questions/bike/StationPumpTools.ts
@@ -6,7 +6,7 @@ export default class BikeStationPumpTools extends TagRenderingOptions {
constructor() {
super({
priority: 15,
- question: "Which services are available at this bike station?",
+ question: "Which services are available here?",
mappings: [
{k: new And([new Tag("service:bicycle:tools", "no"), new Tag("service:bicycle:pump", "yes")]), txt: "There is only a pump available."},
{k: new And([new Tag("service:bicycle:tools", "yes"), new Tag("service:bicycle:pump", "no")]), txt: "There are only tools (screwdrivers, pliers...) available."},
diff --git a/assets/bike/broken_pump.svg b/assets/bike/broken_pump.svg
new file mode 100644
index 000000000..38868a504
--- /dev/null
+++ b/assets/bike/broken_pump.svg
@@ -0,0 +1,30 @@
+
diff --git a/assets/bike/drinking_water.svg b/assets/bike/drinking_water.svg
new file mode 100644
index 000000000..4962afe3a
--- /dev/null
+++ b/assets/bike/drinking_water.svg
@@ -0,0 +1,18 @@
+
diff --git a/assets/bike/parking_old.svg b/assets/bike/parking_old.svg
new file mode 100644
index 000000000..b095bc15b
--- /dev/null
+++ b/assets/bike/parking_old.svg
@@ -0,0 +1,93 @@
+