Do not handle map event in 3D mode
This commit is contained in:
		| @@ -55,6 +55,7 @@ export const TOGGLELAYERVALUESENABLED = '[Map] ToggleLayerValuesEnabled' | ||||
| export const GETLAYERVALUE = '[Map] GetLayerValue' | ||||
| export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess' | ||||
| export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide' | ||||
| export const SETVIEWSTATE = '[Map] SetViewState' | ||||
|  | ||||
|  | ||||
| export class Clear implements Action { | ||||
| @@ -323,6 +324,11 @@ export class ToggleShowDataLayerSlide implements Action { | ||||
|   constructor() {} | ||||
| } | ||||
|  | ||||
| export class SetViewState implements Action { | ||||
|   readonly type = SETVIEWSTATE; | ||||
|   constructor(public enabled:boolean) {} | ||||
| } | ||||
|  | ||||
| export type Actions = SetMapState | ||||
|   | Init | ||||
|   | Clear | ||||
| @@ -367,5 +373,6 @@ export type Actions = SetMapState | ||||
|   | GetLayerValueSuccess | ||||
|   | GetLayerValue | ||||
|   | SetPeriod | ||||
|   | ToggleShowDataLayerSlide; | ||||
|   | ToggleShowDataLayerSlide | ||||
|   | SetViewState; | ||||
|  | ||||
|   | ||||
| @@ -27,10 +27,12 @@ | ||||
|     <div> | ||||
|  | ||||
|     </div> | ||||
|     <aol-view [zoom]="state.mapState.zoom" [rotation]="state.mapState.rotation"> | ||||
|        <aol-coordinate [x]="state.mapState.xCenter" [y]="state.mapState.yCenter" [srid]="'EPSG:4326'"></aol-coordinate> | ||||
|        <fm-map-zoom-to-extent [extent]="state.extent" [animate]="true"></fm-map-zoom-to-extent> | ||||
|     </aol-view> | ||||
|     | ||||
|       <aol-view [zoom]="state.mapState.zoom" [rotation]="state.mapState.rotation"> | ||||
|         <aol-coordinate [x]="state.mapState.xCenter" [y]="state.mapState.yCenter" [srid]="'EPSG:4326'"></aol-coordinate> | ||||
|         <fm-map-zoom-to-extent [extent]="state.extent" [animate]="true"></fm-map-zoom-to-extent> | ||||
|      </aol-view>  | ||||
|  | ||||
|     <aol-interaction-default></aol-interaction-default> | ||||
|     <aol-interaction-dragrotateandzoom></aol-interaction-dragrotateandzoom> | ||||
|     <fm-map-item-layers [itemLayers]="state.baseLayers"></fm-map-item-layers> | ||||
|   | ||||
| @@ -94,6 +94,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { | ||||
|   public dataLayerSlideValue:number = 50; | ||||
|   public dataLayerSlideEnabled = false; | ||||
|   private visibleAreaBottom = 0; | ||||
|   private viewEnabled: boolean = true; | ||||
|    | ||||
|   @ViewChild('map') map; | ||||
|   @ViewChild('contentDiv') contentDiv: ElementRef; | ||||
| @@ -375,6 +376,9 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { | ||||
|       this.dataLayerSlideEnabled=v; | ||||
|       this.map.instance.render(); | ||||
|     }); | ||||
|     this.store.select(mapReducers.selectGetViewEnabled).subscribe((v) => { | ||||
|       this.viewEnabled = v; | ||||
|     }); | ||||
|   } | ||||
|  | ||||
|   handleSearchCollapse(event) { | ||||
| @@ -428,7 +432,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { | ||||
|   } | ||||
|  | ||||
|   handleOnMoveEnd(event) {     | ||||
|     if(this.initialized) { | ||||
|     if(this.initialized && this.viewEnabled) { | ||||
|       this.zone.run(() =>{ | ||||
|         console.debug("Move end"); | ||||
|         var map = event.map; | ||||
|   | ||||
| @@ -72,6 +72,7 @@ export interface State { | ||||
|   layerValuesEnabled:boolean, | ||||
|   layerValues: Array<ILayervalue> | ||||
|   showDataLayerSlide:boolean, | ||||
|   viewEnabled:boolean | ||||
| } | ||||
|  | ||||
| export const initialState: State = { | ||||
| @@ -115,7 +116,8 @@ export const initialState: State = { | ||||
|   layerValuesY:0, | ||||
|   layerValuesEnabled:false, | ||||
|   layerValues:[], | ||||
|   showDataLayerSlide:false | ||||
|   showDataLayerSlide:false, | ||||
|   viewEnabled:true | ||||
| } | ||||
|  | ||||
| export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State { | ||||
| @@ -538,6 +540,10 @@ export function reducer(state = initialState, action: mapActions.Actions | commo | ||||
|       v.push(a.layervalue); | ||||
|       return tassign(state,{layerValues:v}); | ||||
|     } | ||||
|     case mapActions.SETVIEWSTATE:{ | ||||
|       let a= action as mapActions.SetViewState; | ||||
|       return tassign(state,{viewEnabled:a.enabled}); | ||||
|     } | ||||
|     case commonActions.ITEMDELETEDEVENT:{ | ||||
|       let a= action as commonActions.ItemDeletedEvent; | ||||
|       if(state.selectedItem && state.selectedItem.code == a.itemCode) { | ||||
| @@ -599,6 +605,7 @@ export const getLayerValuesEnabled = (state:State) => state.layerValuesEnabled; | ||||
| export const getLayerValues = (state:State) => state.layerValues; | ||||
| export const getLayerValuesX = (state:State) => state.layerValuesX; | ||||
| export const getLayerValuesY = (state:State) => state.layerValuesY; | ||||
| export const getViewEnabled = (state:State) => state.viewEnabled; | ||||
|  | ||||
|  | ||||
| export const selectMapState = createFeatureSelector<State>(MODULE_NAME); | ||||
| @@ -632,5 +639,6 @@ export const selectGetLayerValuesEnabled = createSelector(selectMapState,getLaye | ||||
| export const selectGetLayerValues = createSelector(selectMapState,getLayerValues); | ||||
| export const selectGetLayerValuesX = createSelector(selectMapState,getLayerValuesX); | ||||
| export const selectGetLayerValuesY = createSelector(selectMapState,getLayerValuesY); | ||||
| export const selectGetViewEnabled = createSelector(selectMapState,getViewEnabled); | ||||
|  | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user