Skip to content

Commit

Permalink
Merge pull request #16 from infra-geo-ouverte/master
Browse files Browse the repository at this point in the history
merge alpha release
  • Loading branch information
drekss authored Sep 29, 2019
2 parents aa8c4e3 + 40f0442 commit 74ca893
Show file tree
Hide file tree
Showing 227 changed files with 3,953 additions and 1,658 deletions.
55 changes: 55 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,58 @@
# [1.0.0](https://github.com/infra-geo-ouverte/igo2-lib/compare/1.0.0-alpha.6...1.0.0) (2019-09-23)


### Bug Fixes

* minors bugs, locale ([730df39](https://github.com/infra-geo-ouverte/igo2-lib/commit/730df39))
* **auth:** error caught ([6d89e07](https://github.com/infra-geo-ouverte/igo2-lib/commit/6d89e07))
* **catalog:** bug when catalog is empty ([3ef2964](https://github.com/infra-geo-ouverte/igo2-lib/commit/3ef2964))
* **catalog:** fix icon ([80b3f51](https://github.com/infra-geo-ouverte/igo2-lib/commit/80b3f51))
* **catalog:** wait for all sources ([d13b6f7](https://github.com/infra-geo-ouverte/igo2-lib/commit/d13b6f7))
* **catalog-browser:** fixed add/remove function for baselayers catalog ([241d111](https://github.com/infra-geo-ouverte/igo2-lib/commit/241d111))
* **cluster:** makes layer style the base style when a cluster feature as length = 1 ([#398](https://github.com/infra-geo-ouverte/igo2-lib/issues/398)) ([3b1ad3a](https://github.com/infra-geo-ouverte/igo2-lib/commit/3b1ad3a))
* **directions:** fix directions alpha ([#402](https://github.com/infra-geo-ouverte/igo2-lib/issues/402)) ([33ee728](https://github.com/infra-geo-ouverte/igo2-lib/commit/33ee728))
* **filter:** set text center on toggle button ([#414](https://github.com/infra-geo-ouverte/igo2-lib/issues/414)) ([bc9f062](https://github.com/infra-geo-ouverte/igo2-lib/commit/bc9f062))
* **geo-layer-id:** id is the same with or whitout origin ([09e2218](https://github.com/infra-geo-ouverte/igo2-lib/commit/09e2218))
* **icherche:** catch error ([76f9197](https://github.com/infra-geo-ouverte/igo2-lib/commit/76f9197))
* **icherche:** invalid characters ([af1fe8d](https://github.com/infra-geo-ouverte/igo2-lib/commit/af1fe8d))
* **import-export:** better error handling ([7952731](https://github.com/infra-geo-ouverte/igo2-lib/commit/7952731))
* **import-export:** fix with ogre api ([555bb1e](https://github.com/infra-geo-ouverte/igo2-lib/commit/555bb1e))
* **media:** JS and CSS breakpoint are now the same ([b4262f2](https://github.com/infra-geo-ouverte/igo2-lib/commit/b4262f2))
* **prod:** fix build prod import ([a2d3a90](https://github.com/infra-geo-ouverte/igo2-lib/commit/a2d3a90))
* **routing:** fix icone, padding, recherche textuelle, label ([#388](https://github.com/infra-geo-ouverte/igo2-lib/issues/388)) ([d7d34e5](https://github.com/infra-geo-ouverte/igo2-lib/commit/d7d34e5))
* **search-bar:** use the arrows no longer launching the search ([997ad90](https://github.com/infra-geo-ouverte/igo2-lib/commit/997ad90))
* **shareMap:** only wms ([8eeb175](https://github.com/infra-geo-ouverte/igo2-lib/commit/8eeb175))
* **wms-wfs:** fix imports format ([9994184](https://github.com/infra-geo-ouverte/igo2-lib/commit/9994184))


### Features

* **about-tool, ogc-filter-toggle-button:** management of multi-lines ([#399](https://github.com/infra-geo-ouverte/igo2-lib/issues/399)) ([76c63b3](https://github.com/infra-geo-ouverte/igo2-lib/commit/76c63b3))
* **base:** possibility to use a base file to put repetitive elements (tools) ([d8b41d6](https://github.com/infra-geo-ouverte/igo2-lib/commit/d8b41d6))
* **catalog:** remove icons ([7b842e3](https://github.com/infra-geo-ouverte/igo2-lib/commit/7b842e3))
* **context:** choose to remove or not all layers on context change ([#406](https://github.com/infra-geo-ouverte/igo2-lib/issues/406)) ([8b2929e](https://github.com/infra-geo-ouverte/igo2-lib/commit/8b2929e))
* **context:** link context-editor and context-permission ([e153820](https://github.com/infra-geo-ouverte/igo2-lib/commit/e153820))
* **datasource:** Add property to show an attribute on map (label) ([#403](https://github.com/infra-geo-ouverte/igo2-lib/issues/403)) ([860ca13](https://github.com/infra-geo-ouverte/igo2-lib/commit/860ca13))
* **form:** form autocomplete may now be disabled ([b70d404](https://github.com/infra-geo-ouverte/igo2-lib/commit/b70d404))
* **geo.layer.style:** styleByAttribute with regex ([#401](https://github.com/infra-geo-ouverte/igo2-lib/issues/401)) ([6ea3d20](https://github.com/infra-geo-ouverte/igo2-lib/commit/6ea3d20))
* **icherche:** get types allowed ([03cbc64](https://github.com/infra-geo-ouverte/igo2-lib/commit/03cbc64))
* **layer-list:** Show/hide legend on click (title) ([#390](https://github.com/infra-geo-ouverte/igo2-lib/issues/390)) ([37220dc](https://github.com/infra-geo-ouverte/igo2-lib/commit/37220dc))
* **layer-order:** verify baselayer before move layer ([531d87d](https://github.com/infra-geo-ouverte/igo2-lib/commit/531d87d))
* **legend:** add Legend Switcher on WMS ([#392](https://github.com/infra-geo-ouverte/igo2-lib/issues/392)) ([2a8ca55](https://github.com/infra-geo-ouverte/igo2-lib/commit/2a8ca55))
* **search:** add a way to trigger a search (and update the searchbar) manually ([53045c0](https://github.com/infra-geo-ouverte/igo2-lib/commit/53045c0))
* **search:** Add select unselect all button on search setting ([#408](https://github.com/infra-geo-ouverte/igo2-lib/issues/408)) ([4c14a2f](https://github.com/infra-geo-ouverte/igo2-lib/commit/4c14a2f))
* **search:** Apply restrictions programatically to search sources ([#418](https://github.com/infra-geo-ouverte/igo2-lib/issues/418)) ([8787a5f](https://github.com/infra-geo-ouverte/igo2-lib/commit/8787a5f))
* **search:** change settings refresh search results ([1978446](https://github.com/infra-geo-ouverte/igo2-lib/commit/1978446))
* **search:** decrease latency ([7d87907](https://github.com/infra-geo-ouverte/igo2-lib/commit/7d87907))
* **search hashtag:** add hashtag to nominatim and ilayer ([a77a2db](https://github.com/infra-geo-ouverte/igo2-lib/commit/a77a2db))
* **search-details:** search-details is now opened after focus ([e0f4e1c](https://github.com/infra-geo-ouverte/igo2-lib/commit/e0f4e1c))
* **shareMap:** Share map alpha for added layers by catalog ([#376](https://github.com/infra-geo-ouverte/igo2-lib/issues/376)) ([18c9572](https://github.com/infra-geo-ouverte/igo2-lib/commit/18c9572))
* **time-filter:** Time filter enhancement alpha ([#411](https://github.com/infra-geo-ouverte/igo2-lib/issues/411)) ([a15e340](https://github.com/infra-geo-ouverte/igo2-lib/commit/a15e340))
* **toolbox:** add scrool buttons ([#404](https://github.com/infra-geo-ouverte/igo2-lib/issues/404)) ([6e8c62e](https://github.com/infra-geo-ouverte/igo2-lib/commit/6e8c62e))
* **toolbox:** toolbox is now using the theme ([5330977](https://github.com/infra-geo-ouverte/igo2-lib/commit/5330977))



# [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)


Expand Down
1 change: 1 addition & 0 deletions demo/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ <h1>{{title}}</h1>
<a mat-list-item routerLink="catalog">Catalog</a>
<a mat-list-item routerLink="search">Search</a>
<a mat-list-item routerLink="print">Print</a>
<a mat-list-item routerLink="import-export">Import/Export</a>
<a mat-list-item routerLink="directions">Directions</a>
<a mat-list-item routerLink="time-filter">Time filter</a>
<a mat-list-item routerLink="ogc-filter">OGC filter</a>
Expand Down
2 changes: 2 additions & 0 deletions demo/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import { AppQueryModule } from './geo/query/query.module';
import { AppCatalogModule } from './geo/catalog/catalog.module';
import { AppSearchModule } from './geo/search/search.module';
import { AppPrintModule } from './geo/print/print.module';
import { AppImportExport } from './geo/import-export/import-export.module';
import { AppDirectionsModule } from './geo/directions/directions.module';
import { AppTimeFilterModule } from './geo/time-filter/time-filter.module';
import { AppOgcFilterModule } from './geo/ogc-filter/ogc-filter.module';
Expand Down Expand Up @@ -89,6 +90,7 @@ import { AppComponent } from './app.component';
AppCatalogModule,
AppSearchModule,
AppPrintModule,
AppImportExport,
AppDirectionsModule,
AppTimeFilterModule,
AppOgcFilterModule,
Expand Down
19 changes: 8 additions & 11 deletions demo/src/app/common/action/action.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { Component, OnInit, OnDestroy } from '@angular/core';

import { BehaviorSubject } from 'rxjs';

import {
Media,
MediaOrientation,
Expand All @@ -17,7 +19,7 @@ import { Overlay } from '@angular/cdk/overlay';
export class AppActionComponent implements OnInit, OnDestroy {
public store = new ActionStore([]);

private added = false;
private added$ = new BehaviorSubject(false);

get actionbarMode(): ActionbarMode {
const media = this.mediaService.media$.value;
Expand All @@ -35,8 +37,6 @@ export class AppActionComponent implements OnInit, OnDestroy {
) {}

ngOnInit() {
const added = () => this.added === true;

this.store.load([
{
id: 'add',
Expand All @@ -45,20 +45,19 @@ export class AppActionComponent implements OnInit, OnDestroy {
tooltip: 'Add Tooltip',
handler: () => {
alert('Add!');
this.added = true;
this.store.updateActionsAvailability();
this.added$.next(true);
}
},
{
id: 'edit',
title: 'Edit',
icon: 'pencil',
tooltip: 'Edit Tooltip',
args: ['1'],
handler: (item: string) => {
alert(`Edit item ${item}!`);
},
conditions: [added],
args: ['1']
availability: () => this.added$
},
{
id: 'delete',
Expand All @@ -67,13 +66,11 @@ export class AppActionComponent implements OnInit, OnDestroy {
icon: 'delete',
handler: () => {
alert('Delete!');
this.added = false;
this.store.updateActionsAvailability();
this.added$.next(false);
},
conditions: [added]
availability: () => this.added$
}
]);
this.store.updateActionsAvailability();
}

ngOnDestroy() {
Expand Down
2 changes: 2 additions & 0 deletions demo/src/app/core/activity/activity.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@
</mat-card-actions>
<p>Counter: {{counter}}</p>

<igo-spinner igoSpinnerActivity></igo-spinner>

</mat-card>
4 changes: 3 additions & 1 deletion demo/src/app/core/activity/activity.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
import { MatCardModule, MatButtonModule } from '@angular/material';

import { IgoActivityModule } from '@igo2/core';
import { IgoSpinnerModule } from '@igo2/common';

import { AppActivityComponent } from './activity.component';
import { AppActivityRoutingModule } from './activity-routing.module';
Expand All @@ -12,7 +13,8 @@ import { AppActivityRoutingModule } from './activity-routing.module';
AppActivityRoutingModule,
MatCardModule,
MatButtonModule,
IgoActivityModule.forRoot() // Only if you want register http calls
IgoActivityModule.forRoot(), // Only if you want register http calls
IgoSpinnerModule
],
exports: [AppActivityComponent]
})
Expand Down
1 change: 0 additions & 1 deletion demo/src/app/core/request/request.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { HttpClient } from '@angular/common/http';

import { LanguageService } from '@igo2/core';


@Component({
selector: 'app-request',
templateUrl: './request.component.html',
Expand Down
15 changes: 15 additions & 0 deletions demo/src/app/geo/import-export/import-export-routing.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Routes, RouterModule } from '@angular/router';
import { ModuleWithProviders } from '@angular/core';

import { AppImportExportComponent } from './import-export.component';

const routes: Routes = [
{
path: 'import-export',
component: AppImportExportComponent
}
];

export const AppImportExportRoutingModule: ModuleWithProviders = RouterModule.forChild(
routes
);
20 changes: 20 additions & 0 deletions demo/src/app/geo/import-export/import-export.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<mat-card>
<mat-card-subtitle>Geo</mat-card-subtitle>
<mat-card-title>Import / Export</mat-card-title>
<mat-card-content>
<li>Dependencies: LanguageService</li>

<br>
See the <a href="https://github.com/infra-geo-ouverte/igo2-lib/tree/master/demo/src/app/geo/import-export">code of this example</a>
<hr>
</mat-card-content>

<igo-map-browser [map]="map" [view]="view">
<igo-zoom-button [map]="map" color="primary"></igo-zoom-button>
</igo-map-browser>

<igo-import-export [map]="map"></igo-import-export>

</mat-card>

<igo-message-center></igo-message-center>
4 changes: 4 additions & 0 deletions demo/src/app/geo/import-export/import-export.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
igo-map-browser {
width: 900px;
height: 1000px;
}
43 changes: 43 additions & 0 deletions demo/src/app/geo/import-export/import-export.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import { Component } from '@angular/core';

import { LanguageService } from '@igo2/core';
import { IgoMap, LayerService } from '@igo2/geo';

@Component({
selector: 'app-import-export',
templateUrl: './import-export.component.html',
styleUrls: ['./import-export.component.scss']
})
export class AppImportExportComponent {
public map = new IgoMap({
controls: {
attribution: {
collapsed: true
}
}
});

public view = {
center: [-73, 47.2],
zoom: 9
};

constructor(
private languageService: LanguageService,
private layerService: LayerService
) {
this.layerService
.createAsyncLayer({
title: 'Quebec Base Map',
sourceOptions: {
type: 'wmts',
url: '/carto/wmts/1.0.0/wmts',
layer: 'carte_gouv_qc_ro',
matrixSet: 'EPSG_3857',
version: '1.3.0'
}
})
.subscribe(l => this.map.addLayer(l));

}
}
22 changes: 22 additions & 0 deletions demo/src/app/geo/import-export/import-export.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { NgModule } from '@angular/core';
import { MatCardModule, MatButtonModule } from '@angular/material';

import { IgoMessageModule } from '@igo2/core';
import { IgoMapModule, IgoImportExportModule } from '@igo2/geo';

import { AppImportExportComponent } from './import-export.component';
import { AppImportExportRoutingModule } from './import-export-routing.module';

@NgModule({
declarations: [AppImportExportComponent],
imports: [
AppImportExportRoutingModule,
MatCardModule,
MatButtonModule,
IgoMessageModule,
IgoMapModule,
IgoImportExportModule
],
exports: [AppImportExportComponent]
})
export class AppImportExport {}
1 change: 0 additions & 1 deletion demo/src/app/geo/layer/layer.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<igo-layer-list
[layers]="map.layers"
[expandLegendOfVisibleLayers]="false"
placeholder="Filter"
floatLabel="never"
[queryBadge]="true">

Expand Down
54 changes: 54 additions & 0 deletions demo/src/app/geo/layer/layer.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,60 @@ export class AppLayerComponent {
})
.subscribe(l => this.map.addLayer(l));

this.layerService
.createAsyncLayer({
title: 'lieu habité',
visible: false,
sourceOptions: {
type: 'wms',
url: 'https://ws.mapserver.transports.gouv.qc.ca/swtq',
optionsFromCapabilities: true,
params: {
layers: 'lieuhabite',
version: '1.3.0'
}
}
})
.subscribe(l => this.map.addLayer(l));

this.layerService
.createAsyncLayer({
title: 'sh_dis_eco',
visible: false,
sourceOptions: {
type: 'wms',
url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/mffpecofor.fcgi',
optionsFromCapabilities: true,
params: {
layers: 'sh_dis_eco',
version: '1.3.0'
}
}
})
.subscribe(l => this.map.addLayer(l));

this.layerService
.createAsyncLayer({
title: 'nurc:Arc_Sample_Parent',
visible: true,
legendOptions: {
// collapsed: false,
display: true,
// url: 'https://v.seloger.com/s/width/1144/visuels/0/m/l/4/0ml42xbt1n3itaboek3qec5dtskdgw6nlscu7j69k.jpg',
stylesAvailable: [{name: 'rain', title: 'Pluie'}, {name: 'raster', title: 'Défaut'}] //
},
sourceOptions: {
type: 'wms',
url: 'https://demo.geo-solutions.it/geoserver/ows',
optionsFromCapabilities: true,
params: {
layers: 'nurc:Arc_Sample', // , test:Linea_costa
version: '1.3.0'
}
}
})
.subscribe(l => this.map.addLayer(l));

this.layerService
.createAsyncLayer({
title: 'Avertissements routier',
Expand Down
6 changes: 2 additions & 4 deletions demo/src/app/geo/time-filter/time-filter.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<mat-card-title>Time filter</mat-card-title>
<mat-card-content>
<li>npm install --save [email protected]</li>
<li>npm install --save @mat-datetimepicker/core@2.0.1</li>
<li>npm install --save @mat-datetimepicker/core@3.0.0-beta.0</li>
<li>Dependencies: LanguageService</li>

<br>
Expand All @@ -16,9 +16,7 @@
</igo-map-browser>

<igo-panel title="Layers">
<igo-time-filter-list [layers]="map.layers">

</igo-time-filter-list>
<igo-time-filter-list [layers]="map.layers"></igo-time-filter-list>
</igo-panel>

</mat-card>
Loading

0 comments on commit 74ca893

Please sign in to comment.