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

Fix request canceling
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Willem Dantuma 2021-03-05 18:41:09 +01:00
parent 9d5cd0fa88
commit aa308abbb0
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/common-map/src/fm-map/components/aol/layer-values/layer-values.component.html
View File

@ -7,7 +7,7 @@
<li class="border-top pt-1 pb-1 value" *ngFor="let layerValue of layers"> <li class="border-top pt-1 pb-1 value" *ngFor="let layerValue of layers">
<div>{{layerValue.layerName}}</div> <div>{{layerValue.layerName}}</div>
<div>{{layerValue.date|date}}</div> <div>{{layerValue.date|date}}</div>
<div><span>{{layerValue.quantity}}</span> <span>{{layerValue.value}}</span><span>{{layerValue.unit}}</span></div> <div><span class="mr-1">{{layerValue.quantity}}</span> <span class="mr-1 font-weight-bold">{{layerValue.value}}</span><span>{{layerValue.unit}}</span></div>
</li> </li>
</ul> </ul>
<ng-template #no_data> <ng-template #no_data>

9
projects/common-map/src/fm-map/components/aol/layer-values/layer-values.component.ts
View File

@ -5,8 +5,8 @@ import * as mapReducers from '../../../reducers/map.reducer';
import * as mapActions from '../../../actions/map.actions'; import * as mapActions from '../../../actions/map.actions';
import { MapComponent } from 'ngx-openlayers'; import { MapComponent } from 'ngx-openlayers';
import { ILayervalue } from '../../../models/layer.value'; import { ILayervalue } from '../../../models/layer.value';
import { Observable,interval } from 'rxjs'; import { Observable,interval,Subject } from 'rxjs';
import { debounce } from 'rxjs/operators'; import { debounce, throttle } from 'rxjs/operators';
import { toLonLat } from 'ol/proj'; import { toLonLat } from 'ol/proj';
import { toStringHDMS } from 'ol/coordinate'; import { toStringHDMS } from 'ol/coordinate';
import { ClipboardService } from 'ngx-clipboard' import { ClipboardService } from 'ngx-clipboard'
@ -37,12 +37,15 @@ export class LayerValuesComponent implements OnInit,AfterViewInit {
} }
moveEndSubject = new Subject<any>();
ngAfterViewInit():void { ngAfterViewInit():void {
this.offsetY$ = this.containerRef.nativeElement.offsetTop; this.offsetY$ = this.containerRef.nativeElement.offsetTop;
this.offsetX$ = this.containerRef.nativeElement.offsetLeft; this.offsetX$ = this.containerRef.nativeElement.offsetLeft;
this.map.instance.on('moveend', () => { this.map.instance.on('moveend', () => {
this.updateValuesLocation(); this.moveEndSubject.next({});
}); });
this.moveEndSubject.pipe(throttle(ev => interval(100))).subscribe(() => this.updateValuesLocation());
} }
updateValuesLocation() { updateValuesLocation() {

20
projects/common-map/src/fm-map/effects/map.effects.ts
View File

@ -300,13 +300,25 @@ export class MapEffects {
@Effect() @Effect()
getLayerValue$: Observable<Action> = this.actions$.pipe( getLayerValue$: Observable<Action> = this.actions$.pipe(
ofType(mapActions.GETLAYERVALUE), ofType(mapActions.GETLAYERVALUE),
switchMap((action:mapActions.GetLayerValue) => { mergeMap((action:mapActions.GetLayerValue) => {
var l = action.itemLayer.item.data["layers"][action.itemLayer.layerIndex]; var l = action.itemLayer.item.data["layers"][action.itemLayer.layerIndex];
var scale = l.scale?l.scale:1; var scale = l.scale?l.scale:1;
return this.itemService$.getLayerValue(action.itemLayer.item.code,action.itemLayer.layerIndex,action.x,action.y).pipe( return this.itemService$.getLayerValue(action.itemLayer.item.code,action.itemLayer.layerIndex,action.x,action.y).pipe(
switchMap((v: number) => { mergeMap((v: number) => {
let a=[]; let a=[];
if(v) a.push(new mapActions.GetLayerValueSuccess({date:"",value:v*scale,layerName:l.name,quantity:l.quantity,unit:l.unit})); if(v) {
if(l.renderer && l.renderer.colorMap && l.renderer.colorMap.colormapType == "manual") {
l.renderer.colorMap.entries.forEach((e) => {
if(e.value == v) {
v=e.label;
return;
}
});
a.push(new mapActions.GetLayerValueSuccess({date:action.itemLayer.item.dataDate,value:v,layerName:l.name,quantity:"",unit:l.unit}));
} else {
a.push(new mapActions.GetLayerValueSuccess({date:action.itemLayer.item.dataDate,value:v*scale,layerName:l.name,quantity:l.quantity,unit:l.unit}));
}
}
return a; return a;
})) }))
} }
@ -327,7 +339,7 @@ export class MapEffects {
withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItemLayer)), withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItemLayer)),
withLatestFrom(this.store$.select(mapReducers.selectGetLayerValuesEnabled)), withLatestFrom(this.store$.select(mapReducers.selectGetLayerValuesEnabled)),
withLatestFrom(this.store$.select(mapReducers.selectGetOverlayLayers)), withLatestFrom(this.store$.select(mapReducers.selectGetOverlayLayers)),
switchMap(([[[action, selected], enabled],overlayLayers]) => { mergeMap(([[[action, selected], enabled],overlayLayers]) => {
let layers = []; let layers = [];
if(selected) layers.push(selected); if(selected) layers.push(selected);
overlayLayers.forEach((ol) => { overlayLayers.forEach((ol) => {