Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/next' into giin
Browse files Browse the repository at this point in the history
  • Loading branch information
pelord committed Jun 5, 2023
2 parents a318ef5 + a069b03 commit b72632d
Show file tree
Hide file tree
Showing 9 changed files with 236 additions and 81 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/gh-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:
run: npm install [email protected]
- name: Generate Changelog-current
run: npm run changelog-current | grep -v "^>" | sed '/^$/d' > ${{ github.workspace }}-CHANGELOG.txt
- name: Ensure to have locales from lib
run: npm run postinstall
- name: Build production
run: npm run build.prod
- name: Install zip
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
## [1.15.2](https://github.com/infra-geo-ouverte/igo2/compare/1.15.1...1.15.2) (2023-05-18)


### Features

* **app:** upgrade igo2-lib 1.15.2 ([11253c5](https://github.com/infra-geo-ouverte/igo2/commit/11253c57578cbf3f5649eab0555bddfe26d02f85))



## [1.15.1](https://github.com/infra-geo-ouverte/igo2/compare/1.15.0...1.15.1) (2023-05-05)


Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ IGO2 is having multiple features, such as Web GIS viewer adapted to Desktop and
---

## Téléchargement
- [Version 1.15.1](https://github.com/infra-geo-ouverte/igo2/releases/download/1.15.1/igo2.zip)
- [Version 1.15.2](https://github.com/infra-geo-ouverte/igo2/releases/download/1.15.2/igo2.zip)
- [Version 1.14.2](https://github.com/infra-geo-ouverte/igo2/releases/download/1.14.2/igo2.zip)
- [Version 1.13.4](https://github.com/infra-geo-ouverte/igo2/releases/download/1.13.4/igo2.zip)
- [Version 1.12.1](https://github.com/infra-geo-ouverte/igo2/releases/download/1.12.1/igo2.zip)
Expand Down Expand Up @@ -141,7 +141,7 @@ Nous sommes bien heureux que vous pensiez contribuer à IGO! Avant de le faire,

## Download

- [Version 1.15.1](https://github.com/infra-geo-ouverte/igo2/releases/download/1.15.1/igo2.zip)
- [Version 1.15.2](https://github.com/infra-geo-ouverte/igo2/releases/download/1.15.2/igo2.zip)
- [Version 1.14.2](https://github.com/infra-geo-ouverte/igo2/releases/download/1.14.2/igo2.zip)
- [Version 1.13.4](https://github.com/infra-geo-ouverte/igo2/releases/download/1.13.4/igo2.zip)
- [Version 1.12.1](https://github.com/infra-geo-ouverte/igo2/releases/download/1.12.1/igo2.zip)
Expand Down
2 changes: 1 addition & 1 deletion ngsw-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"index": "/index.html",
"appData": {
"changelog": "Version update",
"version": "1.15.1"
"version": "1.15.2"
},
"assetGroups": [
{
Expand Down
132 changes: 66 additions & 66 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "igo",
"version": "1.15.1",
"version": "1.15.2",
"description": "Infrastructure géomatique ouverte",
"author": "Communauté IGO",
"repository": {
Expand Down Expand Up @@ -61,13 +61,13 @@
"@angular/service-worker": "^14.3.0",
"@azure/msal-angular": "^2.4.1",
"@azure/msal-browser": "^2.28.1",
"@igo2/auth": "1.15.1",
"@igo2/common": "1.15.1",
"@igo2/context": "1.15.1",
"@igo2/core": "1.15.1",
"@igo2/geo": "1.15.1",
"@igo2/integration": "1.15.1",
"@igo2/utils": "1.15.1",
"@igo2/auth": "1.15.2",
"@igo2/common": "1.15.2",
"@igo2/context": "1.15.2",
"@igo2/core": "1.15.2",
"@igo2/geo": "1.15.2",
"@igo2/integration": "1.15.2",
"@igo2/utils": "1.15.2",
"@mat-datetimepicker/core": "~10.0.0",
"@turf/buffer": "^6.5.0",
"@turf/point-on-feature": "^6.5.0",
Expand Down
6 changes: 6 additions & 0 deletions src/app/pages/portal/toast-panel/toast-panel.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@
(click)="handleGiin_distribuer()">
<mat-icon svgIcon="download-lock"></mat-icon>
</button>
<button *ngIf="hasGeoService()" mat-icon-button igoStopPropagation panelLeftButton tooltip-position="below"
matTooltipShowDelay="500" [color]="(potententialLayerisAdded$ | async) ? 'warn' : ''" (click)="handleLayer()">
<mat-icon [svgIcon]="(potententialLayerisAdded$ | async) ? 'delete' : 'plus'">
</mat-icon>
</button>

<button
*ngIf="resultSelected$.value"
Expand Down Expand Up @@ -93,6 +98,7 @@
<div #content class="toast-content">

<igo-feature-details
[map]="map"
*ngIf="resultSelected$.value"
[feature]="resultSelected$.value.data"
(htmlDisplayEvent)=setHtmlDisplay($event)>
Expand Down
Loading

0 comments on commit b72632d

Please sign in to comment.