Fix(ogc filter) for Angular 6 and adjustements for minilib (new master branch)

demo/src/app/geo/layer/layer.component.html

@@ -20,6 +20,7 @@
     floatLabel="never">
 
       <ng-template #igoLayerItemToolbar let-layer="layer">
+        <igo-ogc-filter-button [map]="map" [layer]="layer"></igo-ogc-filter-button>
         <igo-metadata-button [layer]="layer"></igo-metadata-button>
         <igo-download-button [layer]="layer"></igo-download-button>
       </ng-template>

demo/src/app/geo/layer/layer.component.ts

@@ -7,6 +7,8 @@ import {
   LayerService,
   WMSDataSourceOptions,
   LayerOptions,
+  WFSDataSourceOptions,
+  OgcFilterableDataSourceOptions,
   MetadataLayerOptions
 } from '@igo2/geo';
 
@@ -47,6 +49,43 @@ export class AppLayerComponent {
         );
       });
 
+    interface WFSoptions
+      extends WFSDataSourceOptions,
+        OgcFilterableDataSourceOptions {}
+
+    const wfsDatasource: WFSoptions = {
+      type: 'wfs',
+      url: 'https://geoegl.msp.gouv.qc.ca/igo2/api/ws/igo_gouvouvert.fcgi',
+      params: {
+        featureTypes: 'vg_observation_v_autre_wmst',
+        fieldNameGeometry: 'geometry',
+        maxFeatures: 10000,
+        version: '2.0.0',
+        outputFormat: 'geojson_utf8',
+        outputFormatDownload: 'shp'
+      },
+      ogcFilters: {
+        enabled: true,
+        editable: true,
+        filters: {
+          operator: 'PropertyIsEqualTo',
+          propertyName: 'code_municipalite',
+          expression: '10043'
+        }
+      }
+    };
+
+    this.dataSourceService
+      .createAsyncDataSource(wfsDatasource)
+      .subscribe(dataSource => {
+        const layer: LayerOptions = {
+          title: 'WFS ',
+          visible: true,
+          source: dataSource
+        };
+        this.map.addLayer(this.layerService.createLayer(layer));
+      });
+
     this.layerService
       .createAsyncLayer({
         sourceOptions: {

demo/src/app/geo/layer/layer.module.ts

@@ -9,6 +9,7 @@ import { IgoPanelModule } from '@igo2/common';
 import {
   IgoMapModule,
   IgoLayerModule,
+  IgoFilterModule,
   IgoMetadataModule,
   IgoDownloadModule
 } from '@igo2/geo';
@@ -26,6 +27,7 @@ import { AppLayerRoutingModule } from './layer-routing.module';
     IgoPanelModule,
     IgoMapModule,
     IgoLayerModule,
+    IgoFilterModule,
     IgoMetadataModule,
     IgoDownloadModule
   ],

demo/src/app/geo/ogc-filter/ogc-filter.component.html

@@ -14,7 +14,7 @@
   </igo-map-browser>
 
   <igo-panel title="Layers">
-    <igo-ogc-filterable-list [layers]="map.layers">
+    <igo-ogc-filterable-list [map]="map" [layers]="map.layers">
 
     </igo-ogc-filterable-list>
   </igo-panel>

demo/src/app/geo/ogc-filter/ogc-filter.component.ts

@@ -5,8 +5,11 @@ import {
   IgoMap,
   DataSourceService,
   LayerService,
+  WMSDataSourceOptions,
   WFSDataSourceOptions,
-  OgcFilterableDataSourceOptions
+  WFSDataSourceOptionsParams,
+  OgcFilterableDataSourceOptions,
+  AnyBaseOgcFilterOptions
 } from '@igo2/geo';
 
 @Component({
@@ -58,15 +61,43 @@ export class AppOgcFilterComponent {
         fieldNameGeometry: 'geometry',
         maxFeatures: 10000,
         version: '2.0.0',
-        outputFormat: 'geojson'
+        outputFormat: 'geojson',
+        outputFormatDownload: 'SHP' // based on service capabilities
       },
-      isOgcFilterable: true,
+      sourceFields: [
+        { name: 'code_municipalite', alias: '# de la municipalitée' },
+        { name: 'date_observation' },
+        { name: 'urgence', values: ['immédiate', 'inconnue'] }
+      ],
       ogcFilters: {
-        filtersAreEditable: true,
+        enabled: true,
+        editable: true,
         filters: {
-          operator: 'PropertyIsEqualTo',
-          propertyName: 'code_municipalite',
-          expression: '10043'
+          logical: 'Or',
+          filters: [
+            {
+              operator: 'PropertyIsEqualTo',
+              propertyName: 'code_municipalite',
+              expression: '10043'
+            },
+            {
+              operator: 'Intersects',
+              geometryName: 'the_geom',
+              wkt_geometry: `MULTIPOLYGON(((
+              -8379441.158019895 5844447.897707146,
+              -8379441.158019895 5936172.331649357,
+              -8134842.66750733 5936172.331649357,
+              -8134842.66750733 5844447.897707146,
+              -8379441.158019895 5844447.897707146
+            ), (
+              -8015003 5942074,
+              -8015003 5780349,
+              -7792364 5780349,
+              -7792364 5942074,
+              -8015003 5942074
+            )))`
+            }
+          ] as AnyBaseOgcFilterOptions[]
         }
       }
     };
@@ -81,5 +112,52 @@ export class AppOgcFilterComponent {
           })
         );
       });
