From 19aab0358b256d80e5872da1857841ee3d7de0af Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Tue, 12 Jul 2022 14:20:21 +0200
Subject: [PATCH 1/4] Fix #947

---
 manifest.webmanifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.webmanifest b/manifest.webmanifest
index 1e577af789..5679708fcb 100644
--- a/manifest.webmanifest
+++ b/manifest.webmanifest
@@ -1,5 +1,5 @@
 {
-  "name": "index",
+  "name": "MapComplete",
   "short_name": "MapComplete",
   "start_url": "index.html",
   "lang": "en",

From a7b0db24161cacdcd5293529c6ede1fe48f57e5f Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Tue, 12 Jul 2022 14:20:40 +0200
Subject: [PATCH 2/4] Fix build, formatting

---
 assets/themes/rainbow_crossings/crossing.svg           | 2 ++
 assets/themes/rainbow_crossings/logo.svg               | 2 +-
 assets/themes/rainbow_crossings/rainbow_crossings.json | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/assets/themes/rainbow_crossings/crossing.svg b/assets/themes/rainbow_crossings/crossing.svg
index 37304af0f3..468f421dd0 100644
--- a/assets/themes/rainbow_crossings/crossing.svg
+++ b/assets/themes/rainbow_crossings/crossing.svg
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
    viewBox="0 0 600 600"
+   width="600"
+   height="600"
    version="1.1"
    id="svg20"
    sodipodi:docname="crossing.svg"
diff --git a/assets/themes/rainbow_crossings/logo.svg b/assets/themes/rainbow_crossings/logo.svg
index a5cd706689..e688942307 100644
--- a/assets/themes/rainbow_crossings/logo.svg
+++ b/assets/themes/rainbow_crossings/logo.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 600 600">
+<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600" viewBox="0 0 600 600">
   <rect fill="#750787" width="600" height="600" />
   <rect fill="#004dff" width="500" height="600" />
   <rect fill="#008026" width="400" height="600" />
diff --git a/assets/themes/rainbow_crossings/rainbow_crossings.json b/assets/themes/rainbow_crossings/rainbow_crossings.json
index 32fe470a36..1a63df6fc3 100644
--- a/assets/themes/rainbow_crossings/rainbow_crossings.json
+++ b/assets/themes/rainbow_crossings/rainbow_crossings.json
@@ -24,7 +24,9 @@
         "=presets": [],
         "source": {
           "osmTags": {
-            "and+": ["crossing:marking=rainbow"]
+            "and+": [
+              "crossing:marking=rainbow"
+            ]
           }
         }
       }
@@ -38,6 +40,4 @@
       }
     }
   ]
-}
-
-
+}
\ No newline at end of file

From d50b60f07a1cd7de2ed09c0d06ea3b91df32e42b Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Tue, 12 Jul 2022 14:21:14 +0200
Subject: [PATCH 3/4] Fix caching behaviour of service worker

---
 service-worker.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service-worker.ts b/service-worker.ts
index 56e006a4e1..d50009104b 100644
--- a/service-worker.ts
+++ b/service-worker.ts
@@ -71,7 +71,7 @@ self.addEventListener('fetch',
                 event.respondWith(new Response(JSON.stringify({"service-worker-version": version})));
                 return
             }
-            const shouldBeCached = origin.host === requestUrl.host && origin.host !== "127.0.0.1:1234"  && origin.host !== "localhost" && !origin.host.endsWith(".gitpod.io")
+            const shouldBeCached = origin.host === requestUrl.host && origin.hostname !== "127.0.0.1"  && origin.hostname !== "localhost" && !origin.host.endsWith(".gitpod.io")
             if (!shouldBeCached) {
                 console.log("Not intercepting ", requestUrl.toString(), origin.host, requestUrl.host)
                 // We return _without_ calling event.respondWith, which signals the browser that it'll have to handle it himself

From 02711c43c3166d4835257ad09a4d22c441af5e0f Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Tue, 12 Jul 2022 14:22:14 +0200
Subject: [PATCH 4/4] Actually use awaits where appropriate

---
 scripts/generateLayouts.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/scripts/generateLayouts.ts b/scripts/generateLayouts.ts
index 546d26350b..1272117c52 100644
--- a/scripts/generateLayouts.ts
+++ b/scripts/generateLayouts.ts
@@ -165,7 +165,7 @@ async function createManifest(layout: LayoutConfig, alreadyWritten: string[]): P
     const ogDescr = Translations.T(layout.description ?? "").txt;
 
     const manifest = {
-        name: name,
+        name: ogTitle,
         short_name: ogTitle,
         start_url: `${layout.id.toLowerCase()}.html`,
         lang: "en",
@@ -257,7 +257,7 @@ async function createLandingPage(layout: LayoutConfig, manifest, whiteIcons, alr
         .replace(/<!-- THEME-SPECIFIC -->.*<!-- THEME-SPECIFIC-END-->/s, themeSpecific)
         .replace(/<!-- DESCRIPTION START -->.*<!-- DESCRIPTION END -->/s, layout.shortDescription.textFor(targetLanguage))
         .replace("<script src=\"./index.ts\"></script>", `<script src='./index_${layout.id}.ts'></script>`);
-
+0
     try {
         output = output
             .replace(/<!-- DECORATION 0 START -->.*<!-- DECORATION 0 END -->/s, `<img src='${icon}' width="100%" height="100%">`)
@@ -320,10 +320,9 @@ async function main(): Promise<void> {
         writeFile(manifestLocation, manif, err);
 
         // Create a landing page for the given theme
-        createLandingPage(layout, manifest, whiteIcons, alreadyWritten).then(landing => {
-            writeFile(enc(layout.id) + ".html", landing, err)
-        });
-        createIndexFor(layout)
+        const landing = await createLandingPage(layout, manifest, whiteIcons, alreadyWritten)
+        writeFile(enc(layout.id) + ".html", landing, err)
+        await createIndexFor(layout)
     }