Refactoring: stabilize touchingFeatureSource

Logic/FeatureSource/Sources/TouchesBboxFeatureSource.ts

@@ -1,28 +1,40 @@
-import {FeatureSource, FeatureSourceForLayer } from "../FeatureSource"
+import { FeatureSource, FeatureSourceForLayer } from "../FeatureSource"
 import StaticFeatureSource from "./StaticFeatureSource"
-import { GeoOperations } from "../../GeoOperations"
 import { BBox } from "../../BBox"
 import FilteredLayer from "../../../Models/FilteredLayer"
+import { Store } from "../../UIEventSource"
 
 /**
  * Results in a feature source which has all the elements that touch the given features
  */
 export default class BBoxFeatureSource extends StaticFeatureSource {
-    constructor(features: FeatureSource, mustTouch: BBox) {
-        const bbox = mustTouch.asGeoJson({})
+    constructor(features: FeatureSource, mustTouch: Store<BBox>) {
         super(
-            features.features.mapD((features) =>
-                features.filter((feature) => GeoOperations.intersect(feature, bbox) !== undefined)
+            features.features.mapD(
+                (features) => {
+                    if (mustTouch.data === undefined) {
+                        return features
+                    }
+                    console.log("UPdating touching bbox")
+                    const box = mustTouch.data
+                    return features.filter((feature) => {
+                        if (feature.geometry.type === "Point") {
+                            return box.contains(<[number, number]>feature.geometry.coordinates)
+                        }
+                        return box.overlapsWith(BBox.get(feature))
+                    })
+                },
+                [mustTouch]
             )
         )
     }
 }
 
 export class BBoxFeatureSourceForLayer extends BBoxFeatureSource implements FeatureSourceForLayer {
-    constructor(features: FeatureSourceForLayer, mustTouch: BBox) {
+    readonly layer: FilteredLayer
+
+    constructor(features: FeatureSourceForLayer, mustTouch: Store<BBox>) {
         super(features, mustTouch)
         this.layer = features.layer
     }
-
-    readonly layer: FilteredLayer
 }