More refactoring of the featuresources, cleanup, small changes

Logic/FeatureSource/Sources/LocalStorageSource.ts

@@ -1,35 +0,0 @@
-import FeatureSource from "./FeatureSource";
-import {UIEventSource} from "../UIEventSource";
-import LocalStorageSaverActor from "./LocalStorageSaverActor";
-import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig";
-
-export default class LocalStorageSource implements FeatureSource {
-    public features: UIEventSource<{ feature: any; freshness: Date }[]>;
-    public readonly name = "LocalStorageSource";
-
-    constructor(layout: UIEventSource<LayoutConfig>) {
-        this.features = new UIEventSource<{ feature: any; freshness: Date }[]>([])
-        const key = LocalStorageSaverActor.storageKey + layout.data.id
-        layout.addCallbackAndRun(_ => {
-            try {
-                const fromStorage = localStorage.getItem(key);
-                if (fromStorage == null) {
-                    return;
-                }
-                const loaded: { feature: any; freshness: Date | string }[] =
-                    JSON.parse(fromStorage);
-
-                const parsed: { feature: any; freshness: Date }[] = loaded.map(ff => ({
-                    feature: ff.feature,
-                    freshness: typeof ff.freshness == "string" ? new Date(ff.freshness) : ff.freshness
-                }))
-
-                this.features.setData(parsed);
-                console.log("Loaded ", loaded.length, " features from localstorage as cache")
-            } catch (e) {
-                console.log("Could not load features from localStorage:", e)
-                localStorage.removeItem(key)
-            }
-        })
-    }
-}

Logic/FeatureSource/Sources/StaticFeatureSource.ts

@@ -0,0 +1,20 @@
+import FeatureSource from "../FeatureSource";
+import {UIEventSource} from "../../UIEventSource";
+
+/**
+ * A simple dummy implementation for whenever it is needed
+ */
+export default class StaticFeatureSource implements FeatureSource {
+    public readonly features: UIEventSource<{ feature: any; freshness: Date }[]>;
+    public readonly name: string = "StaticFeatureSource"
+
+    constructor(features: any[]) {
+        const now = new Date();
+        this.features = new UIEventSource(features.map(f => ({
+            feature: f,
+            freshness: now
+        })))
+    }
+
+
+}

Logic/FeatureSource/TiledFeatureSource/TileHierarchyMerger.ts

@@ -0,0 +1,45 @@
+import TileHierarchy from "./TiledFeatureSource/TileHierarchy";
+import FeatureSource, {FeatureSourceForLayer, Tiled} from "./FeatureSource";
+import {UIEventSource} from "../UIEventSource";
+import FilteredLayer from "../../Models/FilteredLayer";
+import FeatureSourceMerger from "./Sources/FeatureSourceMerger";
+import {BBox} from "../GeoOperations";
+import {Utils} from "../../Utils";
+
+export class TileHierarchyMerger implements TileHierarchy<FeatureSourceForLayer & Tiled> {
+    public readonly loadedTiles: Map<number, FeatureSourceForLayer & Tiled> = new Map<number, FeatureSourceForLayer & Tiled>();
+    private readonly sources: Map<number, UIEventSource<FeatureSource[]>> = new Map<number, UIEventSource<FeatureSource[]>>();
+
+    public readonly layer: FilteredLayer;
+    private _handleTile: (src: FeatureSourceForLayer, index: number) => void;
+
+    constructor(layer: FilteredLayer, handleTile: (src: FeatureSourceForLayer, index: number) => void) {
+        this.layer = layer;
+        this._handleTile = handleTile;
+    }
+
+    /**
+     * Add another feature source for the given tile.
+     * Entries for this tile will be merged
+     * @param src
+     * @param index
+     */
+    public registerTile(src: FeatureSource, index: number) {
+
+        if (this.sources.has(index)) {
+            const sources = this.sources.get(index)
+            sources.data.push(src)
+            sources.ping()
+            return;
+        }
+
+        // We have to setup
+        const sources = new UIEventSource<FeatureSource[]>([src])
+        this.sources.set(index, sources)
+        const merger = new FeatureSourceMerger(this.layer, index, BBox.fromTile(...Utils.tile_from_index(index)), sources)
+        this.loadedTiles.set(index, merger)
+        this._handleTile(merger, index)
+    }
+
+
+}