From b8dcc4e9e0216ba46a9e65555f1744b45f3a10e3 Mon Sep 17 00:00:00 2001
From: Willem Dantuma <willem.dantuma@dobs.nl>
Date: Fri, 2 Oct 2020 17:48:34 +0200
Subject: [PATCH] Add 3D example to test app

---
 package-lock.json             | 20 ++++++++++++++------
 package.json                  |  5 +++--
 src/app/app-routing.module.ts | 18 +++++++++++++-----
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index af8f150..4f21e37 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1707,17 +1707,25 @@
       }
     },
     "@farmmaps/common": {
-      "version": "0.0.1-prerelease.420",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.420.tgz",
-      "integrity": "sha512-Ldr3RFE/tURB+XGPSF5dsJgBvRV55Z1ORp7+CNYMFL+S9AnI9vXHh2dV58LKIltbTG1VfW8U/7KR7OdKlH0E+Q==",
+      "version": "0.0.1-prerelease.430",
+      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.430.tgz",
+      "integrity": "sha512-UMllsjUL+ky/jIde0CxHov9xB6bpdtb0ZF2aoRltbJWBR6Eaoa7O5i3c6BrQn7BxTNcPWcFyPgHLr3/r8BgtVg==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@farmmaps/common-map": {
-      "version": "0.0.1-prerelease.426",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.426.tgz",
-      "integrity": "sha512-wt1GB0UY9GVfzOvhuKmsDeMXR7hvV4rJmIIAB8f8yYkM/5vja8sY9VqFXidNvbW4Kp6KHgkzByCOG4qtcyDLdw==",
+      "version": "0.0.1-prerelease.430",
+      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.430.tgz",
+      "integrity": "sha512-9g0GDpYHKiP04KOjj1bxMSgrK2hs3dKp4TXFWE1PNczKjuBXNSceviAFSo1dyghP5oYZBQJquHxI0nF1Ks8eRg==",
+      "requires": {
+        "tslib": "^2.0.0"
+      }
+    },
+    "@farmmaps/common-map3d": {
+      "version": "0.0.1-prerelease.430",
+      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.430.tgz",
+      "integrity": "sha512-a1tBLu57+tQaInKs6DJQrrKIJ/YkV+asPNPAd0P9wHVpai4wLe0EPZeD5p1MPvKhyU5a9udq26tx0I53VwPlLQ==",
       "requires": {
         "tslib": "^2.0.0"
       }
diff --git a/package.json b/package.json
index 5e24b37..be4723e 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,9 @@
     "@angular/platform-browser": "~10.1.3",
     "@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": ">=0.0.1-prerelease.430 <0.0.1",
+    "@farmmaps/common-map": ">=0.0.1-prerelease.430 <0.0.1",
+    "@farmmaps/common-map3d": ">=0.0.1-prerelease.430 <0.0.1",
     "@microsoft/signalr": "^3.1.3",
     "@ng-bootstrap/ng-bootstrap": "^7.0",
     "@ngrx/effects": "^10.0",
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 601f3d2..2961558 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -3,6 +3,7 @@ import { RouterModule ,UrlSegment} from '@angular/router';
 
 import { AuthGuard,FullScreenGuard } from '@farmmaps/common';
 import { MapComponent } from '@farmmaps/common-map';
+import { Switch2D3DComponent } from  '@farmmaps/common-map3d';
 import { LogoComponent } from './logo/logo.component';
 import { MenuComponent } from './menu/menu.component';
 import {RegisterDeviceComponent} from './registerdevice/registerdevice.component';
@@ -41,16 +42,23 @@ const routes = [
   },
   { path: 'map', canActivateChild: [AuthGuard],canActivate:[FullScreenGuard], children: [
     {
-        path: '',
-        component: MapComponent
-    },
+      path: '',
+      component: MapComponent
+    },    
     {
         path: ':xCenter/:yCenter/:zoom/:rotation/:baseLayer/:queryState',
-        component: MapComponent       
+        component: MapComponent ,
+        children: [
+          {
+            path:'',
+            component: Switch2D3DComponent,
+            outlet: 'map-controls' 
+          }
+        ]      
     },
     {
       path: ':queryState',
-      component: MapComponent       
+      component: MapComponent  
   }      
    ]},
    {