From efce134a6cc90d4c3794cac91fc0a9da10fdd3b1 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Mon, 16 Oct 2023 12:54:41 +0200
Subject: [PATCH] Themes: fix cycle rental which dissappears

---
 assets/themes/cyclofix/cyclofix.json        |  6 +++---
 src/UI/Popup/AddNewPoint/AddNewPoint.svelte | 14 +++++++-------
 src/UI/Popup/AddNewPoint/PresetList.svelte  |  1 +
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/assets/themes/cyclofix/cyclofix.json b/assets/themes/cyclofix/cyclofix.json
index a99d009c7..5398890f2 100644
--- a/assets/themes/cyclofix/cyclofix.json
+++ b/assets/themes/cyclofix/cyclofix.json
@@ -68,14 +68,14 @@
               "bicycle_rental!=docking_station"
             ]
           }
-        }
+        },
+        "name": null
       }
     },
     {
       "#": "All bicycle rental at a high zoom level, to avoid duplicates",
       "builtin": "bicycle_rental",
       "override": {
-        "name": null,
         "filter": {
           "sameAs": "bicycle_rental_non_docking"
         },
@@ -135,4 +135,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/UI/Popup/AddNewPoint/AddNewPoint.svelte b/src/UI/Popup/AddNewPoint/AddNewPoint.svelte
index 9aed2f44a..4d51d5ec0 100644
--- a/src/UI/Popup/AddNewPoint/AddNewPoint.svelte
+++ b/src/UI/Popup/AddNewPoint/AddNewPoint.svelte
@@ -162,16 +162,16 @@
   <LoginButton osmConnection={state.osmConnection} slot="not-logged-in">
     <Tr slot="message" t={Translations.t.general.add.pleaseLogin} />
   </LoginButton>
-  {#if $isLoading}
-    <div class="alert">
-      <Loading>
-        <Tr t={Translations.t.general.add.stillLoading} />
-      </Loading>
-    </div>
-  {:else if $zoom < Constants.minZoomLevelToAddNewPoint}
+   {#if $zoom < Constants.minZoomLevelToAddNewPoint}
     <div class="alert">
       <Tr t={Translations.t.general.add.zoomInFurther} />
     </div>
+   {:else if $isLoading}
+       <div class="alert">
+         <Loading>
+           <Tr t={Translations.t.general.add.stillLoading} />
+         </Loading>
+       </div>
   {:else if selectedPreset === undefined}
     <!-- First, select the correct preset -->
     <PresetList
diff --git a/src/UI/Popup/AddNewPoint/PresetList.svelte b/src/UI/Popup/AddNewPoint/PresetList.svelte
index 05c997370..35439b4a2 100644
--- a/src/UI/Popup/AddNewPoint/PresetList.svelte
+++ b/src/UI/Popup/AddNewPoint/PresetList.svelte
@@ -30,6 +30,7 @@
     if (flayer.isDisplayed.data === false) {
       // The layer is not displayed...
       if (!state.featureSwitches.featureSwitchFilter.data) {
+          console.log("Not showing presets for layer", flayer.layerDef.id, "as not displayed and featureSwitchFilter.data is set",state.featureSwitches.featureSwitchFilter.data)
         // ...and we cannot enable the layer control -> we skip, as these presets can never be shown anyway
         continue
       }