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

Fix navigation issue
All checks were successful
FarmMaps.Develop/FarmMapsLib/develop This commit looks good
Details

Browse Source
This commit is contained in:
Willem Dantuma
2020-02-20 17:38:05 +01:00
parent 1a3bbf26f2
commit f82125a486
3 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,11 +150,11 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
this.compassHeading$ = this.deviceorientationService.getCurrentCompassHeading();
this.styles$ = this.store.select(mapReducers.selectGetStyles);
this.mapState$.pipe(withLatestFrom(this.queryState$)).subscribe((state) => {
this.replaceUrl(state[0], state[1], true);
});
// this.mapState$.pipe(withLatestFrom(this.queryState$)).subscribe((state) => {
// this.replaceUrl(state[0], state[1], true);
// });
this.query$.pipe(withLatestFrom(this.mapState$)).subscribe((state) => {
this.replaceUrl(state[1], state[0],false);
this.replaceUrl(state[1], state[0],this.stateSetCount == 0);
});
this.initCustomStyles();
}
@@ -210,17 +210,27 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
queryStateChanged = this.lastQueryState != queryState;
this.lastQueryState = queryState;
}
this.zone.run(()=> {
if ( queryStateChanged) {
console.debug("Query state");
this.store.dispatch(new mapActions.SetQueryState(newQueryState));
} else if (mapStateChanged) {
console.debug("Map state");
this.store.dispatch(new mapActions.SetMapState(newMapState));
}
})
if (mapStateChanged && queryStateChanged) {
console.debug("Both states");
this.store.dispatch(new mapActions.SetState(newMapState, newQueryState));
} else if (mapStateChanged) {
console.debug("Map state");
this.store.dispatch(new mapActions.SetMapState(newMapState));
} else if (queryStateChanged) {
console.debug("Query state");
this.store.dispatch(new mapActions.SetQueryState(newQueryState));
}
// if (mapStateChanged && queryStateChanged) {
// console.debug("Both states");
// this.store.dispatch(new mapActions.SetState(newMapState, newQueryState));
// } else if (mapStateChanged) {
// console.debug("Map state");
// this.store.dispatch(new mapActions.SetMapState(newMapState));
// } else if (queryStateChanged) {
// console.debug("Query state");
// this.store.dispatch(new mapActions.SetQueryState(newQueryState));
// }
this.stateSetCount += 1;
});
setTimeout(() => {