feat(view): add maxZoomOnExtent options to restrict the zoom level af…

…ter a set extent
infra-geo-ouverte · Feb 3, 2020 · 74fae5a · 74fae5a
1 parent 583e908
commit 74fae5a
Show file tree

Hide file tree

Showing 4 changed files with 306 additions and 156 deletions.
diff --git a/packages/geo/src/lib/map/shared/controllers/view.ts b/packages/geo/src/lib/map/shared/controllers/view.ts
@@ -32,6 +32,16 @@ export class MapViewController extends MapController {
    */
   state$ = new BehaviorSubject<MapViewState>(undefined);
 
+  /**
+   * View Padding
+   */
+  padding = [0, 0, 0, 0];
+
+  /**
+   * Max zoom after set extent
+   */
+  maxZoomOnExtent = 19;
+
   /**
    * Extent stream
    */
@@ -52,11 +62,6 @@ export class MapViewController extends MapController {
    */
   private stateIndex: number = 0;
 
-  /**
-   * View Padding
-   */
-  padding = [0, 0, 0, 0];
-
   /**
    * Whether the view controller should keep the view's state history
    */
@@ -326,7 +331,10 @@ export class MapViewController extends MapController {
     const moySize = (toSize + fromSize) / 2;
     const xSize = distCenter / moySize;
 
-    const maxZoom = action === MapViewAction.Move ? zoom : zoom > 19 ? zoom : 19;
+    const maxZoom =
+      action === MapViewAction.Move || zoom > this.maxZoomOnExtent
+        ? zoom
+        : this.maxZoomOnExtent;
 
     olView.fit(extent, {
       maxZoom,

diff --git a/packages/geo/src/lib/map/shared/map.interface.ts b/packages/geo/src/lib/map/shared/map.interface.ts
@@ -3,6 +3,7 @@ export type MapExtent = [number, number, number, number];
 export interface MapViewOptions {
   projection?: string;
   center?: [number, number];
+  maxZoomOnExtent?: number;
   geolocate?: boolean;
   buffer?: Buffer;
 

diff --git a/packages/geo/src/lib/map/shared/map.ts b/packages/geo/src/lib/map/shared/map.ts
@@ -134,6 +134,9 @@ export class IgoMap {
     );
 
     this.setView(Object.assign(viewOptions, options));
+    if (options.maxZoomOnExtent) {
+      this.viewController.maxZoomOnExtent = options.maxZoomOnExtent;
+    }
   }
 
   /**
@@ -188,8 +191,12 @@ export class IgoMap {
 
     baseLayer.visible = true;
 
-    this.viewController.olView.setMinZoom(baseLayer.dataSource.options.minZoom || (this.options.view || {}).minZoom);
-    this.viewController.olView.setMaxZoom(baseLayer.dataSource.options.maxZoom || (this.options.view || {}).maxZoom);
+    this.viewController.olView.setMinZoom(
+      baseLayer.dataSource.options.minZoom || (this.options.view || {}).minZoom
+    );
+    this.viewController.olView.setMaxZoom(
+      baseLayer.dataSource.options.maxZoom || (this.options.view || {}).maxZoom
+    );
   }
 
   getBaseLayers(): Layer[] {