+
+    interface WMSoptions
+      extends WMSDataSourceOptions,
+        OgcFilterableDataSourceOptions {}
+
+    const datasourceWms: WMSoptions = {
+      type: 'wms',
+      url: '/geoserver/wms',
+      urlWfs: '/geoserver/wfs',
+      params: {
+        layers: 'water_areas',
+        version: '1.3.0'
+      },
+      ogcFilters: {
+        enabled: true,
+        editable: true,
+        filters: {
+          operator: 'PropertyIsEqualTo',
+          propertyName: 'waterway',
+          expression: 'riverbank'
+        }
+      },
+      sourceFields: [
+        { name: 'waterway', alias: 'Chemin d eau' },
+        { name: 'osm_id' },
+        { name: 'landuse', values: ['yes', 'no'] }
+      ],
+      paramsWFS: {
+        featureTypes: 'water_areas',
+        fieldNameGeometry: 'the_geom',
+        maxFeatures: 10000,
+        version: '1.1.0',
+        outputFormat: 'application/json',
+        outputFormatDownload: 'application/vnd.google-earth.kml+xml'
+      } as WFSDataSourceOptionsParams
+    };
+
+    this.dataSourceService
+      .createAsyncDataSource(datasourceWms)
+      .subscribe(dataSource => {
+        this.map.addLayer(
+          this.layerService.createLayer({
+            title: 'Geoserver water_areas',
+            source: dataSource
+          })
+        );
+      });
   }
 }

projects/core/src/lib/request/error.interceptor.ts

@@ -71,6 +71,7 @@ export class ErrorInterceptor implements HttpInterceptor {
       const translate = this.injector.get(LanguageService).translate;
       const message = translate.instant('igo.core.errors.uncaught.message');
       const title = translate.instant('igo.core.errors.uncaught.title');
+      this.httpError.error.caught = true;
       this.messageService.error(message, title);
     }
   }

projects/geo/src/lib/datasource/shared/datasource.service.spec.ts

@@ -3,7 +3,7 @@ import { HttpClientModule } from '@angular/common/http';
 
 import { CapabilitiesService } from './capabilities.service';
 import { DataSourceService } from './datasource.service';
