AW-2924 Cache codelists
This commit is contained in:
parent
b182b7fda6
commit
914e272fc2
@ -5,7 +5,7 @@ import { IItemLayer } from '../models/item.layer';
|
|||||||
import { ILayervalue } from '../models/layer.value';
|
import { ILayervalue } from '../models/layer.value';
|
||||||
import { IQueryState } from '@farmmaps/common';
|
import { IQueryState } from '@farmmaps/common';
|
||||||
import { IItem } from '@farmmaps/common';
|
import { IItem } from '@farmmaps/common';
|
||||||
import { Feature } from 'ol';
|
import { Feature, Observable } from 'ol';
|
||||||
import { Style } from 'ol/style';
|
import { Style } from 'ol/style';
|
||||||
import { Geometry } from 'ol/geom';
|
import { Geometry } from 'ol/geom';
|
||||||
import { IPeriodState } from '../models/period.state';
|
import { IPeriodState } from '../models/period.state';
|
||||||
@ -56,7 +56,7 @@ export const GETLAYERVALUE = '[Map] GetLayerValue'
|
|||||||
export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess'
|
export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess'
|
||||||
export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
|
export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
|
||||||
export const SETVIEWSTATE = '[Map] SetViewState'
|
export const SETVIEWSTATE = '[Map] SetViewState'
|
||||||
|
export const SETCODELIST = '[Map] SetCodeList'
|
||||||
|
|
||||||
export class Clear implements Action {
|
export class Clear implements Action {
|
||||||
readonly type = CLEAR;
|
readonly type = CLEAR;
|
||||||
@ -329,6 +329,12 @@ export class SetViewState implements Action {
|
|||||||
constructor(public enabled:boolean) {}
|
constructor(public enabled:boolean) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class SetCodeList implements Action {
|
||||||
|
readonly type = SETCODELIST;
|
||||||
|
|
||||||
|
constructor(public itemType:string, public values: IItem[]) { }
|
||||||
|
}
|
||||||
|
|
||||||
export type Actions = SetMapState
|
export type Actions = SetMapState
|
||||||
| Init
|
| Init
|
||||||
| Clear
|
| Clear
|
||||||
@ -374,5 +380,6 @@ export type Actions = SetMapState
|
|||||||
| GetLayerValue
|
| GetLayerValue
|
||||||
| SetPeriod
|
| SetPeriod
|
||||||
| ToggleShowDataLayerSlide
|
| ToggleShowDataLayerSlide
|
||||||
| SetViewState;
|
| SetViewState
|
||||||
|
| SetCodeList;
|
||||||
|
|
||||||
|
@ -36,6 +36,7 @@ import {Extent,createEmpty,extend } from 'ol/extent';
|
|||||||
import {transform} from 'ol/proj';
|
import {transform} from 'ol/proj';
|
||||||
import { tassign } from 'tassign';
|
import { tassign } from 'tassign';
|
||||||
import * as style from 'ol/style';
|
import * as style from 'ol/style';
|
||||||
|
import { ICodeLists } from '../../models/codelist.cache';
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
@ -85,6 +86,8 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
|||||||
public overlayLayersCollapsed = true;
|
public overlayLayersCollapsed = true;
|
||||||
public extent$: Observable<Extent> = this.store.select(mapReducers.selectGetExtent);
|
public extent$: Observable<Extent> = this.store.select(mapReducers.selectGetExtent);
|
||||||
public styles$:Observable<IStyles> = this.store.select(mapReducers.selectGetStyles);
|
public styles$:Observable<IStyles> = this.store.select(mapReducers.selectGetStyles);
|
||||||
|
public codeLists$: Observable<ICodeLists> = this.store.select(mapReducers.selectGetCodeLists);
|
||||||
|
public codeList$ = (id: string) => this.store.select(mapReducers.selectGetCodeList(id));
|
||||||
public fullscreen$: Observable<boolean> = this.store.select(commonReducers.selectGetFullScreen);
|
public fullscreen$: Observable<boolean> = this.store.select(commonReducers.selectGetFullScreen);
|
||||||
private lastUrl = "";
|
private lastUrl = "";
|
||||||
private initialized = false;
|
private initialized = false;
|
||||||
|
@ -5,7 +5,7 @@ import { ROUTER_NAVIGATED, RouterReducerState } from '@ngrx/router-store';
|
|||||||
import * as fromRouter from '@ngrx/router-store';
|
import * as fromRouter from '@ngrx/router-store';
|
||||||
import { createEffect, Actions, ofType } from '@ngrx/effects';
|
import { createEffect, Actions, ofType } from '@ngrx/effects';
|
||||||
|
|
||||||
import { EMPTY, Observable, of } from 'rxjs';
|
import { EMPTY, Observable, of, forkJoin } from 'rxjs';
|
||||||
import { withLatestFrom, switchMap, map, catchError, mergeMap } from 'rxjs/operators';
|
import { withLatestFrom, switchMap, map, catchError, mergeMap } from 'rxjs/operators';
|
||||||
|
|
||||||
import { GeoJSON, WKT } from 'ol/format';
|
import { GeoJSON, WKT } from 'ol/format';
|
||||||
@ -99,6 +99,65 @@ export class MapEffects {
|
|||||||
color: 'rgba(0, 0, 0, 0)'
|
color: 'rgba(0, 0, 0, 0)'
|
||||||
})
|
})
|
||||||
})));
|
})));
|
||||||
|
// cache code lists
|
||||||
|
forkJoin([
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl017'),
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl018'),
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl020'),
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl022'),
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl104'),
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl127'),
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl232'),
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl251'),
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl256'),
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl259'),
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl263'),
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl264'),
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl290'),
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl291'),
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl293'),
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl405'),
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl411'),
|
||||||
|
this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl421'),
|
||||||
|
]).subscribe(([
|
||||||
|
cl017,
|
||||||
|
cl018,
|
||||||
|
cl020,
|
||||||
|
cl022,
|
||||||
|
cl104,
|
||||||
|
cl127,
|
||||||
|
cl232,
|
||||||
|
cl251,
|
||||||
|
cl256,
|
||||||
|
cl259,
|
||||||
|
cl263,
|
||||||
|
cl264,
|
||||||
|
cl290,
|
||||||
|
cl291,
|
||||||
|
cl293,
|
||||||
|
cl405,
|
||||||
|
cl411,
|
||||||
|
cl421,
|
||||||
|
]) => {
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl017', cl017));
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl018', cl018));
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl020', cl020));
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl020', cl020));
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl104', cl104));
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl127', cl127));
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl232', cl232));
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl251', cl251));
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl256', cl256));
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl259', cl259));
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl263', cl263));
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl264', cl264));
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl290', cl290));
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl291', cl291));
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl293', cl293));
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl405', cl405));
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl411', cl411));
|
||||||
|
actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl421', cl421));
|
||||||
|
});
|
||||||
|
|
||||||
return actions;
|
return actions;
|
||||||
}
|
}
|
||||||
|
5
projects/common-map/src/fm-map/models/codelist.cache.ts
Normal file
5
projects/common-map/src/fm-map/models/codelist.cache.ts
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
import { IItem } from '@farmmaps/common';
|
||||||
|
|
||||||
|
export interface ICodeLists {
|
||||||
|
[id: string]: IItem[];
|
||||||
|
}
|
@ -1,5 +1,5 @@
|
|||||||
import { tassign } from 'tassign';
|
import { tassign } from 'tassign';
|
||||||
import { IItem,Item } from '@farmmaps/common';
|
import { IItem } from '@farmmaps/common';
|
||||||
import { IItemLayer,ItemLayer,ITemporalItemLayer,TemporalItemLayer} from '../models/item.layer';
|
import { IItemLayer,ItemLayer,ITemporalItemLayer,TemporalItemLayer} from '../models/item.layer';
|
||||||
import { IMapState} from '../models/map.state';
|
import { IMapState} from '../models/map.state';
|
||||||
import { IQueryState} from '@farmmaps/common';
|
import { IQueryState} from '@farmmaps/common';
|
||||||
@ -17,6 +17,7 @@ import {Geometry} from 'ol/geom';
|
|||||||
import { ROUTER_NAVIGATION, RouterNavigationAction } from '@ngrx/router-store';
|
import { ROUTER_NAVIGATION, RouterNavigationAction } from '@ngrx/router-store';
|
||||||
|
|
||||||
import { MODULE_NAME } from '../module-name';
|
import { MODULE_NAME } from '../module-name';
|
||||||
|
import { ICodeLists } from '../models/codelist.cache';
|
||||||
|
|
||||||
const startDate:Date = new Date(new Date(Date.now()).getFullYear(), new Date(Date.now()).getMonth() - 3, 1);
|
const startDate:Date = new Date(new Date(Date.now()).getFullYear(), new Date(Date.now()).getMonth() - 3, 1);
|
||||||
const endDate:Date = new Date(Date.now());
|
const endDate:Date = new Date(Date.now());
|
||||||
@ -72,7 +73,8 @@ export interface State {
|
|||||||
layerValuesEnabled:boolean,
|
layerValuesEnabled:boolean,
|
||||||
layerValues: Array<ILayervalue>
|
layerValues: Array<ILayervalue>
|
||||||
showDataLayerSlide:boolean,
|
showDataLayerSlide:boolean,
|
||||||
viewEnabled:boolean
|
viewEnabled: boolean,
|
||||||
|
codeLists:ICodeLists,
|
||||||
}
|
}
|
||||||
|
|
||||||
export const initialState: State = {
|
export const initialState: State = {
|
||||||
@ -117,7 +119,8 @@ export const initialState: State = {
|
|||||||
layerValuesEnabled:false,
|
layerValuesEnabled:false,
|
||||||
layerValues:[],
|
layerValues:[],
|
||||||
showDataLayerSlide:false,
|
showDataLayerSlide:false,
|
||||||
viewEnabled:true
|
viewEnabled: true,
|
||||||
|
codeLists: {}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State {
|
export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State {
|
||||||
@ -569,6 +572,12 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
|||||||
}
|
}
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
case mapActions.SETCODELIST:{
|
||||||
|
const a = action as mapActions.SetCodeList;
|
||||||
|
const codeLists = tassign(state.codeLists);
|
||||||
|
codeLists[a.itemType] = a.values;
|
||||||
|
return tassign(state,{codeLists:codeLists});
|
||||||
|
}
|
||||||
default: {
|
default: {
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
@ -607,7 +616,7 @@ export const getLayerValues = (state:State) => state.layerValues;
|
|||||||
export const getLayerValuesX = (state:State) => state.layerValuesX;
|
export const getLayerValuesX = (state:State) => state.layerValuesX;
|
||||||
export const getLayerValuesY = (state:State) => state.layerValuesY;
|
export const getLayerValuesY = (state:State) => state.layerValuesY;
|
||||||
export const getViewEnabled = (state:State) => state.viewEnabled;
|
export const getViewEnabled = (state:State) => state.viewEnabled;
|
||||||
|
export const getCodeLists = (state:State) => state.codeLists;
|
||||||
|
|
||||||
export const selectMapState = createFeatureSelector<State>(MODULE_NAME);
|
export const selectMapState = createFeatureSelector<State>(MODULE_NAME);
|
||||||
export const selectGetMapState= createSelector(selectMapState, getMapState);
|
export const selectGetMapState= createSelector(selectMapState, getMapState);
|
||||||
@ -642,5 +651,5 @@ export const selectGetLayerValues = createSelector(selectMapState,getLayerValues
|
|||||||
export const selectGetLayerValuesX = createSelector(selectMapState,getLayerValuesX);
|
export const selectGetLayerValuesX = createSelector(selectMapState,getLayerValuesX);
|
||||||
export const selectGetLayerValuesY = createSelector(selectMapState,getLayerValuesY);
|
export const selectGetLayerValuesY = createSelector(selectMapState,getLayerValuesY);
|
||||||
export const selectGetViewEnabled = createSelector(selectMapState,getViewEnabled);
|
export const selectGetViewEnabled = createSelector(selectMapState,getViewEnabled);
|
||||||
|
export const selectGetCodeLists = createSelector(selectMapState, getCodeLists);
|
||||||
|
export const selectGetCodeList = (id: string) => createSelector(selectGetCodeLists, (codeLists) => codeLists[id]);
|
Loading…
Reference in New Issue
Block a user