feat(baselayer): the map zoom is now limited by the baselayer

infra-geo-ouverte · Jan 27, 2020 · 08c42d2 · 08c42d2
1 parent a36648e
commit 08c42d2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/packages/geo/src/lib/datasource/shared/datasources/datasource.interface.ts b/packages/geo/src/lib/datasource/shared/datasources/datasource.interface.ts
@@ -22,6 +22,8 @@ export interface DataSourceOptions {
   // view?: ol.olx.layer.ImageOptions;
   id?: string;
   ol?: olSource;
+  minZoom?: number;
+  maxZoom?: number;
   // TODO: Should those options really belong here?
   sourceFields?: SourceFieldsOptionsParams[];
   download?: DownloadOptions;

diff --git a/packages/geo/src/lib/map/baselayers-switcher/baselayers-switcher.component.ts b/packages/geo/src/lib/map/baselayers-switcher/baselayers-switcher.component.ts
@@ -64,12 +64,15 @@ export class BaseLayersSwitcherComponent implements AfterViewInit, OnDestroy {
 
   get baseLayers(): Layer[] {
     const mapResolution = this.map.viewController.getResolution();
+    const mapZoom = this.map.viewController.getZoom();
 
     const bl = this._baseLayers.filter(l => {
       return (
         (!l.options.maxResolution ||
           mapResolution <= l.options.maxResolution) &&
-        (!l.options.minResolution || mapResolution >= l.options.minResolution)
+        (!l.options.minResolution || mapResolution >= l.options.minResolution) &&
+        (!l.options.source.options.maxZoom || mapZoom <= l.options.source.options.maxZoom) &&
+        (!l.options.source.options.minZoom || mapZoom >= l.options.source.options.minZoom)
       );
     });
 

diff --git a/packages/geo/src/lib/map/baselayers-switcher/mini-basemap.component.ts b/packages/geo/src/lib/map/baselayers-switcher/mini-basemap.component.ts
@@ -92,9 +92,12 @@ export class MiniBaseMapComponent implements AfterViewInit, OnDestroy {
 
     const options: any = Object.assign(
       Object.create(baselayer.options),
-      baselayer.options
+      baselayer.options,
+      {
+        visible: true,
+        baseLayer: false
+      }
     );
-    options.visible = true;
 
     const layer = this.layerService.createLayer(options);
     this.basemap.addLayer(layer);

diff --git a/packages/geo/src/lib/map/shared/map.ts b/packages/geo/src/lib/map/shared/map.ts
@@ -187,6 +187,9 @@ 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);
   }
 
   getBaseLayers(): Layer[] {