From fbf2742f80d4189545b2a791025766849f10e256 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Thu, 1 Jun 2023 03:17:52 +0200
Subject: [PATCH] Tweaking GRB theme a bit more

---
 .../LocalStorageFeatureSource.ts              |  2 --
 UI/ThemeViewGUI.svelte                        |  2 +-
 assets/themes/grb/grb.json                    | 24 ++++---------------
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/Logic/FeatureSource/TiledFeatureSource/LocalStorageFeatureSource.ts b/Logic/FeatureSource/TiledFeatureSource/LocalStorageFeatureSource.ts
index d8b1dc575e..16cc2b94eb 100644
--- a/Logic/FeatureSource/TiledFeatureSource/LocalStorageFeatureSource.ts
+++ b/Logic/FeatureSource/TiledFeatureSource/LocalStorageFeatureSource.ts
@@ -4,8 +4,6 @@ import {BBox} from "../../BBox"
 import TileLocalStorage from "../Actors/TileLocalStorage"
 import {Feature} from "geojson"
 import StaticFeatureSource from "../Sources/StaticFeatureSource"
-import {constants} from "http2";
-import HTTP_STATUS_CONTINUE = module
 
 export default class LocalStorageFeatureSource extends DynamicTileSource {
     constructor(
diff --git a/UI/ThemeViewGUI.svelte b/UI/ThemeViewGUI.svelte
index 184506d979..6be3276108 100644
--- a/UI/ThemeViewGUI.svelte
+++ b/UI/ThemeViewGUI.svelte
@@ -150,7 +150,7 @@
             </MapControlButton>
             <a class="pointer-events-auto opacity-50 hover:opacity-100 text-white cursor-pointer bg-black-transparent pl-1 pr-2 rounded-2xl h-fit max-h-12 overflow-hidden self-end" 
                on:click={() =>{ state.guistate.themeViewTab.setData("copyright"); state.guistate.themeIsOpened.setData(true)}}>
-                © OpenStreetMap <span class="w-24">{rasterLayerName}</span>
+                © OpenStreetMap, <span class="w-24">{rasterLayerName}</span>
             </a>
         </div>
 
diff --git a/assets/themes/grb/grb.json b/assets/themes/grb/grb.json
index bf6fe763fb..73cd2d72c2 100644
--- a/assets/themes/grb/grb.json
+++ b/assets/themes/grb/grb.json
@@ -26,7 +26,7 @@
     "maxZoom": 15
   },
   "overrideAll": {
-    "minzoom": 17
+    "minzoom": 15
   },
   "layers": [
     {
@@ -380,7 +380,6 @@
           "id": "Building info",
           "render": "This is a <b>{building}</b> <span class='subtle'>detected by {detection_method}</span>"
         },
-        
         {
           "id": "overlapping building address",
           "render": "The overlapping openstreetmap-building has no address information at all",
@@ -724,7 +723,7 @@
       "builtin": "current_view",
       "override": {
         "calculatedTags+": [
-          "_overlapping=Number(feat.properties.zoom) >= 16 ? overlapWith(feat)('grb').map(ff => ff.feat.properties) : undefined",
+          "_overlapping=Number(feat.properties.zoom) >= 14 ? overlapWith(feat)('grb').map(ff => ff.feat.properties) : undefined",
           "_applicable_conflate=get(feat)('_overlapping')?.filter(p => p._imported !== 'yes' && (!p['_imported_osm_still_fresh'] || !p['_imported_osm_object_found']) && p['_overlap_absolute'] > 10 && p['_overlap_percentage'] > 80 && p['_reverse_overlap_percentage'] > 80)?.map(p => p.id)",
           "_applicable=feat.properties._overlapping.filter(p => p._imported !== 'yes' && p._imported_osm_object_found === false && !(p['_overlap_absolute'] > 5) && !p._intersects_with_other_features)?.map(p => p.id)",
           "_applicable_count=get(feat)('_applicable')?.length",
@@ -751,23 +750,11 @@
           },
           {
             "id": "autoapply",
-            "render": "{auto_apply(grb, _applicable, Import-button, Import all non-conflicting buildings in view)}",
-            "mappings": [
-              {
-                "if": "zoom<16",
-                "then": "Zoom in more to import"
-              }
-            ]
+            "render": "{auto_apply(grb, _applicable, Import-button, Import all non-conflicting buildings in view)}"
           },
           {
             "id": "autoapply_conflate",
-            "render": "{auto_apply(grb, _applicable_conflate, Import-button, Conflate all non-conflicting buildings in view)}",
-            "mappings": [
-              {
-                "if": "zoom<16",
-                "then": "Zoom in more to import"
-              }
-            ]
+            "render": "{auto_apply(grb, _applicable_conflate, Import-button, Conflate all non-conflicting buildings in view)}"
           }
         ],
         "+mapRendering": [
@@ -780,14 +767,13 @@
             },
             "iconSize": "15,15,center"
           }
-          
         ]
       }
     }
   ],
   "hideFromOverview": true,
   "defaultBackgroundId": "AGIVFlandersGRB",
-  "overpassMaxZoom": 17,
+  "overpassMaxZoom": 15,
   "osmApiTileSize": 17,
   "credits": "Pieter Vander Vennet"
 }