Add more checks in the import helper after user testing

Logic/FeatureSource/Sources/GeoJsonSource.ts

@@ -13,6 +13,7 @@ import {GeoOperations} from "../../GeoOperations";
 export default class GeoJsonSource implements FeatureSourceForLayer, Tiled {
 
     public readonly features: UIEventSource<{ feature: any; freshness: Date }[]>;
+    public readonly state = new UIEventSource<undefined | {error: string} | "loaded">(undefined)
     public readonly name;
     public readonly isOsmCache: boolean
     public readonly layer: FilteredLayer;
@@ -80,6 +81,7 @@ export default class GeoJsonSource implements FeatureSourceForLayer, Tiled {
         const self = this;
         Utils.downloadJson(url)
             .then(json => {
+                self.state.setData("loaded")
                 if (json.features === undefined || json.features === null) {
                     return;
                 }
@@ -135,7 +137,10 @@ export default class GeoJsonSource implements FeatureSourceForLayer, Tiled {
 
                 eventSource.setData(eventSource.data.concat(newFeatures))
 
-            }).catch(msg => console.debug("Could not load geojson layer", url, "due to", msg))
+            }).catch(msg => {
+            console.debug("Could not load geojson layer", url, "due to", msg);
+            self.state.setData({error: msg})
+        })
     }
 
 }

Logic/FeatureSource/TiledFeatureSource/DynamicGeoJsonTileSource.ts

@@ -1,7 +1,6 @@
 import FilteredLayer from "../../../Models/FilteredLayer";
 import {FeatureSourceForLayer, Tiled} from "../FeatureSource";
 import {UIEventSource} from "../../UIEventSource";
-import Loc from "../../../Models/Loc";
 import DynamicTileSource from "./DynamicTileSource";
 import {Utils} from "../../../Utils";
 import GeoJsonSource from "../Sources/GeoJsonSource";
@@ -14,7 +13,7 @@ export default class DynamicGeoJsonTileSource extends DynamicTileSource {
     constructor(layer: FilteredLayer,
                 registerLayer: (layer: FeatureSourceForLayer & Tiled) => void,
                 state: {
-                    locationControl: UIEventSource<Loc>
+                    locationControl?: UIEventSource<{zoom?: number}>
                     currentBounds: UIEventSource<BBox>
                 }) {
         const source = layer.layerDef.source

Logic/FeatureSource/TiledFeatureSource/DynamicTileSource.ts

@@ -1,7 +1,6 @@
 import FilteredLayer from "../../../Models/FilteredLayer";
 import {FeatureSourceForLayer, Tiled} from "../FeatureSource";
 import {UIEventSource} from "../../UIEventSource";
-import Loc from "../../../Models/Loc";
 import TileHierarchy from "./TileHierarchy";
 import {Tiles} from "../../../Models/TileRange";
 import {BBox} from "../../BBox";
@@ -19,30 +18,29 @@ export default class DynamicTileSource implements TileHierarchy<FeatureSourceFor
         constructTile: (zxy: [number, number, number]) => (FeatureSourceForLayer & Tiled),
         state: {
             currentBounds: UIEventSource<BBox>;
-            locationControl: UIEventSource<Loc>
+            locationControl?: UIEventSource<{zoom?: number}>
         }
     ) {
         const self = this;
 
         this.loadedTiles = new Map<number, FeatureSourceForLayer & Tiled>()
-        const neededTiles = state.locationControl.map(
-            location => {
+        const neededTiles = state.currentBounds.map(
+            bounds => {
+                if (bounds === undefined) {
+                    // We'll retry later
+                    return undefined
+                }
+                
                 if (!layer.isDisplayed.data && !layer.layerDef.forceLoad) {
                     // No need to download! - the layer is disabled
                     return undefined;
                 }
 
-                if (location.zoom < layer.layerDef.minzoom) {
+                if (state.locationControl?.data?.zoom !== undefined && state.locationControl.data.zoom < layer.layerDef.minzoom) {
                     // No need to download! - the layer is disabled
                     return undefined;
                 }
 
-                // Yup, this is cheating to just get the bounds here
-                const bounds = state.currentBounds.data
-                if (bounds === undefined) {
-                    // We'll retry later
-                    return undefined
-                }
                 const tileRange = Tiles.TileRangeBetween(zoomlevel, bounds.getNorth(), bounds.getEast(), bounds.getSouth(), bounds.getWest())
                 if (tileRange.total > 10000) {
                     console.error("Got a really big tilerange, bounds and location might be out of sync")
@@ -55,7 +53,7 @@ export default class DynamicTileSource implements TileHierarchy<FeatureSourceFor
                 }
                 return needed
             }
-            , [layer.isDisplayed, state.currentBounds]).stabilized(250);
+            , [layer.isDisplayed, state.locationControl]).stabilized(250);
 
         neededTiles.addCallbackAndRunD(neededIndexes => {
             console.log("Tiled geojson source ", layer.layerDef.id, " needs", neededIndexes)

Logic/Web/IdbLocalStorage.ts

@@ -8,18 +8,24 @@ import {Utils} from "../../Utils";
 export class IdbLocalStorage {
 
 
-    public static Get<T>(key: string, options?: { defaultValue?: T, whenLoaded?: (t: T) => void }): UIEventSource<T> {
+    public static Get<T>(key: string, options?: { defaultValue?: T, whenLoaded?: (t: T | null) => void }): UIEventSource<T> {
         const src = new UIEventSource<T>(options?.defaultValue, "idb-local-storage:" + key)
         if (Utils.runningFromConsole) {
             return src;
         }
+        src.addCallback(v => idb.set(key, v))
+        
         idb.get(key).then(v => {
             src.setData(v ?? options?.defaultValue);
             if (options?.whenLoaded !== undefined) {
                 options?.whenLoaded(v)
             }
+        }).catch(err => {
+            console.warn("Loading from local storage failed due to", err)
+            if (options?.whenLoaded !== undefined) {
+                options?.whenLoaded(null)
+            }
         })
-        src.addCallback(v => idb.set(key, v))
         return src;
 
     }