From 214dc3ffa1150427cd84d01337a2dcc4e0f48135 Mon Sep 17 00:00:00 2001
From: Willem Dantuma <willem.dantuma@dobs.nl>
Date: Mon, 29 Jun 2020 16:09:19 +0200
Subject: [PATCH] Refactor temporallast

---
 projects/common/src/fm/services/item.service.ts  |  3 ++-
 projects/common/src/fm/services/senml-service.ts | 13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/projects/common/src/fm/services/item.service.ts b/projects/common/src/fm/services/item.service.ts
index 671e522..da7eb0b 100644
--- a/projects/common/src/fm/services/item.service.ts
+++ b/projects/common/src/fm/services/item.service.ts
@@ -3,6 +3,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { IItemType } from '../models/item.type';
 import { IItem } from '../models/item';
+import { IJsonline } from '../models/json-line';
 import { IItemTask } from '../models/itemTask';
 import { HttpClient, HttpParams } from "@angular/common/http";
 import { AppConfig } from "../shared/app.config";
@@ -135,7 +136,7 @@ export class ItemService {
     return this.httpClient.post<any>(`${this.ApiEndpoint()}/api/v1/items/delete`, itemCodes);
   }
 
-  getTemporalLast(code: string): Observable<any> {
+  getTemporalLast(code: string): Observable<IJsonline> {
     return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/items/${code}/temporal/last`);
   }
 
diff --git a/projects/common/src/fm/services/senml-service.ts b/projects/common/src/fm/services/senml-service.ts
index 6148ba5..9cf16da 100644
--- a/projects/common/src/fm/services/senml-service.ts
+++ b/projects/common/src/fm/services/senml-service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { IJsonline } from '../models/json-line';
 import { ISenMLItem } from '../models/senml-item';
 import { IDataLayer } from '../models/data.layer';
+import { IItem } from '../models/item';
 
 @Injectable({
   providedIn: 'root',
@@ -10,13 +11,21 @@ export class SenmlService {
     constructor() {
     }
 
-    getSenMLItem(name:string,jsonLine:IJsonline): ISenMLItem {
+    getSenMLItem(layer:IDataLayer,jsonLine:IJsonline): ISenMLItem {
         if (jsonLine) {
           var senmlPack = jsonLine.data as ISenMLItem[];
-          var temp = senmlPack.filter((i) => i.u == name);
+          var temp = senmlPack.filter((i) => i.u == layer.indexKey);
           if (temp.length == 1) return temp[0];
           return null;
         }
     }
 
+    getFirstLayer(item:IItem):IDataLayer {
+        if(item && item.data && item.data["layers"] && item.data["layers"].length > 0 ) {
+            return item.data["layers"][0] as IDataLayer;
+        } else {
+            let retVal:IDataLayer = { name:"Soil moisture",index:0,scale:1,unit:"%",indexKey:"%vol" };
+            return retVal;
+        }
+    }
 }
\ No newline at end of file