From 1df4496058863d09b3b13fde975a642bb78154cd Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 11 Apr 2025 11:55:57 +0000 Subject: [PATCH 01/49] Updated packages #2546 --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2416a61..62b7c6e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "farmmaps-lib-app", - "version": "4.14.0", + "version": "4.17.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "farmmaps-lib-app", - "version": "4.14.0", + "version": "4.17.0", "dependencies": { "@angular-eslint/eslint-plugin": "^18.2.0", "@angular/animations": "18.2.3", @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.14.0-prerelease.2544", + "version": "4.14.0-prerelease.2545", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.14.0-prerelease.2544", + "version": "4.14.0-prerelease.2545", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.14.0-prerelease.2544", + "version": "4.14.0-prerelease.2545", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.14.0-prerelease.2544", + "version": "4.14.0-prerelease.2545", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" diff --git a/package.json b/package.json index 75ea77e..290a65b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "farmmaps-lib-app", - "version": "4.14.0", + "version": "4.17.0", "scripts": { "ng": "ng", "start": "ng serve", From 467f7447bf8966119bac50079968b6cee1651817 Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 11 Apr 2025 12:01:45 +0000 Subject: [PATCH 02/49] [ci skip] Updated packages #2547 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62b7c6e..fd36f4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.14.0-prerelease.2545", + "version": "4.17.0-prerelease.2546", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.14.0-prerelease.2545", + "version": "4.17.0-prerelease.2546", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.14.0-prerelease.2545", + "version": "4.17.0-prerelease.2546", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.14.0-prerelease.2545", + "version": "4.17.0-prerelease.2546", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From ee1ce21cca4f545e2af39a4699087e36bf97ab4c Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 11 Apr 2025 21:16:35 +0000 Subject: [PATCH 03/49] Updated packages #2548 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index fd36f4b..adea594 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2546", + "version": "4.17.0-prerelease.2547", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2546", + "version": "4.17.0-prerelease.2547", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2546", + "version": "4.17.0-prerelease.2547", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2546", + "version": "4.17.0-prerelease.2547", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 95200d9920c601a9ede8eaccc79a759938c2b61b Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 11 Apr 2025 21:23:04 +0000 Subject: [PATCH 04/49] [ci skip] Updated packages #2549 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index adea594..b07cd84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2547", + "version": "4.17.0-prerelease.2548", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2547", + "version": "4.17.0-prerelease.2548", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2547", + "version": "4.17.0-prerelease.2548", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2547", + "version": "4.17.0-prerelease.2548", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From ee9c050db3d4b4ec027a98bfa77ee973f6ac61ed Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 14 Apr 2025 12:29:56 +0200 Subject: [PATCH 05/49] AW-6649 Achtergrondlagen --- .../layer-switcher/layer-switcher.component.html | 8 +++++++- .../layer-switcher/layer-switcher.component.ts | 9 ++++++--- projects/common-map/src/fm-map/reducers/map.reducer.ts | 2 ++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html b/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html index 9eb9fc6..f4e46e1 100644 --- a/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html +++ b/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html @@ -10,7 +10,13 @@
  •  Base maps
    - + +
    +
    • +
  • +  Aerial photos +
    +
  • diff --git a/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.ts b/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.ts index e85bbe1..f52a913 100644 --- a/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.ts +++ b/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.ts @@ -4,7 +4,7 @@ import { Store } from '@ngrx/store'; import * as mapReducers from '../../reducers/map.reducer'; import * as mapActions from '../../actions/map.actions'; import {createEmpty,extend } from 'ol/extent'; -import { Observable } from 'rxjs'; +import { filter, map, Observable } from 'rxjs'; @Component({ selector: 'fm-map-layer-switcher', @@ -17,7 +17,8 @@ export class LayerSwitcher implements OnInit,OnChanges{ public overlayLayers: Observable>; public selectedOverlayLayer: Observable; public selectedItemLayer$: Observable; - public baseLayers: Observable>; + public baseMaps: Observable>; + public aerialMaps: Observable>; public selectedBaseLayer: Observable; constructor( private store: Store) { @@ -26,7 +27,8 @@ export class LayerSwitcher implements OnInit,OnChanges{ ngOnInit() { this.overlayLayers = this.store.select(mapReducers.selectGetOverlayLayers); this.selectedOverlayLayer = this.store.select(mapReducers.selectGetSelectedOverlayLayer); - this.baseLayers = this.store.select(mapReducers.selectGetBaseLayers); + this.baseMaps = this.store.select(mapReducers.selectGetBaseMaps); + this.aerialMaps = this.store.select(mapReducers.selectGetArealMaps); this.selectedBaseLayer = this.store.select(mapReducers.selectGetSelectedBaseLayer); this.selectedItemLayer$ = this.store.select(mapReducers.selectGetSelectedItemLayer) this.showLayerSwitcher = this.store.select(mapReducers.selectGetShowLayerSwitcher); @@ -83,3 +85,4 @@ export class LayerSwitcher implements OnInit,OnChanges{ event.preventDefault(); } } + \ No newline at end of file diff --git a/projects/common-map/src/fm-map/reducers/map.reducer.ts b/projects/common-map/src/fm-map/reducers/map.reducer.ts index a0b171f..8dca782 100644 --- a/projects/common-map/src/fm-map/reducers/map.reducer.ts +++ b/projects/common-map/src/fm-map/reducers/map.reducer.ts @@ -637,6 +637,8 @@ export const selectGetExtent = createSelector(selectMapState, getExtent); export const selectGetViewExtent = createSelector(selectMapState, getViewExtent); export const selectGetOverlayLayers = createSelector(selectMapState, getOverlayLayers); export const selectGetBaseLayers = createSelector(selectMapState, getBaseLayers); +export const selectGetBaseMaps = createSelector(selectGetBaseLayers, (layers) => layers.filter(layer => layer.item.data.category === "baseMap")); +export const selectGetArealMaps = createSelector(selectGetBaseLayers, (layers) => layers.filter(layer => layer.item.data.category === "aerialPhoto")); export const selectGetProjection = createSelector(selectMapState, getProjection); export const selectGetSelectedBaseLayer = createSelector(selectMapState, getSelectedBaseLayer); export const selectGetSelectedOverlayLayer = createSelector(selectMapState, getSelectedOverlayLayer); From b9850311eae7ee4c9f0c7f0bb3bdb03833a5f270 Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 14 Apr 2025 10:31:45 +0000 Subject: [PATCH 06/49] [ci skip] Updated packages #2550 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index b07cd84..e349a4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2548", + "version": "4.17.0-prerelease.2549", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2548", + "version": "4.17.0-prerelease.2549", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2548", + "version": "4.17.0-prerelease.2549", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2548", + "version": "4.17.0-prerelease.2549", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From dc096065b4573753b0f6afa945d4c6a2a1a88f73 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 14 Apr 2025 13:34:18 +0200 Subject: [PATCH 07/49] AW-6649 Achtergrondlagen --- projects/common-map/src/fm-map/reducers/map.reducer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common-map/src/fm-map/reducers/map.reducer.ts b/projects/common-map/src/fm-map/reducers/map.reducer.ts index 8dca782..acf1cf0 100644 --- a/projects/common-map/src/fm-map/reducers/map.reducer.ts +++ b/projects/common-map/src/fm-map/reducers/map.reducer.ts @@ -638,7 +638,7 @@ export const selectGetViewExtent = createSelector(selectMapState, getViewExtent) export const selectGetOverlayLayers = createSelector(selectMapState, getOverlayLayers); export const selectGetBaseLayers = createSelector(selectMapState, getBaseLayers); export const selectGetBaseMaps = createSelector(selectGetBaseLayers, (layers) => layers.filter(layer => layer.item.data.category === "baseMap")); -export const selectGetArealMaps = createSelector(selectGetBaseLayers, (layers) => layers.filter(layer => layer.item.data.category === "aerialPhoto")); +export const selectGetArealMaps = createSelector(selectGetBaseLayers, (layers) => layers.filter(layer => layer.item.data.category === "aerialPhoto").sort((a, b) => a.item.dataDate <= b.item.dataDate ? 1 : -1)); export const selectGetProjection = createSelector(selectMapState, getProjection); export const selectGetSelectedBaseLayer = createSelector(selectMapState, getSelectedBaseLayer); export const selectGetSelectedOverlayLayer = createSelector(selectMapState, getSelectedOverlayLayer); From 7365bea14513b93a5d28d21127ccd4454bf7f608 Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 14 Apr 2025 11:36:12 +0000 Subject: [PATCH 08/49] [ci skip] Updated packages #2551 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index e349a4c..3d21284 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2549", + "version": "4.17.0-prerelease.2550", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2549", + "version": "4.17.0-prerelease.2550", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2549", + "version": "4.17.0-prerelease.2550", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2549", + "version": "4.17.0-prerelease.2550", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 51170b45e9a56f7af50434cf9c737899f07736be Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 14 Apr 2025 14:56:06 +0200 Subject: [PATCH 09/49] =?UTF-8?q?AW-6649=20overlays=20boven=20luchtfoto?= =?UTF-8?q?=E2=80=99s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layer-switcher/layer-switcher.component.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html b/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html index f4e46e1..c93eb27 100644 --- a/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html +++ b/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html @@ -13,18 +13,18 @@
    • -
  • -  Aerial photos -
    - -
    -
  •  Overlays
    • +
  • +  Aerial photos +
    + +
    +
  •  Data
    From e78f2893ae2c3b1dc960cbb114ea4068238d7a4f Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 14 Apr 2025 12:57:56 +0000 Subject: [PATCH 10/49] [ci skip] Updated packages #2552 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3d21284..01717d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2550", + "version": "4.17.0-prerelease.2551", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2550", + "version": "4.17.0-prerelease.2551", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2550", + "version": "4.17.0-prerelease.2551", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2550", + "version": "4.17.0-prerelease.2551", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From fb25b923491d5d0d72ad1a6d23dcc2d8242f0d31 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Wed, 16 Apr 2025 15:43:08 +0200 Subject: [PATCH 11/49] AW-6792 Update API --- projects/common/src/fm/services/admin.service.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/common/src/fm/services/admin.service.ts b/projects/common/src/fm/services/admin.service.ts index 9ba956a..9ccf0bc 100644 --- a/projects/common/src/fm/services/admin.service.ts +++ b/projects/common/src/fm/services/admin.service.ts @@ -53,15 +53,15 @@ export class AdminService { return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/admin/${item.code}/tasks`, task); } - getAnalyseFolderOverview(): Observable { - return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/overview`); + getFileStorageOverview(): Observable { + return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/overview`); } - getAnalyseFolderInfo(user: string): Observable { - return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/${user}`); + getFileStorageInfo(user: string): Observable { + return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/${user}`); } - getAnalyseFolderLog(): Observable { - return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/log`); + getFileStorageLog(): Observable { + return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/log`); } } From 61e6de0052b01b5e6180543731d505d2e672c912 Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 16 Apr 2025 13:45:05 +0000 Subject: [PATCH 12/49] [ci skip] Updated packages #2553 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 01717d9..9049c5a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2551", + "version": "4.17.0-prerelease.2552", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2551", + "version": "4.17.0-prerelease.2552", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2551", + "version": "4.17.0-prerelease.2552", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2551", + "version": "4.17.0-prerelease.2552", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 1c92ad4c285b33b97bb7c96e3796ce2a38c8dc2a Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Wed, 23 Apr 2025 15:44:36 +0200 Subject: [PATCH 13/49] AW-6790 Admin -> users --- projects/common/src/fm/services/admin.service.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/common/src/fm/services/admin.service.ts b/projects/common/src/fm/services/admin.service.ts index 9ccf0bc..5f68379 100644 --- a/projects/common/src/fm/services/admin.service.ts +++ b/projects/common/src/fm/services/admin.service.ts @@ -64,4 +64,8 @@ export class AdminService { getFileStorageLog(): Observable { return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/log`); } + + validateEmail(user: IUser) { + return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/admin/${user.code}/validateemail`, user); + } } From 79bc3d9082960c1de72d9012959a03e7cfdaafc5 Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 23 Apr 2025 13:46:30 +0000 Subject: [PATCH 14/49] [ci skip] Updated packages #2554 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9049c5a..bd97499 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2552", + "version": "4.17.0-prerelease.2553", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2552", + "version": "4.17.0-prerelease.2553", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2552", + "version": "4.17.0-prerelease.2553", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2552", + "version": "4.17.0-prerelease.2553", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From b80ddf7854e2eb2c9da0ed2740116fa769259186 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Wed, 23 Apr 2025 16:37:26 +0200 Subject: [PATCH 15/49] AW-6790 Admin -> users --- projects/common/src/fm/services/admin.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common/src/fm/services/admin.service.ts b/projects/common/src/fm/services/admin.service.ts index 5f68379..f8eabef 100644 --- a/projects/common/src/fm/services/admin.service.ts +++ b/projects/common/src/fm/services/admin.service.ts @@ -66,6 +66,6 @@ export class AdminService { } validateEmail(user: IUser) { - return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/admin/${user.code}/validateemail`, user); + return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/admin/user/${user.code}/validateemail`, user); } } From d6841c8f83ab2f76928588b169f6058f2cfacc08 Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 23 Apr 2025 14:39:24 +0000 Subject: [PATCH 16/49] [ci skip] Updated packages #2555 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index bd97499..818dbf6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2553", + "version": "4.17.0-prerelease.2554", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2553", + "version": "4.17.0-prerelease.2554", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2553", + "version": "4.17.0-prerelease.2554", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2553", + "version": "4.17.0-prerelease.2554", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From a2641f8ea5d8a84e7b57f95837f9da94ecdc608d Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Thu, 24 Apr 2025 16:15:57 +0200 Subject: [PATCH 17/49] AW-3101 Alleen relevante plaatje downloaden bij satelliet --- .../selected-item-temporal.component.html | 74 ++++++++++--------- .../selected-item-temporal.component.ts | 6 +- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html index 5076153..b61bae7 100644 --- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html +++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html @@ -7,44 +7,46 @@

    {{parentItem.name}}

    {{item.name}}

    -
    + +
    +
    +
    Date: {{temporalService.selectedDate(itemLayer)}}
    +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    + +
    + +
    +
    -
    Date: {{temporalService.selectedDate(itemLayer)}}
    -
    -
    - -
    -
    - -
    -
    - +
    -
    -
    - -
    - -
    -
    -
    - -
    + diff --git a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts index bc6af67..ef546ac 100644 --- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts @@ -61,13 +61,11 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent return false; } - download(item:IItem,event:MouseEvent) { + download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) { event.stopPropagation(); event.preventDefault(); - const itemLink : IItemLinkType = {itemcode:item.code,pathsuffix:"download", validminutes:10} - console.log('download1', itemLink) + const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10} const foo = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => { - console.log('download2', itemLinkUrl) window.location.href =itemLinkUrl.url }) } From ab19b1c2cef44380bacd86c3d9e775c7ef0a8ddf Mon Sep 17 00:00:00 2001 From: jenkins Date: Thu, 24 Apr 2025 14:18:56 +0000 Subject: [PATCH 18/49] [ci skip] Updated packages #2556 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 818dbf6..89c3516 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2554", + "version": "4.17.0-prerelease.2555", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2554", + "version": "4.17.0-prerelease.2555", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2554", + "version": "4.17.0-prerelease.2555", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2554", + "version": "4.17.0-prerelease.2555", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From f039898c26ba74d84b3b8406364782876da784b5 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 28 Apr 2025 08:45:05 +0200 Subject: [PATCH 19/49] AW-3101 vnd.farmmaps.itemtype.geotiff.processed -> Download as tiff --- .../selected-item-geotiff.component.html | 43 ++++++++++--------- .../selected-item-geotiff.component.ts | 21 ++++++--- .../selected-item-temporal.component.ts | 2 +- 3 files changed, 39 insertions(+), 27 deletions(-) diff --git a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html index 88d2730..58b1b99 100644 --- a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html +++ b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html @@ -7,28 +7,31 @@

    {{parentItem.name}}

    {{item.name}}

    -
    -
    -
    - + +
    +
    +
    + +
    +
    -
    -
    -
    - -
    - +
    + +
    + +
    diff --git a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts index b633d3d..26fa44a 100644 --- a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts @@ -1,12 +1,12 @@ -import { Component, Injectable } from '@angular/core'; import { Location } from '@angular/common'; -import { Store } from '@ngrx/store'; -import * as mapReducers from '../../reducers/map.reducer'; -import { commonReducers, ItemTypeService, ItemService, FolderService } from '@farmmaps/common'; +import { Component, Injectable } from '@angular/core'; import { Router } from '@angular/router'; +import { commonReducers, FolderService, IItem, IItemLinkType, ItemService, ItemTypeService, IUrlType } from '@farmmaps/common'; +import { Store } from '@ngrx/store'; +import * as mapActions from '../../actions/map.actions'; +import * as mapReducers from '../../reducers/map.reducer'; import { ForItemType } from '../for-item/for-itemtype.decorator'; import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component'; -import * as mapActions from '../../actions/map.actions'; @ForItemType("vnd.farmmaps.itemtype.geotiff.processed") @@ -18,7 +18,7 @@ import * as mapActions from '../../actions/map.actions'; }) export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent { - constructor(store: Store, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) { + constructor(store: Store, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) { super(store, itemTypeService,location,router); } @@ -29,4 +29,13 @@ export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent layer(layers:any,layerIndex:number) { return layers.find(l => l.index == layerIndex); } + + download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) { + event.stopPropagation(); + event.preventDefault(); + const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10} + const foo = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => { + window.location.href = itemLinkUrl.url; + }) + } } diff --git a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts index ef546ac..9179f22 100644 --- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts @@ -66,7 +66,7 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent event.preventDefault(); const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10} const foo = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => { - window.location.href =itemLinkUrl.url + window.location.href = itemLinkUrl.url; }) } } From af0a3dca2d3bd6a113e07af2ba39b0d1dfd8c1d0 Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 28 Apr 2025 06:47:11 +0000 Subject: [PATCH 20/49] [ci skip] Updated packages #2557 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 89c3516..7d5ca40 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2555", + "version": "4.17.0-prerelease.2556", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2555", + "version": "4.17.0-prerelease.2556", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2555", + "version": "4.17.0-prerelease.2556", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2555", + "version": "4.17.0-prerelease.2556", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 2e55b5a70e7c03a338dd71acc415be461ecf0f71 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 28 Apr 2025 10:20:19 +0200 Subject: [PATCH 21/49] AW-3101 vnd.farmmaps.itemtype.shape.processed download as shape (zip) --- .../selected-item-geotiff.component.ts | 12 ++++-- .../selected-item-shape.component.html | 37 ++++++++++--------- .../selected-item-shape.component.ts | 33 ++++++++++++----- .../selected-item-temporal.component.ts | 27 ++++++++------ 4 files changed, 67 insertions(+), 42 deletions(-) diff --git a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts index 26fa44a..f8efe38 100644 --- a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts @@ -1,8 +1,9 @@ import { Location } from '@angular/common'; -import { Component, Injectable } from '@angular/core'; +import { Component, Injectable, OnDestroy } from '@angular/core'; import { Router } from '@angular/router'; import { commonReducers, FolderService, IItem, IItemLinkType, ItemService, ItemTypeService, IUrlType } from '@farmmaps/common'; import { Store } from '@ngrx/store'; +import { Subscription } from 'rxjs'; import * as mapActions from '../../actions/map.actions'; import * as mapReducers from '../../reducers/map.reducer'; import { ForItemType } from '../for-item/for-itemtype.decorator'; @@ -16,12 +17,17 @@ import { AbstractSelectedItemComponent } from '../selected-item/selected-item.co templateUrl: './selected-item-geotiff.component.html', styleUrls: ['./selected-item-geotiff.component.scss'] }) -export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent { +export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent implements OnDestroy { + sub: Subscription; constructor(store: Store, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) { super(store, itemTypeService,location,router); } + ngOnDestroy(): void { + if (this.sub) this.sub.unsubscribe(); + } + onLayerChanged(layerIndex: number) { this.store.dispatch(new mapActions.SetLayerIndex(layerIndex)); } @@ -34,7 +40,7 @@ export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent event.stopPropagation(); event.preventDefault(); const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10} - const foo = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => { + this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => { window.location.href = itemLinkUrl.url; }) } diff --git a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html index 6475704..da0eec1 100644 --- a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html +++ b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html @@ -7,25 +7,28 @@

    {{parentItem.name}}

    {{item.name}}

    -
    -
    -
    - + +
    +
    +
    + +
    +
    -
    -
    -
    - -
    +
    + +
    +
    diff --git a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts index bed1cf7..2a94c2f 100644 --- a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts @@ -1,14 +1,13 @@ -import { Component, Input, Injectable, OnInit } from '@angular/core'; import { Location } from '@angular/common'; -import { Feature } from 'ol'; +import { Component, Injectable, OnDestroy } from '@angular/core'; +import { Router } from '@angular/router'; +import { commonReducers, FolderService, IItem, IItemLinkType, ItemService, ItemTypeService, IUrlType } from '@farmmaps/common'; import { Store } from '@ngrx/store'; -import * as mapReducers from '../../reducers/map.reducer'; -import { commonReducers, ItemTypeService, IItem, Item, ItemService, FolderService, IListItem} from '@farmmaps/common'; import * as mapActions from '../../actions/map.actions'; -import { Router, ActivatedRoute, ParamMap, Event } from '@angular/router'; +import * as mapReducers from '../../reducers/map.reducer'; import { ForItemType } from '../for-item/for-itemtype.decorator'; import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component'; -import { Observable } from 'rxjs'; +import { Subscription } from 'rxjs'; @ForItemType("vnd.farmmaps.itemtype.shape.processed") @@ -18,13 +17,18 @@ import { Observable } from 'rxjs'; templateUrl: './selected-item-shape.component.html', styleUrls: ['./selected-item-shape.component.scss'] }) -export class SelectedItemShapeComponent extends AbstractSelectedItemComponent { +export class SelectedItemShapeComponent extends AbstractSelectedItemComponent implements OnDestroy { + public selectedLayer = 0; + sub: Subscription; - constructor(store: Store, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) { + constructor(store: Store, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) { super(store, itemTypeService,location,router); } - public selectedLayer = 0; - + + ngOnDestroy(): void { + if (this.sub) this.sub.unsubscribe(); + } + onLayerChanged(layerIndex: number) { this.store.dispatch(new mapActions.SetLayerIndex(layerIndex)); } @@ -32,4 +36,13 @@ export class SelectedItemShapeComponent extends AbstractSelectedItemComponent { layer(layers:any,layerIndex:number) { return layers.find(l => l.index == layerIndex); } + + download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) { + event.stopPropagation(); + event.preventDefault(); + const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10} + this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => { + window.location.href = itemLinkUrl.url; + }) + } } diff --git a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts index 9179f22..3bdceaf 100644 --- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts @@ -1,15 +1,15 @@ -import { Component, Injectable } from '@angular/core'; import { Location } from '@angular/common'; -import { Store } from '@ngrx/store'; -import * as mapReducers from '../../reducers/map.reducer'; -import { commonReducers, ItemTypeService, IItem, ItemService, IItemLinkType, IUrlType } from '@farmmaps/common'; +import { Component, Injectable, OnDestroy } from '@angular/core'; import { Router } from '@angular/router'; +import { commonReducers, IItem, IItemLinkType, ItemService, ItemTypeService, IUrlType } from '@farmmaps/common'; +import { Store } from '@ngrx/store'; +import { Subscription } from 'rxjs'; +import * as mapActions from '../../actions/map.actions'; +import { IItemLayer, ITemporalItemLayer } from '../../models/item.layer'; +import * as mapReducers from '../../reducers/map.reducer'; +import { TemporalService } from '../../services/temporal.service'; import { ForItemType } from '../for-item/for-itemtype.decorator'; import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component'; -import { ITemporalItemLayer} from '../../models/item.layer'; -import * as mapActions from '../../actions/map.actions'; -import { IItemLayer } from '../../models/item.layer'; -import {TemporalService} from '../../services/temporal.service'; @ForItemType("vnd.farmmaps.itemtype.temporal") @Injectable() @@ -18,11 +18,16 @@ import {TemporalService} from '../../services/temporal.service'; templateUrl: './selected-item-temporal.component.html', styleUrls: ['./selected-item-temporal.component.scss'] }) -export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent { +export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent implements OnDestroy { + sub: Subscription; constructor(store: Store, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) { super(store, itemTypeService,location,router); } + + ngOnDestroy(): void { + if (this.sub) this.sub.unsubscribe(); + } onLayerChanged(layerIndex: number) { this.store.dispatch(new mapActions.SetLayerIndex(layerIndex)); @@ -32,8 +37,6 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent return (this.itemLayer as ITemporalItemLayer)?.selectedItemLayer } - - handleNextTemporal(event:MouseEvent) { this.store.dispatch(new mapActions.NextTemporal()); event.preventDefault(); @@ -65,7 +68,7 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent event.stopPropagation(); event.preventDefault(); const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10} - const foo = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => { + this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => { window.location.href = itemLinkUrl.url; }) } From 8684ba25c8a603204187388bf108d6d307b6e48e Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 28 Apr 2025 08:22:16 +0000 Subject: [PATCH 22/49] [ci skip] Updated packages #2558 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7d5ca40..4be96e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2556", + "version": "4.17.0-prerelease.2557", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2556", + "version": "4.17.0-prerelease.2557", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2556", + "version": "4.17.0-prerelease.2557", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2556", + "version": "4.17.0-prerelease.2557", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 1c0ad57b0a92cb6d2dc276866712b6c78c763300 Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 29 Apr 2025 19:28:05 +0000 Subject: [PATCH 23/49] Updated packages #2559 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4be96e0..ff30f39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2557", + "version": "4.17.0-prerelease.2558", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2557", + "version": "4.17.0-prerelease.2558", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2557", + "version": "4.17.0-prerelease.2558", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2557", + "version": "4.17.0-prerelease.2558", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From e9e3b719a40cb16818383e2ea9f75dff4c8f185c Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 29 Apr 2025 19:35:08 +0000 Subject: [PATCH 24/49] [ci skip] Updated packages #2560 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index ff30f39..31e33db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2558", + "version": "4.17.0-prerelease.2559", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2558", + "version": "4.17.0-prerelease.2559", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2558", + "version": "4.17.0-prerelease.2559", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2558", + "version": "4.17.0-prerelease.2559", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 51291cd86fe3d57ec5e6f677043b4ef93dbe01e4 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Wed, 30 Apr 2025 08:25:00 +0200 Subject: [PATCH 25/49] AW-6801 Add switch to add full path to items result --- projects/common/src/fm/models/item.ts | 1 + projects/common/src/fm/services/item.service.ts | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/common/src/fm/models/item.ts b/projects/common/src/fm/models/item.ts index 34977c7..7a429a3 100644 --- a/projects/common/src/fm/models/item.ts +++ b/projects/common/src/fm/models/item.ts @@ -26,6 +26,7 @@ export class Item implements IItem { public data?:any; public isEditable?:boolean; public owner?: string; + public fullPath?: string; constructor() { } diff --git a/projects/common/src/fm/services/item.service.ts b/projects/common/src/fm/services/item.service.ts index e7b18b0..8d08465 100644 --- a/projects/common/src/fm/services/item.service.ts +++ b/projects/common/src/fm/services/item.service.ts @@ -79,7 +79,8 @@ export class ItemService { getItemList(itemType?: string, dataFilter?: any, level?: number, atItemLocationItemCode?: string, indexed?: boolean, validToday?: boolean,tags?:string,crs?:string, startDate?: Date, endDate?: Date, - skip?: number, take?: number, sourceTask?: string, exactMatchStartOrEndDate?: boolean, owner?:string): Observable { + skip?: number, take?: number, sourceTask?: string, exactMatchStartOrEndDate?: boolean, owner?:string, + includeFullpath?: boolean): Observable { let params = new HttpParams(); if(itemType) params = params.append("it", itemType); if(dataFilter) params = params.append("df", JSON.stringify(dataFilter)); @@ -96,6 +97,7 @@ export class ItemService { if(take) params = params.append("take", take); if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); if(owner) params = params.append("owner", owner); + if(includeFullpath) params = params.append("includeFullpath",includeFullpath?"true":"false"); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/`, { params: params }); } From e6d90c9e611b246746bd61aae689f2300c51534f Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 30 Apr 2025 06:26:59 +0000 Subject: [PATCH 26/49] [ci skip] Updated packages #2561 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 31e33db..3413758 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2559", + "version": "4.17.0-prerelease.2560", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2559", + "version": "4.17.0-prerelease.2560", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2559", + "version": "4.17.0-prerelease.2560", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2559", + "version": "4.17.0-prerelease.2560", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 4fc3ad933ce8e9fe1624252ad7faf451bc727a9a Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 30 Apr 2025 09:14:15 +0000 Subject: [PATCH 27/49] Updated packages #2562 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3413758..dcf0c6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2560", + "version": "4.17.0-prerelease.2561", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2560", + "version": "4.17.0-prerelease.2561", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2560", + "version": "4.17.0-prerelease.2561", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2560", + "version": "4.17.0-prerelease.2561", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From a11eb81e73e8d2a6a08e6be255e31c9a2873a297 Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 30 Apr 2025 09:21:42 +0000 Subject: [PATCH 28/49] [ci skip] Updated packages #2563 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index dcf0c6a..e4f7ce3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2561", + "version": "4.17.0-prerelease.2562", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2561", + "version": "4.17.0-prerelease.2562", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2561", + "version": "4.17.0-prerelease.2562", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2561", + "version": "4.17.0-prerelease.2562", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 9d6cbffb3d4a44068e8672dec9bbeedf2702c003 Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 30 Apr 2025 11:20:25 +0000 Subject: [PATCH 29/49] Updated packages #2564 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index e4f7ce3..fb934f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2562", + "version": "4.17.0-prerelease.2563", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2562", + "version": "4.17.0-prerelease.2563", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2562", + "version": "4.17.0-prerelease.2563", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2562", + "version": "4.17.0-prerelease.2563", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From e17911b33989e7458df73b3c8ba6d4703f7103ba Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 30 Apr 2025 11:27:32 +0000 Subject: [PATCH 30/49] [ci skip] Updated packages #2565 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index fb934f7..b78b2a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2563", + "version": "4.17.0-prerelease.2564", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2563", + "version": "4.17.0-prerelease.2564", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2563", + "version": "4.17.0-prerelease.2564", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2563", + "version": "4.17.0-prerelease.2564", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From d599430cb0e20f613a997a4da557d30be3d766c5 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 12 May 2025 12:59:12 +0200 Subject: [PATCH 31/49] AW-6649 Layers dialog => rename Data to Overlay slide, move below Overlays --- .../layer-switcher/layer-switcher.component.html | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html b/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html index c93eb27..7ec7bd8 100644 --- a/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html +++ b/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html @@ -19,19 +19,18 @@
    • +
  • +  Overlay slider +
    + +
    +
  •  Aerial photos
    • -
  • -  Data -
    - -
    -
    • - From 0d96a1be4fd3455a762153c06dff590ac1dc097f Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 12 May 2025 11:01:08 +0000 Subject: [PATCH 32/49] [ci skip] Updated packages #2566 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index b78b2a6..aa800b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2564", + "version": "4.17.0-prerelease.2565", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2564", + "version": "4.17.0-prerelease.2565", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2564", + "version": "4.17.0-prerelease.2565", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2564", + "version": "4.17.0-prerelease.2565", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From b2b2a1e8bed820e7dcf0aee25ac617a7bbe27c7c Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 12 May 2025 13:48:35 +0000 Subject: [PATCH 33/49] Updated packages #2567 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index aa800b7..080d9f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2565", + "version": "4.17.0-prerelease.2566", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2565", + "version": "4.17.0-prerelease.2566", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2565", + "version": "4.17.0-prerelease.2566", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2565", + "version": "4.17.0-prerelease.2566", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 58391b7828482140b634b91dd1afa10e2580ab66 Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 12 May 2025 13:54:16 +0000 Subject: [PATCH 34/49] [ci skip] Updated packages #2568 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 080d9f8..6ddb836 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2566", + "version": "4.17.0-prerelease.2567", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2566", + "version": "4.17.0-prerelease.2567", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2566", + "version": "4.17.0-prerelease.2567", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2566", + "version": "4.17.0-prerelease.2567", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 3e1b3ee78ea6a604e9262560385fd30eb2d987b9 Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 13 May 2025 09:28:46 +0000 Subject: [PATCH 35/49] Updated packages #2569 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6ddb836..4877327 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2567", + "version": "4.17.0-prerelease.2568", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2567", + "version": "4.17.0-prerelease.2568", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2567", + "version": "4.17.0-prerelease.2568", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2567", + "version": "4.17.0-prerelease.2568", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From fe73f615adf8f4168faf87a32646df0c31283307 Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 13 May 2025 09:34:44 +0000 Subject: [PATCH 36/49] [ci skip] Updated packages #2570 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4877327..d8f2b87 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2568", + "version": "4.17.0-prerelease.2569", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2568", + "version": "4.17.0-prerelease.2569", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2568", + "version": "4.17.0-prerelease.2569", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2568", + "version": "4.17.0-prerelease.2569", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From ac15b2018d07e8c79e97b4d3084f0388fe43e717 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Tue, 3 Jun 2025 12:15:14 +0200 Subject: [PATCH 37/49] AW-6806 Allow delete --- .../components/selected-item/selected-item.component.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts index 0fd6b69..4062a98 100644 --- a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts @@ -2,7 +2,7 @@ import {Component, Injectable, Input, Directive} from '@angular/core'; import {Location} from '@angular/common'; import {Store} from '@ngrx/store'; import * as mapReducers from '../../reducers/map.reducer'; -import {AppConfig, commonReducers, IItem, ItemTypeService} from '@farmmaps/common'; +import {AppConfig, commonReducers, IItem, ItemService, ItemTypeService} from '@farmmaps/common'; import * as mapActions from '../../actions/map.actions'; import {Router} from '@angular/router'; import { IItemLayer } from '../../models/item.layer'; @@ -15,7 +15,7 @@ export abstract class AbstractSelectedItemComponent { @Input() parentItem: IItem; @Input() itemLayer: IItemLayer; @Input() overlayLayers: Array; - constructor(public store: Store, public itemTypeService: ItemTypeService, private location: Location, public router: Router) { + constructor(public store: Store, public itemTypeService: ItemTypeService, public itemService: ItemService, private location: Location, public router: Router) { } handleOnView(item: IItem) { @@ -37,6 +37,11 @@ export abstract class AbstractSelectedItemComponent { return false; } + handleOnDelete(item: IItem) { + this.itemService.deleteItem(item.code); + return false; + } + handleAddAsLayer(item: IItem,layerIndex = -1) { this.store.dispatch(new mapActions.AddLayer(item,layerIndex)); return false; From ea641caf38f7ca593dabf9ab9b46c8a8b611fd3a Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Tue, 3 Jun 2025 12:25:16 +0200 Subject: [PATCH 38/49] AW-6806 Allow delete --- .../selected-item-cropfield.component.ts | 2 +- .../selected-item-geotiff/selected-item-geotiff.component.ts | 2 +- .../selected-item-shape/selected-item-shape.component.ts | 2 +- .../selected-item-temporal.component.ts | 2 +- .../components/selected-item/selected-item.component.ts | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts b/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts index 9f15b39..0195fa7 100644 --- a/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts @@ -25,7 +25,7 @@ export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponen public items: Observable; constructor(store: Store, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) { - super(store, itemTypeService,location,router); + super(store, itemTypeService, itemService$, location,router); } areaInHa(item:IItem):number { diff --git a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts index f8efe38..d6c42d5 100644 --- a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts @@ -21,7 +21,7 @@ export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent sub: Subscription; constructor(store: Store, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) { - super(store, itemTypeService,location,router); + super(store, itemTypeService,itemService,location,router); } ngOnDestroy(): void { diff --git a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts index 2a94c2f..27c8f11 100644 --- a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts @@ -22,7 +22,7 @@ export class SelectedItemShapeComponent extends AbstractSelectedItemComponent im sub: Subscription; constructor(store: Store, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) { - super(store, itemTypeService,location,router); + super(store, itemTypeService,itemService,location,router); } ngOnDestroy(): void { diff --git a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts index 3bdceaf..e56dfb4 100644 --- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts @@ -22,7 +22,7 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent sub: Subscription; constructor(store: Store, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) { - super(store, itemTypeService,location,router); + super(store, itemTypeService,itemService,location,router); } ngOnDestroy(): void { diff --git a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts index 4062a98..1e48b10 100644 --- a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts @@ -81,8 +81,8 @@ export abstract class AbstractSelectedItemComponent { }) export class SelectedItemComponent extends AbstractSelectedItemComponent { - constructor(store: Store, itemTypeService: ItemTypeService, location: Location, router: Router, public config:AppConfig) { - super(store, itemTypeService,location,router); + constructor(store: Store, itemTypeService: ItemTypeService, itemService: ItemService, location: Location, router: Router, public config:AppConfig) { + super(store, itemTypeService,itemService,location,router); } getThumbnailUrl(item:IItem):string { From 6b73fb0d5556d7a4dc89f30d2d6db64f5a4badd0 Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 3 Jun 2025 10:27:08 +0000 Subject: [PATCH 39/49] [ci skip] Updated packages #2572 --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d8f2b87..c2d8abe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.17.0-prerelease.2569", + "version": "2.1.0", "dependencies": { "tslib": "^2.3.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2569", + "version": "4.17.0-prerelease.2570", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.17.0-prerelease.2569", + "version": "18.0.0", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From c3fb42c65f8f31761b20ab74dd2b14dcb9d7a6c5 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Wed, 30 Jul 2025 11:17:55 +0200 Subject: [PATCH 40/49] AW-4935 Tools in croppingscheme weer goed zetten op mobile --- .../fm-map/components/map/map.component.scss | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/projects/common-map/src/fm-map/components/map/map.component.scss b/projects/common-map/src/fm-map/components/map/map.component.scss index df5e219..d5097b5 100644 --- a/projects/common-map/src/fm-map/components/map/map.component.scss +++ b/projects/common-map/src/fm-map/components/map/map.component.scss @@ -52,11 +52,20 @@ aol-map { position:absolute;width:100%;height:calc( 100vh );} pointer-events: none; } +@media screen and (max-width: 768px) { + .control-container { + float:right; + margin-right: 1em; + pointer-events: all; + } +} -.control-container { - float:right; - margin-right: 1em; - pointer-events: all; +@media screen and (min-width: 768px) { + .control-container { + margin-left:1em; + margin-right: 1em; + pointer-events: all; + } } .fullscreen .viewport-container { From 313cc59fe7b00df264007aebbe085d5e46ba244c Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 30 Jul 2025 09:20:14 +0000 Subject: [PATCH 41/49] [ci skip] Updated packages #2573 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index c2d8abe..d0718e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "farmmaps-lib-app", - "version": "4.17.0", + "version": "4.18.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "farmmaps-lib-app", - "version": "4.17.0", + "version": "4.18.0", "dependencies": { "@angular-eslint/eslint-plugin": "^18.2.0", "@angular/animations": "18.2.3", diff --git a/package.json b/package.json index 290a65b..a3e277e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "farmmaps-lib-app", - "version": "4.17.0", + "version": "4.18.0", "scripts": { "ng": "ng", "start": "ng serve", From 205b73b30ed25da51b324ea9c9aab682b33f864e Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Wed, 30 Jul 2025 11:46:58 +0200 Subject: [PATCH 42/49] AW-4935 Tools in croppingscheme weer goed zetten op mobile --- .../common-map/src/fm-map/components/map/map.component.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/common-map/src/fm-map/components/map/map.component.scss b/projects/common-map/src/fm-map/components/map/map.component.scss index d5097b5..b91c7b0 100644 --- a/projects/common-map/src/fm-map/components/map/map.component.scss +++ b/projects/common-map/src/fm-map/components/map/map.component.scss @@ -54,7 +54,7 @@ aol-map { position:absolute;width:100%;height:calc( 100vh );} @media screen and (max-width: 768px) { .control-container { - float:right; + margin-left: 1em; margin-right: 1em; pointer-events: all; } @@ -62,7 +62,7 @@ aol-map { position:absolute;width:100%;height:calc( 100vh );} @media screen and (min-width: 768px) { .control-container { - margin-left:1em; + float: right; margin-right: 1em; pointer-events: all; } From f50ff878e09135a5a545de65132b3d9bc3579a1f Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 30 Jul 2025 09:49:37 +0000 Subject: [PATCH 43/49] [ci skip] Updated packages #2574 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index d0718e1..3d57546 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "2.1.0", + "version": "4.18.0-prerelease.2573", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.17.0-prerelease.2569", + "version": "4.18.0-prerelease.2573", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.17.0-prerelease.2570", + "version": "4.18.0-prerelease.2573", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "18.0.0", + "version": "4.18.0-prerelease.2573", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 2ffce50c477081c82fdad465a88a285d6562b69b Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Mon, 11 Aug 2025 09:40:00 +0200 Subject: [PATCH 44/49] Add hideShowLayerValues flag for fm-map-map --- .../fm-map/components/map/map.component.ts | 381 +++++++++--------- 1 file changed, 194 insertions(+), 187 deletions(-) diff --git a/projects/common-map/src/fm-map/components/map/map.component.ts b/projects/common-map/src/fm-map/components/map/map.component.ts index d1b0b87..d2717d4 100644 --- a/projects/common-map/src/fm-map/components/map/map.component.ts +++ b/projects/common-map/src/fm-map/components/map/map.component.ts @@ -1,39 +1,39 @@ -import { Component, OnInit, OnDestroy, HostListener, ViewChild, AfterViewInit,NgZone,ElementRef } from '@angular/core'; +import { Component, OnInit, OnDestroy, HostListener, ViewChild, AfterViewInit, NgZone, ElementRef } from '@angular/core'; import { Location } from '@angular/common'; -import { Observable, Subject, Subscription, from,of ,EMPTY } from 'rxjs'; -import { withLatestFrom, switchMap,skip } from 'rxjs/operators'; +import { Observable, Subject, Subscription, from, of, EMPTY } from 'rxjs'; +import { withLatestFrom, switchMap, skip } from 'rxjs/operators'; import { Router, ActivatedRoute, ParamMap } from '@angular/router'; import { Store } from '@ngrx/store'; import { DeviceService } from '@farmmaps/common'; -import {getRenderPixel} from 'ol/render'; +import { getRenderPixel } from 'ol/render'; // Map import * as mapReducers from '../../reducers/map.reducer'; import * as mapActions from '../../actions/map.actions'; -import { IMapState} from '../../models/map.state'; -import { IClickedFeature} from '../../models/clicked.feature'; +import { IMapState } from '../../models/map.state'; +import { IClickedFeature } from '../../models/clicked.feature'; import { IQuery } from '../../reducers/map.reducer' import { ISelectedFeatures } from '../../models/selected.features'; import { IItemLayer } from '../../models/item.layer'; import { IListItem, IQueryState } from '@farmmaps/common'; import { IPeriodState } from '../../models/period.state'; -import {IStyles} from '../../models/style.cache'; +import { IStyles } from '../../models/style.cache'; import { IDroppedFile } from '../aol/file-drop-target/file-drop-target.component'; import { StateSerializerService } from '@farmmaps/common'; -import { GeolocationService} from '../../services/geolocation.service'; +import { GeolocationService } from '../../services/geolocation.service'; import { GeolocatorService } from '@farmmaps/common'; -import {DeviceOrientationService} from '../../services/device-orientation.service'; +import { DeviceOrientationService } from '../../services/device-orientation.service'; // AppCommon import { ResumableFileUploadService, ItemTypeService } from '@farmmaps/common'; import { IItemType, IItem } from '@farmmaps/common'; -import {commonReducers} from '@farmmaps/common'; -import {commonActions} from '@farmmaps/common'; +import { commonReducers } from '@farmmaps/common'; +import { commonActions } from '@farmmaps/common'; -import {Feature} from 'ol'; -import {Geometry,Point,Circle} from 'ol/geom'; -import {Extent,createEmpty,extend } from 'ol/extent'; -import {transform} from 'ol/proj'; +import { Feature } from 'ol'; +import { Geometry, Point, Circle } from 'ol/geom'; +import { Extent, createEmpty, extend } from 'ol/extent'; +import { transform } from 'ol/proj'; import { tassign } from 'tassign'; import * as style from 'ol/style'; @@ -44,7 +44,7 @@ import * as style from 'ol/style'; styleUrls: ['./map.component.scss'] }) -export class MapComponent implements OnInit, OnDestroy,AfterViewInit { +export class MapComponent implements OnInit, OnDestroy, AfterViewInit { title = 'Map'; public openedModalName$: Observable = this.store.select(commonReducers.selectOpenedModalName); public itemTypes$: Observable<{ [id: string]: IItemType }>; @@ -54,49 +54,51 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { public selectedOverlayLayer$: Observable = this.store.select(mapReducers.selectGetSelectedOverlayLayer); public selectedItemLayer$: Observable = this.store.select(mapReducers.selectGetSelectedItemLayer); public baseLayers$: Observable> = this.store.select(mapReducers.selectGetBaseLayers); - public selectedBaseLayer$: Observable = this.store.select(mapReducers.selectGetSelectedBaseLayer); + public selectedBaseLayer$: Observable = this.store.select(mapReducers.selectGetSelectedBaseLayer); public projection$: Observable = this.store.select(mapReducers.selectGetProjection); public selectedFeatures$: Subject = new Subject(); - public droppedFile$: Subject = new Subject(); + public droppedFile$: Subject = new Subject(); private paramSub: Subscription; private itemTypeSub: Subscription; private stateSub: Subscription; private queryStateSub: Subscription; private querySub: Subscription; - public parentCode$: Observable =this.store.select(mapReducers.selectGetParentCode); + public parentCode$: Observable = this.store.select(mapReducers.selectGetParentCode); public panelVisible$: Observable = this.store.select(mapReducers.selectGetPanelVisible); public panelCollapsed$: Observable = this.store.select(mapReducers.selectGetPanelCollapsed); public panelExtraWide$: Observable = this.store.select(mapReducers.selectGetPanelExtraWide); public selectedFeature$: Observable> = this.store.select(mapReducers.selectGetSelectedFeature); public clickedFeature: Subject> = new Subject>(); public selectedItem$: Observable = this.store.select(mapReducers.selectGetSelectedItem); - public parentItem$: Observable =this.store.select(mapReducers.selectGetParentItem); + public parentItem$: Observable = this.store.select(mapReducers.selectGetParentItem); public queryState$: Observable = this.store.select(mapReducers.selectGetQueryState); - public state$:Observable<{mapState:IMapState,queryState:IQueryState}> = this.store.select(mapReducers.selectGetState); + public state$: Observable<{ mapState: IMapState, queryState: IQueryState }> = this.store.select(mapReducers.selectGetState); public period$: Observable = this.store.select(mapReducers.selectGetPeriod); public clearEnabled$: Observable = this.store.select(mapReducers.selectGetClearEnabled); public searchCollapsed$: Observable = this.store.select(mapReducers.selectGetSearchCollapsed); public searchMinified$: Observable = this.store.select(mapReducers.selectGetSearchMinified); public showDataLayerSlide$: Observable = this.store.select(mapReducers.selectGetShowdataLayerSlide); public menuVisible$: Observable; - public query$: Observable = this.store.select(mapReducers.selectGetQuery); + public query$: Observable = this.store.select(mapReducers.selectGetQuery); public position$: Observable = this.geolocationService.getCurrentPosition(); public compassHeading$: Observable = this.deviceorientationService.getCurrentCompassHeading(); public baseLayersCollapsed = true; public overlayLayersCollapsed = true; public extent$: Observable = this.store.select(mapReducers.selectGetExtent); - public styles$:Observable = this.store.select(mapReducers.selectGetStyles); + public styles$: Observable = this.store.select(mapReducers.selectGetStyles); public fullscreen$: Observable = this.store.select(commonReducers.selectGetFullScreen); private lastUrl = ""; private initialized = false; public noContent = false; public overrideSelectedItemLayer = false; public overrideOverlayLayers = false; + public hideShowLayerValues = false; + public const public dataLayerSlideValue = 50; public dataLayerSlideEnabled = false; private visibleAreaBottom = 0; private viewEnabled = true; - + @ViewChild('map') map; @ViewChild('contentDiv') contentDiv: ElementRef; @@ -110,47 +112,48 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { private geolocationService: GeolocationService, private geolocaterService: GeolocatorService, private zone: NgZone, - private deviceorientationService:DeviceOrientationService, - public devicesService:DeviceService) { - if(route && route.snapshot && route.snapshot.data && route.snapshot.data["fm-map-map"]) { - const params = route.snapshot.data["fm-map-map"]; - this.overrideSelectedItemLayer = params["overrideSelectedItemlayer"] ? params["overrideSelectedItemlayer"] : false; - this.overrideOverlayLayers = params["overrideOverlayLayers"] ? params["overrideOverlayLayers"] : false; - } - this.querySub = this.query$.pipe(skip(1), withLatestFrom(this.mapState$)).subscribe(([query,mapState]) =>{ - if(query && query.querystate) { - let newQueryState = tassign(mapReducers.initialQueryState); - //console.debug(`Do Query`); - const urlparts=[]; - if (query.querystate.itemCode && query.querystate.itemCode != "") { - if(query.querystate.itemType && query.querystate.itemType!= "") { - const itemType = this.itemTypeService.itemTypes[query.querystate.itemType]; - if (itemType && itemType.viewer && itemType.viewer == "edit_in_editor" && itemType.editor) { - urlparts.push('/editor'); - urlparts.push(itemType.editor); - urlparts.push('item'); - urlparts.push(query.querystate.itemCode); - } + private deviceorientationService: DeviceOrientationService, + public devicesService: DeviceService) { + if (route && route.snapshot && route.snapshot.data && route.snapshot.data["fm-map-map"]) { + const params = route.snapshot.data["fm-map-map"]; + this.overrideSelectedItemLayer = params["overrideSelectedItemlayer"] ? params["overrideSelectedItemlayer"] : false; + this.overrideOverlayLayers = params["overrideOverlayLayers"] ? params["overrideOverlayLayers"] : false; + this.hideShowLayerValues = params["hideShowLayerValues"] ? params["hideShowLayerValues"] : false; + } + this.querySub = this.query$.pipe(skip(1), withLatestFrom(this.mapState$)).subscribe(([query, mapState]) => { + if (query && query.querystate) { + let newQueryState = tassign(mapReducers.initialQueryState); + //console.debug(`Do Query`); + const urlparts = []; + if (query.querystate.itemCode && query.querystate.itemCode != "") { + if (query.querystate.itemType && query.querystate.itemType != "") { + const itemType = this.itemTypeService.itemTypes[query.querystate.itemType]; + if (itemType && itemType.viewer && itemType.viewer == "edit_in_editor" && itemType.editor) { + urlparts.push('/editor'); + urlparts.push(itemType.editor); + urlparts.push('item'); + urlparts.push(query.querystate.itemCode); } - } else { - newQueryState= query.querystate; - } - if(urlparts.length==0 ) { - newQueryState.itemCode = query.querystate.itemCode; - this.zone.run(() => { - this.replaceUrl(mapState,newQueryState,query.replace); - }) - } else { - this.router.navigate(urlparts); } + } else { + newQueryState = query.querystate; } - }); - this.store.dispatch(new mapActions.Init()); - // this.store.select(commonReducers.getRootItems).subscribe((l) => { - // if(l && l.length>0) { - // this.store.dispatch(new mapActions.Init()); - // } - // }); + if (urlparts.length == 0) { + newQueryState.itemCode = query.querystate.itemCode; + this.zone.run(() => { + this.replaceUrl(mapState, newQueryState, query.replace); + }) + } else { + this.router.navigate(urlparts); + } + } + }); + this.store.dispatch(new mapActions.Init()); + // this.store.select(commonReducers.getRootItems).subscribe((l) => { + // if(l && l.length>0) { + // this.store.dispatch(new mapActions.Init()); + // } + // }); } @HostListener('document:keyup', ['$event']) @@ -161,27 +164,27 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { } } - handlePanelResize(resizeTop:number) { - if(resizeTop==100 || !this.devicesService.IsMobile() ) { - this.visibleAreaBottom=0; + handlePanelResize(resizeTop: number) { + if (resizeTop == 100 || !this.devicesService.IsMobile()) { + this.visibleAreaBottom = 0; } else { - this.visibleAreaBottom=100-resizeTop; - if(this.visibleAreaBottom>60) { - this.visibleAreaBottom=60; + this.visibleAreaBottom = 100 - resizeTop; + if (this.visibleAreaBottom > 60) { + this.visibleAreaBottom = 60; } - } + } } - bottom(panelVisible:boolean) { - if(panelVisible) { - return this.visibleAreaBottom + '%'; + bottom(panelVisible: boolean) { + if (panelVisible) { + return this.visibleAreaBottom + '%'; } else { return "0%"; } } handleOpenModal(modalName: string) { - this.store.dispatch(new commonActions.OpenModal(modalName)); + this.store.dispatch(new commonActions.OpenModal(modalName)); } handleCloseModal() { @@ -189,7 +192,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { } handleFileDropped(droppedFile: IDroppedFile) { - this.uploadService.addFiles(droppedFile.files, droppedFile.event, { parentCode:droppedFile.parentCode, geometry:droppedFile.geometry }); + this.uploadService.addFiles(droppedFile.files, droppedFile.event, { parentCode: droppedFile.parentCode, geometry: droppedFile.geometry }); } handleFeatureClick(feature: Feature) { @@ -205,26 +208,26 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { this.store.dispatch(new mapActions.DoQuery(queryState)); } - handleSidepaneloutletActivate(component:any) { - if(component && component.hasOwnProperty('clickedFeature')) { - (component as IClickedFeature).clickedFeature = this.clickedFeature; - } - if(component && component.hasOwnProperty('extrawide')) { - this.store.dispatch(new mapActions.SetPanelExtraWide(true)); + handleSidepaneloutletActivate(component: any) { + if (component && component.hasOwnProperty('clickedFeature')) { + (component as IClickedFeature).clickedFeature = this.clickedFeature; + } + if (component && component.hasOwnProperty('extrawide')) { + this.store.dispatch(new mapActions.SetPanelExtraWide(true)); + } } - } - handleSidepaneloutletDeactivate(component:any) { - if(component && component.hasOwnProperty('clickedFeature')) { + handleSidepaneloutletDeactivate(component: any) { + if (component && component.hasOwnProperty('clickedFeature')) { (component as IClickedFeature).clickedFeature = null; } - if(component && component.hasOwnProperty('extrawide')) { + if (component && component.hasOwnProperty('extrawide')) { this.store.dispatch(new mapActions.SetPanelExtraWide(false)); } } - handlePrerender(event:any) { - if(!this.dataLayerSlideEnabled) return; + handlePrerender(event: any) { + if (!this.dataLayerSlideEnabled) return; const ctx = event.context; const mapSize = this.map.instance.getSize(); const width = mapSize[0] * (this.dataLayerSlideValue / 100); @@ -243,72 +246,74 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { ctx.clip(); } - handleSlideChange(event:any) { - this.dataLayerSlideValue = event.target.value; - this.map.instance.render(); + handleSlideChange(event: any) { + this.dataLayerSlideValue = event.target.value; + this.map.instance.render(); } - ngOnInit() { + ngOnInit() { this.initialized = false; //console.debug("Init"); this.store.dispatch(new mapActions.Clear()); - this.selectedFeatures$.next({x:0,y:0,features:[]}); + this.selectedFeatures$.next({ x: 0, y: 0, features: [] }); this.selectedFeatures$.next(null); } initCustomStyles() { - this.store.dispatch(new mapActions.SetStyle('vnd.farmmaps.itemtype.layer',new style.Style({ + this.store.dispatch(new mapActions.SetStyle('vnd.farmmaps.itemtype.layer', new style.Style({ stroke: new style.Stroke({ color: 'red', - lineDash: [ 5,5], + lineDash: [5, 5], width: 1 }), - geometry:(feature) =>feature.getGeometry() + geometry: (feature) => feature.getGeometry() }))); - this.store.dispatch(new mapActions.SetStyle('vnd.farmmaps.itemtype.layer_selected',new style.Style({ + this.store.dispatch(new mapActions.SetStyle('vnd.farmmaps.itemtype.layer_selected', new style.Style({ stroke: new style.Stroke({ color: 'red', - lineDash: [ 5,5], + lineDash: [5, 5], width: 3 }), - geometry:(feature) =>feature.getGeometry() + geometry: (feature) => feature.getGeometry() }))); } - round(value:number,decimals:number):number { + round(value: number, decimals: number): number { const d = Math.pow(10, decimals); - return Math.round((value + Number.EPSILON)*d)/d; + return Math.round((value + Number.EPSILON) * d) / d; } - getMapStateFromUrl(params:ParamMap):IMapState { + getMapStateFromUrl(params: ParamMap): IMapState { const hasUrlmapState = params.has("xCenter") && params.has("yCenter"); if (hasUrlmapState) { const xCenter = parseFloat(params.get("xCenter")); const yCenter = parseFloat(params.get("yCenter")); const zoom = parseFloat(params.get("zoom")); const rotation = parseFloat(params.get("rotation")); - const baseLayer = params.get("baseLayer")?params.get("baseLayer"):""; - const newMapState = {zoom: zoom, rotation: rotation, xCenter: xCenter, yCenter: yCenter, baseLayerCode: baseLayer }; + const baseLayer = params.get("baseLayer") ? params.get("baseLayer") : ""; + const newMapState = { zoom: zoom, rotation: rotation, xCenter: xCenter, yCenter: yCenter, baseLayerCode: baseLayer }; return newMapState; } else { return null; } } - normalizeMapState(mapState:IMapState):IMapState { - if(!mapState) return null; - return {zoom: this.round(mapState.zoom,0), - rotation: this.round(mapState.rotation,2), - xCenter: this.round(mapState.xCenter,5), - yCenter: this.round(mapState.yCenter,5), - baseLayerCode: mapState.baseLayerCode }; + normalizeMapState(mapState: IMapState): IMapState { + if (!mapState) return null; + return { + zoom: this.round(mapState.zoom, 0), + rotation: this.round(mapState.rotation, 2), + xCenter: this.round(mapState.xCenter, 5), + yCenter: this.round(mapState.yCenter, 5), + baseLayerCode: mapState.baseLayerCode + }; } - serializeMapState(mapState:IMapState):string { + serializeMapState(mapState: IMapState): string { return JSON.stringify(this.normalizeMapState(mapState)); } - getQueryStateFromUrl(params:ParamMap):IQueryState { + getQueryStateFromUrl(params: ParamMap): IQueryState { if (params.has("queryState")) { const queryState = params.get("queryState"); let newQueryState = tassign(mapReducers.initialQueryState); @@ -323,65 +328,65 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { ngAfterViewInit() { //console.debug("View init"); - this.noContent=true; + this.noContent = true; this.route.children.forEach((entry) => { - if(entry.outlet=="primary") { - this.noContent=false; + if (entry.outlet == "primary") { + this.noContent = false; } }); - + this.initCustomStyles(); // url to state - const urlMapState = this.getMapStateFromUrl(this.route.snapshot.paramMap); - const urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap); - if(urlQueryState && urlMapState && this.noContent) { - this.store.dispatch(new mapActions.SetState(urlMapState,urlQueryState)); - window.localStorage.setItem("FarmMapsCommonMap_mapState",this.serializeMapState(urlMapState)); - } else if(urlQueryState && this.noContent) { - this.store.dispatch(new mapActions.SetQueryState(urlQueryState)); - } else { - this.store.dispatch(new mapActions.SetReplaceUrl(true)); - } + const urlMapState = this.getMapStateFromUrl(this.route.snapshot.paramMap); + const urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap); + if (urlQueryState && urlMapState && this.noContent) { + this.store.dispatch(new mapActions.SetState(urlMapState, urlQueryState)); + window.localStorage.setItem("FarmMapsCommonMap_mapState", this.serializeMapState(urlMapState)); + } else if (urlQueryState && this.noContent) { + this.store.dispatch(new mapActions.SetQueryState(urlQueryState)); + } else { + this.store.dispatch(new mapActions.SetReplaceUrl(true)); + } - this.paramSub = this.route.paramMap.pipe(withLatestFrom(this.state$),switchMap(([params,state]) => { - if(this.initialized && this.noContent) { - const urlQueryState = this.getQueryStateFromUrl(params); - if( this.serializeService.serialize(state.queryState) != this.serializeService.serialize(urlQueryState)) { - return of(new mapActions.SetState(state.mapState,urlQueryState)); - } - } - return EMPTY; - })).subscribe((action) => { - if(action) { - this.zone.run(() => { - //console.debug("Url to state"); - this.store.dispatch(action); - }); + this.paramSub = this.route.paramMap.pipe(withLatestFrom(this.state$), switchMap(([params, state]) => { + if (this.initialized && this.noContent) { + const urlQueryState = this.getQueryStateFromUrl(params); + if (this.serializeService.serialize(state.queryState) != this.serializeService.serialize(urlQueryState)) { + return of(new mapActions.SetState(state.mapState, urlQueryState)); } - }); + } + return EMPTY; + })).subscribe((action) => { + if (action) { + this.zone.run(() => { + //console.debug("Url to state"); + this.store.dispatch(action); + }); + } + }); // state to url this.stateSub = this.state$.pipe(switchMap((state) => { const newUrl = this.serializeMapState(state.mapState) + "_" + this.serializeService.serialize(state.queryState); - if(this.lastUrl!=newUrl) { - this.lastUrl=newUrl; + if (this.lastUrl != newUrl) { + this.lastUrl = newUrl; return of(state); } else { return of(null); } })).subscribe((newUrlState: any) => { - if(newUrlState) { - //console.debug(`State to url`); - this.replaceUrl(newUrlState.mapState,newUrlState.queryState,newUrlState.replaceUrl); - } - }); - this.initialized = true; + if (newUrlState) { + //console.debug(`State to url`); + this.replaceUrl(newUrlState.mapState, newUrlState.queryState, newUrlState.replaceUrl); + } + }); + this.initialized = true; this.showDataLayerSlide$.subscribe((v) => { - this.dataLayerSlideEnabled=v; + this.dataLayerSlideEnabled = v; this.map.instance.render(); }); this.store.select(mapReducers.selectGetViewEnabled).subscribe((v) => { @@ -401,7 +406,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { this.store.dispatch(new commonActions.ToggleMenu()); } - handleToggleBaseLayers(event:MouseEvent) { + handleToggleBaseLayers(event: MouseEvent) { this.baseLayersCollapsed = !this.baseLayersCollapsed; event.preventDefault(); } @@ -418,30 +423,30 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { } replaceUrl(mapState: IMapState, queryState: IQueryState, replace = true) { - if(this.noContent) { - const newMapState = this.serializeMapState(mapState); - const newQueryState = this.serializeService.serialize(queryState); - const currentMapState = this.serializeMapState(this.getMapStateFromUrl(this.route.snapshot.paramMap)); - const urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap); - const currentQueryState = urlQueryState==null?"":this.serializeService.serialize(urlQueryState); - if(mapState.baseLayerCode!="" && ((newMapState!= currentMapState) || (newQueryState!=currentQueryState))) { - const parts =["."]; - parts.push(mapState.xCenter.toFixed(5)); - parts.push(mapState.yCenter.toFixed(5)); - parts.push( mapState.zoom.toFixed(0)); - parts.push( mapState.rotation.toFixed(2)); - parts.push(mapState.baseLayerCode); - parts.push( this.serializeService.serialize(queryState)); - - //console.debug("Replace url",parts); - this.router.navigate(parts, { replaceUrl: replace,relativeTo:this.route.parent }); - } - } + if (this.noContent) { + const newMapState = this.serializeMapState(mapState); + const newQueryState = this.serializeService.serialize(queryState); + const currentMapState = this.serializeMapState(this.getMapStateFromUrl(this.route.snapshot.paramMap)); + const urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap); + const currentQueryState = urlQueryState == null ? "" : this.serializeService.serialize(urlQueryState); + if (mapState.baseLayerCode != "" && ((newMapState != currentMapState) || (newQueryState != currentQueryState))) { + const parts = ["."]; + parts.push(mapState.xCenter.toFixed(5)); + parts.push(mapState.yCenter.toFixed(5)); + parts.push(mapState.zoom.toFixed(0)); + parts.push(mapState.rotation.toFixed(2)); + parts.push(mapState.baseLayerCode); + parts.push(this.serializeService.serialize(queryState)); + + //console.debug("Replace url",parts); + this.router.navigate(parts, { replaceUrl: replace, relativeTo: this.route.parent }); + } + } } - handleOnMoveEnd(event) { - if(this.initialized && this.viewEnabled) { - this.zone.run(() =>{ + handleOnMoveEnd(event) { + if (this.initialized && this.viewEnabled) { + this.zone.run(() => { //console.debug("Move end"); const map = event.map; const view = map.getView(); @@ -461,21 +466,23 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { } }); }); - } + } } handleOnMouseDown(event: MouseEvent) { event.stopPropagation(); - this.zone.run(() =>{ + this.zone.run(() => { this.store.dispatch(new commonActions.CloseAll()); }); } handleShowLayerValues(event: MouseEvent) { - event.stopPropagation(); - this.zone.run(() =>{ - this.store.dispatch(new mapActions.ToggleLayerValuesEnabled()); - }); + if (this.hideShowLayerValues) { + event.stopPropagation(); + this.zone.run(() => { + this.store.dispatch(new mapActions.ToggleLayerValuesEnabled()); + }); + } } handleOnDownload(event) { @@ -491,15 +498,15 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { } handleOnToggleVisibility(itemLayer: IItemLayer) { - this.store.dispatch(new mapActions.SetVisibility(itemLayer,!itemLayer.visible)); + this.store.dispatch(new mapActions.SetVisibility(itemLayer, !itemLayer.visible)); } - handleOnSetOpacity(event:{ layer: IItemLayer,opacity:number }) { + handleOnSetOpacity(event: { layer: IItemLayer, opacity: number }) { this.store.dispatch(new mapActions.SetOpacity(event.layer, event.opacity)); } handleZoomToExtent(itemLayer: IItemLayer) { - const extent = createEmpty(); + const extent = createEmpty(); extend(extent, itemLayer.layer.getExtent()); if (extent) { this.store.dispatch(new mapActions.SetExtent(extent)); @@ -514,21 +521,21 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { this.store.dispatch(new mapActions.SelectOverlayLayer(itemLayer)); } - handlePeriodChange(period:IPeriodState) { + handlePeriodChange(period: IPeriodState) { this.store.dispatch(new mapActions.SetPeriod(period)); } - handleCitySearch(location:string) { + handleCitySearch(location: string) { this.geolocaterService.geocode(location).subscribe(locations => { - if( locations.length > 0) { - const point = new Point([locations[0].coordinates.lon,locations[0].coordinates.lat]); + if (locations.length > 0) { + const point = new Point([locations[0].coordinates.lon, locations[0].coordinates.lat]); point.transform('EPSG:4326', 'EPSG:3857'); - const circle = new Circle(point.getCoordinates(),5000);// + const circle = new Circle(point.getCoordinates(), 5000);// const extent = createEmpty(); extend(extent, circle.getExtent()); this.store.dispatch(new mapActions.SetExtent(extent)) } - }); + }); } ngOnDestroy() { From 9d45c25a95b217407963179ec12ddb181a9179af Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 11 Aug 2025 07:42:16 +0000 Subject: [PATCH 45/49] [ci skip] Updated packages #2575 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3d57546..1df2d75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.18.0-prerelease.2573", + "version": "4.18.0-prerelease.2574", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.18.0-prerelease.2573", + "version": "4.18.0-prerelease.2574", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.18.0-prerelease.2573", + "version": "4.18.0-prerelease.2574", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.18.0-prerelease.2573", + "version": "4.18.0-prerelease.2574", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From b5e11da9a8950af39d7e9f89d361fe01369bdb85 Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Mon, 11 Aug 2025 10:11:45 +0200 Subject: [PATCH 46/49] Fix flag check --- projects/common-map/src/fm-map/components/map/map.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common-map/src/fm-map/components/map/map.component.ts b/projects/common-map/src/fm-map/components/map/map.component.ts index d2717d4..50b80f7 100644 --- a/projects/common-map/src/fm-map/components/map/map.component.ts +++ b/projects/common-map/src/fm-map/components/map/map.component.ts @@ -477,7 +477,7 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit { } handleShowLayerValues(event: MouseEvent) { - if (this.hideShowLayerValues) { + if (!this.hideShowLayerValues) { event.stopPropagation(); this.zone.run(() => { this.store.dispatch(new mapActions.ToggleLayerValuesEnabled()); From c79637be771656b8542f37597134cdc1a19ef9c6 Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 11 Aug 2025 08:14:46 +0000 Subject: [PATCH 47/49] [ci skip] Updated packages #2576 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1df2d75..4effff2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.18.0-prerelease.2574", + "version": "4.18.0-prerelease.2575", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.18.0-prerelease.2574", + "version": "4.18.0-prerelease.2575", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.18.0-prerelease.2574", + "version": "4.18.0-prerelease.2575", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.18.0-prerelease.2574", + "version": "4.18.0-prerelease.2575", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From a8d0f05c816be881743589b55e485d354f9aadcb Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Thu, 14 Aug 2025 09:26:36 +0200 Subject: [PATCH 48/49] Aw6981 Add observation components --- .../src/fm-map/common-map.module.ts | 10 ++++++- ...re-list-feature-observation.component.html | 10 +++++++ ...re-list-feature-observation.component.scss | 22 ++++++++++++++ ...ture-list-feature-observation.component.ts | 29 ++++++++++++++++++ .../feature-list-observation.component.html | 14 +++++++++ .../feature-list-observation.component.scss | 20 +++++++++++++ .../feature-list-observation.component.ts | 30 +++++++++++++++++++ 7 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.html create mode 100644 projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.scss create mode 100644 projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.ts create mode 100644 projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.html create mode 100644 projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.scss create mode 100644 projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.ts diff --git a/projects/common-map/src/fm-map/common-map.module.ts b/projects/common-map/src/fm-map/common-map.module.ts index 32d68c8..1074bf8 100644 --- a/projects/common-map/src/fm-map/common-map.module.ts +++ b/projects/common-map/src/fm-map/common-map.module.ts @@ -36,10 +36,12 @@ import { RotationResetComponent } from './components/aol/rotation-reset/rotation import { ZoomToExtentComponent } from './components/aol/zoom-to-extent/zoom-to-extent.component'; import { FeatureListContainerComponent } from './components/feature-list-container/feature-list-container.component'; import { FeatureListCropfieldComponent } from './components/feature-list-cropfield/feature-list-cropfield.component'; +import { FeatureListObservationComponent } from './components/feature-list-observation/feature-list-observation.component'; import { FeatureListCroppingschemeComponent } from './components/feature-list-croppingscheme/feature-list-croppingscheme.component'; import { FeatureListFeatureContainerComponent } from './components/feature-list-feature-container/feature-list-feature-container.component'; import { FeatureListFeatureCropfieldComponent } from './components/feature-list-feature-cropfield/feature-list-feature-cropfield.component'; import { FeatureListFeatureCroppingschemeComponent } from './components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component'; +import { FeatureListFeatureObservationComponent } from './components/feature-list-feature-observation/feature-list-feature-observation.component'; import { AbstractFeatureListFeatureComponent, FeatureListFeatureComponent } from './components/feature-list-feature/feature-list-feature.component'; import { AbstractFeatureListComponent, FeatureListComponent } from './components/feature-list/feature-list.component'; import { GeometryThumbnailComponent } from './components/feature-thumbnail/feature-thumbnail.component'; @@ -105,7 +107,7 @@ const metaReducers: Array> = [LocalStorageSync]; export { AbstractFeatureListComponent, - AbstractFeatureListFeatureComponent, AbstractItemListComponent, AbstractItemListItemComponent, AbstractItemWidgetComponent, AbstractSelectedItemComponent, DeviceOrientationService, FeatureIconService, FeatureListComponent, FeatureListContainerComponent, FeatureListCropfieldComponent, FeatureListCroppingschemeComponent, FeatureListFeatureComponent, FeatureListFeatureContainerComponent, FeatureListFeatureCropfieldComponent, FeatureListFeatureCroppingschemeComponent, FileDropTargetComponent, ForChild, + AbstractFeatureListFeatureComponent, AbstractItemListComponent, AbstractItemListItemComponent, AbstractItemWidgetComponent, AbstractSelectedItemComponent, DeviceOrientationService, FeatureIconService, FeatureListComponent, FeatureListContainerComponent, FeatureListCropfieldComponent, FeatureListObservationComponent, FeatureListCroppingschemeComponent, FeatureListFeatureComponent, FeatureListFeatureContainerComponent, FeatureListFeatureCropfieldComponent, FeatureListFeatureObservationComponent, FeatureListFeatureCroppingschemeComponent, FileDropTargetComponent, ForChild, ForItemType, ForPackage, ForSourceTask, GeolocationService, GeometryThumbnailComponent, GpsLocation, IClickedFeature, ifZoomToShowDirective, IItemLayer, IMapState, IPeriodState, ISelectedFeatures, ItemLayer, ItemLayersComponent, ItemListComponent, ItemListItemComponent, ItemListItemContainerComponent, ITemporalItemLayer, ItemVectorSourceComponent, ItemWidgetListComponent, LayerListComponent, LayerSwitcher, LayerVectorImageComponent, LegendComponent, mapActions, MapComponent, mapEffects, mapReducers, MapSearchComponent, MetaDataModalComponent, PanToLocation, RotationResetComponent, SelectedItemComponent, SelectedItemContainerComponent, SelectedItemCropfieldComponent, @@ -142,10 +144,12 @@ export { FeatureListContainerComponent, FeatureListCroppingschemeComponent, FeatureListCropfieldComponent, + FeatureListObservationComponent, FeatureListFeatureContainerComponent, FeatureListFeatureComponent, FeatureListFeatureCroppingschemeComponent, FeatureListFeatureCropfieldComponent, + FeatureListFeatureObservationComponent, SelectedItemContainerComponent, SelectedItemComponent, SelectedItemCropfieldComponent, @@ -178,6 +182,7 @@ export { LayerSwitcher, FeatureListFeatureComponent, FeatureListFeatureCropfieldComponent, + FeatureListFeatureObservationComponent, FeatureListFeatureCroppingschemeComponent, SelectedItemContainerComponent, SelectedItemComponent, @@ -201,6 +206,7 @@ export { FeatureListContainerComponent, FeatureListCroppingschemeComponent, FeatureListCropfieldComponent, + FeatureListObservationComponent, FeatureListFeatureContainerComponent, ZoomToExtentComponent, ifZoomToShowDirective, @@ -214,9 +220,11 @@ export { TemporalService, { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true }, { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true }, + { provide: AbstractFeatureListComponent, useClass: FeatureListObservationComponent, multi: true }, { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true }, { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true }, { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true }, + { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureObservationComponent, multi: true }, { provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true }, { provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true }, { provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true }, diff --git a/projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.html b/projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.html new file mode 100644 index 0000000..edf13e5 --- /dev/null +++ b/projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.html @@ -0,0 +1,10 @@ +
    +
    +
    + +
    +
    +

    {{feature.get('name')}}

    +
    +
    +
    \ No newline at end of file diff --git a/projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.scss b/projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.scss new file mode 100644 index 0000000..0af39a5 --- /dev/null +++ b/projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.scss @@ -0,0 +1,22 @@ +.card-title { + font-size: 1rem; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.card-text { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +.col { + overflow: hidden; +} + +.thumbnail { + width: 4em; + height: 4em; +} + diff --git a/projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.ts b/projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.ts new file mode 100644 index 0000000..2c02cbb --- /dev/null +++ b/projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.ts @@ -0,0 +1,29 @@ +import { Component, Injectable } from '@angular/core'; +import { AppConfig, commonReducers, ItemTypeService } from '@farmmaps/common'; +import { Store } from '@ngrx/store'; +import { Feature } from 'ol'; +import { Geometry } from 'ol/geom'; +import * as mapReducers from '../../reducers/map.reducer'; +import { AbstractFeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component'; +import { ForItemType } from '../for-item/for-itemtype.decorator'; + +@ForItemType("vnd.farmmaps.itemtype.observation") +@Injectable() +@Component({ + selector: 'fm-map-feature-list-feature-observation', + templateUrl: './feature-list-feature-observation.component.html', + styleUrls: ['./feature-list-feature-observation.component.scss'] +}) +export class FeatureListFeatureObservationComponent extends AbstractFeatureListFeatureComponent { + + constructor(store: Store, itemTypeService: ItemTypeService,config:AppConfig) { + super(store, itemTypeService,config); + } + + getSource(feature: Feature): string { + let source = "/images/decease.png"; + var type = feature.get('type'); + source = '/images/' + type + '.png'; + return source; + } +} diff --git a/projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.html b/projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.html new file mode 100644 index 0000000..d5f6532 --- /dev/null +++ b/projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.html @@ -0,0 +1,14 @@ +
    +
    + +

    Farm

    +

    {{schemeItem.name}}

    +
    +
    +
    + +
    +
    +
    +
    +
    diff --git a/projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.scss b/projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.scss new file mode 100644 index 0000000..5db84ec --- /dev/null +++ b/projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.scss @@ -0,0 +1,20 @@ +fm-map-feature-list-feature-container { + width:100%; + pointer-events:none; +} + +.row { + border-bottom: 1px solid var(--bs-gray-500); + user-select: none; + padding-left:1.5rem; +} + +.row.selected { + background-color: var(--bs-gray-100); +} + +.cropfields { + border-top: 1px solid var(--bs-gray-500); + margin-left: -1.25rem; + margin-right: -1.25rem; +} diff --git a/projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.ts b/projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.ts new file mode 100644 index 0000000..1c06bdf --- /dev/null +++ b/projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.ts @@ -0,0 +1,30 @@ +import { Component, Injectable,AfterViewInit, OnInit,SimpleChanges, ChangeDetectorRef} from '@angular/core'; +import { Location } from '@angular/common'; +import { AbstractFeatureListComponent } from '../feature-list/feature-list.component'; +import {ForItemType } from '../for-item/for-itemtype.decorator'; +import {ForChild } from '../for-item/for-child.decorator'; +import { Store } from '@ngrx/store'; +import * as mapReducers from '../../reducers/map.reducer'; +import { commonReducers, ItemTypeService, IItem,ItemService } from '@farmmaps/common'; +import { Observable } from 'rxjs'; + +@ForChild() +@ForItemType("vnd.farmmaps.itemtype.observation") +@Injectable() +@Component({ + selector: 'fm-map-feature-list-observation', + templateUrl: './feature-list-observation.component.html', + styleUrls: ['./feature-list-observation.component.scss'] +}) +export class FeatureListObservationComponent extends AbstractFeatureListComponent implements OnInit { + + constructor(store: Store, itemTypeService: ItemTypeService, location: Location, private itemService: ItemService) { + super(store, itemTypeService,location); + } + + public schemeItem: Observable + + ngOnInit() { + this.schemeItem = this.itemService.getItem(this.queryState.parentCode); + } +} From df77631299b1ffadf437db49530fa16319132118 Mon Sep 17 00:00:00 2001 From: jenkins Date: Thu, 14 Aug 2025 07:28:29 +0000 Subject: [PATCH 49/49] [ci skip] Updated packages #2577 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4effff2..b5c8923 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.18.0-prerelease.2575", + "version": "4.18.0-prerelease.2576", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.18.0-prerelease.2575", + "version": "4.18.0-prerelease.2576", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.18.0-prerelease.2575", + "version": "4.18.0-prerelease.2576", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.18.0-prerelease.2575", + "version": "4.18.0-prerelease.2576", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0"