From 22e007b70bf7ca47653ea4bf94d6a6f19f817d54 Mon Sep 17 00:00:00 2001
From: Willem Dantuma <willem.dantuma@dobs.nl>
Date: Fri, 18 Sep 2020 08:38:05 +0200
Subject: [PATCH 1/5] First attempt to bring back 3D view in map

---
 angular.json                                  |  9 ++-
 package-lock.json                             | 39 +++++++--
 package.json                                  | 11 ++-
 projects/common-map/package.json              |  2 +-
 .../src/fm-map/common-map.module.ts           |  5 +-
 .../aol/switch2d3d/switch2d3d.component.ts    | 80 +++++++++----------
 .../fm-map/components/map/map.component.html  |  2 +-
 src/main.ts                                   |  7 ++
 8 files changed, 101 insertions(+), 54 deletions(-)

diff --git a/angular.json b/angular.json
index dbe82e7..e346a4f 100644
--- a/angular.json
+++ b/angular.json
@@ -35,13 +35,20 @@
                 "input":"src/assets",
                 "output":"/"
               },
+              {
+                "glob": "**/*",
+                "input": "node_modules/cesium/Build/Cesium",
+                "output": "/assets/cesium"
+              },
               "src/configuration.json"
             ],
             "styles": [
               "src/styles.css",
               "node_modules/bootstrap/dist/css/bootstrap.min.css",
               "node_modules/font-awesome/css/font-awesome.min.css",              
-              "fonts/FMIconFont/style.css"
+              "fonts/FMIconFont/style.css",
+              "node_modules/cesium/Build/Cesium/Widgets/widgets.css",
+              "node_modules/ol/ol.css"
             ],
             "scripts": [],
             "es5BrowserSupport": true
diff --git a/package-lock.json b/package-lock.json
index a6a9530..893b90f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,20 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@angular-builders/custom-webpack": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-9.1.0.tgz",
+      "integrity": "sha512-Dek6KxNUFBELKqNRO4Im5JIP0/rZF4HmvgA8X+RyqOd9cyDxk16A441WlqTqy3UKX8lcbf6C9RcR5D2dI1ZATQ==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/architect": ">=0.900.0 < 0.1000.0",
+        "@angular-devkit/build-angular": ">=0.900.0 < 0.1000.0",
+        "@angular-devkit/core": "^9.0.0",
+        "lodash": "^4.17.10",
+        "ts-node": "^8.5.2",
+        "webpack-merge": "^4.2.1"
+      }
+    },
     "@angular-devkit/architect": {
       "version": "0.901.0",
       "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.0.tgz",
@@ -2692,14 +2706,12 @@
       }
     },
     "@farmmaps/common": {
-      "version": "0.0.1-prerelease.349",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.349.tgz",
-      "integrity": "sha512-CLANnjefX8vpIIOHX/eutPG9H/7PD/rgG5HH/VhmXjTwSjU97W4xf+iLow4SvukVFfikQ1EDnWECx/6uKKRIUg=="
+      "version": "0.0.1-prerelease.398",
+      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.398.tgz",
+      "integrity": "sha512-lAOHGwYFUSE4lTqiSIbANbP6KJoAW0uEgor8ag2ridTRHE8X5skj3wYZIkzYOhUA8njPEju+U6wwW8e4wshlCw=="
     },
     "@farmmaps/common-map": {
-      "version": "0.0.1-prerelease.360",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.360.tgz",
-      "integrity": "sha512-V7cWPiTHS1gIahwCpt32Qcv+wHxdOWg/+LzmP2x/6X9cJnC0L6XDR5rJFvS8zpGeRJiunq7cSFCm/22MOpnRTQ=="
+      "version": "file:dist/common-map"
     },
     "@istanbuljs/schema": {
       "version": "0.1.2",
@@ -4434,6 +4446,11 @@
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
+    "cesium": {
+      "version": "1.73.0",
+      "resolved": "https://registry.npmjs.org/cesium/-/cesium-1.73.0.tgz",
+      "integrity": "sha512-HqvxPbCEsE1Szdm5qPIrBNjHG2cJ9Xk5uYMELmG0GuBL/sYaQ/0IMton43LUBY4E/wblRivNo1Vz7tIQweraFw=="
+    },
     "chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -9443,6 +9460,11 @@
         "minimist": "^1.2.5"
       }
     },
+    "moment": {
+      "version": "2.27.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
+      "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -10085,6 +10107,11 @@
         "rbush": "^3.0.1"
       }
     },
+    "ol-cesium": {
+      "version": "2.11.3",
+      "resolved": "https://registry.npmjs.org/ol-cesium/-/ol-cesium-2.11.3.tgz",
+      "integrity": "sha512-rdjk2BjNgSQF1i6wV2FfmGATAdnaLQ5d7DMIhIBoxRVpUYvOOp7swptIQZLDXQMVzqkVJUoY7AKFLEFLbUV+TQ=="
+    },
     "on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
diff --git a/package.json b/package.json
index 4074ffd..c90ca9a 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.349 <0.0.1",
-    "@farmmaps/common-map": ">=0.0.1-prerelease.349 <0.0.1",
+    "@farmmaps/common": ">=0.0.1-prerelease.398 <0.0.1",
+    "@farmmaps/common-map": "file:dist/common-map",
     "@microsoft/signalr": "^3.1.3",
     "@ng-bootstrap/ng-bootstrap": "^6.0",
     "@ngrx/effects": "^9.0",
@@ -28,21 +28,24 @@
     "@ngrx/store": "^9.0",
     "angular-oauth2-oidc": "^9.1",
     "bootstrap": "^4.4.1",
