From aad1a461d31e69fb53491bbd687ca14ebced12b2 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Thu, 19 Jun 2025 18:51:46 +0200
Subject: [PATCH] Attempt to get script working

---
 .forgejo/workflows/on_release.yml | 5 +++--
 android                           | 2 +-
 scripts/generateLayouts.ts        | 7 +++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.forgejo/workflows/on_release.yml b/.forgejo/workflows/on_release.yml
index 2797c3361..79265a241 100644
--- a/.forgejo/workflows/on_release.yml
+++ b/.forgejo/workflows/on_release.yml
@@ -35,6 +35,9 @@ jobs:
       - name: install deps
         run: npm ci
 
+
+      - run: npm run init
+
       - name: Move dependency (@capacitor) into android repo
         run: |
           cd android
@@ -54,8 +57,6 @@ jobs:
           sed -i "s/versionName \".*\"/versionName \"$new_versionname\"/" "build.gradle"
           git add build.gradle
 
-      - run: npm run init
-
       - name: Run tests
         run: npm run test
 
diff --git a/android b/android
index e3e82a546..f62d2704a 160000
--- a/android
+++ b/android
@@ -1 +1 @@
-Subproject commit e3e82a546e1f25901f09bee4a05c9dc29602af14
+Subproject commit f62d2704a0632a47c70055b145dcff95107ba547
diff --git a/scripts/generateLayouts.ts b/scripts/generateLayouts.ts
index ab592e832..49c4077d0 100644
--- a/scripts/generateLayouts.ts
+++ b/scripts/generateLayouts.ts
@@ -300,6 +300,9 @@ class GenerateLayouts extends Script {
                 if (url.endsWith(".pmtiles")) {
                     continue
                 }
+                try{
+
+                console.log("Downloading ", url)
                 const styleSpec = await Utils.downloadJsonCached(url, 1000 * 120, {
                     Origin: "https://mapcomplete.org",
                 })
@@ -324,6 +327,10 @@ class GenerateLayouts extends Script {
                 urls.push(...(styleSpec["tiles"] ?? []))
                 urls.push(styleSpec["sprite"])
                 urls.push(styleSpec["glyphs"])
+                }catch (e) {
+                    console.error("ERROR: could not download a resource, some sprites might not be whitelisted and thus not load")
+                }
+
             }
         }
         this.eliUrlsCached = urls