From ccc1f8eff5f6b2af9462645ccba93ea43e1eafca Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Sun, 17 Jan 2021 23:06:05 +0100
Subject: [PATCH 1/2] Small fixes

---
 UI/Base/Ornament.ts                                    | 10 +++++-----
 .../bicycle_tube_vending_machine.json                  |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/UI/Base/Ornament.ts b/UI/Base/Ornament.ts
index 2cbf759..3de8733 100644
--- a/UI/Base/Ornament.ts
+++ b/UI/Base/Ornament.ts
@@ -16,10 +16,10 @@ export default class Ornament extends UIElement {
         const self = this;
         this.onClick(() => {
             let c = Number(index.data);
-            if(isNaN(c)){
+            if (isNaN(c)) {
                 c = 0;
             }
-            self._index.setData(""+ ((c + 1) % (Ornament.ornamentsCount + 1)));
+            self._index.setData("" + ((c + 1) % (Ornament.ornamentsCount + 1)));
 
         })
     }
@@ -35,11 +35,11 @@ export default class Ornament extends UIElement {
     }
 
     InnerRender(): string {
-        if(this._index.data == "0"){
+        const svg = Svg.All[`Ornament-Horiz-${Number(this._index.data) - 1}.svg`];
+        if (this._index.data == "0" || svg === undefined) {
             return "<svg></svg>"
         }
-        console.log(this._index.data)
-        return Svg.All[`Ornament-Horiz-${Number(this._index.data) - 1}.svg`]
+        return svg;
     }
 
 }
\ No newline at end of file
diff --git a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json
index 3b0b816..53018e3 100644
--- a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json
+++ b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json
@@ -133,8 +133,7 @@
           "then": "Schwalbe tubes are sold here"
         }
       ],
-      "multiAnswer": true,
-      "condition": "operator!=Schwalbe"
+      "multiAnswer": true
     },
     {
       "question": "Who maintains this vending machine?",

From b104feb080113ddb8084a734b172f51b411aedfa Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Mon, 18 Jan 2021 01:52:15 +0100
Subject: [PATCH 2/2] Disable creating new images; changed staging deploy

---
 package.json             | 2 +-
 scripts/createLayouts.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index c1f9dd1..02dbe8a 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "generate": "npm run generate:images && npm run generate:translations",
     "build": "rm -rf dist/ && npm run generate && parcel build --public-url ./ *.html assets/** assets/**/** assets/**/**/** vendor/* vendor/*/*",
     "prepare-deploy": "npm run generate:editor-layer-index && npm run generate:layouts && npm run generate && npm run build && rm -rf .cache",
-    "deploy:staging": "npm run prepare-deploy && rm -rf /home/pietervdvn/git/pietervdvn.github.io/MapComplete/* && cp -r dist/* /home/pietervdvn/git/pietervdvn.github.io/MapComplete/ && cd /home/pietervdvn/git/pietervdvn.github.io/ && git add * && git commit -m 'New MapComplete Version' && git push && cd - && npm run clean",
+    "deploy:staging": "npm run prepare-deploy && rm -rf /home/pietervdvn/git/pietervdvn.github.io/Staging/* && cp -r dist/* /home/pietervdvn/git/pietervdvn.github.io/Staging/ && cd /home/pietervdvn/git/pietervdvn.github.io/ && git add * && git commit -m 'New MapComplete Version' && git push && cd - && npm run clean",
     "deploy:production": "rm -rf ./assets/generated && npm run prepare-deploy && npm run optimize-images && rm -rf /home/pietervdvn/git/mapcomplete.github.io/* && cp -r dist/* /home/pietervdvn/git/mapcomplete.github.io/ && cd /home/pietervdvn/git/mapcomplete.github.io/ && echo \"mapcomplete.osm.be\" > CNAME  && git add * && git commit -m 'New MapComplete Version' && git push && cd - && npm run clean",
     "clean": "rm -rf .cache/ && (find *.html | grep -v \"\\(index\\|land\\|test\\|preferences\\|customGenerator\\).html\" | xargs rm) && rm *.webmanifest"
   },
diff --git a/scripts/createLayouts.ts b/scripts/createLayouts.ts
index c5cb73e..878eec2 100644
--- a/scripts/createLayouts.ts
+++ b/scripts/createLayouts.ts
@@ -125,7 +125,7 @@ function createIcon(iconPath: string, size: number, layout: LayoutConfig) {
         console.log("Creating icon ", name, newname)
         // We already read to file, in order to crash here if the file is not found
         readFileSync(iconPath);
-        svg2img(iconPath,
+      /*  svg2img(iconPath,
             // @ts-ignore
             {width: size, height: size, preserveAspectRatio: true})
             .then((buffer) => {
@@ -134,7 +134,7 @@ function createIcon(iconPath: string, size: number, layout: LayoutConfig) {
             }).catch((error) => {
             console.log("ERROR while writing" + iconPath, error)
         });
-
+//*/
     } catch (e) {
         console.error("Could not read icon", iconPath, "due to", e)
     }