Merge branch 'feature/streamline_flow' into develop

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

@@ -42,6 +42,7 @@ export const DOQUERY = '[Map] DoQuery';
 export const SETSTYLE = '[Map] SetStyle';
 export const SHOWLAYERSWITCHER = '[Map] ShowLayerSwitcher';
 export const CLEAR = '[Map] Clear';
+export const SETREPLACEURL = '[Map] SetReplaceUrl';
 
 export class Clear implements Action {
   readonly type = CLEAR;
@@ -87,7 +88,7 @@ export class StartSearch implements Action {
 export class StartSearchSuccess implements Action {
   readonly type = STARTSEARCHSUCCESS;
 
-  constructor(public features: Array<Feature>, public query:IQueryState) { }
+  constructor(public features: Array<Feature>, public query:IQueryState,public setStateCount:number) { }
 }
 
 export class SelectFeature implements Action {
@@ -165,7 +166,7 @@ export class SetExtent implements Action {
 export class SetQueryState implements Action {
   readonly type = SETQUERYSTATE;
 
-  constructor(public queryState: IQueryState) { }
+  constructor(public queryState: IQueryState,public replaceUrl:boolean = true) { }
 }
 
 export class SetTimeSpan implements Action {
@@ -251,6 +252,11 @@ export class ShowLayerSwitcher implements Action {
   constructor(public show:boolean) {}
 }
 
+export class SetReplaceUrl implements Action {
+  readonly type = SETREPLACEURL;
+  constructor(public replaceUrl:boolean) {}
+}
+
 export type Actions = SetMapState
   | Init
   | Clear
@@ -285,5 +291,6 @@ export type Actions = SetMapState
   | SetViewExtent
   | DoQuery
   | SetStyle
-  | ShowLayerSwitcher;
+  | ShowLayerSwitcher
+  | SetReplaceUrl;
 

projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts

@@ -68,7 +68,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
     } else {
       evaluatedStyle = this.stylesCache["selected"];
     }    
-    if(evaluatedStyle && evaluatedStyle.geometry_ == null) {
+    if(evaluatedStyle ) {
       evaluatedStyle.setGeometry((feature) => this.geometry(feature));
     } 
     return evaluatedStyle

projects/common-map/src/fm-map/components/feature-list/feature-list.component.ts

@@ -28,7 +28,7 @@ export abstract class AbstractFeatureListComponent {
   }
 
   getAction(feature:Feature):Action {
-      var newQuery: any = tassign(mapReducers.initialState.query);
+      var newQuery: any = tassign(mapReducers.initialState.queryState);
       newQuery.parentCode = feature.get('parentCode');
       newQuery.itemCode = feature.get('code');
       newQuery.itemType = feature.get('itemType');

projects/common-map/src/fm-map/components/map/map.component.ts

@@ -1,8 +1,8 @@
-import { Component, OnInit, OnDestroy, HostListener, Inject, ViewChild, AfterViewInit,ChangeDetectorRef,NgZone } from '@angular/core';
+import { Component, OnInit, OnDestroy, HostListener, ViewChild, AfterViewInit,NgZone } from '@angular/core';
 import { Location } from '@angular/common';
-import { Observable, Subject, Subscription,combineLatest, from,interval  } from 'rxjs';
+import { Observable, Subject, Subscription, from,of  } from 'rxjs';
-import { debounce, withLatestFrom, first, combineAll,throttle  } from 'rxjs/operators';
+import { withLatestFrom, switchMap,skip  } from 'rxjs/operators';
-import { Router, ActivatedRoute, ParamMap, Event } from '@angular/router';
+import { Router, ActivatedRoute, ParamMap } from '@angular/router';
 import { Store } from '@ngrx/store';
 //import { proj,Map } from 'openlayers';
 
@@ -16,7 +16,6 @@ import { IQueryState } from '@farmmaps/common';
 import { IPeriodState } from '../../models/period.state';
 import {IStyles} from '../../models/style.cache';
 import { IDroppedFile } from '../aol/file-drop-target/file-drop-target.component';
-import { IMetaData } from '../meta-data-modal/meta-data-modal.component';
 import { StateSerializerService } from '@farmmaps/common';
 import { GeolocationService} from '../../services/geolocation.service';
 import {DeviceOrientationService} from '../../services/device-orientation.service';
@@ -30,7 +29,6 @@ import {commonActions} from '@farmmaps/common';
 import {Feature} from 'ol';
 import {Extent,createEmpty,extend } from 'ol/extent';
 import {transform} from 'ol/proj';
-import { query } from '@angular/animations';
 import { tassign } from 'tassign';
 import * as style from 'ol/style';
 
@@ -57,8 +55,9 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   public droppedFile$: Subject<IDroppedFile>  = new Subject<IDroppedFile>();
   private paramSub: Subscription;
   private itemTypeSub: Subscription;
-  private mapStateSub: Subscription;
+  private stateSub: Subscription;
   private queryStateSub: Subscription;
+  private querySub: Subscription;
   public parentCode$: Observable<string> =this.store.select(mapReducers.selectGetParentCode);
   public panelVisible$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelVisible);
   public panelCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelCollapsed);
@@ -66,6 +65,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   public clickedFeature: Subject<Feature> = new Subject<Feature>();
   public selectedItem$: Observable<IItem> = this.store.select(mapReducers.selectGetSelectedItem);
   public queryState$: Observable<IQueryState> = this.store.select(mapReducers.selectGetQueryState);
+  public state$:Observable<{mapState:IMapState,queryState:IQueryState,setStateCount:number}> = this.store.select(mapReducers.selectGetState);
   public period$: Observable<IPeriodState> = this.store.select(mapReducers.selectGetPeriod);
   public clearEnabled$: Observable<boolean> = this.store.select(mapReducers.selectGetClearEnabled);
   public searchCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetSearchCollapsed);
@@ -79,6 +79,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   public extent$: Observable<Extent> = this.store.select(mapReducers.selectGetExtent);
   public styles$:Observable<IStyles> = this.store.select(mapReducers.selectGetStyles);
   private setStateCount$:Observable<number> =  this.store.select(mapReducers.selectgetSetStateCount);
+  private lastUrl = "";
 
   @ViewChild('map') map;
   
@@ -92,7 +93,34 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     private geolocationService: GeolocationService,
     private zone: NgZone,
     private deviceorientationService:DeviceOrientationService) {
-      
+      this.querySub = this.query$.pipe(skip(1), withLatestFrom(this.mapState$),withLatestFrom(this.setStateCount$)).subscribe(([[queryState,mapState],setStateCount]) =>{
+        if(queryState) {
+          let newQueryState = tassign(mapReducers.initialQueryState);
+          console.debug(`Do Query ${setStateCount}`);
+          let urlparts=[];
+          if (queryState.itemCode && queryState.itemCode != "") {         
+            if(queryState.itemType && queryState.itemType!= "") {
+              let itemType = this.itemTypeService.itemTypes[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(queryState.itemCode);               
+              }    
+            }         
+          } else {
+            newQueryState= queryState;
+          }
+          if(urlparts.length==0 ) {              
+            newQueryState.itemCode = queryState.itemCode;
+            this.zone.run(() => {
+              this.store.dispatch(new mapActions.SetQueryState(newQueryState,false));
+            })
+          } else {
+            this.router.navigate(urlparts);
+          }          
+        }
+      });        
   }
 
   @HostListener('document:keyup', ['$event'])
@@ -132,44 +160,6 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     this.store.dispatch(new mapActions.Clear());
     this.selectedFeatures$.next({x:0,y:0,features:[]});
     this.selectedFeatures$.next(null);      
-    this.query$.pipe(withLatestFrom(this.mapState$),withLatestFrom(this.setStateCount$)).subscribe(([[queryState,mapState],setStateCount]) =>{
-      console.debug(`Do Query ${setStateCount}`);
-      if(setStateCount>1) {
-        let newQueryState = tassign(mapReducers.initialQueryState);
-        let urlparts=[];
-        if (queryState.itemCode && queryState.itemCode != "") {         
-          if(queryState.itemType && queryState.itemType!= "") {
-            let itemType = this.itemTypeService.itemTypes[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(queryState.itemCode);               
-            }    
-          }         
-        } else {
-          newQueryState= queryState;
-        }
-        if(urlparts.length==0 ) {
-          newQueryState.itemCode = queryState.itemCode;
-          this.replaceUrl(mapState,newQueryState,false);
-        } else {
-          this.router.navigate(urlparts);
-        }
-      }
-    });   
-    this.mapState$.pipe(withLatestFrom(this.queryState$),withLatestFrom(this.setStateCount$)).subscribe(([[mapState,queryState],setStateCount]) =>{
-      console.debug(`Mapstate ${setStateCount}`);
-      if(setStateCount>0) {
-        this.replaceUrl(mapState,queryState,true);
-      }
-    });    
-    this.queryState$.pipe(withLatestFrom(this.mapState$),withLatestFrom(this.setStateCount$)).subscribe(([[queryState,mapState],setStateCount]) =>{
-      console.debug(`Querystate ${setStateCount}`);
-      if(setStateCount>0) {
-        this.replaceUrl(mapState,queryState,true);
-      }
-    }) 
   }
 
   initCustomStyles() {
@@ -191,45 +181,109 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     })));
   }
 
