feat(feature-datasource): add a preload options on vector source (#1231)

* feat(feature-datasource): add a preload options on vector source * wip * wip
infra-geo-ouverte · May 3, 2023 · c303d57 · c303d57
1 parent f7bc3d8
commit c303d57
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/packages/geo/src/lib/datasource/shared/datasources/feature-datasource.interface.ts b/packages/geo/src/lib/datasource/shared/datasources/feature-datasource.interface.ts
@@ -16,8 +16,14 @@ export interface FeatureDataSourceOptions extends DataSourceOptions {
   format?: olFormatFeature;
   url?: string;
   pathOffline?: string;
+  preload?: PreloadOptions;
   excludeAttribute?: Array<string>;
   excludeAttributeOffline?: Array<string>;
 
   ol?: olSourceVector<OlGeometry> | olSource;
 }
+
+export interface PreloadOptions {
+  bypassVisible?: boolean;
+  bypassResolution?: boolean;
+}
diff --git a/packages/geo/src/lib/layer/shared/layers/vector-layer.ts b/packages/geo/src/lib/layer/shared/layers/vector-layer.ts
@@ -17,7 +17,7 @@ import { WebSocketDataSource } from '../../../datasource/shared/datasources/webs
 import { ClusterDataSource } from '../../../datasource/shared/datasources/cluster-datasource';
 
 import { VectorWatcher } from '../../utils';
-import { IgoMap, MapExtent } from '../../../map';
+import { IgoMap, MapExtent, getResolutionFromScale } from '../../../map';
 import { Layer } from './layer';
 import { VectorLayerOptions } from './vector-layer.interface';
 import { AuthInterceptor } from '@igo2/auth';
@@ -34,6 +34,7 @@ import { LayerDBService } from '../../../offline/layerDB/layerDB.service';
 import { LayerDBData } from '../../../offline';
 import BaseEvent from 'ol/events/Event';
 import { olStyleToBasicIgoStyle } from '../../../style/shared/vector/conversion.utils';
+import { FeatureDataSourceOptions } from '../../../datasource/shared/datasources/feature-datasource.interface';
 
 export class VectorLayer extends Layer {
   public dataSource:
@@ -69,6 +70,24 @@ export class VectorLayer extends Layer {
   }
 
   protected createOlLayer(): olLayerVector<olSourceVector<OlGeometry>> {
+    const initialOpacityValue = this.options.opacity || 1;
+    const initialVisibleValue = this.options.visible !== false;
+    const initialMinResValue = this.options.minResolution || getResolutionFromScale(Number(this.options.minScaleDenom));
+    const initialMaxResValue = this.options.maxResolution || getResolutionFromScale(Number(this.options.maxScaleDenom));
+    const so = this.options.sourceOptions as FeatureDataSourceOptions;
+    if (this.dataSource instanceof FeatureDataSource) {
+      if (so?.preload?.bypassResolution || so?.preload?.bypassVisible) {
+        this.options.opacity = 0;
+        if (so.preload.bypassResolution && (this.options.minResolution || this.options.maxResolution)) {
+          this.options.minResolution = 0;
+          this.options.maxResolution = Infinity;
+        }
+        if (so.preload.bypassVisible && !initialVisibleValue) {
+          this.options.visible = true;
+        }
+      }
+    }
+
     const olOptions = Object.assign({}, this.options, {
       source: this.options.source.ol as olSourceVector<OlGeometry>
     });
@@ -93,6 +112,23 @@ export class VectorLayer extends Layer {
       });
     }
 
+    if (
+      this.dataSource instanceof FeatureDataSource &&
+      (so?.preload?.bypassResolution || so?.preload?.bypassVisible)) {
+      this.dataSource.ol.once('featuresloadend', () => {
+        if (initialOpacityValue) {
+          this.opacity = initialOpacityValue;
+        }
+        if (so.preload.bypassResolution) {
+          this.minResolution = initialMinResValue;
+          this.maxResolution = initialMaxResValue;
+        }
+        if (so.preload.bypassVisible) {
+          this.visible = initialVisibleValue;
+        }
+      });
+    }
+
     if (this.options.trackFeature) {
       this.enableTrackFeature(this.options.trackFeature);
     }