From 892380c2228b97894d5c8754fa4721c26520504b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Barbeau?=
 <marc-andre.barbeau@msp.gouv.qc.ca>
Date: Thu, 12 Apr 2018 11:03:31 -0400
Subject: [PATCH] fix(filter): fix typage

---
 src/lib/datasource/shared/datasources/datasource.ts         | 1 -
 .../filter/ogc-filter-form/ogc-filter-form.component.html   | 2 +-
 .../ogc-filterable-item/ogc-filterable-item.component.ts    | 6 +++---
 src/lib/layer/layer-item/layer-item.component.html          | 6 +++---
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/lib/datasource/shared/datasources/datasource.ts b/src/lib/datasource/shared/datasources/datasource.ts
index e1758bdefa..50ceec5384 100644
--- a/src/lib/datasource/shared/datasources/datasource.ts
+++ b/src/lib/datasource/shared/datasources/datasource.ts
@@ -7,7 +7,6 @@ export abstract class DataSource {
   public id: string;
   public ol: ol.source.Source;
 
-
   get title(): string {
     return this.options.alias ? this.options.alias : this.options.title;
   }
diff --git a/src/lib/filter/ogc-filter-form/ogc-filter-form.component.html b/src/lib/filter/ogc-filter-form/ogc-filter-form.component.html
index db4596a5c0..e674e8b064 100644
--- a/src/lib/filter/ogc-filter-form/ogc-filter-form.component.html
+++ b/src/lib/filter/ogc-filter-form/ogc-filter-form.component.html
@@ -198,7 +198,7 @@
     <div class="igo-layer-button-group">
       <mat-slide-toggle class="example-margin" (change)="toggleFilterState($event,currentFilter,'active')" tooltip-position="below"
         matTooltipShowDelay="500" [matTooltip]="'igo.filter.toggleFilterState' | translate" [color]="color" [checked]="currentFilter.active"
-        [disabled]="disabled">
+        [disabled]="!currentFilter.active">
       </mat-slide-toggle>
       <button mat-icon-button tooltip-position="below" matTooltipShowDelay="500" [matTooltip]="'igo.filter.removeFilter' | translate"
         color="warn" (click)="deleteFilter(currentFilter)">
diff --git a/src/lib/filter/ogc-filterable-item/ogc-filterable-item.component.ts b/src/lib/filter/ogc-filterable-item/ogc-filterable-item.component.ts
index b57b4c22da..9bb99d180f 100644
--- a/src/lib/filter/ogc-filterable-item/ogc-filterable-item.component.ts
+++ b/src/lib/filter/ogc-filterable-item/ogc-filterable-item.component.ts
@@ -11,8 +11,8 @@ import { DownloadService } from '../../download';
   styleUrls: ['./ogc-filterable-item.component.styl']
 })
 export class OgcFilterableItemComponent implements OnInit, OnDestroy {
-  color = 'primary';
-  private layers;
+  public color = 'primary';
+  public layers;
   private layers$$: Subscription;
   private lastRunOgcFilter;
   private defaultLogicalParent = 'And';
@@ -50,7 +50,7 @@ export class OgcFilterableItemComponent implements OnInit, OnDestroy {
     this.layers$$.unsubscribe();
   }
 
-  addFilterToSequence(event) {
+  addFilterToSequence() {
     const arr = this.datasource.options.ogcFilters.interfaceOgcFilters
     const lastLevel = arr.length === 0 ? 0 : arr[arr.length - 1].level;
     const firstFieldName = this.datasource.options['sourceFields'][0].name === undefined ?
diff --git a/src/lib/layer/layer-item/layer-item.component.html b/src/lib/layer/layer-item/layer-item.component.html
index 135ca69ae6..e90460f6b9 100644
--- a/src/lib/layer/layer-item/layer-item.component.html
+++ b/src/lib/layer/layer-item/layer-item.component.html
@@ -8,9 +8,9 @@
     (toggle)="toggleLegend($event)">
   </mat-icon>
   <h4 matLine [matTooltip]="layer.title +' ('+ id +') '" matTooltipShowDelay="500">{{layer.title}}</h4>
-  
+
   <button
-    *ngIf="layer.dataSource.options.ogcFiltered"
+    *ngIf="layer.dataSource.options['ogcFiltered']"
     mat-icon-button
     collapsibleButton
     tooltip-position="below"
@@ -20,7 +20,7 @@ <h4 matLine [matTooltip]="layer.title +' ('+ id +') '" matTooltipShowDelay="500"
     disabled = true>
     <mat-icon> filter_list </mat-icon>
   </button>
-  
+
   <button
     mat-icon-button
     collapsibleButton