contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Change in tagfilters

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-07-16 14:21:06 +02:00
parent c1c11ed906
commit 19acba61d2
3 changed files with 49 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Customizations/Layers/BikeServices.ts
View file

@ -1,5 +1,5 @@
import {LayerDefinition} from "../LayerDefinition";
import {And, Tag} from "../../Logic/TagsFilter";
import {And, Tag, TagsFilter} from "../../Logic/TagsFilter";
import * as L from "leaflet";
import BikeStationChain from "../Questions/BikeStationChain";
import BikeStationPumpTools from "../Questions/BikeStationPumpTools";
@ -10,8 +10,14 @@ import BikeStationBrand from "../Questions/BikeStationBrand";
import FixedText from "../Questions/FixedText";
import {BikePumpManometer} from "../Questions/BikePumpManometer";
import {ImageCarouselWithUploadConstructor} from "../../UI/Image/ImageCarouselWithUpload";
import {BikePumpOperationalStatus} from "../Questions/BikePumpOperationalStatus";
export default class BikeServices extends LayerDefinition {
private readonly pump: TagsFilter = new Tag("service:bicycle:pump", "yes");
private readonly tools: TagsFilter = new Tag("service:bicycle:tools", "yes");
constructor() {
super();
this.name = "bike station or pump";
@ -31,7 +37,6 @@ export default class BikeServices extends LayerDefinition {
this.style = this.generateStyleFunction();
this.title = new FixedText("Bike station");
const pump = new Tag("service:bicycle:pump", "yes");
this.elementsToShow = [
@ -39,11 +44,12 @@ export default class BikeServices extends LayerDefinition {
new BikeStationPumpTools(),
new BikeStationChain().OnlyShowIf(new Tag("service:bicycle:tools", "yes")),
new BikeStationStand().OnlyShowIf(new Tag("service:bicycle:tools", "yes")),
new BikeStationChain().OnlyShowIf(this.tools),
new BikeStationStand().OnlyShowIf(this.tools),
new PumpManual().OnlyShowIf(pump),
new BikePumpManometer().OnlyShowIf(pump),
new PumpManual().OnlyShowIf(this.pump),
new BikePumpManometer().OnlyShowIf(this.pump),
new BikePumpOperationalStatus().OnlyShowIf(this.pump),
new BikeStationOperator(),
new BikeStationBrand()
@ -54,7 +60,8 @@ export default class BikeServices extends LayerDefinition {
private generateStyleFunction() {
const self = this;
return function (properties: any) {
const onlyPump = properties["service:bicycle:tools"] == "no" && properties["service:bicycle:pump"] == "yes";
const onlyPump = self.pump.matchesProperties(properties) &&
!self.tools.matchesProperties(properties)
const iconUrl = onlyPump ? "./assets/pump.svg" : "./assets/wrench.svg"
return {
color: "#00bb00",

15
Customizations/Questions/BikePumpOperationalStatus.ts Normal file
View file

@ -0,0 +1,15 @@
import {TagDependantUIElement} from "../UIElementConstructor";
import {TagRenderingOptions} from "../TagRendering";
import {Tag} from "../../Logic/TagsFilter";
export class BikePumpOperationalStatus extends TagRenderingOptions{
constructor() {
super({
question: "Is the bicycle pump still operational?",
mappings: [
{k: new Tag("service:bicycle:pump:operational_status","broken"), txt: "This pump is broken"},
{k: new Tag("service:bicycle:pump:operational_status",""), txt: "This pump is operational"}
]
});
}
}