From 38c8def43a47f7a1046cf4c62695d30d08978bae Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Tue, 25 Feb 2020 15:14:29 +0100 Subject: [PATCH] Add area to selected-item-cropfield --- ...eature-list-feature-cropfield.component.ts | 3 +- .../selected-item-cropfield.component.html | 4 +- .../selected-item-cropfield.component.ts | 73 +++++++++++-------- 3 files changed, 47 insertions(+), 33 deletions(-) diff --git a/projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.ts b/projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.ts index 0698217..ecc5625 100644 --- a/projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.ts +++ b/projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.ts @@ -5,6 +5,7 @@ import * as mapReducers from '../../reducers/map.reducer'; import { commonReducers,ItemTypeService,AppConfig } from '@farmmaps/common'; import { AbstractFeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component'; import { ForItemType } from '../for-item/for-itemtype.decorator'; +import {getArea} from 'ol/sphere'; @ForItemType("vnd.farmmaps.itemtype.cropfield") @@ -25,6 +26,6 @@ export class FeatureListFeatureCropfieldComponent extends AbstractFeatureListFea // get area from faeture if 0 calculate from polygon let a = feature.get('area'); if(a) return a; - return (feature.getGeometry().getArea() / 10000); + return getArea(feature.getGeometry(),{projectio:"EPSG:3857"}) / 10000; } } diff --git a/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.html b/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.html index 9bdf90d..f4374cf 100644 --- a/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.html +++ b/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.html @@ -6,8 +6,8 @@

Cropfield

{{item.name}}

-
{{item.data.cropTypeName}}
-
{{item.data.startDate|date}} - {{item.data.endDate|date}}
+
{{areaInHa(item)| number:'1.2-2'}} ha {{item.data.cropTypeName}}
+
{{item.data.startDate|date}} - {{item.data.endDate|date}}
diff --git a/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts b/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts index e814a49..5617547 100644 --- a/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts @@ -1,30 +1,43 @@ -import { Component, Input, Injectable, OnInit } from '@angular/core'; -import { Location } from '@angular/common'; -import { Feature } from 'ol'; -import { Store } from '@ngrx/store'; -import * as mapReducers from '../../reducers/map.reducer'; -import { commonReducers, ItemTypeService, IItem, Item, ItemService, FolderService, IListItem} from '@farmmaps/common'; -import { Router, ActivatedRoute, ParamMap, Event } from '@angular/router'; -import { ForItemType } from '../for-item/for-itemtype.decorator'; -import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component'; -import { Observable } from 'rxjs'; - - -@ForItemType("vnd.farmmaps.itemtype.cropfield") -@Injectable() -@Component({ - selector: 'fm-map-selected-item-cropfield', - templateUrl: './selected-item-cropfield.component.html', - styleUrls: ['./selected-item-cropfield.component.scss'] -}) -export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponent implements OnInit{ - - public items: Observable; - - constructor(store: Store, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) { - super(store, itemTypeService,location,router); - } - ngOnInit() { - this.items = this.folderService$.getItems(this.item.code, 0, 1000); - } -} +import { Component, Input, Injectable, OnInit } from '@angular/core'; +import { Location } from '@angular/common'; +import { Feature } from 'ol'; +import { Store } from '@ngrx/store'; +import * as mapReducers from '../../reducers/map.reducer'; +import { commonReducers, ItemTypeService, IItem, Item, ItemService, FolderService, IListItem} from '@farmmaps/common'; +import { Router, ActivatedRoute, ParamMap, Event } from '@angular/router'; +import { ForItemType } from '../for-item/for-itemtype.decorator'; +import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component'; +import { Observable } from 'rxjs'; +import {GeoJSON} from 'ol/format'; +import {getArea} from 'ol/sphere'; + + +@ForItemType("vnd.farmmaps.itemtype.cropfield") +@Injectable() +@Component({ + selector: 'fm-map-selected-item-cropfield', + templateUrl: './selected-item-cropfield.component.html', + styleUrls: ['./selected-item-cropfield.component.scss'] +}) +export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponent implements OnInit{ + + public items: Observable; + + constructor(store: Store, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) { + super(store, itemTypeService,location,router); + } + + areaInHa(item:IItem):number { + if(!item) return 0; + // get area from faeture if 0 calculate from polygon + let a = item.data.area; + if(a) return a; + let format = new GeoJSON(); + let polygon = format.readGeometry(item.geometry); + return getArea(polygon,{projection:"EPSG:4326"}) / 10000; + } + + ngOnInit() { + this. items = this.folderService$.getItems(this.item.code, 0, 1000); + } +}