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

1.0.0 alpha

CHANGELOG.md

@@ -1,3 +1,14 @@
+# [1.0.0-alpha.6](https://github.com/infra-geo-ouverte/igo2-lib/compare/1.0.0-alpha.5...1.0.0-alpha.6) (2019-08-15)
+
+
+### Bug Fixes
+
+* minors bugs ([f79de3d](https://github.com/infra-geo-ouverte/igo2-lib/commit/f79de3d))
+* **context-list:** dectect change ([ecf80c8](https://github.com/infra-geo-ouverte/igo2-lib/commit/ecf80c8))
+* **layer-list:** id missing ([7c801fe](https://github.com/infra-geo-ouverte/igo2-lib/commit/7c801fe))
+
+
+
 # [1.0.0-alpha.5](https://github.com/infra-geo-ouverte/igo2-lib/compare/1.0.0-alpha.4...1.0.0-alpha.5) (2019-08-13)
 
 

demo/src/app/app.module.ts

@@ -1,7 +1,9 @@
-import { BrowserModule } from '@angular/platform-browser';
+import { BrowserModule, DomSanitizer } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { NgModule } from '@angular/core';
+import {} from '@angular/platform-browser';
 import {
+  MatIconRegistry,
   MatSidenavModule,
   MatToolbarModule,
   MatButtonModule,
@@ -98,4 +100,12 @@ import { AppComponent } from './app.component';
   ],
   bootstrap: [AppComponent]
 })
-export class AppModule {}
+export class AppModule {
+  constructor(matIconRegistry: MatIconRegistry, domSanitizer: DomSanitizer) {
+    matIconRegistry.addSvgIconSet(
+      domSanitizer.bypassSecurityTrustResourceUrl(
+        './assets/igo2/core/icons/mdi.svg'
+      )
+    );
+  }
+}

demo/src/app/core/request/request.component.ts

@@ -1,13 +1,16 @@
 import { Component } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 
+import { LanguageService } from '@igo2/core';
+
+
 @Component({
   selector: 'app-request',
   templateUrl: './request.component.html',
   styleUrls: ['./request.component.scss']
 })
 export class AppRequestComponent {
-  constructor(private http: HttpClient) {}
+  constructor(private http: HttpClient, public languageService: LanguageService) {}
 
   callHttp() {
     const url = '/locale/en.json';

demo/src/app/core/request/request.module.ts

@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { HttpClientModule } from '@angular/common/http';
 import { MatCardModule, MatButtonModule } from '@angular/material';
 
-import { IgoLoggingModule, IgoErrorModule } from '@igo2/core';
+import { IgoErrorModule, IgoLanguageModule } from '@igo2/core';
 
 import { AppRequestComponent } from './request.component';
 import { AppRequestRoutingModule } from './request-routing.module';
@@ -14,6 +14,7 @@ import { AppRequestRoutingModule } from './request-routing.module';
     MatCardModule,
     MatButtonModule,
     HttpClientModule,
+    IgoLanguageModule.forRoot(),
     IgoErrorModule.forRoot() // Only if you want register errors from http call in console
     // IgoLoggingModule.forRoot() // Only if you want register http calls in console
   ],

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

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 
 import { LanguageService } from '@igo2/core';
-import { IgoMap, LayerService } from '@igo2/geo';
+import { IgoMap, LayerService, MapService } from '@igo2/geo';
 
 @Component({
   selector: 'app-directions',
@@ -25,8 +25,10 @@ export class AppDirectionsComponent {
 
   constructor(
     private languageService: LanguageService,
-    private layerService: LayerService
+    private layerService: LayerService,
+    private mapService: MapService
   ) {
+    this.mapService.setMap(this.map);
     this.layerService
       .createAsyncLayer({
         title: 'Quebec Base Map',

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

@@ -6,7 +6,6 @@ import {
   MatIconModule
 } from '@angular/material';
 
-import { IgoCoreModule } from '@igo2/core';
 import { IgoPanelModule, IgoEntityTableModule } from '@igo2/common';
 import { IgoMapModule, IgoFeatureModule } from '@igo2/geo';
 
@@ -21,7 +20,6 @@ import { AppFeatureRoutingModule } from './feature-routing.module';
     MatCardModule,
     MatButtonModule,
     MatIconModule,
-    IgoCoreModule,
     IgoPanelModule,
     IgoEntityTableModule,
     IgoMapModule,

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

@@ -1,7 +1,6 @@
 import { NgModule } from '@angular/core';
 import { MatCardModule } from '@angular/material';
 
-import { IgoCoreModule } from '@igo2/core';
 import { IgoMapModule, IgoMeasureModule } from '@igo2/geo';
 
 import { AppMeasureComponent } from './measure.component';
@@ -12,7 +11,6 @@ import { AppMeasureRoutingModule } from './measure-routing.module';
   imports: [
     AppMeasureRoutingModule,
     MatCardModule,
-    IgoCoreModule,
     IgoMapModule,
     IgoMeasureModule
   ],

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

@@ -16,6 +16,7 @@
 
   <igo-panel title="Search">
     <igo-search-bar
+      [searchSettings]="true"
       (change)="onSearchTermChange($event)"
       (search)="onSearch($event)"
       (clearFeature)="removeFeatureFromMap()">
@@ -50,3 +51,5 @@
     [mode]="'context'">
   </igo-actionbar>
 </ng-template>
+
+<igo-message-center></igo-message-center>

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

@@ -8,11 +8,14 @@ import {
   MatTooltipModule
 } from '@angular/material';
 
+import { IgoMessageModule } from '@igo2/core';
+
 import {
   IgoPanelModule,
   IgoActionbarModule,
   IgoContextMenuModule
 } from '@igo2/common';
+
 import {
   IgoFeatureModule,
   IgoMapModule,
@@ -38,6 +41,7 @@ import { AppSearchRoutingModule } from './search-routing.module';
     MatButtonModule,
     MatIconModule,
     MatTooltipModule,
+    IgoMessageModule.forRoot(),
     IgoPanelModule,
     IgoMapModule,
     IgoSearchModule.forRoot(),

demo/src/contexts/_base.json

@@ -0,0 +1,17 @@
+{
+  "map": {
+    "view": {
+      "projection": "EPSG:3857",
+      "center": [-72, 50],
+      "zoom": 8
+    }
+  },
+  "layers": [
+    {
+      "title": "OSM",
+      "sourceOptions": {
+        "type": "osm"
+      }
+    }
+  ]
+}

demo/src/contexts/_default.json

@@ -1,20 +1,7 @@
 {
   "uri": "_default",
-  "title": "Default Context",
-  "map": {
-    "view": {
-      "projection": "EPSG:3857",
-      "center": [-72, 50],
-      "zoom": 8
-    }
-  },
+  "base": "_base",
   "layers": [
-    {
-      "title": "OSM",
-      "sourceOptions": {
-        "type": "osm"
-      }
-    },
     {
       "sourceOptions": {
         "type": "wms",

demo/src/contexts/context2.json

@@ -1,6 +1,5 @@
 {
   "uri": "context2",
-  "title": "Context 2",
   "map": {
     "view": {
       "projection": "EPSG:3857",

demo/src/contexts/context3.json

@@ -1,6 +1,5 @@
 {
   "uri": "context3",
-  "title": "CARTO examples",
   "map": {
     "view": {
       "projection": "EPSG:3857",

demo/src/contexts/context4.json

@@ -1,6 +1,5 @@
 {
   "uri": "context4",
-  "title": "ArcGIS / TileArcGIS Rest examples ",
   "map": {
     "view": {
       "projection": "EPSG:3857",

demo/src/environments/environment.ts

@@ -65,40 +65,28 @@ export const environment: Environment = {
     },
     searchSources: {
       nominatim: {
-        enabled: false,
-        disabled: true
-      },
-      reseautq: {
-        searchUrl: 'https://ws.mapserver.transports.gouv.qc.ca/swtq',
-        locateUrl: 'https://ws.mapserver.transports.gouv.qc.ca/swtq',
-        limit: 5,
-        locateLimit: 15,
-        zoomMaxOnSelect: 8,
-        enabled: false,
-        propertiesAlias: [
-          { name: 'title', alias: 'Titre' },
-          { name: 'etiquette', alias: 'Informations' },
-          { name: 'nommun', alias: 'Municipalité' },
-          { name: 'messagpan', alias: 'Message' },
-          { name: 'noroute', alias: '# de route' },
-        { name: 'nosortie', alias: '# de sortie' },
-          { name: 'direction', alias: 'Direction' },
-          { name: 'typesort', alias: 'Type de sortie' }
-        ],
-        distance: 0.5
+        enabled: true
       },
       icherche: {
         searchUrl: '/apis/icherche/geocode',
-        zoomMaxOnSelect: 10,
-        enabled: true
+        order: 2,
+        enabled: true,
+        params: {
+          limit: '8'
+        }
       },
       icherchereverse: {
         searchUrl: '/apis/territoires/locate',
+        order: 3,
         enabled: true
       },
       ilayer: {
         searchUrl: '/apis/layers/search',
-        enabled: true
+        order: 4,
+        enabled: true,
+        params: {
+          limit: '5'
+        }
       }
     }
   }