Resolve merge
This commit is contained in:
commit
9d245bcf98
2 changed files with 5 additions and 3 deletions
|
@ -10,7 +10,8 @@ import BikeStationBrand from "../Questions/bike/StationBrand";
|
||||||
import FixedText from "../Questions/FixedText";
|
import FixedText from "../Questions/FixedText";
|
||||||
import PumpManometer from "../Questions/bike/PumpManometer";
|
import PumpManometer from "../Questions/bike/PumpManometer";
|
||||||
import {ImageCarouselWithUploadConstructor} from "../../UI/Image/ImageCarouselWithUpload";
|
import {ImageCarouselWithUploadConstructor} from "../../UI/Image/ImageCarouselWithUpload";
|
||||||
import BikePumpOperationalStatus from "../Questions/bike/PumpOperationalStatus";
|
import PumpOperationalStatus from "../Questions/bike/PumpOperationalStatus";
|
||||||
|
import PumpValves from "../Questions/bike/PumpValves";
|
||||||
|
|
||||||
|
|
||||||
export default class BikeStations extends LayerDefinition {
|
export default class BikeStations extends LayerDefinition {
|
||||||
|
@ -45,7 +46,8 @@ export default class BikeStations extends LayerDefinition {
|
||||||
|
|
||||||
new PumpManual().OnlyShowIf(this.pump),
|
new PumpManual().OnlyShowIf(this.pump),
|
||||||
new PumpManometer().OnlyShowIf(this.pump),
|
new PumpManometer().OnlyShowIf(this.pump),
|
||||||
new BikePumpOperationalStatus().OnlyShowIf(this.pump),
|
new PumpValves().OnlyShowIf(this.pump),
|
||||||
|
new PumpOperationalStatus().OnlyShowIf(this.pump),
|
||||||
|
|
||||||
new BikeStationOperator(),
|
new BikeStationOperator(),
|
||||||
// new BikeStationBrand() DISABLED
|
// new BikeStationBrand() DISABLED
|
||||||
|
|
|
@ -2,7 +2,7 @@ import {TagRenderingOptions} from "../../TagRendering";
|
||||||
import {Tag} from "../../../Logic/TagsFilter";
|
import {Tag} from "../../../Logic/TagsFilter";
|
||||||
|
|
||||||
|
|
||||||
export class PumpValves extends TagRenderingOptions{
|
export default class PumpValves extends TagRenderingOptions{
|
||||||
constructor() {
|
constructor() {
|
||||||
super({
|
super({
|
||||||
question: "What valves are supported?",
|
question: "What valves are supported?",
|
||||||
|
|
Loading…
Reference in a new issue