Merge branch 'master' into develop

src/Models/FilteredLayer.ts

@@ -231,6 +231,12 @@ export default class FilteredLayer {
                 }
             }
         }
+        {
+            if(!this.isDisplayed.data){
+                return false
+            }
+        }
+
         {
             const isShown: TagsFilter = this.layerDef.isShown
             if (isShown !== undefined && !isShown.matchesProperties(properties)) {

src/UI/BigComponents/Filterview.svelte

@@ -28,9 +28,9 @@
     (s) =>
       (s === "yes" &&
         state?.userRelatedState?.osmConnection?.userDetails?.data?.csCount >=
-          Constants.userJourney.tagsVisibleAt) ||
+        Constants.userJourney.tagsVisibleAt) ||
       s === "always" ||
-      s === "full"
+      s === "full",
   )
 
   /**
@@ -79,9 +79,11 @@
             {#if filter.options.length === 1 && filter.options[0].fields.length === 0}
               <Checkbox selected={getBooleanStateFor(filter)}>
                 <Tr t={filter.options[0].question} />
+                {#if $showTags && filter.options[0].osmTags !== undefined}
                 <span class="subtle">
                   {filter.options[0].osmTags.asHumanString()}
                 </span>
+                {/if}
               </Checkbox>
             {/if}
 

src/assets/global-raster-layers.json

@@ -130,29 +130,6 @@
         "url": "https://github.com/ZeLonewolf/openstreetmap-americana/"
       }
     },
-    {
-      "name": "MapTiler",
-      "url": "https://api.maptiler.com/maps/15cc8f61-0353-4be6-b8da-13daea5f7432/style.json?key=GvoVAJgu46I5rZapJuAy",
-      "style": "https://api.maptiler.com/maps/15cc8f61-0353-4be6-b8da-13daea5f7432/style.json?key=GvoVAJgu46I5rZapJuAy",
-      "category": "osmbasedmap",
-      "id": "maptiler",
-      "type": "vector",
-      "attribution": {
-        "text": "Maptiler",
-        "url": "https://www.maptiler.com/copyright/"
-      }
-    },
-    {
-      "name": "MapTiler Carto",
-      "url": "https://api.maptiler.com/maps/openstreetmap/style.json?key=GvoVAJgu46I5rZapJuAy",
-      "category": "osmbasedmap",
-      "id": "maptiler.carto",
-      "type": "vector",
-      "attribution": {
-        "text": "Maptiler",
-        "url": "https://www.maptiler.com/copyright/"
-      }
-    },
     {
       "name": "Alidade Smooth",
       "url": "https://tiles-eu.stadiamaps.com/styles/alidade_smooth.json?key=14c5a900-7137-42f7-9cb9-fff0f4696f75",