FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More refactoring

Browse Source
This commit is contained in:
Willem Dantuma
2020-04-21 14:54:13 +02:00
parent e41c728fb2
commit ef81b04f4e
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
projects/common-map/src/fm-map/components/map/map.component.ts
View File

@@ -252,14 +252,14 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
queryStateChanged = this.serializeService.serialize(state.queryState) != this.serializeService.serialize(urlQueryState);
}
if(queryStateChanged || mapStateChanged) {
if(queryStateChanged && mapStateChanged && state.setStateCount ==0) {
return of(new mapActions.SetState(newMapState,newQueryState));
} else {
return of(null);
}
window.localStorage.setItem("FarmMapsCommonMap_mapState",this.serializeMapState(newMapState));
} else if(queryStateChanged) {
return of(new mapActions.SetQueryState(newQueryState));
} return of(null)
})).subscribe((action) => {
if(action) {
window.localStorage.setItem("FarmMapsCommonMap_mapState",this.serializeMapState(action.mapState));
if(action) {
console.debug("Url to state");
this.store.dispatch(action);
}
@@ -353,6 +353,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
}
handleOnMouseDown(event: MouseEvent) {
event.stopPropagation();
this.zone.run(() =>{
this.store.dispatch(new mapActions.CollapseSearch());
});