FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add 3D example to test app
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Willem Dantuma 2020-10-02 17:48:34 +02:00
parent 4b6175b6c4
commit b8dcc4e9e0
3 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
package-lock.json generated
View File

@ -1707,17 +1707,25 @@
} }
}, },
"@farmmaps/common": { "@farmmaps/common": {
"version": "0.0.1-prerelease.420", "version": "0.0.1-prerelease.430",
"resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.420.tgz", "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.430.tgz",
"integrity": "sha512-Ldr3RFE/tURB+XGPSF5dsJgBvRV55Z1ORp7+CNYMFL+S9AnI9vXHh2dV58LKIltbTG1VfW8U/7KR7OdKlH0E+Q==", "integrity": "sha512-UMllsjUL+ky/jIde0CxHov9xB6bpdtb0ZF2aoRltbJWBR6Eaoa7O5i3c6BrQn7BxTNcPWcFyPgHLr3/r8BgtVg==",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@farmmaps/common-map": { "@farmmaps/common-map": {
"version": "0.0.1-prerelease.426", "version": "0.0.1-prerelease.430",
"resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.426.tgz", "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.430.tgz",
"integrity": "sha512-wt1GB0UY9GVfzOvhuKmsDeMXR7hvV4rJmIIAB8f8yYkM/5vja8sY9VqFXidNvbW4Kp6KHgkzByCOG4qtcyDLdw==", "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": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }

5
package.json
View File

@ -19,8 +19,9 @@
"@angular/platform-browser": "~10.1.3", "@angular/platform-browser": "~10.1.3",
"@angular/platform-browser-dynamic": "~10.1.3", "@angular/platform-browser-dynamic": "~10.1.3",
"@angular/router": "~10.1.3", "@angular/router": "~10.1.3",
"@farmmaps/common": ">=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.420 <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", "@microsoft/signalr": "^3.1.3",
"@ng-bootstrap/ng-bootstrap": "^7.0", "@ng-bootstrap/ng-bootstrap": "^7.0",
"@ngrx/effects": "^10.0", "@ngrx/effects": "^10.0",

14
src/app/app-routing.module.ts
View File

@ -3,6 +3,7 @@ import { RouterModule ,UrlSegment} from '@angular/router';
import { AuthGuard,FullScreenGuard } from '@farmmaps/common'; import { AuthGuard,FullScreenGuard } from '@farmmaps/common';
import { MapComponent } from '@farmmaps/common-map'; import { MapComponent } from '@farmmaps/common-map';
import { Switch2D3DComponent } from '@farmmaps/common-map3d';
import { LogoComponent } from './logo/logo.component'; import { LogoComponent } from './logo/logo.component';
import { MenuComponent } from './menu/menu.component'; import { MenuComponent } from './menu/menu.component';
import {RegisterDeviceComponent} from './registerdevice/registerdevice.component'; import {RegisterDeviceComponent} from './registerdevice/registerdevice.component';
@ -41,12 +42,19 @@ const routes = [
}, },
{ path: 'map', canActivateChild: [AuthGuard],canActivate:[FullScreenGuard], children: [ { path: 'map', canActivateChild: [AuthGuard],canActivate:[FullScreenGuard], children: [
{ {
path: '', path: '',
component: MapComponent component: MapComponent
}, },
{ {
path: ':xCenter/:yCenter/:zoom/:rotation/:baseLayer/:queryState', path: ':xCenter/:yCenter/:zoom/:rotation/:baseLayer/:queryState',
component: MapComponent component: MapComponent ,
children: [
{
path:'',
component: Switch2D3DComponent,
outlet: 'map-controls'
}
]
}, },
{ {
path: ':queryState', path: ':queryState',