Refactor ILayer

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",

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",

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"
   }

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
 }