-import { WFSService } from './wfs.service';
+import { WFSService } from './datasources/wfs.service';
 
 describe('DataSourceService', () => {
   beforeEach(() => {

projects/geo/src/lib/datasource/shared/datasource.service.ts

@@ -14,6 +14,7 @@ import {
   XYZDataSourceOptions,
   WFSDataSource,
   WFSDataSourceOptions,
+  WFSService,
   WMTSDataSource,
   WMTSDataSourceOptions,
   WMSDataSource,
@@ -33,7 +34,10 @@ import {
 export class DataSourceService {
   public datasources$ = new BehaviorSubject<DataSource[]>([]);
 
-  constructor(private capabilitiesService: CapabilitiesService) {}
+  constructor(
+    private capabilitiesService: CapabilitiesService,
+    private wfsDataSourceService: WFSService
+  ) {}
 
   createAsyncDataSource(context: AnyDataSourceOptions): Observable<DataSource> {
     if (!context.type) {
@@ -104,7 +108,9 @@ export class DataSourceService {
   private createWFSDataSource(
     context: WFSDataSourceOptions
   ): Observable<WFSDataSource> {
-    return new Observable(d => d.next(new WFSDataSource(context)));
+    return new Observable(d =>
+      d.next(new WFSDataSource(context, this.wfsDataSourceService))
+    );
   }
 
   private createWMSDataSource(
@@ -114,11 +120,16 @@ export class DataSourceService {
       return this.capabilitiesService
         .getWMSOptions(context)
         .pipe(
-          map((options: WMSDataSourceOptions) => new WMSDataSource(options))
+          map(
+            (options: WMSDataSourceOptions) =>
+              new WMSDataSource(options, this.wfsDataSourceService)
+          )
         );
     }
 
-    return new Observable(d => d.next(new WMSDataSource(context)));
+    return new Observable(d =>
+      d.next(new WMSDataSource(context, this.wfsDataSourceService))
+    );
   }
 
   private createWMTSDataSource(

projects/geo/src/lib/datasource/shared/datasources/data.service.ts

@@ -0,0 +1,3 @@
+export abstract class DataService {
+    abstract getData(): string;
+}

projects/geo/src/lib/datasource/shared/datasources/datasource.interface.ts

@@ -1,6 +1,7 @@
 import olSource from 'ol/source/Source';
 
 import { DataSource } from './datasource';
+import { DownloadOptions } from '../../../download/shared/download.interface';
 
 export interface DataSourceOptions {
   type?:
@@ -21,6 +22,8 @@ export interface DataSourceOptions {
   // view?: ol.olx.layer.ImageOptions;
   // displayField?: string;
   ol?: olSource;
+  sourceFields?: SourceFieldsOptionsParams[];
+  download?: DownloadOptions;
 }
 
 export interface DataSourceLegendOptions {
@@ -31,3 +34,9 @@ export interface DataSourceLegendOptions {
   style?: { [key: string]: string | number };
   title?: string;
 }
+
+export interface SourceFieldsOptionsParams {
+  name: any;
+  alias?: any;
+  values?: any;
+}

projects/geo/src/lib/datasource/shared/datasources/datasource.ts

@@ -5,14 +5,15 @@ import {
   DataSourceLegendOptions
 } from './datasource.interface';
 
-// import { DataService } from './data.service';
+import { DataService } from './data.service';
 
 export abstract class DataSource {
   public id: string;
   public ol: olSource;
 
   constructor(
-    public options: DataSourceOptions = {} // protected dataSourceService?: DataService
+    public options: DataSourceOptions = {},
+    protected dataService?: DataService
   ) {
     this.options = options;
     this.id = this.generateId();

projects/geo/src/lib/datasource/shared/datasources/index.ts

@@ -1,3 +1,4 @@
+export * from './data.service';
 export * from './datasource';
 export * from './datasource.interface';
 export * from './feature-datasource';
@@ -8,6 +9,7 @@ export * from './xyz-datasource';
 export * from './xyz-datasource.interface';
 export * from './wfs-datasource';
 export * from './wfs-datasource.interface';
+export * from './wfs.service';
 export * from './wms-datasource';
 export * from './wms-datasource.interface';
 export * from './wmts-datasource';

projects/geo/src/lib/datasource/shared/datasources/wfs-datasource.interface.ts

@@ -5,15 +5,24 @@ export interface WFSDataSourceOptions
   extends DataSourceOptions,
     FeatureDataSourceOptions {
   // type?: 'wfs';
-  params: WFSDataSourceOptionsParams;
+  params: WFSDataSourceOptionsParams; // Used by user
+  paramsWFS?: WFSDataSourceOptionsParams; // Used by code
+  urlWfs?: string; // Used by code
 }
 
 export interface WFSDataSourceOptionsParams {
   version?: string;
   featureTypes: string;
   fieldNameGeometry: string;
   maxFeatures?: Number;
-  outputFormat?: string;
+  outputFormat: string;
+  outputFormatDownload?: string;
   srsname?: string;
   xmlFilter?: string;
+  wfsCapabilities?: WFSCapabilitiesParams;
+}
+
+export interface WFSCapabilitiesParams {
+  xmlBody?: string;
+  GetPropertyValue?: boolean;
 }