From eb50218a8d6dacaf4c46b353fd438e3075b9be09 Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Fri, 29 Jan 2021 12:00:59 +0100 Subject: [PATCH] Refactor some stuff to a service --- .../src/fm-map/common-map.module.ts | 3 + .../selected-item-temporal.component.html | 10 +-- .../selected-item-temporal.component.ts | 62 ++---------------- .../src/fm-map/services/temporal.service.ts | 65 +++++++++++++++++++ 4 files changed, 78 insertions(+), 62 deletions(-) create mode 100644 projects/common-map/src/fm-map/services/temporal.service.ts diff --git a/projects/common-map/src/fm-map/common-map.module.ts b/projects/common-map/src/fm-map/common-map.module.ts index 055d45b..dfd2cfb 100644 --- a/projects/common-map/src/fm-map/common-map.module.ts +++ b/projects/common-map/src/fm-map/common-map.module.ts @@ -58,6 +58,7 @@ import { LayerVectorImageComponent } from './components/aol/layer-vector-image/l import {FeatureIconService} from './services/feature-icon.service'; import { GeolocationService } from './services/geolocation.service'; import {DeviceOrientationService} from './services/device-orientation.service'; +import { TemporalService} from './services/temporal.service'; import { WidgetStatusComponent } from './components/widget-status/widget-status.component'; import { ForChild} from './components/for-item/for-child.decorator'; import {ForItemType } from './components/for-item/for-itemtype.decorator'; @@ -139,6 +140,7 @@ export { FeatureIconService, GeolocationService, DeviceOrientationService, + TemporalService, IMapState, ISelectedFeatures, IItemLayer, @@ -265,6 +267,7 @@ export { FeatureIconService, GeolocationService, DeviceOrientationService, + TemporalService, { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true }, { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true }, { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true }, 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 6ac2c0f..49d084c 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 @@ -9,16 +9,16 @@
-
Date: {{selectedDate()}}
+
Date: {{temporalService.selectedDate(itemLayer)}}
-
-
diff --git a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts index 39f60da..36e85d9 100644 --- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts @@ -1,14 +1,15 @@ import { Component, Injectable } from '@angular/core'; -import { Location,DatePipe } from '@angular/common'; +import { Location } from '@angular/common'; import { Store } from '@ngrx/store'; import * as mapReducers from '../../reducers/map.reducer'; -import { commonReducers, ItemTypeService, ItemService, FolderService,IItem,TimespanService } from '@farmmaps/common'; +import { commonReducers, ItemTypeService, IItem } from '@farmmaps/common'; import { Router } from '@angular/router'; import { ForItemType } from '../for-item/for-itemtype.decorator'; import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component'; import { ITemporalItemLayer} from '../../models/item.layer'; import * as mapActions from '../../actions/map.actions'; import { IItemLayer } from '../../models/item.layer'; +import {TemporalService} from '../../services/temporal.service'; @ForItemType("vnd.farmmaps.itemtype.temporal") @@ -20,7 +21,7 @@ import { IItemLayer } from '../../models/item.layer'; }) export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent { - constructor(store: Store, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService, private timespanService$:TimespanService,private datePipe$: DatePipe) { + constructor(store: Store, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) { super(store, itemTypeService,location,router); } @@ -32,60 +33,7 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent return (this.itemLayer as ITemporalItemLayer)?.selectedItemLayer } - hasNext():boolean { - let temporalItemLayer = this.itemLayer as ITemporalItemLayer; - return temporalItemLayer && temporalItemLayer.nextItemLayer != null; - } - - selectedDate():string { - let temporalItemLayer = this.itemLayer as ITemporalItemLayer; - if(temporalItemLayer.selectedItemLayer) { - if(temporalItemLayer.selectedItemLayer.item.dataDate && temporalItemLayer.selectedItemLayer.item.dataEndDate) { - let sd = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataDate)); - let ed = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataEndDate)); - return this.timespanService$.getCaption(sd,ed); - } else { - let d = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataDate)); - return this.datePipe$.transform(d, "shortDate"); - } - } - return ""; - } - - nextDate():string { - let temporalItemLayer = this.itemLayer as ITemporalItemLayer; - if(temporalItemLayer.nextItemLayer.item) { - if(temporalItemLayer.nextItemLayer.item.dataDate && temporalItemLayer.nextItemLayer.item.dataEndDate) { - let sd = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataDate)); - let ed = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataEndDate)); - return this.timespanService$.getCaption(sd,ed); - } else { - let d = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataDate)); - return this.datePipe$.transform(d, "shortDate"); - } - } - return ""; - } - - hasPrevious():boolean { - let temporalItemLayer = this.itemLayer as ITemporalItemLayer; - return temporalItemLayer && temporalItemLayer.previousItemLayer != null; - } - - previousDate():string { - let temporalItemLayer = this.itemLayer as ITemporalItemLayer; - if(temporalItemLayer.previousItemLayer.item) { - if(temporalItemLayer.previousItemLayer.item.dataDate && temporalItemLayer.previousItemLayer.item.dataEndDate) { - let sd = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataDate)); - let ed = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataEndDate)); - return this.timespanService$.getCaption(sd,ed); - } else { - let d = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataDate)); - return this.datePipe$.transform(d, "shortDate"); - } - } - return ""; - } + handleNextTemporal(event:MouseEvent) { this.store.dispatch(new mapActions.NextTemporal()); diff --git a/projects/common-map/src/fm-map/services/temporal.service.ts b/projects/common-map/src/fm-map/services/temporal.service.ts new file mode 100644 index 0000000..457c937 --- /dev/null +++ b/projects/common-map/src/fm-map/services/temporal.service.ts @@ -0,0 +1,65 @@ +import { Injectable} from '@angular/core'; +import {DatePipe} from '@angular/common'; +import {TimespanService} from '@farmmaps/common'; +import { IItemLayer, ITemporalItemLayer,TemporalItemLayer} from '../models/item.layer'; + + +@Injectable() +export class TemporalService { + constructor(private timespanService$:TimespanService,private datePipe$: DatePipe) {} + + hasNext(itemLayer:IItemLayer):boolean { + let temporalItemLayer = itemLayer as ITemporalItemLayer; + return temporalItemLayer && temporalItemLayer.nextItemLayer != null; + } + + selectedDate(itemLayer:IItemLayer):string { + let temporalItemLayer = itemLayer as ITemporalItemLayer; + if(temporalItemLayer.selectedItemLayer) { + if(temporalItemLayer.selectedItemLayer.item.dataDate && temporalItemLayer.selectedItemLayer.item.dataEndDate) { + let sd = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataDate)); + let ed = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataEndDate)); + return this.timespanService$.getCaption(sd,ed); + } else { + let d = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataDate)); + return this.datePipe$.transform(d, "shortDate"); + } + } + return ""; + } + + nextDate(itemLayer:IItemLayer):string { + let temporalItemLayer = itemLayer as ITemporalItemLayer; + if(temporalItemLayer.nextItemLayer.item) { + if(temporalItemLayer.nextItemLayer.item.dataDate && temporalItemLayer.nextItemLayer.item.dataEndDate) { + let sd = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataDate)); + let ed = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataEndDate)); + return this.timespanService$.getCaption(sd,ed); + } else { + let d = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataDate)); + return this.datePipe$.transform(d, "shortDate"); + } + } + return ""; + } + + hasPrevious(itemLayer:IItemLayer):boolean { + let temporalItemLayer = itemLayer as ITemporalItemLayer; + return temporalItemLayer && temporalItemLayer.previousItemLayer != null; + } + + previousDate(itemLayer:IItemLayer):string { + let temporalItemLayer = itemLayer as ITemporalItemLayer; + if(temporalItemLayer.previousItemLayer.item) { + if(temporalItemLayer.previousItemLayer.item.dataDate && temporalItemLayer.previousItemLayer.item.dataEndDate) { + let sd = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataDate)); + let ed = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataEndDate)); + return this.timespanService$.getCaption(sd,ed); + } else { + let d = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataDate)); + return this.datePipe$.transform(d, "shortDate"); + } + } + return ""; + } +} \ No newline at end of file