+    "cesium": "^1.73.0",
     "core-js": "^2.6.11",
     "font-awesome": "^4.7.0",
+    "moment": "^2.27.0",
     "ngrx-store-localstorage": "^9.0",
     "ngx-bootstrap": "^5.6.1",
     "ngx-openlayers": "1.0.0-next.13",
     "ngx-uploadx": "^3.5.1",
     "ol": "6.1.1",
+    "ol-cesium": "^2.11.3",
     "resumablejs": "^1.1.0",
     "rxjs": "^6.5.4",
     "tassign": "^1.0.0",
     "tslib": "^1.10.0",
-    "zone.js": "~0.10.2",
-    "moment": "^2.27.0"
+    "zone.js": "~0.10.2"
   },
   "devDependencies": {
+    "@angular-builders/custom-webpack": "9.1.0",
     "@angular-devkit/build-angular": "~0.901.0",
     "@angular-devkit/build-ng-packagr": "~0.901.0",
     "@angular/cli": "^9.1.0",
diff --git a/projects/common-map/package.json b/projects/common-map/package.json
index ce20ab4..bfea8b9 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.308 <0.0.1",
+    "@farmmaps/common": ">=0.0.1-prerelease.398 <0.0.1",
     "ngx-openlayers": "1.0.0-next.13",
     "ol": "6.1.1"
   }
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 588732c..0666c5b 100644
--- a/projects/common-map/src/fm-map/common-map.module.ts
+++ b/projects/common-map/src/fm-map/common-map.module.ts
@@ -24,7 +24,7 @@ import { IPeriodState } from './models/period.state';
 
 // components
 import { GpsLocation} from './components/aol/gps-location/gps-location.component';
-//import {Switch2D3DComponent } from './components/aol/switch2d3d/switch2d3d.component';
+import {Switch2D3DComponent } from './components/aol/switch2d3d/switch2d3d.component';
 import {FeatureListFeatureCropfieldComponent } from './components/feature-list-feature-cropfield/feature-list-feature-cropfield.component';
 import { FeatureListFeatureCroppingschemeComponent} from './components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component';
 import { ItemWidgetListComponent} from './components/item-widget-list/item-widget-list.component';
