Fix skipped question count

Customizations/AllKnownLayouts.ts

@@ -17,7 +17,6 @@ export class AllKnownLayouts {
     public static allSets = AllKnownLayouts.AllLayouts();
 
     private static AllLayouts(): Map<string, Layout> {
-        const all = new All();
         const layouts: Layout[] = [
             new Groen(),
             new GRB(),
@@ -27,15 +26,26 @@ export class AllKnownLayouts {
             new MetaMap(),
             new StreetWidth(),
             new Natuurpunt(),
-            all
             /*new Toilets(),
             new Statues(),
             */
         ];
+
+
+        const all = new All();
+        for (const layout of layouts) {
+            for (const layer of layout.layers) {
+                if (all.layers.indexOf(layer) >= 0) {
+                    continue;
+                }
+                all.layers.push(layer);
+            }
+        }
+        layouts.push(all)
+
         const allSets: Map<string, Layout> = new Map();
         for (const layout of layouts) {
             allSets[layout.name] = layout;
-            all.layers = all.layers.concat(layout.layers);
         }
         return allSets;
     }

Customizations/OnlyShowIf.ts

@@ -64,7 +64,7 @@ class OnlyShowIf extends UIElement implements TagDependantUIElement {
         return this._filter.matches(TagUtils.proprtiesToKV(this._source.data));
     } 
 
-    protected InnerRender(): string {
+    InnerRender(): string {
         if (this.Matches()) {
             return this._embedded.Render();
         } else {
@@ -82,6 +82,13 @@ class OnlyShowIf extends UIElement implements TagDependantUIElement {
         }
         return this._embedded.IsKnown();
     }
+    
+    IsSkipped(): boolean {
+        if(!this.Matches()){
+            return false;
+        }
+        return this._embedded.IsSkipped();
+    }
 
     IsQuestioning(): boolean {
         if(!this.Matches()){

Customizations/TagRendering.ts

@@ -15,7 +15,6 @@ import {FixedInputElement} from "../UI/Input/FixedInputElement";
 import {RadioButton} from "../UI/Input/RadioButton";
 import Translations from "../UI/i18n/Translations";
 import Locale from "../UI/i18n/Locale";
-import {FloatField, IntField, StringField} from "../UI/Input/PhoneField";
 
 export class TagRenderingOptions implements TagDependantUIElementConstructor {
 
@@ -402,6 +401,10 @@ class TagRendering extends UIElement implements TagDependantUIElement {
         return this._freeform !== undefined && this._source.data[this._freeform.key] !== undefined;
     }
 
+    IsSkipped(): boolean {
+        return this._questionSkipped.data;
+    }
+
     private CurrentValue(): TagsFilter {
         const tags = TagUtils.proprtiesToKV(this._source.data);
 

Customizations/UIElementConstructor.ts

@@ -19,4 +19,5 @@ export abstract class TagDependantUIElement extends UIElement {
     
     abstract Priority() : number;
 
+    abstract IsSkipped() : boolean;
 }

UI/ConfirmDialog.ts

@@ -49,7 +49,7 @@ export class ConfirmDialog extends UIElement {
         
     }
 
-    protected InnerRender(): string {
+    InnerRender(): string {
         if (!this._source.data) {
             return "";
         }

UI/FeatureInfoBox.ts

@@ -104,7 +104,7 @@ export class FeatureInfoBox extends UIElement {
                 info.push(infobox);
             } else if (infobox.IsQuestioning()) {
                 questions.push(infobox);
-            } else {
+            } else if(infobox.IsSkipped()){
                 // This question is neither known nor questioning -> it was skipped
                 skippedQuestions++;
             }

UI/Image/ImageCarousel.ts

@@ -126,6 +126,10 @@ export class ImageCarousel extends TagDependantUIElement {
     IsQuestioning(): boolean {
         return false;
     }
+    
+    IsSkipped(): boolean {
+        return false;
+    }
 
     Priority(): number {
         return 0;

UI/Image/ImageCarouselWithUpload.ts

@@ -65,6 +65,10 @@ class ImageCarouselWithUpload extends TagDependantUIElement {
     IsQuestioning(): boolean {
         return false;
     }
+    
+    IsSkipped(): boolean {
+        return false;
+    }
 
     Priority(): number {
         return 0;

index.css

@@ -216,7 +216,8 @@ form {
     }
 
     #topleft-tools {
-        margin: 0.5em;
+        margin: 0.2em !important;
+        margin-top: 0.3em !important;;
     }
 
     #userbadge {

index.html

@@ -9,6 +9,7 @@
           integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ=="
           crossorigin=""/>
     <link rel="stylesheet" href="./index.css"/>
+    <link rel="manifest" href="./manifest.webmanifest">
     
           <!--
     <meta property="og:image" content="https://buurtnatuur.be/assets/BuurtnatuurFront.jpg">

index.ts

@@ -53,7 +53,7 @@ if (location.hostname === "localhost" || location.hostname === "127.0.0.1") {
 
 // ----------------- SELECT THE RIGHT QUESTSET -----------------
 
-let defaultLayout = "walkbybrussels"
+let defaultLayout = "all"
 
 
 // Run over all questsets. If a part of the URL matches a searched-for part in the layout, it'll take that as the default

manifest.json

@@ -1,2 +0,0 @@
-{
-}

manifest.webmanifest

@@ -0,0 +1,25 @@
+{
+  "name": "MapComplete",
+  "short_name": "MapComplete",
+  "start_url": ".",
+  "display": "standalone",
+  "background_color": "#fff",
+  "description": "Easily edit OpenStreetMap",
+  "icons": [
+    {
+      "src": "assets/logos/logo192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "assets/logos/logo512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    },
+    {
+      "src": "assets/logos/logo.svg",
+      "sizes": "513x513",
+      "type": "image/svg"
+    }
+  ]
+}