More refactoring, move minimap behind facade

Logic/FeatureSource/Sources/FeatureSourceMerger.ts

@@ -1,22 +1,28 @@
-import FeatureSource, {FeatureSourceForLayer} from "./FeatureSource";
-import {UIEventSource} from "../UIEventSource";
-import FilteredLayer from "../../Models/FilteredLayer";
-
 /**
  * Merges features from different featureSources for a single layer
  * Uses the freshest feature available in the case multiple sources offer data with the same identifier
  */
-export default class FeatureSourceMerger implements FeatureSourceForLayer {
+import {UIEventSource} from "../../UIEventSource";
+import FeatureSource, {FeatureSourceForLayer, Tiled} from "../FeatureSource";
+import FilteredLayer from "../../../Models/FilteredLayer";
+import {BBox} from "../../GeoOperations";
+import {Utils} from "../../../Utils";
+
+export default class FeatureSourceMerger implements FeatureSourceForLayer, Tiled {
 
     public features: UIEventSource<{ feature: any; freshness: Date }[]> = new UIEventSource<{ feature: any; freshness: Date }[]>([]);
     public readonly name;
     public readonly layer: FilteredLayer
     private readonly _sources: UIEventSource<FeatureSource[]>;
+    public readonly tileIndex: number;
+    public readonly bbox: BBox;
 
-    constructor(layer: FilteredLayer ,sources: UIEventSource<FeatureSource[]>) {
+    constructor(layer: FilteredLayer, tileIndex: number, bbox: BBox, sources: UIEventSource<FeatureSource[]>) {
+        this.tileIndex = tileIndex;
+        this.bbox = bbox;
         this._sources = sources;
         this.layer = layer;
-        this.name = "SourceMerger"
+        this.name = "FeatureSourceMerger("+layer.layerDef.id+", "+Utils.tile_from_index(tileIndex).join(",")+")"
         const self = this;
 
         const handledSources = new Set<FeatureSource>();

Logic/FeatureSource/Sources/FilteringFeatureSource.ts

@@ -1,13 +1,13 @@
-import {FeatureSourceForLayer} from "./FeatureSource";
-import {UIEventSource} from "../UIEventSource";
-import Hash from "../Web/Hash";
-import LayerConfig from "../../Models/ThemeConfig/LayerConfig";
-import FilteredLayer from "../../Models/FilteredLayer";
+import {UIEventSource} from "../../UIEventSource";
+import LayerConfig from "../../../Models/ThemeConfig/LayerConfig";
+import FilteredLayer from "../../../Models/FilteredLayer";
+import {FeatureSourceForLayer} from "../FeatureSource";
+import Hash from "../../Web/Hash";
 
 export default class FilteringFeatureSource implements FeatureSourceForLayer {
     public features: UIEventSource<{ feature: any; freshness: Date }[]> =
         new UIEventSource<{ feature: any; freshness: Date }[]>([]);
-    public readonly name = "FilteringFeatureSource";
+    public readonly name;
     public readonly layer: FilteredLayer;
 
     constructor(
@@ -18,6 +18,7 @@ export default class FilteringFeatureSource implements FeatureSourceForLayer {
         upstream: FeatureSourceForLayer
     ) {
         const self = this;
+        this.name = "FilteringFeatureSource("+upstream.name+")"
 
         this.layer = upstream.layer;
         const layer = upstream.layer;

Logic/FeatureSource/Sources/GeoJsonSource.ts

@@ -1,14 +1,14 @@
-import {FeatureSourceForLayer} from "./FeatureSource";
-import {UIEventSource} from "../UIEventSource";
-import {Utils} from "../../Utils";
-import FilteredLayer from "../../Models/FilteredLayer";
-import {control} from "leaflet";
-
-
 /**
  * Fetches a geojson file somewhere and passes it along
  */
-export default class GeoJsonSource implements FeatureSourceForLayer {
+import {UIEventSource} from "../../UIEventSource";
+import FilteredLayer from "../../../Models/FilteredLayer";
+import {Utils} from "../../../Utils";
+import {FeatureSourceForLayer, Tiled} from "../FeatureSource";
+import {BBox} from "../../GeoOperations";
+
+
+export default class GeoJsonSource implements FeatureSourceForLayer, Tiled {
 
     public readonly features: UIEventSource<{ feature: any; freshness: Date }[]>;
     public readonly name;
@@ -17,6 +17,8 @@ export default class GeoJsonSource implements FeatureSourceForLayer {
     private readonly seenids: Set<string> = new Set<string>()
     public readonly layer: FilteredLayer;
 
+    public readonly tileIndex
+    public readonly bbox;
 
     public constructor(flayer: FilteredLayer,
                        zxy?: [number, number, number]) {
@@ -28,10 +30,16 @@ export default class GeoJsonSource implements FeatureSourceForLayer {
         this.layer = flayer;
         let url = flayer.layerDef.source.geojsonSource.replace("{layer}", flayer.layerDef.id);
         if (zxy !== undefined) {
+            const [z, x, y] = zxy;
             url = url
-                .replace('{z}', "" + zxy[0])
-                .replace('{x}', "" + zxy[1])
-                .replace('{y}', "" + zxy[2])
+                .replace('{z}', "" + z)
+                .replace('{x}', "" + x)
+                .replace('{y}', "" + y)
+            this.tileIndex = Utils.tile_index(z, x, y)
+            this.bbox = BBox.fromTile(z, x, y)
+        } else {
+            this.tileIndex = Utils.tile_index(0, 0, 0)
+            this.bbox = BBox.global;
         }
 
         this.name = "GeoJsonSource of " + url;

Logic/FeatureSource/Sources/OsmApiFeatureSource.ts

@@ -1,9 +1,9 @@
-import FeatureSource from "./FeatureSource";
-import {UIEventSource} from "../UIEventSource";
-import {OsmObject} from "../Osm/OsmObject";
-import {Utils} from "../../Utils";
-import Loc from "../../Models/Loc";
-import FilteredLayer from "../../Models/FilteredLayer";
+import FeatureSource from "../FeatureSource";
+import {UIEventSource} from "../../UIEventSource";
+import Loc from "../../../Models/Loc";
+import FilteredLayer from "../../../Models/FilteredLayer";
+import {Utils} from "../../../Utils";
+import {OsmObject} from "../../Osm/OsmObject";
 
 
 export default class OsmApiFeatureSource implements FeatureSource {

Logic/FeatureSource/Sources/RememberingSource.ts

@@ -1,11 +1,10 @@
-
-import FeatureSource, {FeatureSourceForLayer} from "./FeatureSource";
-import {UIEventSource} from "../UIEventSource";
-import FilteredLayer from "../../Models/FilteredLayer";
 /**
  * Every previously added point is remembered, but new points are added.
  * Data coming from upstream will always overwrite a previous value
  */
+import FeatureSource from "../FeatureSource";
+import {UIEventSource} from "../../UIEventSource";
+
 export default class RememberingSource implements FeatureSource {
 
     public readonly features: UIEventSource<{ feature: any, freshness: Date }[]>;

Logic/FeatureSource/Sources/SimpleFeatureSource.ts

@@ -1,6 +1,6 @@
-import {FeatureSourceForLayer} from "./FeatureSource";
-import {UIEventSource} from "../UIEventSource";
-import FilteredLayer from "../../Models/FilteredLayer";
+import {UIEventSource} from "../../UIEventSource";
+import FilteredLayer from "../../../Models/FilteredLayer";
+import {FeatureSourceForLayer} from "../FeatureSource";
 
 export default class SimpleFeatureSource implements FeatureSourceForLayer {
     public readonly features: UIEventSource<{ feature: any; freshness: Date }[]> = new UIEventSource<{ feature: any; freshness: Date }[]>([]);

Logic/FeatureSource/Sources/StaticFeatureSource.ts

@@ -8,12 +8,19 @@ export default class StaticFeatureSource implements FeatureSource {
     public readonly features: UIEventSource<{ feature: any; freshness: Date }[]>;
     public readonly name: string = "StaticFeatureSource"
 
-    constructor(features: any[]) {
+    constructor(features: any[] | UIEventSource<any[]>, useFeaturesDirectly = false) {
         const now = new Date();
-        this.features = new UIEventSource(features.map(f => ({
-            feature: f,
-            freshness: now
-        })))
+        if(useFeaturesDirectly){
+            // @ts-ignore
+            this.features = features
+        }else         if (features instanceof UIEventSource) {
+            this.features = features.map(features => features.map(f => ({feature: f, freshness: now})))
+        } else {
+            this.features = new UIEventSource(features.map(f => ({
+                feature: f,
+                freshness: now
+            })))
+        }
     }
 
 

Logic/FeatureSource/Sources/WayHandlingApplyingFeatureSource.ts

@@ -1,18 +1,18 @@
-import {FeatureSourceForLayer} from "./FeatureSource";
-import {UIEventSource} from "../UIEventSource";
-import {GeoOperations} from "../GeoOperations";
-import LayerConfig from "../../Models/ThemeConfig/LayerConfig";
-
 /**
  * This is the part of the pipeline which introduces extra points at the center of an area (but only if this is demanded by the wayhandling)
  */
+import {UIEventSource} from "../../UIEventSource";
+import LayerConfig from "../../../Models/ThemeConfig/LayerConfig";
+import {GeoOperations} from "../../GeoOperations";
+import {FeatureSourceForLayer} from "../FeatureSource";
+
 export default class WayHandlingApplyingFeatureSource implements FeatureSourceForLayer {
     public readonly features: UIEventSource<{ feature: any; freshness: Date }[]>;
     public readonly name;
     public readonly layer;
 
     constructor(upstream: FeatureSourceForLayer) {
-        this.name = "Wayhandling of " + upstream.name;
+        this.name = "Wayhandling(" + upstream.name+")";
         this.layer = upstream.layer
         const layer = upstream.layer.layerDef;