Merge pull request #5 from infra-geo-ouverte/1.0.0-alpha

1.0.0 alpha

CHANGELOG.md

@@ -1,3 +1,66 @@
+# [1.0.0-alpha.4](https://github.com/infra-geo-ouverte/igo2-lib/compare/1.0.0-alpha.3...1.0.0-alpha.4) (2019-08-07)
+
+
+### Bug Fixes
+
+* **context:** fix minors issues context module ([7771fb9](https://github.com/infra-geo-ouverte/igo2-lib/commit/7771fb9))
+
+
+### Features
+
+* **catalog:** add metadata button ([#377](https://github.com/infra-geo-ouverte/igo2-lib/issues/377)) ([b1083e8](https://github.com/infra-geo-ouverte/igo2-lib/commit/b1083e8))
+* **entity-table:** add option to choose button style ([d0d4aae](https://github.com/infra-geo-ouverte/igo2-lib/commit/d0d4aae))
+* **ogcFilters:** OgcFilters simplification, PushButtons and fields & operator control  ([#361](https://github.com/infra-geo-ouverte/igo2-lib/issues/361)) ([1466996](https://github.com/infra-geo-ouverte/igo2-lib/commit/1466996))
+* **search:** Search setting upgrade ([#375](https://github.com/infra-geo-ouverte/igo2-lib/issues/375)) ([67074c6](https://github.com/infra-geo-ouverte/igo2-lib/commit/67074c6))
+
+
+
+# [1.0.0-alpha.3](https://github.com/infra-geo-ouverte/igo2-lib/compare/1.0.0-alpha.2...1.0.0-alpha.3) (2019-07-26)
+
+
+### Bug Fixes
+
+* fix icon, harmonizing crossOrigin syntax and  Allow IE 11 to manage some object properly ([#372](https://github.com/infra-geo-ouverte/igo2-lib/issues/372)) ([e9d9f31](https://github.com/infra-geo-ouverte/igo2-lib/commit/e9d9f31))
+* **catalog:** fix add layer icon ([0a4e591](https://github.com/infra-geo-ouverte/igo2-lib/commit/0a4e591))
+* **context:** fix create layerOptions when create context ([7054b02](https://github.com/infra-geo-ouverte/igo2-lib/commit/7054b02))
+* **demo:** fix action demo ([bcd2a11](https://github.com/infra-geo-ouverte/igo2-lib/commit/bcd2a11))
+* **entity-table:** fix check for button click functions ([af7b60b](https://github.com/infra-geo-ouverte/igo2-lib/commit/af7b60b))
+* **form:** fix disabled form fields ([43d88a2](https://github.com/infra-geo-ouverte/igo2-lib/commit/43d88a2))
+* **geometry input:** fix buffer of size 0 behavior ([71fac4b](https://github.com/infra-geo-ouverte/igo2-lib/commit/71fac4b))
+* **icons:** fix a few missing icons (post font upgrade) ([308bac4](https://github.com/infra-geo-ouverte/igo2-lib/commit/308bac4))
+* **icons:** fix icons ([4d98eb7](https://github.com/infra-geo-ouverte/igo2-lib/commit/4d98eb7))
+* **print:** fix print undefined comment ([f537a95](https://github.com/infra-geo-ouverte/igo2-lib/commit/f537a95))
+* **sharemap:** Limit sharemap url length,  Coord precision & skip default context ([#367](https://github.com/infra-geo-ouverte/igo2-lib/issues/367)) ([4c4fb3c](https://github.com/infra-geo-ouverte/igo2-lib/commit/4c4fb3c))
+* **workspace-selector:** change many attr to multi ([4564e91](https://github.com/infra-geo-ouverte/igo2-lib/commit/4564e91))
+* **zoom:** remove minResolution ([758fb0b](https://github.com/infra-geo-ouverte/igo2-lib/commit/758fb0b))
+
+
+### Features
+
+* **catalog:** allow ctalogs to define query params and source options ([83d61ce](https://github.com/infra-geo-ouverte/igo2-lib/commit/83d61ce))
+* **catalog:** optionnally force a user to expand a group of layers before adding it to the map ([e502a52](https://github.com/infra-geo-ouverte/igo2-lib/commit/e502a52))
+* **catalog tool:** allow catalog tool to define the toggle group input ([b5bc01a](https://github.com/infra-geo-ouverte/igo2-lib/commit/b5bc01a))
+* **datasource:** add Cluster datasource ([#374](https://github.com/infra-geo-ouverte/igo2-lib/issues/374)) ([d22d3c2](https://github.com/infra-geo-ouverte/igo2-lib/commit/d22d3c2))
+* **datasource,layer:** add MVT datasource, vectortile layer and style by attribute ([#368](https://github.com/infra-geo-ouverte/igo2-lib/issues/368)) ([5ff9239](https://github.com/infra-geo-ouverte/igo2-lib/commit/5ff9239))
+* **entity selector:** support multiple selections ([3d30520](https://github.com/infra-geo-ouverte/igo2-lib/commit/3d30520))
+* **entity-selector:** support multiple selections ([fc89dd7](https://github.com/infra-geo-ouverte/igo2-lib/commit/fc89dd7))
+* **form:** add utility method to retrieve a form's fields ([1329282](https://github.com/infra-geo-ouverte/igo2-lib/commit/1329282))
+* **form:** dynamic form fields can now have a disable switch, useful for batch editing, for example ([d7d7fb4](https://github.com/infra-geo-ouverte/igo2-lib/commit/d7d7fb4))
+* **form:** dynamic forms now support textareas ([bf8d081](https://github.com/infra-geo-ouverte/igo2-lib/commit/bf8d081))
+* **geometry-form-field:** allow to set symbol ([#373](https://github.com/infra-geo-ouverte/igo2-lib/issues/373)) ([87cf1cd](https://github.com/infra-geo-ouverte/igo2-lib/commit/87cf1cd))
+* **icherche:** icherche v2 / territoire ([e0e0a0a](https://github.com/infra-geo-ouverte/igo2-lib/commit/e0e0a0a))
+* **query:** Force a geometry to html getfeatureinfo ([#363](https://github.com/infra-geo-ouverte/igo2-lib/issues/363)) ([d2e33ae](https://github.com/infra-geo-ouverte/igo2-lib/commit/d2e33ae))
+* **query:** keep wms title ([9575f30](https://github.com/infra-geo-ouverte/igo2-lib/commit/9575f30))
+* **rotation-button:** Set option to always show even if no rotation ([#312](https://github.com/infra-geo-ouverte/igo2-lib/issues/312)) ([58dd071](https://github.com/infra-geo-ouverte/igo2-lib/commit/58dd071))
+* **search:** add Searchsource settings ([#370](https://github.com/infra-geo-ouverte/igo2-lib/issues/370)) ([0a01898](https://github.com/infra-geo-ouverte/igo2-lib/commit/0a01898)), closes [#349](https://github.com/infra-geo-ouverte/igo2-lib/issues/349)
+* **search:** rainbow of possibilities for searching coordinate ([#365](https://github.com/infra-geo-ouverte/igo2-lib/issues/365)) ([e8c2147](https://github.com/infra-geo-ouverte/igo2-lib/commit/e8c2147)), closes [#288](https://github.com/infra-geo-ouverte/igo2-lib/issues/288)
+* **search:** Searchsource hashtag ([#371](https://github.com/infra-geo-ouverte/igo2-lib/issues/371)) ([e69276e](https://github.com/infra-geo-ouverte/igo2-lib/commit/e69276e)), closes [#349](https://github.com/infra-geo-ouverte/igo2-lib/issues/349)
+* **search-results-tool:** add feature details in tool ([753cb23](https://github.com/infra-geo-ouverte/igo2-lib/commit/753cb23))
+* **store:** add an empty$ and count$ observables ([f0de496](https://github.com/infra-geo-ouverte/igo2-lib/commit/f0de496))
+* **view:** add a count and empty observables to entity views ([4a0444c](https://github.com/infra-geo-ouverte/igo2-lib/commit/4a0444c))
+
+
+
 # [1.0.0-alpha.2](https://github.com/infra-geo-ouverte/igo2-lib/compare/1.0.0-alpha.1...1.0.0-alpha.2) (2019-06-07)
 
 

demo/src/app/common/action/action.component.ts

@@ -1,6 +1,11 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
 
-import { Media, MediaOrientation, MediaService } from '@igo2/core';
+import {
+  Media,
+  MediaOrientation,
+  MediaService,
+  LanguageService
+} from '@igo2/core';
 import { ActionStore, ActionbarMode } from '@igo2/common';
 import { Overlay } from '@angular/cdk/overlay';
 
@@ -23,7 +28,11 @@ export class AppActionComponent implements OnInit, OnDestroy {
     return ActionbarMode.Overlay;
   }
 
-  constructor(private mediaService: MediaService, public overlay: Overlay) {}
+  constructor(
+    public overlay: Overlay,
+    private mediaService: MediaService,
+    private languageService: LanguageService
+  ) {}
 
   ngOnInit() {
     const added = () => this.added === true;
@@ -32,7 +41,7 @@ export class AppActionComponent implements OnInit, OnDestroy {
       {
         id: 'add',
         title: 'Add',
-        icon: 'add',
+        icon: 'plus',
         tooltip: 'Add Tooltip',
         handler: () => {
           alert('Add!');
@@ -43,7 +52,7 @@ export class AppActionComponent implements OnInit, OnDestroy {
       {
         id: 'edit',
         title: 'Edit',
-        icon: 'edit',
+        icon: 'pencil',
         tooltip: 'Edit Tooltip',
         handler: (item: string) => {
           alert(`Edit item ${item}!`);

demo/src/app/common/entity-table/entity-table.component.ts

@@ -30,8 +30,8 @@ export class AppEntityTableComponent implements OnInit, OnDestroy {
         title: 'Selected',
         valueAccessor: (entity: object) => {
           return this.store.state.get(entity).selected
-            ? 'radio_button_checked'
-            : 'radio_button_unchecked';
+            ? 'radiobox-marked'
+            : 'radiobox-blank';
         },
         renderer: EntityTableColumnRenderer.Icon
       },

demo/src/app/context/context/context.component.html

@@ -16,7 +16,7 @@
     [map]="map">
     <igo-zoom-button [map]="map" color="primary"></igo-zoom-button>
     <igo-geolocate-button [map]="map" color="primary"></igo-geolocate-button>
-    <igo-rotation-button [map]="map" color="primary"></igo-rotation-button>
+    <igo-rotation-button [map]="map" [showIfNoRotation]="true" color="primary"></igo-rotation-button>
   </igo-map-browser>
 
   <igo-panel title="Contexts list">

demo/src/app/context/context/context.component.ts

@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
 
 import { LanguageService } from '@igo2/core';
-import { IgoMap, OverlayService } from '@igo2/geo';
+import { IgoMap, OverlayService, MapService } from '@igo2/geo';
+
 @Component({
   selector: 'app-context',
   templateUrl: './context.component.html',
@@ -23,6 +24,9 @@ export class AppContextComponent {
 
   constructor(
     private languageService: LanguageService,
+    private mapService: MapService,
     private overlayService: OverlayService
-  ) {}
+  ) {
+    this.mapService.setMap(this.map);
+  }
 }

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

@@ -12,7 +12,7 @@
   <igo-map-browser [map]="map" [view]="view">
     <igo-zoom-button [map]="map" color="primary"></igo-zoom-button>
     <igo-geolocate-button [map]="map" color="primary"></igo-geolocate-button>
-    <igo-rotation-button [map]="map" color="primary"></igo-rotation-button>
+    <igo-rotation-button [map]="map" [showIfNoRotation]="false" color="primary"></igo-rotation-button>
   </igo-map-browser>
 
   <igo-routing-form [map]="map"></igo-routing-form>

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

@@ -1,6 +1,7 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
 import { Validators } from '@angular/forms';
 import { BehaviorSubject, Subscription } from 'rxjs';
+import * as olstyle from 'ol/style';
 
 import { LanguageService } from '@igo2/core';
 import { Form, FormService } from '@igo2/common';
@@ -70,7 +71,25 @@ export class AppGeometryComponent implements OnInit, OnDestroy {
           geometryType: 'Polygon',
           drawGuideField: true,
           drawGuide: 50,
-          drawGuidePlaceholder: 'Draw Guide'
+          drawGuidePlaceholder: 'Draw Guide',
+          drawStyle: new olstyle.Style({
+            stroke: new olstyle.Stroke({
+              color: [255, 0, 0, 1],
+              width: 2
+            }),
+            fill:  new olstyle.Fill({
+              color: [255, 0, 0, 0.2]
+            }),
+            image: new olstyle.Circle({
+              radius: 8,
+              stroke: new olstyle.Stroke({
+                color: [255, 0, 0, 1]
+              }),
+              fill: new olstyle.Fill({
+                color: [255, 0, 0, 0.2]
+              })
+            })
+          })
         }
       },
       {

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

@@ -18,7 +18,8 @@
     [layers]="map.layers"
     [expandLegendOfVisibleLayers]="false"
     placeholder="Filter"
-    floatLabel="never">
+    floatLabel="never"
+    [queryBadge]="true">
 
       <ng-template #igoLayerItemToolbar let-layer="layer">
         <igo-metadata-button [layer]="layer"></igo-metadata-button>

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

@@ -9,7 +9,8 @@ import {
   WFSDataSourceOptions,
   WFSDataSourceOptionsParams,
   OgcFilterableDataSourceOptions,
-  AnyBaseOgcFilterOptions
+  AnyBaseOgcFilterOptions,
+  OgcFilterOperatorType
 } from '@igo2/geo';
 
 @Component({
@@ -66,12 +67,13 @@ export class AppOgcFilterComponent {
       },
       sourceFields: [
         { name: 'code_municipalite', alias: '# de la municipalitée' },
-        { name: 'date_observation' },
+        { name: 'date_observation', excludeFromOgcFilters: true },
         { name: 'urgence', values: ['immédiate', 'inconnue'] }
       ],
       ogcFilters: {
         enabled: true,
         editable: true,
+        allowedOperatorsType: OgcFilterOperatorType.All,
         filters: {
           logical: 'Or',
           filters: [
@@ -117,6 +119,116 @@ export class AppOgcFilterComponent {
       extends WMSDataSourceOptions,
         OgcFilterableDataSourceOptions {}
 
+    const filterableWMSwithPushButtons: WMSoptions = {
+      type: 'wms',
+      url: 'https://ws.mapserver.transports.gouv.qc.ca/swtq',
+      urlWfs: 'https://ws.mapserver.transports.gouv.qc.ca/swtq',
+      params: {
+        layers: 'radars_photos',
+        version: '1.3.0'
+      },
+      ogcFilters: {
+        enabled: true,
+        editable: true,
+        pushButtons: [{
+          logical: 'Or',
+          ogcPushButtons: [{
+            title: 'Radar photo fixe',
+            enabled: true,
+            color: '0,0,255',
+            tooltip: 'Here a tooltip explaning ...',
+            filters: {
+              operator: 'PropertyIsEqualTo',
+              propertyName: 'typeAppareil',
+              expression: 'Radar photo fixe'
+            }
+          },
+          {
+            title: 'Radar photo mobile',
+            enabled: false,
+            color: '255,200,0',
+            tooltip: 'Here a tooltip explaning ...',
+            filters: {
+              operator: 'PropertyIsEqualTo',
+              propertyName: 'typeAppareil',
+              expression: 'Radar photo mobile'
+            }
+          },
+          {
+            title: 'Radar photo fixe + feu rouge',
+            enabled: false,
+            color: '0,200,0',
+            tooltip: 'Here a tooltip explaning ...',
+            filters: {
+              operator: 'PropertyIsEqualTo',
+              propertyName: 'typeAppareil',
+              expression: 'Radar photo fixe et surveillance au feu rouge'
+            }
+          },
+          {
+            title: 'Radar feu rouge',
+            enabled: false,
+            color: '255,0,0',
+            tooltip: 'Here a tooltip explaning ...',
+            filters: {
+              operator: 'PropertyIsEqualTo',
+              propertyName: 'typeAppareil',
+              expression: 'Appareil de surveillance au feu rouge'
+            }
+          }
+        ]
+        },
+        {
+          logical: 'Or',
+          vertical: true,
+          ogcPushButtons: [{
+            title: 'Montréal & Laval',
+            enabled: false,
+            tooltip: 'Here a tooltip explaning ...',
+            filters: {
+              logical: 'Or',
+              filters: [
+                { operator: 'PropertyIsEqualTo', propertyName: 'region', expression: 'Montréal'},
+                { operator: 'PropertyIsEqualTo', propertyName: 'region', expression: 'Laval'}]
+            }
+          },
+          {
+            title: 'Outside Montréal & Laval',
+            enabled: false,
+            tooltip: 'Here a tooltip explaning ...',
+            filters: {
+              logical: 'And',
+              filters: [
+                { operator: 'PropertyIsNotEqualTo', propertyName: 'region', expression: 'Montréal'},
+                { operator: 'PropertyIsNotEqualTo', propertyName: 'region', expression: 'Laval'}]
+            }
+          }
+        ]
+        }
+      ],
+      allowedOperatorsType: OgcFilterOperatorType.Basic,
+      },
+      paramsWFS: {
+        featureTypes: 'radars_photos',
+        fieldNameGeometry: 'geometry',
+        maxFeatures: 10000,
+        version: '1.1.0',
+        outputFormat: 'geojson',
+        outputFormatDownload: 'shp'
+      } as WFSDataSourceOptionsParams
+    };
+
+    this.dataSourceService
+    .createAsyncDataSource(filterableWMSwithPushButtons)
+    .subscribe(dataSource => {
+      this.map.addLayer(
+        this.layerService.createLayer({
+          title: 'Filterable WMS layers with predefined filters (buttons)',
+          source: dataSource
+        })
+      );
+    });
+
     const datasourceWmsWith2Layers: WMSoptions = {
       type: 'wms',
       url: 'https://ws.mapserver.transports.gouv.qc.ca/swtq',

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

@@ -18,7 +18,7 @@
   <igo-map-browser [map]="map" [view]="view">
     <igo-zoom-button [map]="map" color="primary"></igo-zoom-button>
     <igo-geolocate-button [map]="map" color="primary"></igo-geolocate-button>
-    <igo-rotation-button [map]="map" color="primary"></igo-rotation-button>
+    <igo-rotation-button [map]="map" [showIfNoRotation]="false" color="primary"></igo-rotation-button>
   </igo-map-browser>
 
   <igo-print [map]="map"></igo-print>