Merge branch 'develop'

# Conflicts: # package-lock.json
2024-10-22 16:12:25 +02:00 · 2024-09-24 20:10:52 +02:00 · 2024-04-24 00:09:30 +00:00 · 2024-04-23 11:54:04 +02:00 · 2024-03-20 12:00:40 +00:00 · 2024-03-20 11:59:14 +00:00
34 changed files with 207 additions and 400 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,22 +1,22 @@
 {
  "name": "farmmaps-lib-app",
-  "version": "4.17.0",
+  "version": "4.11.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "farmmaps-lib-app",
-      "version": "4.17.0",
+      "version": "4.11.0",
      "dependencies": {
        "@angular-eslint/eslint-plugin": "^18.2.0",
-        "@angular/animations": "18.2.3",
-        "@angular/common": "18.2.3",
-        "@angular/compiler": "18.2.3",
-        "@angular/core": "18.2.3",
-        "@angular/forms": "18.2.3",
-        "@angular/platform-browser": "18.2.3",
-        "@angular/platform-browser-dynamic": "18.2.3",
-        "@angular/router": "18.2.3",
+        "@angular/animations": "^18.2.3",
+        "@angular/common": "^18.2.3",
+        "@angular/compiler": "^18.2.3",
+        "@angular/core": "^18.2.3",
+        "@angular/forms": "^18.2.3",
+        "@angular/platform-browser": "^18.2.3",
+        "@angular/platform-browser-dynamic": "^18.2.3",
+        "@angular/router": "^18.2.3",
        "@farmmaps/common": "file:dist/common",
        "@farmmaps/common-map": "file:dist/common-map",
        "@farmmaps/common-map3d": "file:dist/common-map3d",
@@ -55,11 +55,11 @@
      },
      "devDependencies": {
        "@angular-builders/custom-webpack": "^18.0.0",
-        "@angular-devkit/build-angular": "18.2.3",
-        "@angular/cli": "18.2.3",
-        "@angular/compiler-cli": "18.2.3",
-        "@angular/language-service": "18.2.3",
-        "@angular/localize": "18.2.3",
+        "@angular-devkit/build-angular": "^18.2.3",
+        "@angular/cli": "^18.2.3",
+        "@angular/compiler-cli": "^18.2.3",
+        "@angular/language-service": "^18.2.3",
+        "@angular/localize": "^18.2.3",
        "@types/arcgis-rest-api": "^10.4.5",
        "@types/jasmine": "~2.8.8",
        "@types/jasminewd2": "^2.0.9",
@@ -90,14 +90,14 @@
    },
    "dist/common": {
      "name": "@farmmaps/common",
-      "version": "2.1.0",
+      "version": "4.11.0-prerelease.2517",
      "dependencies": {
        "tslib": "^2.3.0"
      },
      "peerDependencies": {
-        "@angular/common": "18.2.3",
-        "@angular/core": "18.2.3",
-        "@angular/forms": "18.2.3",
+        "@angular/common": "^18.2.3",
+        "@angular/core": "^18.2.3",
+        "@angular/forms": "^18.2.3",
        "@microsoft/signalr": "^3.1.16",
        "@ng-bootstrap/ng-bootstrap": "^17.0.1",
        "@ngrx/effects": "^18.0.2",
@@ -115,12 +115,12 @@
    },
    "dist/common-map": {
      "name": "@farmmaps/common-map",
-      "version": "4.17.0-prerelease.2569",
+      "version": "4.11.0-prerelease.2517",
      "dependencies": {
        "tslib": "^2.0.0"
      },
      "peerDependencies": {
-        "@angular/core": "18.2.3",
+        "@angular/core": "^18.2.3",
        "@ngrx/effects": "^18.0.2",
        "@ngrx/router-store": "^18.0.2",
        "@ngrx/store": "^18.0.2",
@@ -130,27 +130,27 @@
    },
    "dist/common-map3d": {
      "name": "@farmmaps/common-map3d",
-      "version": "4.17.0-prerelease.2570",
+      "version": "4.11.0-prerelease.2517",
      "dependencies": {
        "tslib": "^2.0.0"
      },
      "peerDependencies": {
-        "@angular/common": "18.2.3",
-        "@angular/core": "18.2.3",
+        "@angular/common": "^18.2.3",
+        "@angular/core": "^18.2.3",
        "cesium": "^1.97.0",
        "ol-cesium": ">=2.13.0"
      }
    },
    "dist/ng-openlayers": {
      "name": "@farmmaps/ng-openlayers",
-      "version": "18.0.0",
+      "version": "4.11.0-prerelease.2517",
      "license": "MPL-2.0",
      "dependencies": {
        "tslib": "^2.3.0"
      },
      "peerDependencies": {
-        "@angular/common": "18.2.3",
-        "@angular/core": "18.2.3",
+        "@angular/common": "^18.2.3",
+        "@angular/core": "^18.2.3",
        "ol": "^8.2.0"
      }
    },
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "farmmaps-lib-app",
-  "version": "4.17.0",
+  "version": "4.11.0",
  "scripts":   {
    "ng": "ng",
    "start": "ng serve",
@@ -12,14 +12,14 @@
  "private": true,
  "dependencies":   {
    "@angular-eslint/eslint-plugin": "^18.2.0",
-    "@angular/animations": "18.2.3",
-    "@angular/common": "18.2.3",
-    "@angular/compiler": "18.2.3",
-    "@angular/core": "18.2.3",
-    "@angular/forms": "18.2.3",
-    "@angular/platform-browser": "18.2.3",
-    "@angular/platform-browser-dynamic": "18.2.3",
-    "@angular/router": "18.2.3",
+    "@angular/animations": "^18.2.3",
+    "@angular/common": "^18.2.3",
+    "@angular/compiler": "^18.2.3",
+    "@angular/core": "^18.2.3",
+    "@angular/forms": "^18.2.3",
+    "@angular/platform-browser": "^18.2.3",
+    "@angular/platform-browser-dynamic": "^18.2.3",
+    "@angular/router": "^18.2.3",
    "@farmmaps/common": "file:dist/common",
    "@farmmaps/common-map": "file:dist/common-map",
    "@farmmaps/common-map3d": "file:dist/common-map3d",
@@ -62,11 +62,11 @@
  },
  "devDependencies":   {
    "@angular-builders/custom-webpack": "^18.0.0",
-    "@angular-devkit/build-angular": "18.2.3",
-    "@angular/cli": "18.2.3",
-    "@angular/compiler-cli": "18.2.3",
-    "@angular/language-service": "18.2.3",
-    "@angular/localize": "18.2.3",
+    "@angular-devkit/build-angular": "^18.2.3",
+    "@angular/cli": "^18.2.3",
+    "@angular/compiler-cli": "^18.2.3",
+    "@angular/language-service": "^18.2.3",
+    "@angular/localize": "^18.2.3",
    "@types/arcgis-rest-api": "^10.4.5",
    "@types/jasmine": "~2.8.8",
    "@types/jasminewd2": "^2.0.9",
--- a/projects/common-map/package.json
+++ b/projects/common-map/package.json
@@ -8,7 +8,7 @@
    "tslib": "^2.0.0"
  },
  "peerDependencies": {
-    "@angular/core": "18.2.3",
+    "@angular/core": "^18.2.3",
    "ngrx-store-localstorage": "^18.0.0",
    "@ngrx/effects": "^18.0.2",
    "@ngrx/router-store": "^18.0.2",
--- 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,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]="baseMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
+            <fm-map-layer-list [baseLayers]="true" [itemLayers]="baseLayers|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
          </div>
        </li>
        <li class="nav-item py-0">
@@ -20,17 +20,12 @@
          </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>Overlay slider</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>
+          <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">
            <fm-map-layer-list [dataLayers]="true" [itemLayers]="[selectedItemLayer]" [selectedLayer]="selectedItemLayer" (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>
+
      </ul>
  </div>
  </div>
--- 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 { filter, map, Observable } from 'rxjs';
+import { Observable } from 'rxjs';

@Component({
  selector: 'fm-map-layer-switcher',
@@ -17,8 +17,7 @@ export class LayerSwitcher  implements OnInit,OnChanges{
  public overlayLayers: Observable<Array<IItemLayer>>;
  public selectedOverlayLayer: Observable<IItemLayer>;
  public selectedItemLayer$: Observable<IItemLayer>;
-  public baseMaps: Observable<Array<IItemLayer>>;
-  public aerialMaps: Observable<Array<IItemLayer>>;
+  public baseLayers: Observable<Array<IItemLayer>>;
  public selectedBaseLayer: Observable<IItemLayer>;

  constructor( private store: Store<mapReducers.State>) {
@@ -27,8 +26,7 @@ export class LayerSwitcher  implements OnInit,OnChanges{
  ngOnInit() { 
    this.overlayLayers = this.store.select(mapReducers.selectGetOverlayLayers);
    this.selectedOverlayLayer = this.store.select(mapReducers.selectGetSelectedOverlayLayer);
-    this.baseMaps = this.store.select(mapReducers.selectGetBaseMaps);
-    this.aerialMaps = this.store.select(mapReducers.selectGetArealMaps);
+    this.baseLayers = this.store.select(mapReducers.selectGetBaseLayers);
    this.selectedBaseLayer = this.store.select(mapReducers.selectGetSelectedBaseLayer);
    this.selectedItemLayer$ = this.store.select(mapReducers.selectGetSelectedItemLayer)
    this.showLayerSwitcher = this.store.select(mapReducers.selectGetShowLayerSwitcher);
@@ -85,4 +83,3 @@ export class LayerSwitcher  implements OnInit,OnChanges{
    event.preventDefault();
  }
 }
- 
--- 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<IListItem[]>;

  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
-    super(store, itemTypeService, itemService$, location,router);
+    super(store, itemTypeService,location,router);
  }

  areaInHa(item:IItem):number {
--- 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,8 +7,7 @@
        <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
        <h1>{{item.name}}</h1>
      </div>
-      <ng-container *ngIf="item?.data.layers;let layers">
-        <div class="legend-container">
+      <div class="legend-container" *ngIf="item?.data.layers;let layers">
        <div class="card menu-card">
          <div *ngIf="layers.length>1">
            <select (change)="onLayerChanged($event.target.value)">
@@ -27,11 +26,9 @@
            <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
          </ng-container>
          <li><fm-item-link class="text-primary p-0" [itemCode]="item.code" pathSuffix="data" [showText]="true"></fm-item-link></li>
-            <li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
        </ul>
      </div>
      <fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
-      </ng-container>
    </div>
  </div>
 </div>
--- 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,13 +1,12 @@
+import { Component, Injectable } from '@angular/core';
 import { Location } from '@angular/common';
-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 { commonReducers, ItemTypeService, ItemService, FolderService } from '@farmmaps/common';
+import { Router } from '@angular/router';
 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")
@@ -17,15 +16,10 @@ 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 implements OnDestroy {
-  sub: Subscription;
+export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent {

-  constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
-    super(store, itemTypeService,itemService,location,router);
-  }
-
-  ngOnDestroy(): void {
-    if (this.sub) this.sub.unsubscribe();
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
+    super(store, itemTypeService,location,router);
  }

  onLayerChanged(layerIndex: number) {
@@ -35,13 +29,4 @@ 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}
-    this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {  
-        window.location.href = itemLinkUrl.url;     
-    })
-  }
 }
--- 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,8 +7,7 @@
        <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
        <h1>{{item.name}}</h1>
      </div>
-      <ng-container *ngIf="item?.data.layers;let layers">
-        <div class="legend-container">
+      <div class="legend-container" *ngIf="item?.data.layers;let layers">
        <div class="card menu-card">
          <div *ngIf="layers.length>1">
            <select (change)="onLayerChanged($event.target.value)">
@@ -25,10 +24,8 @@
            <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-olus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
            <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
          </ng-container>
-            <li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
        </ul>
      </div>
-      </ng-container>
      <fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
    </div>
  </div>
--- 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,13 +1,14 @@
+import { Component, Input, Injectable, OnInit } from '@angular/core';
 import { Location } from '@angular/common';
-import { Component, Injectable, OnDestroy } from '@angular/core';
-import { Router } from '@angular/router';
-import { commonReducers, FolderService, IItem, IItemLinkType, ItemService, ItemTypeService, IUrlType } from '@farmmaps/common';
+import { Feature } from 'ol';
 import { Store } from '@ngrx/store';
-import * as mapActions from '../../actions/map.actions';
 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 { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
-import { Subscription } from 'rxjs';
+import { Observable } from 'rxjs';


@ForItemType("vnd.farmmaps.itemtype.shape.processed")
@@ -17,17 +18,12 @@ import { Subscription } from 'rxjs';
  templateUrl: './selected-item-shape.component.html',
  styleUrls: ['./selected-item-shape.component.scss']
 })
-export class SelectedItemShapeComponent extends AbstractSelectedItemComponent implements OnDestroy {
+export class SelectedItemShapeComponent extends AbstractSelectedItemComponent {
+
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
+    super(store, itemTypeService,location,router);
+  }
  public selectedLayer = 0;
-  sub: Subscription;
-
-  constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
-    super(store, itemTypeService,itemService,location,router);
-  }
-
-  ngOnDestroy(): void {
-    if (this.sub) this.sub.unsubscribe();
-  }
  
  onLayerChanged(layerIndex: number) {
    this.store.dispatch(new mapActions.SetLayerIndex(layerIndex));
@@ -36,13 +32,4 @@ export class SelectedItemShapeComponent extends AbstractSelectedItemComponent im
  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;     
-    })
-  }
 }
--- 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,8 +7,7 @@
        <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
        <h1>{{item.name}}</h1>
      </div>
-      <ng-container *ngIf="item?.data.layers;let layers">
-        <div class="legend-container">
+      <div class="legend-container" *ngIf="item?.data.layers;let layers">
        <div class="card menu-card">
          <h5><span i18n>Date</span>: {{temporalService.selectedDate(itemLayer)}}</h5>
          <div class="d-flex justify-content-between">
@@ -43,10 +42,8 @@
            <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
          </ng-container>
          <li><a href="#" (click)="handleGoToChart(item)"><i class="fal fa-line-chart" aria-hidden="true" i18m-title title="Show chart"></i>&nbsp;<span i18n>Show chart</span></a></li>
-            <li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
        </ul>
      </div>
-      </ng-container>
    </div>
  </div>
 </div>
--- 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,16 @@
+import { Component, Injectable } from '@angular/core';
 import { Location } from '@angular/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 { commonReducers, ItemTypeService, IItem } from '@farmmaps/common';
+import { Router } from '@angular/router';
 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,15 +19,10 @@ import { AbstractSelectedItemComponent } from '../selected-item/selected-item.co
  templateUrl: './selected-item-temporal.component.html',
  styleUrls: ['./selected-item-temporal.component.scss']
 })
-export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent implements OnDestroy {
-  sub: Subscription;
+export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent {

-  constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
-    super(store, itemTypeService,itemService,location,router);
-  }
-  
-  ngOnDestroy(): void {
-    if (this.sub) this.sub.unsubscribe();
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
+    super(store, itemTypeService,location,router);
  }

  onLayerChanged(layerIndex: number) {
@@ -37,6 +33,8 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
    return  (this.itemLayer as ITemporalItemLayer)?.selectedItemLayer
  }

+  
+
  handleNextTemporal(event:MouseEvent) {
    this.store.dispatch(new mapActions.NextTemporal());
    event.preventDefault();    
@@ -63,13 +61,4 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
    this.router.navigate(['/viewer', 'temporal', 'item', item.parentCode, new Date(Date.parse(item.dataDate)).getUTCFullYear()]);
    return false;
  }
-  
-  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;       
-    })
-  }
 }
