Merge branch 'develop'

# Conflicts:
#	package-lock.json
#	package.json

README.md

@@ -52,7 +52,7 @@ ng serve
 ```
 *Go*`
 
-Point your browser to http://localhost:4200
+Point your browser to http://localhost:4200 
 
 *ESLint*
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "4.19.0",
+  "version": "4.18.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "farmmaps-lib-app",
-      "version": "4.19.0",
+      "version": "4.18.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.19.0-prerelease.2578",
+      "version": "4.18.0-prerelease.2576",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -115,7 +115,7 @@
     },
     "dist/common-map": {
       "name": "@farmmaps/common-map",
-      "version": "4.19.0-prerelease.2578",
+      "version": "4.18.0-prerelease.2576",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -130,7 +130,7 @@
     },
     "dist/common-map3d": {
       "name": "@farmmaps/common-map3d",
-      "version": "4.19.0-prerelease.2578",
+      "version": "4.18.0-prerelease.2576",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -143,7 +143,7 @@
     },
     "dist/ng-openlayers": {
       "name": "@farmmaps/ng-openlayers",
-      "version": "4.19.0-prerelease.2578",
+      "version": "4.18.0-prerelease.2576",
       "license": "MPL-2.0",
       "dependencies": {
         "tslib": "^2.3.0"

package.json

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

projects/common-map/src/fm-map/actions/map.actions.ts

@@ -59,8 +59,6 @@ export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
 export const SETVIEWSTATE = '[Map] SetViewState'
 export const CLEARFEATURES = '[Map] ClearFeatures';
 export const SETPANELEXTRAWIDE = '[Map] SetPanelExtraWide';
-export const BACKUPFEATURES = '[Map] BackupFeatures';
-export const RESTOREFEATURES = '[Map] RestoreFeatures';
 
 export class Clear implements Action {
   readonly type = CLEAR;
@@ -349,16 +347,6 @@ export class SetPanelExtraWide implements Action {
   constructor(public panelExtraWide:boolean) {}
 }
 
-export class BackupFeatures implements Action {
-  readonly type = BACKUPFEATURES;
-  constructor() {}
-}
-
-export class RestoreFeatures implements Action {
-  readonly type = RESTOREFEATURES;
-  constructor() {}
-}
-
 export type Actions = SetMapState
   | Init
   | Clear
@@ -407,7 +395,5 @@ export type Actions = SetMapState
   | ToggleShowDataLayerSlide
   | SetViewState
   | ClearFeatures
-  | SetPanelExtraWide
+  | SetPanelExtraWide;
-  | BackupFeatures
-  | RestoreFeatures;
 

projects/common-map/src/fm-map/reducers/map.reducer.ts

@@ -9,7 +9,6 @@ import { ILayervalue } from '../models/layer.value';
 import * as mapActions from '../actions/map.actions';
 import {commonActions} from '@farmmaps/common';
 import { createSelector, createFeatureSelector } from '@ngrx/store';
-import * as _ from 'lodash';
 
 import {Feature} from 'ol';
 import {Geometry} from 'ol/geom';
@@ -48,7 +47,6 @@ export interface State {
   query:IQuery,
   parentCode: string,
   features: Array<Feature<Geometry>>,
-  featuresBackup: Array<Feature<Geometry>>,
   panelVisible: boolean,
   panelCollapsed: boolean,
   panelExtraWide: boolean,
@@ -95,7 +93,6 @@ export const initialState: State = {
   query: null,
   parentCode: null,
   features: [],
-  featuresBackup: [],
   panelVisible: false,
   panelCollapsed: false,
   panelExtraWide: false,
@@ -159,15 +156,13 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       const a = action as mapActions.StartSearchSuccess;
       return tassign(state, {
         features: a.features,
-        featuresBackup: [],
         inSearch:false
       });
     }
     case mapActions.SETFEATURES: {
       const a = action as mapActions.SetFeatures;
       return tassign(state, {
-        features: a.features,
+        features: a.features
-        featuresBackup: []
       });
     }
     case mapActions.SELECTFEATURE: {
@@ -185,7 +180,6 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
         selectedItemLayer: null,
         showDataLayerSlide: false,
         features:[],
-        featuresBackup: [],
         inSearch:inSearch
       });
     }
@@ -302,7 +296,6 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       return tassign(state, {
         selectedItem: null,
         features:[],
-        featuresBackup: [],
         selectedItemLayer:null,
         searchCollapsed: !panelVisible,
         panelVisible: panelVisible,
@@ -339,8 +332,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
         extent: a.feature.getGeometry().getExtent(),
         searchCollapsed: false,
         clearEnabled:true,
-        features:features,
+        features:features
-        featuresBackup:[]
       });
     }
     case mapActions.UPDATEFEATURESUCCESS: {
@@ -354,7 +346,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
           features.push(state.features[i]);
         }
       }
-      return tassign(state, { features: features, featuresBackup: [] });
+      return tassign(state, { features: features });
     }
     case mapActions.EXPANDSEARCH: {
       return tassign(state, { searchCollapsed: false });
@@ -399,7 +391,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       return tassign(state, {overlayLayers: [], selectedOverlayLayer: null});
     }
     case mapActions.CLEARFEATURES: {
-      return tassign(state, {features: [], featuresBackup: [], selectedFeature: null});
+      return tassign(state, {features: [], selectedFeature: null});
     }
     case mapActions.SETVISIBILITY: {
       const a = action as mapActions.SetVisibility;
@@ -517,7 +509,6 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
         searchCollapsed: true,
         searchMinified: false,
         features: [],
-        featuresBackup: [],
         query:initialState.query,
         showLayerSwitcher: false,
         extent: null,
@@ -565,8 +556,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
           selectedItem: null,
           selectedItemLayer: null,
           showDataLayerSlide: false,
-          features:[],
+          features:[]
-          featuresBackup:[]
          });
       }
       if(state.features.length>0)  {
@@ -579,7 +569,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
         if(index>=0) {
           const newFeatures = state.features.slice(0);
           newFeatures.splice(index,1);
-          return tassign(state,{features:newFeatures, featuresBackup:[]});
+          return tassign(state,{features:newFeatures});
         }
       }
       return state;
@@ -588,17 +578,6 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       const a= action as mapActions.SetPanelExtraWide;
       return tassign(state,{panelExtraWide:a.panelExtraWide});
     }
-    case mapActions.BACKUPFEATURES: {
-      return tassign(state, {
-        featuresBackup: _.cloneDeep(state.features)
-      });
-    }
-    case mapActions.RESTOREFEATURES: {
-      return tassign(state, {
-        features: _.cloneDeep(state.featuresBackup),
-        featuresBackup: []
-      });
-    }
     default: {
       return state;
     }

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

@@ -116,8 +116,7 @@ export class ItemService {
 
   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,
+                   exactMatchStartOrEndDate?: boolean, owner?:string, indexed?: boolean): Observable<IItem[]> {
-                  atItemLocationItemCode?: string): Observable<IItem[]> {
     let params = new HttpParams();
     if(itemType != null) {
       params = params.append("it", itemType);
@@ -135,7 +134,6 @@ export class ItemService {
     if(skip) params = params.append("skip", skip);
     if(take) params = params.append("take", take);
     if(indexed) params = params.append("ind",indexed?"true":"false");
-    if(atItemLocationItemCode) params = params.append("ail",atItemLocationItemCode);
     return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params });
   }