From b01622780b2adc1913e88711eb6a91438923f3bc Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 17 Jul 2020 12:00:52 +0200 Subject: [PATCH] Fix detection of brokenness --- Customizations/Layers/BikeStations.ts | 5 ++--- Customizations/Layouts/WalkByBrussels.ts | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Customizations/Layers/BikeStations.ts b/Customizations/Layers/BikeStations.ts index ca25fac..89f79b3 100644 --- a/Customizations/Layers/BikeStations.ts +++ b/Customizations/Layers/BikeStations.ts @@ -17,7 +17,7 @@ import PumpValves from "../Questions/bike/PumpValves"; export default class BikeStations extends LayerDefinition { 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 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"), new Tag("service:bicycle:pump:operational_status", "")]); private readonly tools = new Tag("service:bicycle:tools", "yes"); constructor() { @@ -31,7 +31,6 @@ export default class BikeStations extends LayerDefinition { this.newElementTags = [ new Tag("amenity", "bicycle_repair_station") - // new Tag("fixme", "Toegevoegd met MapComplete, geometry nog uit te tekenen") ]; this.maxAllowedOverlapPercentage = 10; @@ -60,7 +59,7 @@ export default class BikeStations extends LayerDefinition { const self = this; return function (properties: any) { const hasPump = self.pump.matchesProperties(properties) - const isOperational = !self.pumpOperationalAny.matchesProperties(properties) || self.pumpOperationalOk.matchesProperties(properties) + const isOperational = self.pumpOperationalOk.matchesProperties(properties) const hasTools = self.tools.matchesProperties(properties) let iconName = "" if (hasPump) { diff --git a/Customizations/Layouts/WalkByBrussels.ts b/Customizations/Layouts/WalkByBrussels.ts index 6ac1382..bf1d188 100644 --- a/Customizations/Layouts/WalkByBrussels.ts +++ b/Customizations/Layouts/WalkByBrussels.ts @@ -2,7 +2,6 @@ import { Layout } from "../Layout"; import { DrinkingWaterLayer } from "../Layers/DrinkingWater"; import { NatureReserves } from "../Layers/NatureReserves"; import { Park } from "../Layers/Park"; -import { BikeParkings } from "../Layers/BikeParkings"; export class WalkByBrussels extends Layout { constructor() {