fix(layer-list): fix baselayer with select all and opacity CSS (#632)

infra-geo-ouverte · May 11, 2020 · f57405c · f57405c
1 parent c44378b
commit f57405c
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 20 deletions.
diff --git a/packages/geo/src/lib/layer/layer-item/layer-item.component.ts b/packages/geo/src/lib/layer/layer-item/layer-item.component.ts
@@ -58,17 +58,15 @@ export class LayerItemComponent implements OnInit, OnDestroy {
   }
   set selectAll(value: boolean) {
     this._selectAll = value;
-    if (value) {
-      if (!this.layer.baseLayer) {
-        this.layerCheck = true;
-      }
+    if (value === true) {
+      this.layerCheck = true;
     } else {
       this.layerCheck = false;
     }
   }
   private _selectAll = false;
 
-  public layerCheck = false;
+  public layerCheck;
 
   private resolution$$: Subscription;
 

diff --git a/packages/geo/src/lib/layer/layer-list/layer-list.component.html b/packages/geo/src/lib/layer/layer-list/layer-list.component.html
@@ -129,19 +129,21 @@
     </button>
 
     <mat-menu #opacityMenu="matMenu">
-      <mat-slider *ngIf="layersChecked.length"
-        id="opacity-slider"
-        color="primary"
-        thumbLabel
-        tickInterval="5"
-        step="5"
-        [min]="0"
-        [max]="100"
-        [(ngModel)]="checkOpacity"
-        [matTooltip]="'igo.geo.layer.opacity' | translate"
-        matTooltipShowDelay="500"
-        tooltip-position="below">
-      </mat-slider>
+      <div id="opacity-menu">
+        <mat-slider *ngIf="layersChecked.length"
+          id="opacity-slider"
+          color="primary"
+          thumbLabel
+          tickInterval="5"
+          step="5"
+          [min]="0"
+          [max]="100"
+          [(ngModel)]="checkOpacity"
+          [matTooltip]="'igo.geo.layer.opacity' | translate"
+          matTooltipShowDelay="500"
+          tooltip-position="below">
+        </mat-slider>
+      </div>
     </mat-menu>
 
     <button

diff --git a/packages/geo/src/lib/layer/layer-list/layer-list.component.ts b/packages/geo/src/lib/layer/layer-list/layer-list.component.ts
@@ -237,6 +237,10 @@ export class LayerListComponent implements OnInit, OnDestroy {
         response = true;
       }
     }
+
+    if (this.layersChecked.length === 1 && this.layersChecked[0].baseLayer) {
+      response = false;
+    }
     return response;
   }
 
@@ -249,6 +253,10 @@ export class LayerListComponent implements OnInit, OnDestroy {
         response = true;
       }
     }
+
+    if (this.layersChecked.length === 1 && this.layersChecked[0].baseLayer) {
+      response = false;
+    }
     return response;
   }
 

diff --git a/packages/geo/src/lib/map/shared/map.ts b/packages/geo/src/lib/map/shared/map.ts
@@ -279,7 +279,9 @@ export class IgoMap {
 
   raiseLayers(layers: Layer[]) {
     for (const layer of layers) {
-      this.raiseLayer(layer);
+      if (layer.baseLayer !== true) {
+        this.raiseLayer(layer);
+      }
     }
   }
 
@@ -293,7 +295,9 @@ export class IgoMap {
   lowerLayers(layers: Layer[]) {
     const reverseLayers = layers.reverse();
     for (const layer of reverseLayers) {
-      this.lowerLayer(layer);
+      if (layer.baseLayer !== true) {
+        this.lowerLayer(layer);
+      }
     }
   }