Merge branch 'master' of github.com:pietervdvn/MapComplete

Customizations/Layers/BikeCafes.ts

@@ -0,0 +1,73 @@
+import {LayerDefinition} from "../LayerDefinition";
+import FixedText from "../Questions/FixedText";
+import {ImageCarouselWithUploadConstructor} from "../../UI/Image/ImageCarouselWithUpload";
+import Translations from "../../UI/i18n/Translations";
+import CafeName from "../Questions/bike/CafeName";
+import { Or, And, Tag, anyValueExcept, Regex } from "../../Logic/TagsFilter";
+import { PhoneNumberQuestion } from "../Questions/PhoneNumberQuestion";
+import Website from "../Questions/Website";
+import CafeRepair from "../Questions/bike/CafeRepair";
+import CafeDiy from "../Questions/bike/CafeDiy";
+import CafePump from "../Questions/bike/CafePump";
+
+
+export default class BikeCafes extends LayerDefinition {
+    private readonly repairsBikes = anyValueExcept("service:bicycle:repair", "no")
+    private readonly hasPump = new Tag("service:bicycle:pump", "yes")
+    private readonly diy = new Tag("service:bicycle:diy", "yes")
+    private readonly bikeServices = [
+        this.diy,
+        this.repairsBikes,
+        this.hasPump
+    ]
+    private readonly to = Translations.t.cyclofix.cafe
+
+    constructor() {
+        super();
+        this.name = this.to.name;
+        this.icon = "./assets/bike/cafe.svg";
+        this.overpassFilter = new And([
+            new Or([
+                new Regex("amenity", "^pub|bar|cafe")
+            ]),
+            new Or([
+                ...this.bikeServices,
+                new Tag("pub", "cycling")
+            ])
+        ]) 
+        this.newElementTags = [
+            new Tag("amenity", "pub"),
+            new Tag("pub", "cycling"),
+        ];
+        this.maxAllowedOverlapPercentage = 10;
+
+        this.minzoom = 13;
+        this.style = this.generateStyleFunction();
+        this.title = new FixedText(this.to.title)
+        this.elementsToShow = [
+            new ImageCarouselWithUploadConstructor(),
+            new CafeName(),
+            new PhoneNumberQuestion("{name}"),
+            new Website("{name}"),
+            new CafeRepair(),
+            new CafeDiy(),
+            new CafePump()
+        ];
+        this.wayHandling = LayerDefinition.WAYHANDLING_CENTER_AND_WAY;
+
+    }
+
+    private generateStyleFunction() {
+        const self = this;
+        return function (properties: any) {
+            return {
+                color: "#00bb00",
+                icon: {
+                    iconUrl: self.icon,
+                    iconSize: [50, 50],
+                    iconAnchor: [25,50]
+                }
+            };
+        };
+    }
+}

Customizations/Layers/BikeOtherShops.ts

@@ -1,6 +1,6 @@
 import { LayerDefinition } from "../LayerDefinition";
 import Translations from "../../UI/i18n/Translations";
-import {And, Tag, Or} from "../../Logic/TagsFilter";
+import {And, Tag, Or, anyValueExcept} from "../../Logic/TagsFilter";
 import { ImageCarouselWithUploadConstructor } from "../../UI/Image/ImageCarouselWithUpload";
 import ShopRetail from "../Questions/bike/ShopRetail";
 import ShopPump from "../Questions/bike/ShopPump";
@@ -14,13 +14,6 @@ import { PhoneNumberQuestion } from "../Questions/PhoneNumberQuestion";
 import Website from "../Questions/Website";
 
 
