fix(geo): store strategy in-map-extent revert changes

infra-geo-ouverte · Oct 26, 2023 · 54027da · 54027da
1 parent 168ab6b
commit 54027da
Showing 1 changed file with 30 additions and 12 deletions.
diff --git a/packages/geo/src/lib/feature/shared/strategies/in-map-extent.ts b/packages/geo/src/lib/feature/shared/strategies/in-map-extent.ts
@@ -1,9 +1,15 @@
 import { EntityStoreStrategy } from '@igo2/common';
 
+import * as olextent from 'ol/extent';
+
 import { Subscription } from 'rxjs';
 import { debounceTime, skipWhile } from 'rxjs/operators';
 
-import { FeatureStoreInMapExtentStrategyOptions } from '../feature.interfaces';
+import { MapExtent } from '../../../map';
+import {
+  Feature,
+  FeatureStoreInMapExtentStrategyOptions
+} from '../feature.interfaces';
 import { FeatureStore } from '../store';
 
 /**
@@ -84,20 +90,32 @@ export class FeatureStoreInMapExtentStrategy extends EntityStoreStrategy {
     if (store?.layer?.map?.viewController) {
       store.state.updateAll({ inMapExtent: false });
       const mapExtent = store.layer.map.viewController.getExtent();
-      let entitiesInMapExtent = store.layer.ol
-        .getSource()
-        .getFeaturesInExtent(mapExtent)
-        .map((f) => store.get(f.getId()));
-      if (entitiesInMapExtent) {
-        store.state.updateMany(
-          entitiesInMapExtent,
-          { inMapExtent: true },
-          false
-        );
-      }
+      const features = store.entities$.value;
+      const entitiesInMapExtent = this.getFeaturesInExtent(features, mapExtent);
+      store.state.updateMany(entitiesInMapExtent, { inMapExtent: true }, false);
     }
   }
 
+  private getFeaturesInExtent(
+    features: Feature<any>[],
+    extent: MapExtent
+  ): Feature[] {
+    return features.reduce((acc, feature) => {
+      const geom = feature.ol?.getGeometry();
+      if (geom) {
+        const featureExtent = geom.getExtent();
+
+        if (olextent.intersects(featureExtent, extent)) {
+          acc.push(feature);
+        }
+      } else {
+        // By default, keep entity with no geometry
+        acc.push(feature);
+      }
+      return acc;
+    }, []);
+  }
+
   /**
    * Stop watching for a store's OL source changes
    * @param store Feature store