--- 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, ItemService, ItemTypeService} from '@farmmaps/common';
+import {AppConfig, commonReducers, IItem, 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<IItemLayer>;
-  constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, public itemService: ItemService, private location: Location, public router: Router) {
+  constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, private location: Location, public router: Router) {
  }

  handleOnView(item: IItem) {
@@ -37,11 +37,6 @@ 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;
@@ -81,8 +76,8 @@ export abstract class AbstractSelectedItemComponent {
 })
 export class SelectedItemComponent extends AbstractSelectedItemComponent {

-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, itemService: ItemService, location: Location, router: Router, public config:AppConfig) {
-    super(store, itemTypeService,itemService,location,router);
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, public config:AppConfig) {
+    super(store, itemTypeService,location,router);
  }

  getThumbnailUrl(item:IItem):string {
--- a/projects/common-map/src/fm-map/reducers/map.reducer.ts
+++ b/projects/common-map/src/fm-map/reducers/map.reducer.ts
@@ -637,8 +637,6 @@ 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);
--- a/projects/common-map3d/package.json
+++ b/projects/common-map3d/package.json
@@ -8,8 +8,8 @@
    "tslib": "^2.0.0"
  },
  "peerDependencies": {
-    "@angular/common": "18.2.3",
-    "@angular/core":  "18.2.3",
+    "@angular/common": "^18.2.3",
+    "@angular/core":  "^18.2.3",
    "cesium": "^1.97.0",
    "ol-cesium": ">=2.13.0"
  }
