From fad04744cfbfbae620f41736ea9eea1a0a63cbd7 Mon Sep 17 00:00:00 2001
From: Willem Dantuma <willem.dantuma@dobs.nl>
Date: Mon, 29 Jun 2020 16:00:53 +0200
Subject: [PATCH] Refactor ILayer

---
 package-lock.json                                  | 12 ++++++------
 package.json                                       |  4 ++--
 projects/common-map/package.json                   |  2 +-
 projects/common-map/src/fm-map/models/color.map.ts |  8 +++-----
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 529c0c2..6d9a403 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2692,14 +2692,14 @@
       }
     },
     "@farmmaps/common": {
-      "version": "0.0.1-prerelease.303",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.303.tgz",
-      "integrity": "sha512-gqfTQMq9oiqt4yNLkNGEr5t1fVwVtIpgrYtyv9A85eYjmRkMJjZv6m1rRvxXU+igcraaQlSp5uqq929ku7JO6Q=="
+      "version": "0.0.1-prerelease.308",
+      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.308.tgz",
+      "integrity": "sha512-sbX5NEHons4ZH3HAnMoOgyeoicbj8tS24s7Xtzx6xE6QQHeeuxi2EmQR9CwQENFynHi7C0U/+nxNTu1ClIuIjw=="
     },
     "@farmmaps/common-map": {
-      "version": "0.0.1-prerelease.303",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.303.tgz",
-      "integrity": "sha512-8MwPtC4xk/pEidfBt5Uttq/hbpe5kGwW06SbbwjLEe4e/tejzP97F0TWVFWHNyu5h26SeJqD1IOCjEizxV6RLg=="
+      "version": "0.0.1-prerelease.308",
+      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.308.tgz",
+      "integrity": "sha512-AotrSNNmguSzh7OgExn5tCwhEP4s1wwEVMPqQN65fZMuMN+5IaliHIvPiQkmkiw73N5rLKvgkfc59u9M+uOZGQ=="
     },
     "@istanbuljs/schema": {
       "version": "0.1.2",
diff --git a/package.json b/package.json
index ffac43b..0fd7e6a 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,8 @@
     "@angular/platform-browser": "~9.1.0",
     "@angular/platform-browser-dynamic": "~9.1.0",
     "@angular/router": "~9.1.0",
-    "@farmmaps/common": ">=0.0.1-prerelease.303 <0.0.1",
-    "@farmmaps/common-map": ">=0.0.1-prerelease.303 <0.0.1",
+    "@farmmaps/common": ">=0.0.1-prerelease.308 <0.0.1",
+    "@farmmaps/common-map": ">=0.0.1-prerelease.308 <0.0.1",
     "@microsoft/signalr": "^3.1.3",
     "@ng-bootstrap/ng-bootstrap": "^6.0",
     "@ngrx/effects": "^9.0",
diff --git a/projects/common-map/package.json b/projects/common-map/package.json
index 7eb8948..ce20ab4 100644
--- a/projects/common-map/package.json
+++ b/projects/common-map/package.json
@@ -11,7 +11,7 @@
     "@ngrx/router-store": "^9.0",
     "@ngrx/store": "^9.0",
     "tassign": "^1.0.0",
-    "@farmmaps/common": ">=0.0.1-prerelease.302 <0.0.1",
+    "@farmmaps/common": ">=0.0.1-prerelease.308 <0.0.1",
     "ngx-openlayers": "1.0.0-next.13",
     "ol": "6.1.1"
   }
diff --git a/projects/common-map/src/fm-map/models/color.map.ts b/projects/common-map/src/fm-map/models/color.map.ts
index ed7438c..64e7337 100644
--- a/projects/common-map/src/fm-map/models/color.map.ts
+++ b/projects/common-map/src/fm-map/models/color.map.ts
@@ -1,3 +1,5 @@
+import { IDataLayer } from '@farmmaps/common';
+
 export interface IColor {
   red: number,
   green: number,
@@ -64,11 +66,7 @@ export interface IRenderoutputImage {
   extent: [number,number,number,number]
 }
 
-export interface ILayer {
-  name: string,
-  unit: string,
-  index: number,
-  scale: number,
+export interface ILayer extends IDataLayer {
   renderer: IRenderer,
   rendering: IRenderoutput
 }