From ce1568f2bb7856d813fab179b14aa64062076fe3 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@gmail.com>
Date: Tue, 15 Sep 2020 00:25:25 +0200
Subject: [PATCH] Fix missing layouts

---
 InitUiElements.ts | 19 ++++++++++++-------
 index.ts          | 10 +++++-----
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/InitUiElements.ts b/InitUiElements.ts
index f69f7d0eb..ab9037b10 100644
--- a/InitUiElements.ts
+++ b/InitUiElements.ts
@@ -34,27 +34,34 @@ import {GeoLocationHandler} from "./Logic/Leaflet/GeoLocationHandler";
 import {Layout} from "./Customizations/Layout";
 import {LocalStorageSource} from "./Logic/Web/LocalStorageSource";
 import {FromJSON} from "./Customizations/JSON/FromJSON";
+import {Utils} from "./Utils";
 
 export class InitUiElements {
 
 
-    static InitAll(layoutToUse: Layout, layoutFromBase64: string, testing: UIEventSource<string>, defaultLayout1: string ) {
+    static InitAll(layoutToUse: Layout, layoutFromBase64: string, testing: UIEventSource<string>, layoutName: string ) {
         if (layoutToUse === undefined) {
             console.log("Incorrect layout")
-            new FixedUiElement("Error: incorrect layout <i>" + defaultLayout1 + "</i><br/><a href='https://pietervdvn.github.io/MapComplete/index.html'>Go back</a>").AttachTo("centermessage").onClick(() => {
+            new FixedUiElement("Error: incorrect layout <i>" + layoutName + "</i><br/><a href='https://pietervdvn.github.io/MapComplete/index.html'>Go back</a>").AttachTo("centermessage").onClick(() => {
             });
             throw "Incorrect layout"
         }
 
-        console.log("Using layout: ", layoutToUse.id);
+        const hash = location.hash.substr(1);
+        console.log("Using layout: ", layoutToUse.id, "LayoutFromBase64 is ", layoutFromBase64);
         State.state = new State(layoutToUse);
+        
+        // This 'leaks' the global state via the window object, useful for debugging
+        // @ts-ignore
+        window.mapcomplete_state = State.state;
 
         if (layoutToUse.hideFromOverview) {
             State.state.osmConnection.GetPreference("hidden-theme-" + layoutToUse.id + "-enabled").setData("true");
         }
 
         if (layoutFromBase64 !== "false") {
-            State.state.layoutDefinition = location.hash.substr(1);
+            State.state.layoutDefinition = hash;
+            console.log("Layout definition:",Utils.EllipsesAfter(State.state.layoutDefinition, 100))
             if (testing.data !== "true") {
                 State.state.osmConnection.OnLoggedIn(() => {
                     State.state.osmConnection.GetLongPreference("installed-theme-" + layoutToUse.id).setData(State.state.layoutDefinition);
@@ -200,9 +207,7 @@ export class InitUiElements {
         new GeoLocationHandler().AttachTo("geolocate-button");
         State.state.locationControl.ping();
         
-        // This 'leaks' the global state via the window object, useful for debugging
-        // @ts-ignore
-        window.mapcomplete_state = State.state;
+       
     }
 
 
diff --git a/index.ts b/index.ts
index 92301b94f..d547dd0b8 100644
--- a/index.ts
+++ b/index.ts
@@ -34,7 +34,6 @@ if (location.hostname === "localhost" || location.hostname === "127.0.0.1") {
 // ----------------- SELECT THE RIGHT QUESTSET -----------------
 
 let defaultLayout = "bookcases"
-let hash = window.location.hash;
 
 const path = window.location.pathname.split("/").slice(-1)[0];
 if (path !== "index.html" && path !== "") {
@@ -68,7 +67,7 @@ if (layoutFromBase64.startsWith("wiki:")) {
     const themeName = layoutFromBase64.substr("wiki:".length);
     new FixedUiElement(`Downloading ${themeName} from the wiki...`)
         .AttachTo("centermessage");
-    const  cleanUrl = `https://wiki.openstreetmap.org/wiki/${themeName}`;
+    const cleanUrl = `https://wiki.openstreetmap.org/wiki/${themeName}`;
     const url = `https://cors-anywhere.herokuapp.com/` + cleanUrl; // VERY SAFE AND HACKER-PROOF!
 
     $.ajax({
@@ -82,6 +81,7 @@ if (layoutFromBase64.startsWith("wiki:")) {
             try {
                 console.log("DOWNLOADED:",layoutJson);
                 const layout = FromJSON.LayoutFromJSON(JSON.parse(layoutJson));
+                layout.id = layoutFromBase64;
                 InitUiElements.InitAll(layout, layoutFromBase64, testing, layoutFromBase64);
             } catch (e) {
                 new FixedUiElement(`<a href="${cleanUrl}">${themeName}</a> is invalid:<br/>${e}`)
@@ -96,9 +96,9 @@ if (layoutFromBase64.startsWith("wiki:")) {
             .AttachTo("centermessage");
     });
 
+} else if (layoutFromBase64 !== "false") {
+    layoutToUse = InitUiElements.LoadLayoutFromHash(userLayoutParam);
+    InitUiElements.InitAll(layoutToUse, layoutFromBase64, testing, defaultLayout);
 } else {
-    if (layoutFromBase64 !== "false") {
-        layoutToUse = InitUiElements.LoadLayoutFromHash(userLayoutParam);
-    }
     InitUiElements.InitAll(layoutToUse, layoutFromBase64, testing, defaultLayout);
 }