@@ -102,6 +102,7 @@ export {
   MapComponent,
   MetaDataModalComponent,
   RotationResetComponent,
+  Switch2D3DComponent,
   MapSearchComponent,
   SelectPeriodModalComponent,
   LayerListComponent,
@@ -170,6 +171,7 @@ export {
     MapComponent,
     MetaDataModalComponent,
     RotationResetComponent,
+    Switch2D3DComponent,
     MapSearchComponent,
     SelectPeriodModalComponent,
     LayerListComponent,
@@ -240,6 +242,7 @@ export {
        ItemWidgetListComponent,
        WidgetStatusComponent,
        RotationResetComponent,
+       Switch2D3DComponent,
        MapSearchComponent,
        SelectPeriodModalComponent,
        LayerListComponent,
diff --git a/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts b/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts
index 5e1c22a..090e5ea 100644
--- a/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts
@@ -1,40 +1,40 @@
-// import { Component, OnInit,Input  } from '@angular/core';
-//import { MapComponent } from 'ngx-openlayers';
-//import OLCesium from 'olcs/OLCesium.js';
-
-
-// @Component({
-//   selector: 'fm-map-switch2d3d',
-//   template: '<div (click)="handleClick($event)" class="rounded-circle twotreed">{{label}}</div>',
-//   styles: [`.twotreed {
-//     width:2.5em;
-//     height:2.5em;
-//     background-color: white;
-//     text-align:center;
-//     line-height:2.5em;
-//     font-weight:bold;
-//     cursor:default;}`]
-
-// })
-// export class Switch2D3DComponent {
-
-//   @Input() enable:boolean;
-//   public label: string = "3D";
-//   private ol3d: OLCesium;
-
-
-//   constructor(private map: MapComponent) {
-    
-//   }
-
-//   ngOnInit() {
-//     this.ol3d = new OLCesium({ map: this.map.instance }); // ol2dMap is the ol.Map instance
-//   }
-
-//   handleClick(event) {
-//     this.enable = !this.enable;
-//     if (this.enable)
-//       this.ol3d.setEnabled(this.enable);
-//       this.label = this.enable?"2D":"3D";
-//   }
-// }
+import { Component, OnInit,Input,Host  } from '@angular/core';
+import { MapComponent } from 'ngx-openlayers';
+import OLCesium from 'ol-cesium';
+
+
+@Component({
+  selector: 'fm-map-switch2d3d',
+  template: '<div (click)="handleClick($event)" class="rounded-circle twotreed">{{label}}</div>',
+  styles: [`.twotreed {
+    width:2.5em;
+    height:2.5em;
+    background-color: white;
+    text-align:center;
+    line-height:2.5em;
+    font-weight:bold;
+    cursor:default;}`]
+
+})
+export class Switch2D3DComponent {
+
+  @Input() enable:boolean;
+  public label: string = "3D";
+  private ol3d: OLCesium;
+
+
+  constructor(@Host() private map: MapComponent) {
+    
+  }
+
+  ngOnInit() {
+    this.ol3d = new OLCesium({ map: this.map.instance }); // ol2dMap is the ol.Map instance
+  }
+
+  handleClick(event) {
+    this.enable = !this.enable;
+    if (this.enable)
+      this.ol3d.setEnabled(this.enable);
+      this.label = this.enable?"2D":"3D";
+  }
+}
diff --git a/projects/common-map/src/fm-map/components/map/map.component.html b/projects/common-map/src/fm-map/components/map/map.component.html
index 2b71672..8b807a6 100644
--- a/projects/common-map/src/fm-map/components/map/map.component.html
+++ b/projects/common-map/src/fm-map/components/map/map.component.html
@@ -39,7 +39,7 @@
     </aol-layer-vector>
     <fm-map-gps-location [position]="state.position" [headingTolerance]="20" [showHeading]="true" [heading]="state.compassHeading"></fm-map-gps-location>
     <div class="control-container">
-  <!--    <switch2d3d></switch2d3d>-->
+     <fm-map-switch2d3d></fm-map-switch2d3d>
       <fm-map-layer-switcher></fm-map-layer-switcher>
       <fm-map-pan-to-location [position]="state.position" [mapState]="state.mapState" [animate]="true"></fm-map-pan-to-location>
       <fm-map-rotation-reset></fm-map-rotation-reset>
diff --git a/src/main.ts b/src/main.ts
index c7b673c..9a03fb3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,12 +1,19 @@
+import * as Cesium from 'cesium'
+
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
 
+
+
 if (environment.production) {
   enableProdMode();
 }
 
+window['CESIUM_BASE_URL'] = '/assets/cesium/';
+window['Cesium'] = Cesium;
+
 platformBrowserDynamic().bootstrapModule(AppModule)
   .catch(err => console.error(err));

From 15d1f14ee166c944e24a1e846e930489754ba146 Mon Sep 17 00:00:00 2001
From: Willem Dantuma <willem.dantuma@dobs.nl>
Date: Fri, 18 Sep 2020 14:20:33 +0200
Subject: [PATCH 2/5] More or less working now

---
 angular.json                                  |  7 +++--
 custom-webpack.config.js                      | 10 +++++++
 .../gps-location/gps-location.component.ts    |  8 ++++--
 .../aol/item-layers/item-layers.component.ts  | 11 ++------
 .../aol/switch2d3d/switch2d3d.component.ts    | 28 +++++++++++++++----
 .../fm-map/components/map/map.component.html  |  2 +-
 .../selected-item-cropfield.component.ts      | 15 +++-------
 src/main.ts                                   |  2 +-
 8 files changed, 51 insertions(+), 32 deletions(-)
 create mode 100644 custom-webpack.config.js

diff --git a/angular.json b/angular.json
index e346a4f..bd5deca 100644
--- a/angular.json
+++ b/angular.json
@@ -11,8 +11,11 @@
       "schematics": {},
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-builders/custom-webpack:browser",
           "options": {
+            "customWebpackConfig": {
+              "path": "./custom-webpack.config.js"
+            },
             "aot": true,
             "outputPath": "dist/farmmaps-lib-app",
             "index": "src/index.html",
@@ -85,7 +88,7 @@
           }
         },
         "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
+          "builder": "@angular-builders/custom-webpack:dev-server",
           "options": {
             "browserTarget": "farmmaps-lib-app:build"
           },
diff --git a/custom-webpack.config.js b/custom-webpack.config.js
new file mode 100644
index 0000000..70173ee
--- /dev/null
+++ b/custom-webpack.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+    node: {
+      // Resolve node module use of fs
+      fs: "empty",
+      Buffer: false,
+      http: "empty",
+      https: "empty",
+      zlib: "empty"
+    }
+  };
\ No newline at end of file
diff --git a/projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.ts b/projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.ts
index 2bb45fc..1428028 100644
--- a/projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, Input, ViewChild, ElementRef, OnChanges, SimpleChanges } from '@angular/core';
+import { Component, OnInit, Input, ViewChild, ElementRef, OnChanges, SimpleChanges ,Host} from '@angular/core';
 import { MapComponent } from 'ngx-openlayers';
 import Overlay from 'ol/Overlay';
 import { fromLonLat, toLonLat } from 'ol/proj';