-function anyValueExcept(key: string, exceptValue: string) {
-    return new And([
-        new Tag(key, "*"),
-        new Tag(key, exceptValue, true)
-    ])
-}
-
 export default class BikeOtherShops extends LayerDefinition {
     private readonly sellsBikes = new Tag("service:bicycle:retail", "yes")
     private readonly repairsBikes = anyValueExcept("service:bicycle:repair", "no")

Customizations/Layouts/Cyclofix.ts

@@ -6,6 +6,7 @@ import Translations from "../../UI/i18n/Translations";
 import {DrinkingWater} from "../Layers/DrinkingWater";
 import Combine from "../../UI/Base/Combine";
 import BikeOtherShops from "../Layers/BikeOtherShops";
+import BikeCafes from "../Layers/BikeCafes";
 
 
 export default class Cyclofix extends Layout {
@@ -14,7 +15,7 @@ export default class Cyclofix extends Layout {
             "cyclofix",
             ["en", "nl", "fr"],
             Translations.t.cyclofix.title,
-            [new BikeServices(), new BikeShops(), new DrinkingWater(), new BikeParkings(), new BikeOtherShops()],
+            [new BikeServices(), new BikeShops(), new DrinkingWater(), new BikeParkings(), new BikeOtherShops(), new BikeCafes()],
             16,
             50.8465573,
             4.3516970,

Customizations/Questions/Website.ts

@@ -8,7 +8,7 @@ export default class Website extends TagRenderingOptions {
         super({
             question: Translations.t.general.questions.websiteOf.Subs({category: category}),
             freeform: {
-                renderTemplate: Translations.t.general.questions.websiteIs.Subs({category: category}),
+                renderTemplate: Translations.t.general.questions.websiteIs,
                 template: "$phone$",
                 key: "phone"
             }

Customizations/Questions/bike/CafeDiy.ts

@@ -0,0 +1,18 @@
+import {TagRenderingOptions} from "../../TagRendering";
+import {Tag} from "../../../Logic/TagsFilter";
+import Translations from "../../../UI/i18n/Translations";
+
+
+export default class CafeDiy extends TagRenderingOptions {
+    constructor() {
+        const key = 'service:bicycle:diy'
+        const to = Translations.t.cyclofix.cafe.diy
+        super({
+            question: to.question,
+            mappings: [
+                {k: new Tag(key, "yes"), txt: to.yes},
+                {k: new Tag(key, "no"), txt: to.no},
+            ]
+        });
+    }
+}

Customizations/Questions/bike/CafeName.ts

@@ -0,0 +1,17 @@
+import {TagRenderingOptions} from "../../TagRendering";
+import Translations from "../../../UI/i18n/Translations";
+
+
+export default class CafeName extends TagRenderingOptions {
+    constructor() {
+        const to = Translations.t.cyclofix.cafe.qName
+        super({
+            question: to.question,
+            freeform: {
+                key: "name",
+                renderTemplate: to.render,
+                template: to.template
+            }
+        })
+    }
+}

Customizations/Questions/bike/CafePump.ts

@@ -0,0 +1,18 @@
+import {TagRenderingOptions} from "../../TagRendering";
+import {Tag} from "../../../Logic/TagsFilter";
+import Translations from "../../../UI/i18n/Translations";
+
+
+export default class CafePump extends TagRenderingOptions {
+    constructor() {
+        const key = 'service:bicycle:pump'
+        const to = Translations.t.cyclofix.cafe.pump
+        super({
+            question: to.question,
+            mappings: [
+                {k: new Tag(key, "yes"), txt: to.yes},
+                {k: new Tag(key, "no"), txt: to.no},
+            ]
+        });
+    }
+}

Customizations/Questions/bike/CafeRepair.ts

@@ -0,0 +1,18 @@
+import {TagRenderingOptions} from "../../TagRendering";
+import {Tag} from "../../../Logic/TagsFilter";
+import Translations from "../../../UI/i18n/Translations";
+
+
+export default class CafeRepair extends TagRenderingOptions {
+    constructor() {
+        const key = 'service:bicycle:repair'
+        const to = Translations.t.cyclofix.cafe.repair
+        super({
+            question: to.question,
+            mappings: [
+                {k: new Tag(key, "yes"), txt: to.yes},
+                {k: new Tag(key, "no"), txt: to.no}
+            ]
+        });
+    }
+}

Customizations/Questions/bike/ShopDiy.ts

@@ -3,7 +3,7 @@ import {Tag} from "../../../Logic/TagsFilter";
 import Translations from "../../../UI/i18n/Translations";
 
 
-export default class ShopPump extends TagRenderingOptions {
+export default class ShopDiy extends TagRenderingOptions {
     constructor() {
         const key = 'service:bicycle:diy'
         const to = Translations.t.cyclofix.shop.diy