--- a/projects/common/package.json
+++ b/projects/common/package.json
@@ -6,9 +6,9 @@
  },
  "peerDependencies": {
    "@ng-bootstrap/ng-bootstrap": "^17.0.1",
-    "@angular/common": "18.2.3",
-    "@angular/core": "18.2.3",
-    "@angular/forms": "18.2.3",
+    "@angular/common": "^18.2.3",
+    "@angular/core": "^18.2.3",
+    "@angular/forms": "^18.2.3",
    "@ngrx/effects": "^18.0.2",
    "@ngrx/router-store": "^18.0.2",
    "@ngrx/store": "^18.0.2",
--- a/projects/common/src/fm/actions/app-common.actions.ts
+++ b/projects/common/src/fm/actions/app-common.actions.ts
@@ -83,11 +83,6 @@ export const SETPAGEMODE = '[AppCommon] SetPageMode';

 export const SETUNREADNOTIFICATIONS = '[AppCommon] SetUnreadNotifications';

-export const SWITCHLANGUAGE = '[AppCommon] SwitchLanguage';
-
-export const SETSETTINGMENUBACKGROUNDCOLOR = '[AppCommon] SetSettingMenuBackgroundColor';
-
-
 export class InitUser implements Action {
  readonly type = INITUSER;

@@ -376,17 +371,6 @@ export class SetUnreadNotifications implements Action {

 }
  
-export class SwitchLanguage implements Action {
-  readonly type = SWITCHLANGUAGE;
-
-  constructor(public locale:string) { }
-}
-
-export class SetSettingMenuBackgroundColor implements Action {
-  readonly type = SETSETTINGMENUBACKGROUNDCOLOR;
-
-  constructor(public color:string) { }
-}

 export type Actions = OpenModal
  | InitRoot
@@ -434,8 +418,6 @@ export type Actions = OpenModal
  | ToggleHelpMenu
  | ToggleSettingMenu
  | NotificationEvent
-  | SetUnreadNotifications
-  | SwitchLanguage
-  | SetSettingMenuBackgroundColor;
+  | SetUnreadNotifications;


--- a/projects/common/src/fm/common-service.module.ts
+++ b/projects/common/src/fm/common-service.module.ts
@@ -13,7 +13,6 @@ import { SchemaService } from './services/schema.service';
 import { FolderService } from './services/folder.service';
 import { TimespanService } from './services/timespan.service';
 import { ItemService } from './services/item.service';
-import { TaskService } from './services/task.service';
 import { AdminService } from './services/admin.service';
 import { EventService } from './services/event.service';
 import { TypeaheadService } from './services/typeahead.service';
@@ -45,7 +44,6 @@ export {
  ItemTypeService,
  TimespanService,
  ItemService,
-  TaskService,
  AdminService,
  EventService,
  TypeaheadService,
--- a/projects/common/src/fm/components/app/app.component.html
+++ b/projects/common/src/fm/components/app/app.component.html
@@ -33,7 +33,7 @@
    <fm-resumable-file-upload></fm-resumable-file-upload>
  </ng-container>  
  <div class="user-menu apponly">
-    <fm-setting-menu [user]="user|async" [showMenu]="settingMenuVisible|async" [backgroundColor]="settingMenuBackgroundColor|async"></fm-setting-menu>
+    <fm-setting-menu [user]="user|async" [showMenu]="settingMenuVisible|async"></fm-setting-menu>
    <fm-help-menu [user]="user|async" [showMenu]="helpMenuVisible|async"></fm-help-menu>
    <fm-notification-menu [user]="user|async" [unread]="unreadNotifications|async" [showMenu]="notificationMenuVisible|async"></fm-notification-menu>
    <fm-app-menu [user]="user|async" [showMenu]="appMenuVisible|async"></fm-app-menu>
--- a/projects/common/src/fm/components/app/app.component.ts
+++ b/projects/common/src/fm/components/app/app.component.ts
@@ -50,7 +50,6 @@ export class AppComponent implements OnInit, OnDestroy {
  public unreadNotifications: Observable<number> = this.store$.select(appReducers.SelectgetUnreadNotifications);
  public user: Observable<IUser> = this.store$.select(appReducers.SelectGetUser);
  public isPageMode: Observable<boolean> = this.store$.select(appReducers.SelectGetIsPageMode);
-  public settingMenuBackgroundColor: Observable<string> = this.store$.select(appReducers.SelectGetSettingMenuBackgroundColor);
  @Input() showUploadProgress = true;

  constructor(
--- a/projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.html
+++ b/projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.html
@@ -11,7 +11,7 @@
        <i class="fal fa-image"></i>
        <div i18n>No image selected</div>
      </div>
-      <image-cropper #imageCropper output="base64" 
+      <image-cropper #imageCropper
      [imageChangedEvent]="imageChangedEvent"
      [maintainAspectRatio]="true"
      [format]="imageType"
--- a/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss
+++ b/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss
@@ -4,7 +4,6 @@ div.resumable-file-upload {
  bottom: 0px;
  width: 300px;
  max-height: 250px;
-  z-index: 1;
  /*z-index:2000 !important;*/
 }

--- a/projects/common/src/fm/components/setting-menu/setting-menu.component.html
+++ b/projects/common/src/fm/components/setting-menu/setting-menu.component.html
@@ -1,5 +1,5 @@
 <div>
-    <div (click)="toggle($event)" class="rounded-circle menu-button hidden" [style.background-color]="backgroundColor" [ngClass]="{'hidden':!user || noContent}">
+    <div (click)="toggle($event)" class="rounded-circle menu-button hidden"  [ngClass]="{'hidden':!user || noContent}">
        <span i18n-title title="Settings"><i class="fas fa-gear" aria-hidden="true"></i></span>
        <div class="menu hidden" [ngClass]="{'hidden':!showMenu}">                                     
            <router-outlet name="setting-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()"></router-outlet>            
--- a/projects/common/src/fm/components/setting-menu/setting-menu.component.ts
+++ b/projects/common/src/fm/components/setting-menu/setting-menu.component.ts
@@ -15,7 +15,6 @@ export class SettingMenuComponent implements OnInit {
  
  @Input() user:IUser;
  @Input() showMenu:boolean;
-  @Input() backgroundColor:string;
  public noContent = true;

  constructor(private store: Store<appReducers.State>) { }
--- a/projects/common/src/fm/effects/app-common.effects.ts
+++ b/projects/common/src/fm/effects/app-common.effects.ts
@@ -1,4 +1,4 @@
-import { Injectable, Inject, LOCALE_ID } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { OAuthService,UserInfo } from 'angular-oauth2-oidc';
 import { Store } from '@ngrx/store';
@@ -16,7 +16,6 @@ import {StateSerializerService} from '../services/state-serializer.service';

@Injectable()
 export class AppCommonEffects {
-  locale: string;

  login$ =  createEffect(() => this.actions$.pipe(
    ofType(appCommonActions.LOGIN),
@@ -48,27 +47,11 @@ export class AppCommonEffects {
    first(),
    switchMap((action) => {
        return zip(this.userService$.getCurrentUser(),from(this.oauthService$.loadUserProfile())).pipe(
-        switchMap(([user,userInfo]) => {
-          if (location.hostname === 'localhost' || user.language === undefined || user.language === this.locale) 
-          {
-            return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))
-          }
-          return of(new appCommonActions.SwitchLanguage(user.language))
-        }),
+        switchMap(([user,userInfo]) => {return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))} ),
        catchError(error => of(new appCommonActions.Fail(error))))
    }
  )));
    
-  switchLanguage$ = createEffect(() => this.actions$.pipe(
-    ofType(appCommonActions.SWITCHLANGUAGE),
-    switchMap((action) => {
-      const a = action as appCommonActions.SwitchLanguage;
-      if (location.href.includes(`/${this.locale}/`)) {
-        const newPath = location.href.replace(`/${this.locale}/`, `/${a.locale}/`);
-        location.replace(newPath);
-      }
-      return of(undefined);
-    })),{ dispatch:false});

  initUserPackages$ =  createEffect(() => this.actions$.pipe(
    ofType(appCommonActions.INITUSERPACKAGES),
@@ -156,17 +139,10 @@ export class AppCommonEffects {
          const itemType = itemtypes[a.item.itemType];
          var editor = itemType && itemType.editor ? itemType.editor : editor;  
        }
-        if (editor == 'croppingscheme') { 
-          // Exeception: no 'item' in route
-          this.router$.navigate(['/editor', editor, a.item.code])
-        }
-        else {
-          this.router$.navigate(['/editor', editor, 'item', a.item.code])
-        }
+      this.router$.navigate(['/editor',editor,'item', a.item.code])
      return [];
    }
-    )
-  ));
+  )));

  viewItem$ =  createEffect(() => this.actions$.pipe(
    ofType(appCommonActions.VIEWITEM),
@@ -225,8 +201,7 @@ export class AppCommonEffects {



-  constructor(private actions$: Actions, private store$: Store<appCommonReducers.State>, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService, @Inject(LOCALE_ID) locale: string) {
-    this.locale = locale;
+  constructor(private actions$: Actions, private store$: Store<appCommonReducers.State>, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService) {
    store$.dispatch(new appCommonActions.LoadItemTypes());
  }
 }
--- a/projects/common/src/fm/models/item.ts
+++ b/projects/common/src/fm/models/item.ts
@@ -26,7 +26,6 @@ export class Item implements IItem {
  public data?:any;
  public isEditable?:boolean;
  public owner?: string;
-  public fullPath?: string;

  constructor() {  
  }
--- a/projects/common/src/fm/models/itemTask.ts
+++ b/projects/common/src/fm/models/itemTask.ts
@@ -1,7 +1,6 @@

 export interface IItemTask  {
  code?: string;
-  workflowCode?: string;
  taskType?: string;
  attributes?: any;
  message?: string,
@@ -12,7 +11,6 @@ export interface IItemTask  {

 export class ItemTask implements IItemTask {
  public code?:string;
-  public workflowCode?: string;
  public taskType?: string;
  public attributes?: any;
  public message?: string;
--- a/projects/common/src/fm/reducers/app-common.reducer.ts
+++ b/projects/common/src/fm/reducers/app-common.reducer.ts
@@ -29,8 +29,7 @@ export interface State {
  settingMenuVisible: boolean,
  unreadNotifications: number,
  isOnline: boolean,
-  isPageMode:boolean,
-  settingMenuBackgroundColor:string
+  isPageMode:boolean
 }

 export const initialState: State = {
@@ -52,8 +51,7 @@ export const initialState: State = {
  settingMenuVisible: false,
  unreadNotifications: 0,
  isOnline: true,
-  isPageMode: true,
-  settingMenuBackgroundColor:'rgb(128, 128, 128)'
+  isPageMode: true
 }

 export function reducer(state = initialState, action: appCommonActions.Actions ): State {
@@ -189,10 +187,6 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
      const a = action as appCommonActions.SetUnreadNotifications;
      return tassign(state,{unreadNotifications:a.unread});
    }
-    case appCommonActions.SETSETTINGMENUBACKGROUNDCOLOR: {
-      const a = action as appCommonActions.SetSettingMenuBackgroundColor;
-      return tassign(state,{settingMenuBackgroundColor:a.color});
-    }    
    default: {
      return state;
    }
@@ -218,7 +212,6 @@ export const getSettingMenuVisible = (state: State) => state.settingMenuVisible;
 export const getUnreadNotifications = (state: State) => state.unreadNotifications;
 export const getIsOnline = (state: State) => state.isOnline;
 export const getIsPageMode = (state: State) => state.isPageMode;
-export const getSettingMenuBackgroundColor = (state: State) => state.settingMenuBackgroundColor;

 export const selectAppCommonState = createFeatureSelector<State>(MODULE_NAME);

@@ -245,4 +238,5 @@ export const SelectgetUnreadNotifications = createSelector(selectAppCommonState,

 export const SelectGetIsOnline = createSelector(selectAppCommonState,getIsOnline);
 export const SelectGetIsPageMode = createSelector(selectAppCommonState,getIsPageMode);
-export const SelectGetSettingMenuBackgroundColor= createSelector(selectAppCommonState,getSettingMenuBackgroundColor);
+
+
--- a/projects/common/src/fm/services/admin.service.ts
+++ b/projects/common/src/fm/services/admin.service.ts
@@ -52,20 +52,4 @@ export class AdminService {
  postItemTask(item: IItem, task: IItemTask): Observable<IItemTask> {
    return this.httpClient.post<IItemTask>(`${this.ApiEndpoint()}/api/v1/admin/${item.code}/tasks`, task);
  }
-
-  getFileStorageOverview(): Observable<any> {
-    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/overview`);
-  }
-
-  getFileStorageInfo(user: string): Observable<any> {
-    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/${user}`);
-  }
-
-  getFileStorageLog(): Observable<any> {
-    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);
-  }
 }
--- a/projects/common/src/fm/services/item.service.ts
+++ b/projects/common/src/fm/services/item.service.ts
@@ -1,12 +1,14 @@
-import {Injectable} from '@angular/core';
-import {Observable} from 'rxjs';
-import {IItemType} from '../models/item.type';
-import {IItemLinkType} from '../models/itemlink.type';
-import {IItem} from '../models/item';
-import {IJsonline} from '../models/json-line';
-import {IItemTask} from '../models/itemTask';
-import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http';
-import {AppConfig} from '../shared/app.config';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { IItemType } from '../models/item.type';
+import { IItemLinkType } from '../models/itemlink.type';
+import { IUrlType } from '../models/url.type';
+import { IItem } from '../models/item';
+import { IJsonline } from '../models/json-line';
+import { IItemTask } from '../models/itemTask';
+import { HttpClient, HttpParams, HttpHeaders } from "@angular/common/http";
+import { AppConfig } from "../shared/app.config";
 import {ItemTypeService} from './itemtype.service';
 import {IListItem} from '../models/list.item';

@@ -79,8 +81,7 @@ 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,
-    includeFullpath?: boolean): Observable<IItem[]> {
+    skip?: number, take?: number, sourceTask?: string): Observable<IItem[]> {
    let params = new HttpParams();
    if(itemType)  params = params.append("it", itemType);
    if(dataFilter) params = params.append("df", JSON.stringify(dataFilter));
@@ -95,28 +96,20 @@ export class ItemService {
    if (sourceTask) params = params.append("sourceTask", sourceTask);
    if(skip) params = params.append("skip", skip);
    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<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/`, { params: params });
  }
  
-  getItemListCount(itemType: string, startDate?: Date, endDate?: Date, sourceTask?: string,
-    indexed?: boolean, exactMatchStartOrEndDate?: boolean, owner?:string): Observable<number> {
+  getItemListCount(itemType: string, startDate?: Date, endDate?: Date, sourceTask?: string): Observable<number> {
    let params = new HttpParams();
    params = params.append("it", itemType);
    if (sourceTask) params = params.append("sourceTask", sourceTask);
    if (startDate) params = params.append("sDate", startDate.toISOString());
    if (endDate) params = params.append("eDate", endDate.toISOString());
-    if(indexed) params = params.append("ind",indexed?"true":"false");
-    if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate);
-    if(owner) params = params.append("owner", owner);
    return this.httpClient.get<number>(`${this.ApiEndpoint()}/api/v1/items/count`, { params: params });
  }

  getChildItemList(parentcode: string, itemType?: string, dataFilter?: any, level = 1, deep = true,
-                   startDate?: Date, endDate?: Date, skip?: number, take?: number,
-                   exactMatchStartOrEndDate?: boolean, owner?:string, indexed?: boolean): Observable<IItem[]> {
+                   startDate?: Date, endDate?: Date, skip?: number, take?: number): Observable<IItem[]> {
    let params = new HttpParams();
    if(itemType != null) {
      params = params.append("it", itemType);
@@ -128,18 +121,13 @@ export class ItemService {
    params = params.append("deep", deep.toString());
    if (startDate) params = params.append("sDate", startDate.toISOString());
    if (endDate) params = params.append("eDate", endDate.toISOString());
-    if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate);
-    if(owner) params = params.append("owner", owner);

    if(skip) params = params.append("skip", skip);
    if(take) params = params.append("take", take);
-    if(indexed) params = params.append("ind",indexed?"true":"false");
    return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params });
  }

-  getChildItemListCount(parentcode: string, itemType?: string,dataFilter?: any,
-                        startDate?: Date, endDate?: Date, exactMatchStartOrEndDate?: boolean, owner?:string,
-                        indexed?: boolean): Observable<number> {
+  getChildItemListCount(parentcode: string, itemType?: string,dataFilter?: any): Observable<number> {
    let params = new HttpParams();
    if(itemType != null) {
      params = params.append("it", itemType);
@@ -147,11 +135,6 @@ export class ItemService {
    if (dataFilter != null) {
      params = params.append("df", JSON.stringify(dataFilter));
    }
-    if (startDate) params = params.append("sDate", startDate.toISOString());
-    if (endDate) params = params.append("eDate", endDate.toISOString());
-    if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate);
-    if(owner) params = params.append("owner", owner);
-    if(indexed) params = params.append("ind",indexed?"true":"false");
    return this.httpClient.get<number>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children/count`, { params: params });
  }

--- a/projects/common/src/fm/services/itemtype.service.ts
+++ b/projects/common/src/fm/services/itemtype.service.ts
@@ -15,37 +15,37 @@ export class ItemTypeService {

     getIcon(itemType: string) {
       let icon = "fal fa-file";
-       if (this.itemTypes && this.itemTypes[itemType]) icon = this.itemTypes[itemType].icon;
+       if (this.itemTypes[itemType]) icon = this.itemTypes[itemType].icon;
       return icon;
     }

     getColor(itemType: string) {
       let color = "#000000";
-       if (this.itemTypes && this.itemTypes[itemType]) color = this.itemTypes[itemType].iconColor;
+       if (this.itemTypes[itemType]) color = this.itemTypes[itemType].iconColor;
       return color;
     }

     getExtraAttributes(itemType: string) {
      let extraAttributes = null;
-      if (this.itemTypes && this.itemTypes[itemType] && this.itemTypes[itemType]?.extraAttributes) extraAttributes = this.itemTypes[itemType]?.extraAttributes;
+      if (this.itemTypes[itemType] && this.itemTypes[itemType].extraAttributes) extraAttributes = this.itemTypes[itemType].extraAttributes;
      return extraAttributes;
    }

    getSchema(itemType: string): string {
      let schema = null;
-      if (this.itemTypes && this.itemTypes[itemType]) schema = this.itemTypes[itemType].schema;
+      if (this.itemTypes[itemType]) schema = this.itemTypes[itemType].schema;
      return schema;
    }

     hasViewer(item: IItem) {
        const itemType: string = item.itemType;
-        if (this.itemTypes && this.itemTypes[itemType]) return this.itemTypes[itemType].viewer !== undefined;
+        if (this.itemTypes[itemType]) return this.itemTypes[itemType].viewer !== undefined;
        return false;
      }

      hasEditor(item: IItem) {
        const itemType: string = item.itemType;
-        if (this.itemTypes && this.itemTypes[itemType]) return this.itemTypes[itemType].editor !== undefined;
+        if (this.itemTypes[itemType]) return this.itemTypes[itemType].editor !== undefined;
        return false;
      }

--- a/projects/common/src/fm/services/task.service.ts
+++ b/projects/common/src/fm/services/task.service.ts
@@ -1,40 +0,0 @@
-import {Injectable} from '@angular/core';
-import {HttpClient, HttpParams} from '@angular/common/http';
-import {AppConfig} from '../shared/app.config';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class TaskService {
-  constructor(public httpClient: HttpClient, public appConfig: AppConfig) {
-  }
-
-  ApiEndpoint() {
-    return this.appConfig.getConfig("apiEndPoint");
-  }
-
-  getTask(taskCode: string) {
-    return this.httpClient.get<any>(`${this.appConfig.getConfig('apiEndPoint')}/api/v1/tasks/${taskCode}`)
-  }
-
-  getTasks(workflowCode: string, itemCode: string = null, taskType: string = null, skip = 0, take = 25) {
-    let params = new HttpParams();
-
-    if (workflowCode) {
-      params = params.append('workflowCode', workflowCode);
-    }
-
-    if (itemCode) {
-      params = params.append('itemCode', itemCode);
-    }
-
-    if (taskType) {
-      params = params.append('taskType', taskType);
-    }
-
-    params = params.append('skip', skip.toString());
-    params = params.append('take', take.toString());
-    return this.httpClient.get<any>(`${this.appConfig.getConfig('apiEndPoint')}/api/v1/tasks`,
-      {params: params})
-  }
-}
--- a/projects/ng-openlayers/package.json
+++ b/projects/ng-openlayers/package.json
@@ -31,8 +31,8 @@
    "tslib": "^2.3.0"
  },
  "peerDependencies": {
-    "@angular/common": "18.2.3",
-    "@angular/core": "18.2.3",
+    "@angular/common": "^18.2.3",
+    "@angular/core": "^18.2.3",
    "ol": "^8.2.0"
  }
 }
Author	SHA1	Message	Date
Mark	0231421cef	Merge branch 'develop' All checks were successful FarmMaps/FarmMapsLib/pipeline/head This commit looks good Details # Conflicts: # package-lock.json	2024-10-22 16:12:25 +02:00
Willem Dantuma	f2c133e9bd	Merge branch 'develop' Some checks failed FarmMaps/FarmMapsLib/pipeline/head There was a failure building this commit Details	2024-09-24 20:10:52 +02:00
jenkins	1274d96f1d	[ci skip] Updated packages #63 Some checks reported errors FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details	2024-04-24 00:09:30 +00:00
Mark van der Wal	35ccb4f4c5	Merge branch 'develop' All checks were successful FarmMaps/FarmMapsLib/pipeline/head This commit looks good Details	2024-04-23 11:54:04 +02:00
jenkins	47fbc5eab9	[ci skip] Updated packages #62 Some checks reported errors FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details	2024-03-20 12:00:40 +00:00
Peter Bastiani	564d08b5b9	Fixed build All checks were successful FarmMaps/FarmMapsLib/pipeline/head This commit looks good Details	2024-03-20 11:59:14 +00:00
Peter Bastiani	7e17a49dc6	Merge branch 'develop' Some checks failed FarmMaps/FarmMapsLib/pipeline/head There was a failure building this commit Details # Conflicts: # package-lock.json # package.json	2024-03-19 16:04:26 +01:00
jenkins	3f286ee042	[ci skip] Updated packages #58 Some checks reported errors FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details	2024-02-29 13:56:31 +00:00
Peter Bastiani	747499d009	Merge branch 'develop' All checks were successful FarmMaps/FarmMapsLib/pipeline/head This commit looks good Details # Conflicts: # package-lock.json # package.json	2024-02-29 14:54:59 +01:00
jenkins	c4f4a4f61e	[ci skip] Changed by Jenkins: 57 Some checks reported errors FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details	2024-01-24 17:19:55 +00:00
Peter Bastiani	6b095b7f49	Trigger build All checks were successful FarmMaps/FarmMapsLib/pipeline/head This commit looks good Details	2024-01-24 17:18:09 +00:00
Peter Bastiani	b2791eb80b	Merge branch 'develop' Some checks reported errors FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details # Conflicts: # README.md # package-lock.json # package.json	2024-01-24 18:13:28 +01:00
jenkins	4c93a9f766	[ci skip] Changed by Jenkins: 56 Some checks reported errors FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details	2023-11-16 17:02:44 +00:00
Peter Bastiani	93554bc7c4	Update README.md All checks were successful FarmMaps/FarmMapsLib/pipeline/head This commit looks good Details	2023-11-16 16:40:14 +00:00
Peter Bastiani	d074cd81cf	Merge branch 'develop' Some checks reported errors FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details	2023-11-16 17:37:13 +01:00
Peter Bastiani	87547aafcc	Update Jenkinsfile Some checks failed FarmMaps/FarmMapsLib/pipeline/head There was a failure building this commit Details	2023-10-20 12:20:24 +00:00
Peter Bastiani	6ab5ba8a56	Update Jenkinsfile.develop	2023-10-20 12:20:13 +00:00