@@ -23,9 +23,10 @@ export class GpsLocation  implements OnInit,OnChanges{
   public path: string = "";
   public rotate: string = "";
   private resolution: number = 0;
+  initialized:boolean = false;
   @ViewChild('location', { static: true }) locationElement: ElementRef;
 
-  constructor(private map: MapComponent) {
+  constructor(@Host() private map: MapComponent) {
     
   }
 
@@ -54,12 +55,13 @@ export class GpsLocation  implements OnInit,OnChanges{
       this.resolution = evt.target.get('resolution');
       this.recalcLocationTolerance();
     });
+    this.initialized = true;
   }
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes.position && this.instance) {
       var p = changes.position.currentValue as Position;
-      if(p) {
+      if(p && this.initialized) {
         this.instance.setPosition(fromLonLat([p.coords.longitude, p.coords.latitude]));
         this.locationTolerance = p.coords.accuracy;
         this.recalcLocationTolerance();  
diff --git a/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts b/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
index 29266b1..bed4b90 100644
--- a/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
@@ -99,17 +99,12 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     var l = (data && data.layers && data.layers.length > 0) ? data.layers[0] : null;
     if (l && l.rendering && l.rendering.renderoutputType == "Tiles") {
       var rt = l.rendering as IRenderoutputTiles;
-      let source = new XYZ({ maxZoom: rt.maxzoom, minZoom: rt.minzoom, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` });
+      let source = new XYZ({crossOrigin: 'use-credentials', maxZoom: rt.maxzoom, minZoom: rt.minzoom, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` });
       layer = new Tile({ source: source });
     }
     if (l && l.rendering && l.rendering.renderoutputType == "Image") {
-      var ri = l.rendering as IRenderoutputImage;
-      let projection = new Projection({
-        code: 'image',
-        units: 'pixels',
-        extent: ri.extent
-      });
-      let source = new ImageStatic({ imageExtent: ri.extent, projection: projection, url: `${this._apiEndPoint}/api/v1/items/${item.code}/mapimage/${layerIndex}?v=${Date.parse(item.updated)}` });
+      var ri = l.rendering as IRenderoutputImage;     
+      let source = new ImageStatic({ imageExtent: ri.extent,  crossOrigin: 'use-credentials',projection: "EPSG:3857", url: `${this._apiEndPoint}/api/v1/items/${item.code}/mapimage/${layerIndex}?v=${Date.parse(item.updated)}` });
       layer = new Image({ source: source });
     }
     return layer;
diff --git a/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts b/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts
index 090e5ea..7c11286 100644
--- a/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit,Input,Host  } from '@angular/core';
 import { MapComponent } from 'ngx-openlayers';
 import OLCesium from 'ol-cesium';
 
+declare var olcs: any;
 
 @Component({
   selector: 'fm-map-switch2d3d',
@@ -21,20 +22,35 @@ export class Switch2D3DComponent {
   @Input() enable:boolean;
   public label: string = "3D";
   private ol3d: OLCesium;
+  private synchronizers:any[];
 
 
   constructor(@Host() private map: MapComponent) {
     
   }
 
-  ngOnInit() {
-    this.ol3d = new OLCesium({ map: this.map.instance }); // ol2dMap is the ol.Map instance
+  ngOnInit() {   
+    this.ol3d = new OLCesium({ map: this.map.instance,createSynchronizers: (map,scene) => {
+        this.synchronizers = [
+            new olcs.RasterSynchronizer(map,scene),
+            new olcs.VectorSynchronizer(map,scene)
+        ];
+        return this.synchronizers;
+    },stopOpenLayersEventsPropagation:true}); 
+  }
+
+  synchronize() {
+      this.synchronizers.forEach((synchronizer) => {
+        synchronizer.synchronize();
+      });
   }
 
   handleClick(event) {
-    this.enable = !this.enable;
-    if (this.enable)
-      this.ol3d.setEnabled(this.enable);
-      this.label = this.enable?"2D":"3D";
+    this.enable = !this.enable; 
+    if(this.enable) {
+        this.synchronize();
+    }
+    this.ol3d.setEnabled(this.enable);
+    this.label = this.enable?"2D":"3D";    
   }
 }
diff --git a/projects/common-map/src/fm-map/components/map/map.component.html b/projects/common-map/src/fm-map/components/map/map.component.html
index 8b807a6..45854c4 100644
--- a/projects/common-map/src/fm-map/components/map/map.component.html
+++ b/projects/common-map/src/fm-map/components/map/map.component.html
@@ -37,7 +37,7 @@
     <aol-layer-vector>
       <fm-map-item-source-vector [styles]="state.styles" [features]="state.features" (onFeaturesSelected)="handleFeatureClick($event)" (onFeatureHover)="handleFeatureHover($event)" [selectedFeature]="state.selectedFeature" [selectedItem]="state.selectedItem"></fm-map-item-source-vector>
     </aol-layer-vector>
-    <fm-map-gps-location [position]="state.position" [headingTolerance]="20" [showHeading]="true" [heading]="state.compassHeading"></fm-map-gps-location>
+    <!-- <fm-map-gps-location [position]="state.position" [headingTolerance]="20" [showHeading]="true" [heading]="state.compassHeading"></fm-map-gps-location> -->
     <div class="control-container">
      <fm-map-switch2d3d></fm-map-switch2d3d>
       <fm-map-layer-switcher></fm-map-layer-switcher>
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 79f17f4..c6da727 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,4 +1,4 @@
-import { Component, Input, Injectable, OnInit, ComponentFactoryResolver, Inject, ComponentFactory } from '@angular/core';
+import { Component, Input, Injectable, OnInit } from '@angular/core';
 import { Location } from '@angular/common';
 import { Feature } from 'ol';
 import { Store } from '@ngrx/store';
@@ -11,7 +11,6 @@ import { Observable,of } from 'rxjs';
 import {GeoJSON} from 'ol/format';
 import {getArea} from 'ol/sphere';
 import { withLatestFrom,switchMap,combineLatest } from 'rxjs/operators';
-import { AbstractItemListItemComponent, ItemListItemComponent } from '../item-list-item/item-list-item.component';
 
 
 @ForItemType("vnd.farmmaps.itemtype.cropfield")
@@ -25,8 +24,7 @@ export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponen
 
   public items: Observable<IListItem[]>;
 
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService,
-    private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractItemListItemComponent) public itemComponentList: AbstractItemListItemComponent[] ) {
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
     super(store, itemTypeService,location,router);
   }
 
@@ -41,7 +39,6 @@ export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponen
   }
 
   ngOnInit() {
-    var componentFactory: ComponentFactory<AbstractItemListItemComponent> = this.componentFactoryResolver.resolveComponentFactory(ItemListItemComponent); // default
     var childItems = this.folderService$.getItems(this.item.code, 0, 1000);
     var atLocationItems = this.itemService$.getItemList(null,null,null,this.item.code,true);
     this.items =  childItems.pipe(
@@ -50,12 +47,8 @@ export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponen
           let retVal:IListItem[] = [];
           let codes = {};
           ci.forEach((listItem) => {
-             if (this.itemComponentList.findIndex(i => 
-                    i.item['forItemType'].indexOf(this.item.itemType) >= 0 &&
-                    i.item['forSourceTask'].indexOf(this.item.sourceTask) >= 0) >= 0) {
-                retVal.push(listItem);
-                codes[listItem.code]=listItem;
-              }
+             retVal.push(listItem);
+             codes[listItem.code]=listItem;
           });
           ali.forEach((atlocationitem) => {
              let listItem = atlocationitem as IListItem;
diff --git a/src/main.ts b/src/main.ts
index 9a03fb3..c10fd29 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,4 +1,4 @@
-import * as Cesium from 'cesium'
+import * as Cesium from 'cesium';
 
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';

From c606e026738691be92c369e194731a6e5a742e20 Mon Sep 17 00:00:00 2001
From: Willem Dantuma <willem.dantuma@dobs.nl>
Date: Fri, 18 Sep 2020 16:05:44 +0200
Subject: [PATCH 3/5] Fix static image layer

---
 .../components/aol/item-layers/item-layers.component.ts     | 6 ++++--
 .../components/aol/switch2d3d/switch2d3d.component.ts       | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts b/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
index bed4b90..468bbac 100644
--- a/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
@@ -103,8 +103,10 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
       layer = new Tile({ source: source });
     }
     if (l && l.rendering && l.rendering.renderoutputType == "Image") {
-      var ri = l.rendering as IRenderoutputImage;     
-      let source = new ImageStatic({ imageExtent: ri.extent,  crossOrigin: 'use-credentials',projection: "EPSG:3857", url: `${this._apiEndPoint}/api/v1/items/${item.code}/mapimage/${layerIndex}?v=${Date.parse(item.updated)}` });
+      var ri = l.rendering as IRenderoutputImage;  
+      // convert to EPSG:4326 asworkaround for cesium   
+      var projectedExtent = proj.transformExtent( ri.extent, 'EPSG:3857','EPSG:4326');
+      let source = new ImageStatic({ imageExtent:projectedExtent,projection:'EPSG:4326',  crossOrigin: 'use-credentials', url: `${this._apiEndPoint}/api/v1/items/${item.code}/mapimage/${layerIndex}?v=${Date.parse(item.updated)}` });
       layer = new Image({ source: source });
     }
     return layer;
diff --git a/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts b/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts
index 7c11286..71de7f4 100644
--- a/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit,Input,Host  } from '@angular/core';
 import { MapComponent } from 'ngx-openlayers';
 import OLCesium from 'ol-cesium';
+//import OLCesium from '../../../../../../../../ol-cesium/src/olcs/OLCesium.js';
 
 declare var olcs: any;
 
@@ -30,13 +31,14 @@ export class Switch2D3DComponent {
   }
 
   ngOnInit() {   
-    this.ol3d = new OLCesium({ map: this.map.instance,createSynchronizers: (map,scene) => {
+    createSynchronizers: (map,scene) => {
         this.synchronizers = [
             new olcs.RasterSynchronizer(map,scene),
             new olcs.VectorSynchronizer(map,scene)
         ];
         return this.synchronizers;
-    },stopOpenLayersEventsPropagation:true}); 
+    }
+    this.ol3d = new OLCesium({ map: this.map.instance,stopOpenLayersEventsPropagation:true}); 
   }
 
   synchronize() {

From 21af6ab2c44f628fec81aeeb5155897a79c0f9fc Mon Sep 17 00:00:00 2001
From: Willem Dantuma <willem.dantuma@dobs.nl>
Date: Fri, 18 Sep 2020 17:19:29 +0200
Subject: [PATCH 4/5] Some styling fixes

---
 .../aol/switch2d3d/switch2d3d.component.scss   | 15 +++++++++++++++
 .../aol/switch2d3d/switch2d3d.component.ts     | 18 +++++-------------
 2 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.scss

diff --git a/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.scss b/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.scss
new file mode 100644
index 0000000..a4e654e
--- /dev/null
+++ b/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.scss
@@ -0,0 +1,15 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+.twotreed {
+  display:block; 
+  width:2.5em;
+  height:2.5em;
+  background-color: $body-bg;
+  background-size: contain;
+  margin-top:0.5em;
+  text-align: center;
+  line-height: 2.5em; 
+  border-radius: 1.75em;
+  padding: 0;
+  color: $secondary;
+}
\ No newline at end of file
diff --git a/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts b/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts
index 71de7f4..1fe871f 100644
--- a/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts
@@ -7,16 +7,8 @@ declare var olcs: any;
 
 @Component({
   selector: 'fm-map-switch2d3d',
-  template: '<div (click)="handleClick($event)" class="rounded-circle twotreed">{{label}}</div>',
-  styles: [`.twotreed {
-    width:2.5em;
-    height:2.5em;
-    background-color: white;
-    text-align:center;
-    line-height:2.5em;
-    font-weight:bold;
-    cursor:default;}`]
-
+  template: '<div (click)="handleClick($event)" class="btn btn-outline-secondary twotreed">{{label}}</div>',
+  styleUrls: ['./switch2d3d.component.scss']
 })
 export class Switch2D3DComponent {
 
@@ -31,14 +23,14 @@ export class Switch2D3DComponent {
   }
 
   ngOnInit() {   
-    createSynchronizers: (map,scene) => {
+   
+    this.ol3d = new OLCesium({ map: this.map.instance, createSynchronizers: (map,scene) => {
         this.synchronizers = [
             new olcs.RasterSynchronizer(map,scene),
             new olcs.VectorSynchronizer(map,scene)
         ];
         return this.synchronizers;
-    }
-    this.ol3d = new OLCesium({ map: this.map.instance,stopOpenLayersEventsPropagation:true}); 
+    }, stopOpenLayersEventsPropagation:true}); 
   }
 
   synchronize() {

From e87affee0872a0b00aa95c995f22969c75dc36c8 Mon Sep 17 00:00:00 2001
From: Willem Dantuma <willem.dantuma@dobs.nl>
Date: Fri, 2 Oct 2020 17:20:00 +0200
Subject: [PATCH 5/5] Refactor 3d to own library

---
 angular.json                                  | 40 +++++++++++++++++++
 package-lock.json                             |  4 +-
 package.json                                  |  4 +-
 projects/common-map/package.json              |  2 +-
 .../src/fm-map/common-map.module.ts           |  4 --
 .../fm-map/components/map/map.component.html  |  2 +-
 projects/common-map3d/README.md               | 24 +++++++++++
 projects/common-map3d/karma.conf.js           | 32 +++++++++++++++
 projects/common-map3d/ng-package.json         |  7 ++++
 projects/common-map3d/package.json            | 14 +++++++
 .../src/fm-map3d/common-map3d.module.ts       | 11 +++++
 .../src/fm-map3d/common-map3d.service.spec.ts | 16 ++++++++
 .../src/fm-map3d/common-map3d.service.ts      |  9 +++++
 .../switch2d3d/switch2d3d.component.scss      |  0
 .../olcs}/switch2d3d/switch2d3d.component.ts  |  3 +-
 projects/common-map3d/src/public-api.ts       |  7 ++++
 projects/common-map3d/src/test.ts             | 26 ++++++++++++
 projects/common-map3d/tsconfig.lib.json       | 25 ++++++++++++
 projects/common-map3d/tsconfig.lib.prod.json  | 10 +++++
 projects/common-map3d/tsconfig.spec.json      | 17 ++++++++
 projects/common-map3d/tslint.json             | 17 ++++++++
 tsconfig.json                                 |  4 ++
 22 files changed, 265 insertions(+), 13 deletions(-)
 create mode 100644 projects/common-map3d/README.md
 create mode 100644 projects/common-map3d/karma.conf.js
 create mode 100644 projects/common-map3d/ng-package.json
 create mode 100644 projects/common-map3d/package.json
 create mode 100644 projects/common-map3d/src/fm-map3d/common-map3d.module.ts
 create mode 100644 projects/common-map3d/src/fm-map3d/common-map3d.service.spec.ts
 create mode 100644 projects/common-map3d/src/fm-map3d/common-map3d.service.ts
 rename projects/{common-map/src/fm-map/components/aol => common-map3d/src/fm-map3d/components/olcs}/switch2d3d/switch2d3d.component.scss (100%)
 rename projects/{common-map/src/fm-map/components/aol => common-map3d/src/fm-map3d/components/olcs}/switch2d3d/switch2d3d.component.ts (88%)
 create mode 100644 projects/common-map3d/src/public-api.ts
 create mode 100644 projects/common-map3d/src/test.ts
 create mode 100644 projects/common-map3d/tsconfig.lib.json
 create mode 100644 projects/common-map3d/tsconfig.lib.prod.json
 create mode 100644 projects/common-map3d/tsconfig.spec.json
 create mode 100644 projects/common-map3d/tslint.json

diff --git a/angular.json b/angular.json
index d456d41..4a2d49a 100644
--- a/angular.json
+++ b/angular.json
@@ -241,6 +241,46 @@
           }
         }
       }
+    },
+    "common-map3d": {
+      "projectType": "library",
+      "root": "projects/common-map3d",
+      "sourceRoot": "projects/common-map3d/src",
+      "prefix": "fm-map3d",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:ng-packagr",
+          "options": {
+            "tsConfig": "projects/common-map3d/tsconfig.lib.json",
+            "project": "projects/common-map3d/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "tsConfig": "projects/common-map3d/tsconfig.lib.prod.json"
+            }
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "projects/common-map3d/src/test.ts",
+            "tsConfig": "projects/common-map3d/tsconfig.spec.json",
+            "karmaConfig": "projects/common-map3d/karma.conf.js"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "projects/common-map3d/tsconfig.lib.json",
+              "projects/common-map3d/tsconfig.spec.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
     }
   },
   "defaultProject": "farmmaps-lib-app"
diff --git a/package-lock.json b/package-lock.json
index cab857b..0cfc6dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1715,9 +1715,7 @@
       }
     },
     "@farmmaps/common-map": {
-      "version": "0.0.1-prerelease.420",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.420.tgz",
-      "integrity": "sha512-91vy6x4M0ms/lk8Zc8I0uaAk2IG15UG1SXYDvuxgoQZHpQxaGQhALvKkf1mY8V27pwwx6dVDYs8X9VuTRIy9rw==",
+      "version": "file:dist/common-map",
       "requires": {
         "tslib": "^2.0.0"
       }
diff --git a/package.json b/package.json
index 43a1eca..0415b31 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@angular/platform-browser-dynamic": "~10.1.3",
     "@angular/router": "~10.1.3",
     "@farmmaps/common": ">=0.0.1-prerelease.420 <0.0.1",
-    "@farmmaps/common-map": ">=0.0.1-prerelease.420 <0.0.1",
+    "@farmmaps/common-map": "file:dist/common-map",
     "@microsoft/signalr": "^3.1.3",
     "@ng-bootstrap/ng-bootstrap": "^7.0",
     "@ngrx/effects": "^10.0",
@@ -33,7 +33,7 @@
     "font-awesome": "^4.7.0",
     "ngrx-store-localstorage": "^10.0",
     "ngx-bootstrap": "^5.6.1",
-    "ngx-openlayers": "1.0.0-next.13",
+    "ngx-openlayers": "1.0.0-next.16",
     "ngx-uploadx": "^3.5.1",
     "ol": "6.1.1",
     "ol-cesium": "^2.11.3",
diff --git a/projects/common-map/package.json b/projects/common-map/package.json
index bdca699..655b895 100644
--- a/projects/common-map/package.json
+++ b/projects/common-map/package.json
@@ -15,7 +15,7 @@
     "@ngrx/store": "^10.0",
     "tassign": "^1.0.0",
     "@farmmaps/common": ">=0.0.1-prerelease.420 <0.0.1",
-    "ngx-openlayers": "1.0.0-next.13",
+    "ngx-openlayers": "1.0.0-next.16",
     "ol": "6.1.1"
   }
 }
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 0666c5b..45bd227 100644
--- a/projects/common-map/src/fm-map/common-map.module.ts
+++ b/projects/common-map/src/fm-map/common-map.module.ts
@@ -24,7 +24,6 @@ import { IPeriodState } from './models/period.state';
 
 // components
 import { GpsLocation} from './components/aol/gps-location/gps-location.component';
