From 27411692b42889fde055f5f6658bd1707874aac6 Mon Sep 17 00:00:00 2001
From: Pieter Fiers <pieter@pfiers.net>
Date: Thu, 16 Jul 2020 16:08:51 +0200
Subject: [PATCH 1/2] Fix pump operational icon

---
 Customizations/Layers/BikeStations.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Customizations/Layers/BikeStations.ts b/Customizations/Layers/BikeStations.ts
index 280052a..fd3a9fb 100644
--- a/Customizations/Layers/BikeStations.ts
+++ b/Customizations/Layers/BikeStations.ts
@@ -1,5 +1,5 @@
 import {LayerDefinition} from "../LayerDefinition";
-import {And, Tag, TagsFilter} from "../../Logic/TagsFilter";
+import {And, Tag, TagsFilter, Or} from "../../Logic/TagsFilter";
 import * as L from "leaflet";
 import BikeStationChain from "../Questions/bike/StationChain";
 import BikeStationPumpTools from "../Questions/bike/StationPumpTools";
@@ -15,9 +15,10 @@ import PumpValves from "../Questions/bike/PumpValves";
 
 
 export default class BikeStations extends LayerDefinition {
-    private readonly pump: TagsFilter = new Tag("service:bicycle:pump", "yes");
-    private readonly pumpOperational: TagsFilter = new Tag("service:bicycle:pump:operational_status", "yes");
-    private readonly tools: TagsFilter = new Tag("service:bicycle:tools", "yes");
+    private readonly pump = new Tag("service:bicycle:pump", "yes");
+    private readonly pumpOperationalAny = new Tag("service:bicycle:pump:operational_status", "yes");
+    private readonly pumpOperationalOk = new Or([new Tag("service:bicycle:pump:operational_status", "yes"), new Tag("service:bicycle:pump:operational_status", "operational"), new Tag("service:bicycle:pump:operational_status", "ok")]);
+    private readonly tools = new Tag("service:bicycle:tools", "yes");
 
     constructor() {
         super();
@@ -59,7 +60,7 @@ export default class BikeStations extends LayerDefinition {
         const self = this;
         return function (properties: any) {
             const hasPump = self.pump.matchesProperties(properties)
-            const isOperational = self.pumpOperational.matchesProperties(properties)
+            const isOperational = !self.pumpOperationalAny.matchesProperties(properties) || self.pumpOperationalOk.matchesProperties(properties)
             const hasTools = self.tools.matchesProperties(properties)
             let iconName = ""
             if (hasPump) {

From 98e299eb07e4a01d4ef16169598a0daa08e2fa9f Mon Sep 17 00:00:00 2001
From: Pieter Fiers <pieter@pfiers.net>
Date: Thu, 16 Jul 2020 16:25:27 +0200
Subject: [PATCH 2/2] Make bike icons 50*50

---
 Customizations/Layers/BikeParkings.ts | 2 +-
 Customizations/Layers/BikeStations.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Customizations/Layers/BikeParkings.ts b/Customizations/Layers/BikeParkings.ts
index a940a84..ccd737e 100644
--- a/Customizations/Layers/BikeParkings.ts
+++ b/Customizations/Layers/BikeParkings.ts
@@ -36,7 +36,7 @@ export default class BikeParkings extends LayerDefinition {
                 color: "#00bb00",
                 icon: L.icon({
                     iconUrl: self.icon,
-                    iconSize: [40, 40]
+                    iconSize: [50, 50]
                 })
             };
         };
diff --git a/Customizations/Layers/BikeStations.ts b/Customizations/Layers/BikeStations.ts
index fd3a9fb..ca25fac 100644
--- a/Customizations/Layers/BikeStations.ts
+++ b/Customizations/Layers/BikeStations.ts
@@ -81,7 +81,7 @@ export default class BikeStations extends LayerDefinition {
                 color: "#00bb00",
                 icon: L.icon({
                     iconUrl: iconUrl,
-                    iconSize: [40, 40]
+                    iconSize: [50, 50]
                 })
             };
         };