Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop

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.17.0-prerelease.2553",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -115,7 +115,7 @@
     },
     "dist/common-map": {
       "name": "@farmmaps/common-map",
-      "version": "4.14.0-prerelease.2544",
+      "version": "4.17.0-prerelease.2553",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -130,7 +130,7 @@
     },
     "dist/common-map3d": {
       "name": "@farmmaps/common-map3d",
-      "version": "4.14.0-prerelease.2544",
+      "version": "4.17.0-prerelease.2553",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -143,7 +143,7 @@
     },
     "dist/ng-openlayers": {
       "name": "@farmmaps/ng-openlayers",
-      "version": "4.14.0-prerelease.2544",
+      "version": "4.17.0-prerelease.2553",
       "license": "MPL-2.0",
       "dependencies": {
         "tslib": "^2.3.0"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "4.14.0",
+  "version": "4.17.0",
   "scripts":   {
     "ng": "ng",
     "start": "ng serve",

projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html

@@ -10,7 +10,7 @@
         <li class="nav-item py-0">
           <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Base maps</span></span>
           <div  class="mb-4">
-            <fm-map-layer-list [baseLayers]="true" [itemLayers]="baseLayers|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
+            <fm-map-layer-list [baseLayers]="true" [itemLayers]="baseMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
           </div>
         </li>
         <li class="nav-item py-0">
@@ -19,6 +19,12 @@
             <fm-map-layer-list [itemLayers]="overlayLayers|async" [selectedLayer]="selectedOverlayLayer|async" (onDelete)="handleOnDelete($event)" (onToggleVisibility)="handleOnToggleVisibility($event)" (onSetOpacity)="handleOnSetOpacity($event)" (onZoomToExtent)="handleZoomToExtent($event)" (onSelectLayer)="handleSelectOverlayLayer($event)"></fm-map-layer-list>
           </div>
         </li>
+        <li class="nav-item py-0">
+          <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Aerial photos</span></span>
+          <div  class="mb-4">
+            <fm-map-layer-list [baseLayers]="true" [itemLayers]="aerialMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
+          </div>
+        </li>
         <li class="nav-item py-0" *ngIf="selectedItemLayer$ | async as selectedItemLayer">
           <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Data</span><span class="slideButton"><a href="#" title="Compare" class="btn btn-light btn-sm" (click)="handleToggleShowDatalayerSlide($event)"><i class="fal fa-sliders-h-square"></i></a></span></span>
           <div class="mb-4">

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<Array<IItemLayer>>;
   public selectedOverlayLayer: Observable<IItemLayer>;
   public selectedItemLayer$: Observable<IItemLayer>;
-  public baseLayers: Observable<Array<IItemLayer>>;
+  public baseMaps: Observable<Array<IItemLayer>>;
+  public aerialMaps: Observable<Array<IItemLayer>>;
   public selectedBaseLayer: Observable<IItemLayer>;
 
   constructor( private store: Store<mapReducers.State>) {
@@ -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();
   }
 }
+ 

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").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);

projects/common/src/fm/services/admin.service.ts

@@ -53,15 +53,19 @@ export class AdminService {
     return this.httpClient.post<IItemTask>(`${this.ApiEndpoint()}/api/v1/admin/${item.code}/tasks`, task);
   }
 
-  getAnalyseFolderOverview(): Observable<any> {
+  getFileStorageOverview(): Observable<any> {
-    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/overview`);
+    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/overview`);
   }
 
-  getAnalyseFolderInfo(user: string): Observable<any> {
+  getFileStorageInfo(user: string): Observable<any> {
-    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/${user}`);
+    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/${user}`);
   }
 
-  getAnalyseFolderLog(): Observable<any> {
+  getFileStorageLog(): Observable<any> {
-    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/log`);
+    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/log`);
+  }
+
+  validateEmail(user: IUser) {
+    return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/admin/user/${user.code}/validateemail`, user);
   }
 }