+  round(value:number,decimals:number):number {
+    let d = Math.pow(10, decimals);
+    return Math.round((value + Number.EPSILON)*d)/d;
+  }
+
+  getMapStateFromUrl(params:ParamMap):IMapState {
+    var hasUrlmapState = params.has("xCenter") && params.has("yCenter");
+    if (hasUrlmapState) {
+      let xCenter = parseFloat(params.get("xCenter"));
+      let yCenter = parseFloat(params.get("yCenter"));
+      let zoom = parseFloat(params.get("zoom"));
+      let rotation = parseFloat(params.get("rotation"));
+      let baseLayer = params.get("baseLayer")?params.get("baseLayer"):"";
+      var 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 };
+  }
+
+  serializeMapState(mapState:IMapState):string {
+    return JSON.stringify(this.normalizeMapState(mapState));
+  }
+
+  getQueryStateFromUrl(params:ParamMap):IQueryState {
+    if (params.has("queryState")) {
+      let queryState = params.get("queryState");
+      var newQueryState = tassign(mapReducers.initialQueryState);
+      if (queryState != "") {
+        newQueryState = this.serializeService.deserialize(queryState);          
+      }
+      return newQueryState;
+    } else {
+      return null;
+    }
+  }
+
   ngAfterViewInit() {    
     console.debug("View init");
     this.initCustomStyles();   
-    this.paramSub = this.route.paramMap.pipe(withLatestFrom(this.setStateCount$),withLatestFrom(this.queryState$),withLatestFrom(this.mapState$)).subscribe( ([[[params,setStateCount],lastQueryState],lastMapState]) => {
+
-      console.debug(`Url change ${setStateCount}`);
+    // url to state
-      var newMapState: IMapState = lastMapState;
+
-      var newQueryState: IQueryState = lastQueryState;
+    this.paramSub = this.route.paramMap.pipe(withLatestFrom(this.state$),switchMap(([params,state]) => {
-      var hasUrlmapState = params.has("xCenter") && params.has("yCenter");
+      var newMapState: IMapState = state.mapState;
+      var newQueryState: IQueryState = state.queryState;
+     
       var queryStateChanged = false;
-      if (hasUrlmapState) {
+      var mapStateChanged = false;
-        let xCenter = parseFloat(params.get("xCenter"));
+      let urlMapState = this.getMapStateFromUrl(params);
-        let yCenter = parseFloat(params.get("yCenter"));
+      if(urlMapState) {
-        let zoom = parseFloat(params.get("zoom"));
+        newMapState = urlMapState;
-        let rotation = parseFloat(params.get("rotation"));
+        mapStateChanged = this.serializeMapState(state.mapState) != this.serializeMapState(newMapState);
-        let baseLayer = params.get("baseLayer")?params.get("baseLayer"):"";
-        newMapState = { xCenter: xCenter, yCenter: yCenter, zoom: zoom, rotation: rotation, baseLayerCode: baseLayer }
-        window.localStorage.setItem("FarmMapsCommonMap_mapState",JSON.stringify(newMapState));
       }
-      if (params.has("queryState")) {
+
-        let queryState = params.get("queryState");
+      let urlQueryState = this.getQueryStateFromUrl(params);
-        newQueryState = tassign(mapReducers.initialQueryState);
+      if(urlQueryState) {
-        if (queryState != "") {
+        newQueryState = urlQueryState;
-          newQueryState = this.serializeService.deserialize(queryState);
+        queryStateChanged = this.serializeService.serialize(state.queryState) !=  this.serializeService.serialize(urlQueryState);
-          queryState = this.serializeService.serialize(newQueryState);
+      }
-        }
+  
-        queryStateChanged = this.serializeService.serialize(lastQueryState) !=  queryState;
+      if(queryStateChanged && mapStateChanged && state.setStateCount ==0) {
+        return of(new mapActions.SetState(newMapState,newQueryState));
+        window.localStorage.setItem("FarmMapsCommonMap_mapState",this.serializeMapState(newMapState));
+      } else if(queryStateChanged) {
+        return of(new mapActions.SetQueryState(newQueryState));
+      } return of(new mapActions.SetReplaceUrl(true));
+    })).subscribe((action) => {
+      if(action) {    
+        this.zone.run(() => {
+          console.debug("Url to state");
+          this.store.dispatch(action);  
+        });       
       }
-      let t =0;
-      if(setStateCount==0) t=600;
-      setTimeout(() => {
-        this.zone.run(()=> {
-          if (setStateCount ==0) {
-            this.store.dispatch(new mapActions.SetState(newMapState,newQueryState));
-          } else if(queryStateChanged) {
-            this.store.dispatch(new mapActions.SetQueryState(newQueryState));
-          } 
-        })
-      },t);                
     });
+
+    // state to url
+    
+    this.stateSub = this.state$.pipe(switchMap((state) => {
+      let newUrl = this.serializeMapState(state.mapState) + "_" + this.serializeService.serialize(state.queryState);
+      if(this.lastUrl!=newUrl && state.setStateCount>0) {
+        this.lastUrl=newUrl;
+        return of(state);
+      }
+      else {
+        return of(null);
+      }          
+      })).subscribe((newUrlState) =>{
+        if(newUrlState) {
+          console.debug(`State to url ${newUrlState.setStateCount}`);
+          this.replaceUrl(newUrlState.mapState,newUrlState.queryState,newUrlState.replaceUrl);
+        }
+      });  
+
     setTimeout(() => {
       this.map.instance.updateSize();
     }, 500);
@@ -272,6 +326,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
       if(mapState.baseLayerCode!="") {
         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 });
       }      
   }
@@ -289,7 +344,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
       let state = { mapState: mapState, extent: extent };
       let source = from([state]);
       source.pipe(withLatestFrom(this.selectedBaseLayer$),withLatestFrom(this.setStateCount$)).subscribe(([[state, baselayer],setStateCount]) => {
-        if (mapState && baselayer && setStateCount > 0) { // do not react on first move
+        if (mapState && baselayer) { // do not react on first move
           let newMapState = tassign(state.mapState, { baseLayerCode: baselayer.item.code });
           this.store.dispatch(new mapActions.SetMapState(newMapState));
           this.store.dispatch(new mapActions.SetViewExtent(state.extent));
@@ -299,6 +354,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   }
 
   handleOnMouseDown(event: MouseEvent) {
+    event.stopPropagation();
     this.zone.run(() =>{
       this.store.dispatch(new mapActions.CollapseSearch());
     });
@@ -341,8 +397,10 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   }
 
   ngOnDestroy() {
-    this.paramSub.unsubscribe();
+    if (this.paramSub) this.paramSub.unsubscribe();
     if (this.itemTypeSub) this.itemTypeSub.unsubscribe();
-    if (this.mapStateSub) this.mapStateSub.unsubscribe();
+    if (this.stateSub) this.stateSub.unsubscribe();
-    if (this.queryStateSub) this.queryStateSub.unsubscribe();  }
+    if (this.queryStateSub) this.queryStateSub.unsubscribe();  
+    if (this.querySub) this.querySub.unsubscribe();
+  }
 }

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

@@ -3,12 +3,12 @@ import { Injectable } from '@angular/core';
 import { Store, Action } from '@ngrx/store';
 import { Effect, Actions,ofType } from '@ngrx/effects';
 
-import { Observable ,  of } from 'rxjs';
+import { Observable , of, interval } from 'rxjs';
-import { withLatestFrom, switchMap, map, catchError, mergeMap } from 'rxjs/operators';
+import { withLatestFrom, switchMap, map, catchError, mergeMap,delayWhen } from 'rxjs/operators';
 
 import {GeoJSON,WKT} from 'ol/format';
 import {Feature} from 'ol';
-import { getCenter } from 'ol/extent';
+import { getCenter,createEmpty,extend } from 'ol/extent';
 import {Point} from 'ol/geom'
 
 
@@ -27,6 +27,7 @@ import {FeatureIconService} from '../services/feature-icon.service';
 import * as style from 'ol/style';
 
 import { ItemTypeService } from '@farmmaps/common';
+import { IQueryState } from 'dist/common/public-api';
 
 
 @Injectable()
@@ -112,34 +113,55 @@ export class MapEffects {
   @Effect()
   startSearch$: Observable<Action> = this.actions$.pipe(
     ofType(mapActions.STARTSEARCH),
-    switchMap((action: mapActions.StartSearch) => {
+    withLatestFrom(this.store$.select(mapReducers.selectgetSetStateCount)),
-      var startDate = action.queryState.startDate;
+    switchMap(([action,setStateCount]) => {
-      var endDate = action.queryState.endDate;    
+      let a = action as mapActions.StartSearch;
+      var startDate = a.queryState.startDate;
+      var endDate = a.queryState.endDate;    
       var newAction:Observable<Action>;
-      if (action.queryState.itemCode || action.queryState.parentCode || action.queryState.itemType || action.queryState.query || action.queryState.tags) {
+      if (a.queryState.itemCode || a.queryState.parentCode || a.queryState.itemType || a.queryState.query || a.queryState.tags) {
-        newAction= this.itemService$.getFeatures(action.queryState.bbox, "EPSG:3857", action.queryState.query, action.queryState.tags, startDate, endDate, action.queryState.itemType, action.queryState.parentCode).pipe(
+        newAction= this.itemService$.getFeatures(a.queryState.bbox, "EPSG:3857", a.queryState.query, a.queryState.tags, startDate, endDate, a.queryState.itemType, a.queryState.parentCode).pipe(
           switchMap((features: any) => {
             for (let f of features.features) {
               if (f.properties && f.properties["code"]) {
                 f.id = f.properties["code"];
               }
             }
-            return of(new mapActions.StartSearchSuccess(this._geojsonFormat.readFeatures(features), action.queryState));
+            return of(new mapActions.StartSearchSuccess(this._geojsonFormat.readFeatures(features), a.queryState,setStateCount));
           }
           ),
           catchError(error => of(new commonActions.Fail(error))));
       } else {
-        newAction=  of(new commonActions.Escape(true,false));
+        return [];
       }     
       return newAction;
     }));
 
 
   @Effect()
-  startSearchSucces$: Observable<Action> = this.actions$.pipe(
+  zoomToExtent$: Observable<Action> = this.actions$.pipe(
+    ofType(mapActions.STARTSEARCHSUCCESS),
+    delayWhen(action => (action as mapActions.StartSearchSuccess).setStateCount == 1 ? interval(500):interval(0)),
+    mergeMap((action: mapActions.StartSearchSuccess) => {
+      let actions =[];
+      actions.push(new commonActions.SetMenuVisible(false));
+      let extent = createEmpty();
+      if (!action.query.bboxFilter) {        
+         if (extent) {
+          for (let f of action.features) {
+            extend(extent, (f as Feature).getGeometry().getExtent());
+          }
+        }  
+        actions.push(new mapActions.SetExtent(extent));
+      }
+      return actions;
+    }));
+
+  @Effect()
+  hideMenu$: Observable<Action> = this.actions$.pipe(
     ofType(mapActions.STARTSEARCHSUCCESS),
     mergeMap((action: mapActions.StartSearchSuccess) => {
-        return [new commonActions.SetMenuVisible(false)];
+      return of(new commonActions.SetMenuVisible(false));
     }));
 
   @Effect()
@@ -198,21 +220,6 @@ export class MapEffects {
       switchMap((action: commonActions.UploadedFileClick) => of(new mapActions.DoQuery(tassign(mapReducers.initialState.query, {itemCode:action.itemCode})))
     ));
 
-  //@Effect()
-  //itemAdded$: Observable<Action> = this.actions$.pipe(
-  //  ofType(commonActions.ITEMADDEDEVENT),
-  //  withLatestFrom(this.store$.select(mapReducers.selectGetParentCode)),
-  //  mergeMap(([action, parentCode]) => {
-  //    let itemAddedAction = action as commonActions.ItemAddedEvent;
-  //    if (parentCode && itemAddedAction.attributes["parentCode"] == parentCode) {
-  //      return this.itemService$.getFeature(itemAddedAction.itemCode,"EPSG:3857").pipe(
-  //        map((feature: Feature) => new mapActions.AddFeatureSuccess(this.toPointFeature(feature))),
-  //        catchError(error => of(new commonActions.Fail(error))))
-  //    } else
-  //      return [
-  //      ];
-  //  }));
-
   @Effect()
   featureUpdate$: Observable<Action> = this.actions$.pipe(
     ofType(commonActions.DEVICEUPDATEEVENT),
@@ -248,30 +255,36 @@ export class MapEffects {
       }
     }));
 
+  getActionFromQueryState(queryState:IQueryState, inSearch:boolean):Observable<Action>|[] {
+    if(!inSearch && (queryState.itemType || queryState.parentCode || queryState.itemCode || queryState.query || queryState.tags)) {
+      var newAction:Action;     
+      if (queryState.itemCode && queryState.itemCode != "") {         
+        newAction= new mapActions.SelectItem(queryState.itemCode);          
+      } else {
+        newAction= new mapActions.StartSearch(queryState);
+      }
+      return of(newAction);  
+    } else {
+      return of(new commonActions.Escape(true,false));
+    }
+  } 
+
   @Effect()
   setQueryState$: Observable<Action> = this.actions$.pipe(
     ofType(mapActions.SETQUERYSTATE),
-    switchMap((action: mapActions.SetQueryState) => {
+    withLatestFrom(this.store$.select(mapReducers.selectGetInSearch)),
-        var newAction:Action;
+    switchMap(([action,inSearch]) => {
-        if (action.queryState.itemCode && action.queryState.itemCode != "") {         
+      let a = action as mapActions.SetQueryState;
-          newAction= new mapActions.SelectItem(action.queryState.itemCode);          
+       return this.getActionFromQueryState(a.queryState,inSearch);
-        } else {
-          newAction= new mapActions.StartSearch(action.queryState);
-        }
-        return of(newAction);
       }));
 
   @Effect()
   setState$: Observable<Action> = this.actions$.pipe(
     ofType(mapActions.SETSTATE),
-    switchMap((action: mapActions.SetState) => {
+    withLatestFrom(this.store$.select(mapReducers.selectGetInSearch)),
-      var newAction:Action;
+    switchMap(([action,inSearch]) => {
-      if (action.queryState.itemCode && action.queryState.itemCode != "") {
+      let a = action as mapActions.SetState;
-        newAction=  new mapActions.SelectItem(action.queryState.itemCode);
+      return this.getActionFromQueryState(a.queryState,inSearch);
-      } else {
-        newAction=  new mapActions.StartSearch(action.queryState);
-      }
-      return of(newAction);
     }));
 
     constructor(private actions$: Actions, private store$: Store<mapReducers.State>, private folderService$: FolderService, private itemService$: ItemService,private featureIconService$:FeatureIconService,private itemTypeService$:ItemTypeService) {

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

@@ -10,7 +10,7 @@ import {commonActions} from '@farmmaps/common';
 import { createSelector, createFeatureSelector } from '@ngrx/store';
 
 import {Feature} from 'ol';
-import { createEmpty, extend} from 'ol/extent';
+
 
 import { ROUTER_NAVIGATION, RouterNavigationAction } from '@ngrx/router-store';
 
@@ -56,7 +56,9 @@ export interface State {
   selectedOverlayLayer: IItemLayer,
   styles:IStyles,
   showLayerSwitcher:boolean,
-  setStateCount:number
+  setStateCount:number,
+  inSearch:boolean,
+  replaceUrl:boolean
 }
 
 export const initialState: State = {
@@ -73,7 +75,7 @@ export const initialState: State = {
   },
   viewExtent:[],
   queryState: tassign(initialQueryState),
-  query: tassign(initialQueryState),
+  query: null,
   parentCode: null,
   features: [],
   panelVisible: false,
@@ -92,7 +94,9 @@ export const initialState: State = {
   selectedItemLayer: null,
   styles: {},
   showLayerSwitcher: false,
-  setStateCount: 0
+  setStateCount: 0,
+  inSearch:false,
+  replaceUrl:true
 }
 
 export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State {    
@@ -109,7 +113,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
     }
     case mapActions.SETQUERYSTATE: {
       let a = action as mapActions.SetQueryState;
-      return tassign(state, { queryState: tassign(a.queryState ),setStateCount: state.setStateCount+1});
+      return tassign(state, { queryState: tassign(a.queryState ),setStateCount: state.setStateCount+1,replaceUrl:a.replaceUrl});
     }
     case mapActions.SETSTATE: {
       let a = action as mapActions.SetState;
@@ -127,18 +131,9 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
     }
     case mapActions.STARTSEARCHSUCCESS: {
       let a = action as mapActions.StartSearchSuccess;
-      let extent = state.extent;
-      if (!action.query.bboxFilter) {
-        extent = createEmpty();
-        if (extent) {
-          for (let f of action.features) {
-            extend(extent, (f as Feature).getGeometry().getExtent());
-          }
-        }  
-      }
       return tassign(state, {       
         features: a.features,
-        extent:extent
+        inSearch:false
       });
     }
     case mapActions.SELECTFEATURE: {
@@ -148,10 +143,14 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       });
     }    
     case mapActions.SELECTITEM: {  
+      let a = action as mapActions.SelectItem;
+      let itemCode = state.selectedItem ? state.selectedItem.code : "";
+      let inSearch = (a.itemCode != itemCode || state.setStateCount == 1)
       return tassign(state, {
         selectedItem: null,
         selectedItemLayer: null,
-        features:[]
+        features:[],
+        inSearch:inSearch
       });
     }
     case mapActions.SELECTITEMSUCCESS: {
@@ -164,6 +163,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
         itemLayer = new TemporalItemLayer(a.item);       
       }
       return tassign(state, {
+        inSearch:false,
         selectedItem: a.item,
         selectedItemLayer: itemLayer,
         panelVisible: a.item != null,
@@ -255,21 +255,24 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
     }
     case mapActions.STARTSEARCH: {
       let a = action as mapActions.StartSearch;
+      let panelVisible = a.queryState.itemCode!=null ||a.queryState.itemType!=null||a.queryState.parentCode!=null || a.queryState.query != null || a.queryState.tags != null;
       return tassign(state, {
         selectedItem: null,
         features:[],
         selectedItemLayer:null,
-        queryState: tassign(a.queryState),
+        searchCollapsed: !panelVisible,
-        searchCollapsed: false,
+        panelVisible: panelVisible,
-        panelVisible: true,
+        clearEnabled: panelVisible,
-        clearEnabled: true,
+        searchMinified: panelVisible,
-        searchMinified: true,
+        inSearch:panelVisible
       });
     }
+    case commonActions.FAIL:{
+      return tassign(state,{inSearch:false});
+    }
     case mapActions.DOQUERY: {
       let a = action as mapActions.DoQuery;
       return tassign(state, {
-        setStateCount:state.setStateCount+1,
         query: tassign(a.query, { bbox: a.query.bboxFilter ? state.viewExtent : [] })});
     }
     case mapActions.ADDFEATURESUCCESS: {
@@ -455,8 +458,12 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       let a = action as mapActions.ShowLayerSwitcher;
       return tassign(state,{showLayerSwitcher:a.show});
     }  
-    case mapActions.CLEAR:{
+    case mapActions.SETREPLACEURL: {
-      return tassign(state,{setStateCount:0,features:[],selectedFeature:null,selectedItem:null});
+      let a= action as mapActions.SetReplaceUrl;
+      return tassign(state,{replaceUrl:a.replaceUrl});
+    }
+    case mapActions.CLEAR: {
+      return tassign(state,{setStateCount:0});
     }
     default: {
       return state;
@@ -487,6 +494,8 @@ export const getPeriod = (state:State) => state.period;
 export const getStyles = (state:State) => state.styles;
 export const getShowLayerSwitcher = (state:State) => state.showLayerSwitcher;
 export const getSetStateCount = (state:State) => state.setStateCount;
+export const getInSearch = (state:State) => state.inSearch;
+export const getState = (state:State) => {return {mapState:state.mapState,queryState:state.queryState,setStateCount:state.setStateCount,replaceUrl:state.replaceUrl};}
 
 export const selectMapState = createFeatureSelector<State>(MODULE_NAME);
 export const selectGetMapState= createSelector(selectMapState, getMapState);
@@ -512,5 +521,7 @@ export const selectGetPeriod = createSelector(selectMapState, getPeriod);
 export const selectGetStyles = createSelector(selectMapState, getStyles);
 export const selectGetShowLayerSwitcher = createSelector(selectMapState,getShowLayerSwitcher);
 export const selectgetSetStateCount = createSelector(selectMapState,getSetStateCount);
+export const selectGetInSearch = createSelector(selectMapState,getInSearch);
+export const selectGetState = createSelector(selectMapState,getState);
 
 

src/app/app.module.ts

@@ -11,7 +11,7 @@ import { AppCommonMapModule} from '@farmmaps/common-map';
 
 import {AppRootComponent} from './app.component';
 
-import {StoreModule, Store} from '@ngrx/store';
+import {StoreModule, ActionReducer,MetaReducer} from '@ngrx/store';
 import {EffectsModule, EffectSources} from '@ngrx/effects';
 import { StoreRouterConnectingModule} from '@ngrx/router-store';
 
@@ -48,6 +48,18 @@ export function provideBootstrapEffects(effects: Type<any>[]) {
   ];
 }
 
+// console.log all actions
+export function debug(reducer: ActionReducer<any>): ActionReducer<any> {
+  return function(state, action) {
+    console.debug('-- State', state);
+    console.debug('-- Action', action);
+ 
+    return reducer(state, action);
+  };
+}
+
+export const metaReducers: MetaReducer<any>[] = [debug];
+
 @NgModule({
   declarations: [
     AppRootComponent,
@@ -61,7 +73,7 @@ export function provideBootstrapEffects(effects: Type<any>[]) {
     AppCommonServiceModule.forRoot(),
     AppCommonMapModule.forRoot(),
     BrowserModule,
-    StoreModule.forRoot({},{runtimeChecks: { // TODO fix this should all be true
+    StoreModule.forRoot({},{metaReducers,runtimeChecks: { // TODO fix this should all be true
 			strictStateImmutability: false,
 			strictActionImmutability: false,
 			strictStateSerializability: false,

src/app/menu/menu.component.html

@@ -5,6 +5,10 @@
             <div class="icon rounded-circle farm-icon"><i class="fm fm-farm" aria-hidden="true"></i></div>
             <div class="caption" i18n>Farms</div>
           </div>   
+          <div class="shortcut-icon" (click)="handlePredefinedQuery($event,{itemType:'vnd.farmmaps.itemtype.layer'})">
+            <div class="icon rounded-circle thematic-maps-icon"><i class="fa fa-map" aria-hidden="true"></i></div>
+            <div class="caption" i18n>Thematic maps</div>
+          </div>   
         </div>
     </div>     
 </div>