From c0f689331ec1a389f045d073488617c00b877481 Mon Sep 17 00:00:00 2001 From: Mark van der Wal Date: Wed, 15 Jul 2020 23:15:31 +0200 Subject: [PATCH] Added parentitem title to geotiff, shape and temporal selected-item components. --- .../src/fm-map/actions/map.actions.ts | 2 +- .../fm-map/components/map/map.component.html | 11 +-- .../fm-map/components/map/map.component.ts | 69 ++++++++++--------- .../selected-item-container.component.ts | 10 +-- .../selected-item-geotiff.component.html | 8 ++- .../selected-item-shape.component.html | 3 +- .../selected-item-temporal.component.html | 1 + .../selected-item/selected-item.component.ts | 5 +- .../src/fm-map/effects/map.effects.ts | 50 +++++++++----- .../src/fm-map/reducers/map.reducer.ts | 48 +++++++------ 10 files changed, 117 insertions(+), 90 deletions(-) diff --git a/projects/common-map/src/fm-map/actions/map.actions.ts b/projects/common-map/src/fm-map/actions/map.actions.ts index 0658192..260e955 100644 --- a/projects/common-map/src/fm-map/actions/map.actions.ts +++ b/projects/common-map/src/fm-map/actions/map.actions.ts @@ -105,7 +105,7 @@ export class SelectItem implements Action { export class SelectItemSuccess implements Action { readonly type = SELECTITEMSUCCESS; - constructor(public item: IItem) { } + constructor(public item: IItem, public parentItem: IItem) { } } export class SelectTemporalItemsSuccess implements Action { diff --git a/projects/common-map/src/fm-map/components/map/map.component.html b/projects/common-map/src/fm-map/components/map/map.component.html index ddead55..2b71672 100644 --- a/projects/common-map/src/fm-map/components/map/map.component.html +++ b/projects/common-map/src/fm-map/components/map/map.component.html @@ -12,6 +12,7 @@ panelCollapsed:panelCollapsed$|async, searchMinified:searchMinified$|async, selectedItem:selectedItem$|async, + parentItem:parentItem$|async, queryState:queryState$|async, searchCollapsed:searchCollapsed$|async, clearEnabled:clearEnabled$|async, @@ -20,9 +21,9 @@ styles:styles$|async, selectedFeature:selectedFeature$|async } as state"> - +
- +
@@ -51,13 +52,13 @@
- +
- +
- +
Cannot find {{state.queryState?.query}}
diff --git a/projects/common-map/src/fm-map/components/map/map.component.ts b/projects/common-map/src/fm-map/components/map/map.component.ts index f190621..b7f2d3f 100644 --- a/projects/common-map/src/fm-map/components/map/map.component.ts +++ b/projects/common-map/src/fm-map/components/map/map.component.ts @@ -64,6 +64,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { public selectedFeature$: Observable = this.store.select(mapReducers.selectGetSelectedFeature); public clickedFeature: Subject = new Subject(); public selectedItem$: Observable = this.store.select(mapReducers.selectGetSelectedItem); + public parentItem$: Observable =this.store.select(mapReducers.selectGetParentItem); public queryState$: Observable = this.store.select(mapReducers.selectGetQueryState); public state$:Observable<{mapState:IMapState,queryState:IQueryState,setStateCount:number}> = this.store.select(mapReducers.selectGetState); public period$: Observable = this.store.select(mapReducers.selectGetPeriod); @@ -82,14 +83,14 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { private lastUrl = ""; @ViewChild('map') map; - - constructor(private store: Store, - private route: ActivatedRoute, + + constructor(private store: Store, + private route: ActivatedRoute, private router: Router, - private uploadService: ResumableFileUploadService, - private serializeService: StateSerializerService, - public itemTypeService: ItemTypeService, - private location: Location, + private uploadService: ResumableFileUploadService, + private serializeService: StateSerializerService, + public itemTypeService: ItemTypeService, + private location: Location, private geolocationService: GeolocationService, private zone: NgZone, private deviceorientationService:DeviceOrientationService) { @@ -98,29 +99,29 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { let newQueryState = tassign(mapReducers.initialQueryState); console.debug(`Do Query ${setStateCount}`); let urlparts=[]; - if (queryState.itemCode && queryState.itemCode != "") { + 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); - } - } + urlparts.push(queryState.itemCode); + } + } } else { newQueryState= queryState; } - if(urlparts.length==0 ) { + 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']) @@ -159,7 +160,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { console.debug("Init"); this.store.dispatch(new mapActions.Clear()); this.selectedFeatures$.next({x:0,y:0,features:[]}); - this.selectedFeatures$.next(null); + this.selectedFeatures$.next(null); } initCustomStyles() { @@ -203,8 +204,8 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { normalizeMapState(mapState:IMapState):IMapState { if(!mapState) return null; - return {zoom: this.round(mapState.zoom,0), - rotation: this.round(mapState.rotation,2), + 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 }; @@ -219,7 +220,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { let queryState = params.get("queryState"); var newQueryState = tassign(mapReducers.initialQueryState); if (queryState != "") { - newQueryState = this.serializeService.deserialize(queryState); + newQueryState = this.serializeService.deserialize(queryState); } return newQueryState; } else { @@ -227,16 +228,16 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { } } - ngAfterViewInit() { + ngAfterViewInit() { console.debug("View init"); - this.initCustomStyles(); + this.initCustomStyles(); // url to state this.paramSub = this.route.paramMap.pipe(withLatestFrom(this.state$),switchMap(([params,state]) => { var newMapState: IMapState = state.mapState; var newQueryState: IQueryState = state.queryState; - + var queryStateChanged = false; var mapStateChanged = false; let urlMapState = this.getMapStateFromUrl(params); @@ -250,7 +251,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { newQueryState = urlQueryState; queryStateChanged = this.serializeService.serialize(state.queryState) != this.serializeService.serialize(urlQueryState); } - + if(queryStateChanged && mapStateChanged && state.setStateCount ==0) { return of(new mapActions.SetState(newMapState,newQueryState)); window.localStorage.setItem("FarmMapsCommonMap_mapState",this.serializeMapState(newMapState)); @@ -258,16 +259,16 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { return of(new mapActions.SetQueryState(newQueryState)); } return of(new mapActions.SetReplaceUrl(true)); })).subscribe((action) => { - if(action) { + if(action) { this.zone.run(() => { console.debug("Url to state"); - this.store.dispatch(action); - }); + this.store.dispatch(action); + }); } }); // 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) { @@ -276,13 +277,13 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { } 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(); @@ -315,7 +316,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { event.preventDefault(); var queryState = tassign(mapReducers.initialQueryState, query); this.store.dispatch(new mapActions.DoQuery(queryState)); - } + } replaceUrl(mapState: IMapState, queryState: IQueryState, replace: boolean = true) { let parts =["."]; @@ -328,7 +329,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { parts.push( this.serializeService.serialize(queryState)); console.debug("Replace url",parts); this.router.navigate(parts, { replaceUrl: replace,relativeTo:this.route.parent }); - } + } } handleOnMoveEnd(event) { @@ -350,7 +351,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { this.store.dispatch(new mapActions.SetViewExtent(state.extent)); } }); - }); + }); } handleOnMouseDown(event: MouseEvent) { @@ -366,7 +367,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { handleClearSearch(event) { this.store.dispatch(new commonActions.Escape(true, false)); - } + } handleOnDelete(itemLayer: IItemLayer) { this.store.dispatch(new mapActions.RemoveLayer(itemLayer)); @@ -385,7 +386,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { extend(extent, itemLayer.layer.getExtent()); if (extent) { this.store.dispatch(new mapActions.SetExtent(extent)); - } + } } handleSelectBaseLayer(itemLayer: IItemLayer) { @@ -400,7 +401,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { if (this.paramSub) this.paramSub.unsubscribe(); if (this.itemTypeSub) this.itemTypeSub.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(); } } diff --git a/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts b/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts index f4e1db4..c86b87e 100644 --- a/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts @@ -8,7 +8,7 @@ import { IItemLayer } from '../../models/item.layer'; @Component({ selector: 'fm-map-selected-item-container', templateUrl: './selected-item-container.component.html', - styleUrls: ['./selected-item-container.component.scss'] + styleUrls: ['./selected-item-container.component.scss'] }) export class SelectedItemContainerComponent { @@ -16,10 +16,11 @@ export class SelectedItemContainerComponent { } @Input() item: IItem; + @Input() parentItem: IItem; @Input() itemLayer:IItemLayer; @Input() overlayLayers:Array; - @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; + @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; loadComponent() { let componentFactory: ComponentFactory = this.componentFactoryResolver.resolveComponentFactory(SelectedItemComponent); // default @@ -42,14 +43,14 @@ export class SelectedItemContainerComponent { matches++; } } - + if(criteria==matches && matches > maxMatches) { selected=i; maxMatches = matches; } } if (selected >= 0) { - componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.selectedItemComponents[selected]['constructor'] as any); + componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.selectedItemComponents[selected]['constructor'] as any); } const viewContainerRef = this.widgetHost.viewContainerRef; @@ -57,6 +58,7 @@ export class SelectedItemContainerComponent { const componentRef = viewContainerRef.createComponent(componentFactory); (componentRef.instance).item = this.item; + (componentRef.instance).parentItem = this.parentItem; (componentRef.instance).itemLayer = this.itemLayer; (componentRef.instance).overlayLayers = this.overlayLayers; } diff --git a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html index 9b1412b..bf71d71 100644 --- a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html +++ b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html @@ -4,7 +4,8 @@
Back
-

{{item.name}}

+

{{parentItem.name}}

+

{{item.name}}

@@ -13,14 +14,15 @@
- +
diff --git a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html index 5df8f70..a9292e1 100644 --- a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html +++ b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html @@ -4,6 +4,7 @@
Back
+

{{parentItem.name}}

{{item.name}}

@@ -20,7 +21,7 @@ diff --git a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html index fe495cb..10ef92f 100644 --- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html +++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html @@ -4,6 +4,7 @@
Back
+

{{parentItem.name}}

{{item.name}}

diff --git a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts index b9e9963..88efef2 100644 --- a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts @@ -11,7 +11,8 @@ import { IItemLayer } from '../../models/item.layer'; @Injectable() @Directive() export abstract class AbstractSelectedItemComponent { - @Input() item: IItem + @Input() item: IItem; + @Input() parentItem: IItem; @Input() itemLayer: IItemLayer; @Input() overlayLayers: Array; constructor(public store: Store, public itemTypeService: ItemTypeService, private location: Location, public router: Router) { @@ -60,7 +61,7 @@ export abstract class AbstractSelectedItemComponent { event.preventDefault(); this.location.back(); } - + } @Injectable() diff --git a/projects/common-map/src/fm-map/effects/map.effects.ts b/projects/common-map/src/fm-map/effects/map.effects.ts index b98e86c..bd20eae 100644 --- a/projects/common-map/src/fm-map/effects/map.effects.ts +++ b/projects/common-map/src/fm-map/effects/map.effects.ts @@ -60,7 +60,7 @@ export class MapEffects { anchor: [0.5, 1], scale: 0.05, src: this.featureIconService$.getIconImageDataUrl("fa fa-file-o") - }), + }), stroke: new style.Stroke({ color: 'red', width: 1 @@ -82,7 +82,7 @@ export class MapEffects { fill: new style.Fill({ color: 'rgba(0, 0, 255, 0.1)' }) - }))); + }))); return actions; } @@ -116,7 +116,7 @@ export class MapEffects { switchMap(([action,setStateCount]) => { let a = action as mapActions.StartSearch; var startDate = a.queryState.startDate; - var endDate = a.queryState.endDate; + var endDate = a.queryState.endDate; var newAction:Observable; if (a.queryState.itemCode || a.queryState.parentCode || a.queryState.itemType || a.queryState.query || a.queryState.tags) { newAction= this.itemService$.getFeatures(a.queryState.bbox, "EPSG:3857", a.queryState.query, a.queryState.tags, startDate, endDate, a.queryState.itemType, a.queryState.parentCode).pipe( @@ -132,7 +132,7 @@ export class MapEffects { catchError(error => of(new commonActions.Fail(error)))); } else { return []; - } + } return newAction; })); @@ -145,12 +145,12 @@ export class MapEffects { let actions =[]; actions.push(new commonActions.SetMenuVisible(false)); let extent = createEmpty(); - if (!action.query.bboxFilter) { + 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; @@ -173,7 +173,14 @@ export class MapEffects { let itemCode = selectedItem ? selectedItem.code : ""; if (a.itemCode != itemCode || setStateCount == 1) { return this.itemService$.getItem(a.itemCode).pipe( - map((item: IItem) => new mapActions.SelectItemSuccess(item)), + switchMap(child => { + return this.itemService$.getItem(child.parentCode) + .pipe(map(parent => { + return {child, parent}; + }) + ); + }), + map(data => new mapActions.SelectItemSuccess(data.child, data.parent)), catchError(error => of(new commonActions.Fail(error)))) } else { return []; @@ -202,14 +209,14 @@ export class MapEffects { if(action.item.itemType == "vnd.farmmaps.itemtype.temporal") { return this.itemService$.getChildItemList(action.item.code,null).pipe( map(items => new mapActions.SelectTemporalItemsSuccess( - items.sort((a, b) => + items.sort((a, b) => -(Date.parse(b.dataDate) - Date.parse(a.dataDate)) ) )), catchError(error => of(new commonActions.Fail(error)))); } else { return []; - } + } } )); @@ -231,9 +238,9 @@ export class MapEffects { feature = f; break; } - } + } if (feature) { - return of(new mapActions.UpdateFeatureSuccess(this.toPointFeature(deviceUpdateEventAction))); + return of(new mapActions.UpdateFeatureSuccess(this.toPointFeature(deviceUpdateEventAction))); } else { return []; } @@ -244,10 +251,17 @@ export class MapEffects { ofType(commonActions.ITEMCHANGEDEVENT), withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItem)), mergeMap(([action, selectedItem]) => { - let itemChangedAction = action as commonActions.ItemChangedEvent; + let itemChangedAction = action as commonActions.ItemChangedEvent; if (selectedItem && selectedItem.code == itemChangedAction.itemCode) { return this.itemService$.getItem(itemChangedAction.itemCode).pipe( - map((item: IItem) => new mapActions.SelectItemSuccess(item)), + switchMap(child => { + return this.itemService$.getItem(child.parentCode) + .pipe(map(parent => { + return {child, parent}; + }) + ); + }), + map(data => new mapActions.SelectItemSuccess(data.child, data.parent)), catchError(error => of(new commonActions.Fail(error)))); } else { return []; @@ -256,17 +270,17 @@ export class MapEffects { getActionFromQueryState(queryState:IQueryState, inSearch:boolean):Observable|[] { 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); + var newAction:Action; + if (queryState.itemCode && queryState.itemCode != "") { + newAction= new mapActions.SelectItem(queryState.itemCode); } else { newAction= new mapActions.StartSearch(queryState); } - return of(newAction); + return of(newAction); } else { return of(new commonActions.Escape(true,false)); } - } + } @Effect() setQueryState$: Observable = this.actions$.pipe( diff --git a/projects/common-map/src/fm-map/reducers/map.reducer.ts b/projects/common-map/src/fm-map/reducers/map.reducer.ts index 32f4009..6f04fa1 100644 --- a/projects/common-map/src/fm-map/reducers/map.reducer.ts +++ b/projects/common-map/src/fm-map/reducers/map.reducer.ts @@ -44,9 +44,10 @@ export interface State { panelCollapsed: boolean, selectedFeature: Feature, selectedItem:IItem, + parentItem:IItem, clearEnabled: boolean, searchCollapsed: boolean, - searchMinified: boolean, + searchMinified: boolean, extent: number[], baseLayers: Array overlayLayers: Array, @@ -81,7 +82,7 @@ export const initialState: State = { panelVisible: false, panelCollapsed: false, selectedFeature: null, - selectedItem: null, + selectedItem: null, clearEnabled: false, searchCollapsed: true, searchMinified:false, @@ -99,7 +100,7 @@ export const initialState: State = { replaceUrl:true } -export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State { +export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State { switch (action.type) { case ROUTER_NAVIGATION: { let a = action as RouterNavigationAction; @@ -125,13 +126,13 @@ export function reducer(state = initialState, action: mapActions.Actions | commo } case mapActions.SETPARENT: { let a = action as mapActions.SetParent; - return tassign(state, { + return tassign(state, { parentCode : a.parentCode }); } case mapActions.STARTSEARCHSUCCESS: { let a = action as mapActions.StartSearchSuccess; - return tassign(state, { + return tassign(state, { features: a.features, inSearch:false }); @@ -141,8 +142,8 @@ export function reducer(state = initialState, action: mapActions.Actions | commo return tassign(state, { selectedFeature: state.selectedItem?state.selectedFeature: a.feature }); - } - case mapActions.SELECTITEM: { + } + case mapActions.SELECTITEM: { let a = action as mapActions.SelectItem; let itemCode = state.selectedItem ? state.selectedItem.code : ""; let inSearch = (a.itemCode != itemCode || state.setStateCount == 1) @@ -160,11 +161,12 @@ export function reducer(state = initialState, action: mapActions.Actions | commo itemLayer = new ItemLayer(a.item); itemLayer.layerIndex = a.item.data.layers?a.item.data.layers[0].index:-1; } else if (a.item && a.item.itemType == "vnd.farmmaps.itemtype.temporal") { - itemLayer = new TemporalItemLayer(a.item); + itemLayer = new TemporalItemLayer(a.item); } return tassign(state, { inSearch:false, selectedItem: a.item, + parentItem: a.parentItem, selectedItemLayer: itemLayer, panelVisible: a.item != null, clearEnabled: a.item != null, @@ -181,7 +183,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo if(a.temporalItems.length>0) { let item = a.temporalItems[a.temporalItems.length-1]; layerIndex = item.data.layers[0].index; - selectedItemLayer.selectedItemLayer = new ItemLayer(item,1,true,layerIndex); + selectedItemLayer.selectedItemLayer = new ItemLayer(item,1,true,layerIndex); } else { selectedItemLayer.selectedItemLayer = null; } @@ -189,9 +191,9 @@ export function reducer(state = initialState, action: mapActions.Actions | commo selectedItemLayer.nextItemLayer = null; if(selectedItemLayer.selectedItemLayer) { let layerIndex = selectedItemLayer.selectedItemLayer.item.data.layers[0].index; - selectedItemLayer.layerIndex = layerIndex; + selectedItemLayer.layerIndex = layerIndex; } - + return tassign(state,{selectedItemLayer:tassign(state.selectedItemLayer,selectedItemLayer as ItemLayer)}); } case mapActions.NEXTTEMPORAL: { @@ -234,11 +236,11 @@ export function reducer(state = initialState, action: mapActions.Actions | commo temporalLayer.nextItemLayer.opacity=0; temporalLayer.nextItemLayer.layerIndex = temporalLayer.layerIndex; } - temporalLayer.selectedItemLayer = temporalLayer.previousItemLayer; + temporalLayer.selectedItemLayer = temporalLayer.previousItemLayer; if( temporalLayer.selectedItemLayer) { temporalLayer.selectedItemLayer.opacity=1; temporalLayer.selectedItemLayer.layerIndex = temporalLayer.layerIndex; - } + } temporalLayer.previousItemLayer = index-2 >=0? new ItemLayer(temporalLayer.temporalItems[index-2],0,true,temporalLayer.layerIndex):null; if( temporalLayer.previousItemLayer) { temporalLayer.previousItemLayer.opacity=0; @@ -289,7 +291,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo }); } case mapActions.UPDATEFEATURESUCCESS: { - let a = action as mapActions.UpdateFeatureSuccess; + let a = action as mapActions.UpdateFeatureSuccess; let features: any[] = []; var index = -1; for (var i = 0; i < state.features.length; i++) { @@ -311,9 +313,9 @@ export function reducer(state = initialState, action: mapActions.Actions | commo return tassign(state, { searchCollapsed: state.panelVisible ? false: true,showLayerSwitcher:false}); } case mapActions.SETEXTENT: { - let a = action as mapActions.SetExtent; + let a = action as mapActions.SetExtent; return tassign(state, { extent: a.extent }); - } + } case mapActions.ADDLAYER: { let a = action as mapActions.AddLayer; let itemLayers = state.overlayLayers.slice(0); @@ -326,7 +328,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo } else { return state; } - + } case mapActions.REMOVELAYER: { let a = action as mapActions.RemoveLayer; @@ -356,7 +358,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo } case mapActions.SETLAYERINDEX: { let a = action as mapActions.SetLayerIndex; - if (a.itemLayer == null) { + if (a.itemLayer == null) { if(state.selectedItemLayer.item.itemType == "vnd.farmmaps.itemtype.temporal") { var newItemlayer = tassign(state.selectedItemLayer,{layerIndex:a.layerIndex}); let tl = newItemlayer as ITemporalItemLayer; @@ -384,7 +386,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo } else { var newItemlayer = new ItemLayer(state.selectedItemLayer.item); newItemlayer.layerIndex = a.layerIndex; - + } return tassign(state, { selectedItemLayer: newItemlayer}) } else { @@ -404,7 +406,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo } var selectedBaseLayer: IItemLayer = null; var mapState = tassign(state.mapState); - let sb = baseLayers.filter(layer => layer.item.code === mapState.baseLayerCode)[0]; + let sb = baseLayers.filter(layer => layer.item.code === mapState.baseLayerCode)[0]; if (baseLayers.length > 0 && mapState.baseLayerCode != "" && sb) { selectedBaseLayer = sb; selectedBaseLayer.visible = true; @@ -460,7 +462,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo case mapActions.SHOWLAYERSWITCHER:{ let a = action as mapActions.ShowLayerSwitcher; return tassign(state,{showLayerSwitcher:a.show}); - } + } case mapActions.SETREPLACEURL: { let a= action as mapActions.SetReplaceUrl; return tassign(state,{replaceUrl:a.replaceUrl}); @@ -481,6 +483,7 @@ export const getPanelVisible = (state: State) => state.panelVisible; export const getPanelCollapsed = (state: State) => state.panelCollapsed; export const getSelectedFeature = (state: State) => state.selectedFeature; export const getSelectedItem = (state: State) => state.selectedItem; +export const getParentItem = (state: State) => state.parentItem; export const getQueryState = (state: State) => state.queryState; export const getClearEnabled = (state: State) => state.clearEnabled; export const getSearchCollapsed = (state: State) => state.searchCollapsed; @@ -508,6 +511,7 @@ export const selectGetPanelVisible = createSelector(selectMapState, getPanelVisi export const selectGetPanelCollapsed = createSelector(selectMapState, getPanelCollapsed); export const selectGetSelectedFeature = createSelector(selectMapState, getSelectedFeature); export const selectGetSelectedItem = createSelector(selectMapState, getSelectedItem); +export const selectGetParentItem = createSelector(selectMapState, getParentItem); export const selectGetQueryState = createSelector(selectMapState, getQueryState); export const selectGetClearEnabled = createSelector(selectMapState, getClearEnabled); export const selectGetSearchCollapsed = createSelector(selectMapState, getSearchCollapsed); @@ -518,7 +522,7 @@ export const selectGetBaseLayers = createSelector(selectMapState, getBaseLayers) export const selectGetProjection = createSelector(selectMapState, getProjection); export const selectGetSelectedBaseLayer = createSelector(selectMapState, getSelectedBaseLayer); export const selectGetSelectedOverlayLayer = createSelector(selectMapState, getSelectedOverlayLayer); -export const selectGetQuery = createSelector(selectMapState, getQuery); +export const selectGetQuery = createSelector(selectMapState, getQuery); export const selectGetSelectedItemLayer = createSelector(selectMapState, getSelectedItemLayer); export const selectGetPeriod = createSelector(selectMapState, getPeriod); export const selectGetStyles = createSelector(selectMapState, getStyles);