Skip to content

Commit

Permalink
fix(filter): fix typage
Browse files Browse the repository at this point in the history
  • Loading branch information
mbarbeau committed Apr 12, 2018
1 parent 45a4195 commit 892380c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
1 change: 0 additions & 1 deletion src/lib/datasource/shared/datasources/datasource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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 ?
Expand Down
6 changes: 3 additions & 3 deletions src/lib/layer/layer-item/layer-item.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down

0 comments on commit 892380c

Please sign in to comment.