-import {Switch2D3DComponent } from './components/aol/switch2d3d/switch2d3d.component';
 import {FeatureListFeatureCropfieldComponent } from './components/feature-list-feature-cropfield/feature-list-feature-cropfield.component';
 import { FeatureListFeatureCroppingschemeComponent} from './components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component';
 import { ItemWidgetListComponent} from './components/item-widget-list/item-widget-list.component';
@@ -102,7 +101,6 @@ export {
   MapComponent,
   MetaDataModalComponent,
   RotationResetComponent,
-  Switch2D3DComponent,
   MapSearchComponent,
   SelectPeriodModalComponent,
   LayerListComponent,
@@ -171,7 +169,6 @@ export {
     MapComponent,
     MetaDataModalComponent,
     RotationResetComponent,
-    Switch2D3DComponent,
     MapSearchComponent,
     SelectPeriodModalComponent,
     LayerListComponent,
@@ -242,7 +239,6 @@ export {
        ItemWidgetListComponent,
        WidgetStatusComponent,
        RotationResetComponent,
-       Switch2D3DComponent,
        MapSearchComponent,
        SelectPeriodModalComponent,
        LayerListComponent,
diff --git a/projects/common-map/src/fm-map/components/map/map.component.html b/projects/common-map/src/fm-map/components/map/map.component.html
index 45854c4..2455031 100644
--- a/projects/common-map/src/fm-map/components/map/map.component.html
+++ b/projects/common-map/src/fm-map/components/map/map.component.html
@@ -39,7 +39,7 @@
     </aol-layer-vector>
     <!-- <fm-map-gps-location [position]="state.position" [headingTolerance]="20" [showHeading]="true" [heading]="state.compassHeading"></fm-map-gps-location> -->
     <div class="control-container">
-     <fm-map-switch2d3d></fm-map-switch2d3d>
+      <router-outlet name="map-controls"></router-outlet>
       <fm-map-layer-switcher></fm-map-layer-switcher>
       <fm-map-pan-to-location [position]="state.position" [mapState]="state.mapState" [animate]="true"></fm-map-pan-to-location>
       <fm-map-rotation-reset></fm-map-rotation-reset>
diff --git a/projects/common-map3d/README.md b/projects/common-map3d/README.md
new file mode 100644
index 0000000..aa24b9f
--- /dev/null
+++ b/projects/common-map3d/README.md
@@ -0,0 +1,24 @@
+# CommonMap3d
+
+This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 10.1.3.
+
+## Code scaffolding
+
+Run `ng generate component component-name --project common-map3d` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project common-map3d`.
+> Note: Don't forget to add `--project common-map3d` or else it will be added to the default project in your `angular.json` file. 
+
+## Build
+
+Run `ng build common-map3d` to build the project. The build artifacts will be stored in the `dist/` directory.
+
+## Publishing
+
+After building your library with `ng build common-map3d`, go to the dist folder `cd dist/common-map3d` and run `npm publish`.
+
+## Running unit tests
+
+Run `ng test common-map3d` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
diff --git a/projects/common-map3d/karma.conf.js b/projects/common-map3d/karma.conf.js
new file mode 100644
index 0000000..1b79caf
--- /dev/null
+++ b/projects/common-map3d/karma.conf.js
@@ -0,0 +1,32 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage-istanbul-reporter'),
+      require('@angular-devkit/build-angular/plugins/karma')
+    ],
+    client: {
+      clearContext: false // leave Jasmine Spec Runner output visible in browser
+    },
+    coverageIstanbulReporter: {
+      dir: require('path').join(__dirname, '../../coverage/common-map3d'),
+      reports: ['html', 'lcovonly', 'text-summary'],
+      fixWebpackSourcePaths: true
+    },
+    reporters: ['progress', 'kjhtml'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    singleRun: false,
+    restartOnFileChange: true
+  });
+};
diff --git a/projects/common-map3d/ng-package.json b/projects/common-map3d/ng-package.json
new file mode 100644
index 0000000..886dc9c
--- /dev/null
+++ b/projects/common-map3d/ng-package.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../dist/common-map3d",
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}
\ No newline at end of file
diff --git a/projects/common-map3d/package.json b/projects/common-map3d/package.json
new file mode 100644
index 0000000..2d75dd9
--- /dev/null
+++ b/projects/common-map3d/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "common-map3d",
+  "version": "0.0.1",
+  "peerDependencies": {
+    "@angular/common": "^10.1.3",
+    "@angular/core": "^10.1.3",
+    "ngx-openlayers": "1.0.0-next.16",
+    "cesium": "^1.73.0",
+    "ol-cesium": "^2.11.3"
+  },
+  "dependencies": {
+    "tslib": "^2.0.0"
+  }
+}
\ No newline at end of file
diff --git a/projects/common-map3d/src/fm-map3d/common-map3d.module.ts b/projects/common-map3d/src/fm-map3d/common-map3d.module.ts
new file mode 100644
index 0000000..29a20f1
--- /dev/null
+++ b/projects/common-map3d/src/fm-map3d/common-map3d.module.ts
@@ -0,0 +1,11 @@
+import { NgModule } from '@angular/core';
+import { Switch2D3DComponent } from './components/olcs/switch2d3d/switch2d3d.component';
+
+
+@NgModule({
+  declarations: [Switch2D3DComponent],
+  imports: [
+  ],
+  exports: [Switch2D3DComponent]
+})
+export class CommonMap3dModule { }
diff --git a/projects/common-map3d/src/fm-map3d/common-map3d.service.spec.ts b/projects/common-map3d/src/fm-map3d/common-map3d.service.spec.ts
new file mode 100644
index 0000000..9bc6cad
--- /dev/null
+++ b/projects/common-map3d/src/fm-map3d/common-map3d.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { CommonMap3dService } from './common-map3d.service';
+
+describe('CommonMap3dService', () => {
+  let service: CommonMap3dService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(CommonMap3dService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/projects/common-map3d/src/fm-map3d/common-map3d.service.ts b/projects/common-map3d/src/fm-map3d/common-map3d.service.ts
new file mode 100644
index 0000000..db5e459
--- /dev/null
+++ b/projects/common-map3d/src/fm-map3d/common-map3d.service.ts
@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class CommonMap3dService {
+
+  constructor() { }
+}
diff --git a/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.scss b/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.scss
similarity index 100%
rename from projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.scss
rename to projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.scss
diff --git a/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts b/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts
similarity index 88%
rename from projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts
rename to projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts
index 1fe871f..d89a80e 100644
--- a/projects/common-map/src/fm-map/components/aol/switch2d3d/switch2d3d.component.ts
+++ b/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts
@@ -1,12 +1,11 @@
 import { Component, OnInit,Input,Host  } from '@angular/core';
 import { MapComponent } from 'ngx-openlayers';
 import OLCesium from 'ol-cesium';
-//import OLCesium from '../../../../../../../../ol-cesium/src/olcs/OLCesium.js';
 
 declare var olcs: any;
 
 @Component({
-  selector: 'fm-map-switch2d3d',
+  selector: 'fm-map3d-switch2d3d',
   template: '<div (click)="handleClick($event)" class="btn btn-outline-secondary twotreed">{{label}}</div>',
   styleUrls: ['./switch2d3d.component.scss']
 })
diff --git a/projects/common-map3d/src/public-api.ts b/projects/common-map3d/src/public-api.ts
new file mode 100644
index 0000000..ffbc9e2
--- /dev/null
+++ b/projects/common-map3d/src/public-api.ts
@@ -0,0 +1,7 @@
+/*
+ * Public API Surface of common-map3d
+ */
+
+export * from './fm-map3d/common-map3d.service';
+export * from './fm-map3d/components/olcs/switch2d3d/switch2d3d.component';
+export * from './fm-map3d/common-map3d.module';
diff --git a/projects/common-map3d/src/test.ts b/projects/common-map3d/src/test.ts
new file mode 100644
index 0000000..303b32a
--- /dev/null
+++ b/projects/common-map3d/src/test.ts
@@ -0,0 +1,26 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/dist/zone';
+import 'zone.js/dist/zone-testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+declare const require: {
+  context(path: string, deep?: boolean, filter?: RegExp): {
+    keys(): string[];
+    <T>(id: string): T;
+  };
+};
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting()
+);
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
diff --git a/projects/common-map3d/tsconfig.lib.json b/projects/common-map3d/tsconfig.lib.json
new file mode 100644
index 0000000..6e06ad5
--- /dev/null
+++ b/projects/common-map3d/tsconfig.lib.json
@@ -0,0 +1,25 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/lib",
+    "target": "es2015",
+    "declaration": true,
+    "declarationMap": true,
+    "inlineSources": true,
+    "types": [],
+    "lib": [
+      "dom",
+      "es2018"
+    ]
+  },
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true,
+    "enableResourceInlining": true
+  },
+  "exclude": [
+    "src/test.ts",
+    "**/*.spec.ts"
+  ]
+}
diff --git a/projects/common-map3d/tsconfig.lib.prod.json b/projects/common-map3d/tsconfig.lib.prod.json
new file mode 100644
index 0000000..5615c27
--- /dev/null
+++ b/projects/common-map3d/tsconfig.lib.prod.json
@@ -0,0 +1,10 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+  "extends": "./tsconfig.lib.json",
+  "compilerOptions": {
+    "declarationMap": false
+  },
+  "angularCompilerOptions": {
+    "enableIvy": false
+  }
+}
diff --git a/projects/common-map3d/tsconfig.spec.json b/projects/common-map3d/tsconfig.spec.json
new file mode 100644
index 0000000..16da33d
--- /dev/null
+++ b/projects/common-map3d/tsconfig.spec.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/spec",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "src/test.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}
diff --git a/projects/common-map3d/tslint.json b/projects/common-map3d/tslint.json
new file mode 100644
index 0000000..124133f
--- /dev/null
+++ b/projects/common-map3d/tslint.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../tslint.json",
+  "rules": {
+    "directive-selector": [
+      true,
+      "attribute",
+      "lib",
+      "camelCase"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      "lib",
+      "kebab-case"
+    ]
+  }
+}
diff --git a/tsconfig.json b/tsconfig.json
index 2288f09..26caf36 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -26,6 +26,10 @@
       ],
       "common-map/*": [
         "dist/common-map/*"
+      ],
+      "common-map3d": [
+        "dist/common-map3d/common-map3d",
+        "dist/common-map3d"
       ]
     }
   }