From dd97c89254262880b1b568e4cda22035cf3c3fae Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Sat, 30 Jan 2021 14:41:34 +0100 Subject: [PATCH] Fix outlet --- package-lock.json | 21 ++++++++++--------- package.json | 8 +++---- .../fm-map/components/map/map.component.ts | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index c1e885a..879bc76 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1865,25 +1865,25 @@ } }, "@farmmaps/common": { - "version": "0.0.1-prerelease.508", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.508.tgz", - "integrity": "sha512-BFcwyh2m9jgqY47AEecod44pEjPV9lQ+ON937OWH0HCQyvjPptX8uRE7QD1pR17v3xZFGJMhEzdYCqm/l38PfA==", + "version": "0.0.1-prerelease.517", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.517.tgz", + "integrity": "sha512-Bxw+bDDwRAygl0SWdf077TtRa1xpAQAUlKNv/ysY8/rKugkMgaP1WAPnIN226uivTrdkhtPcKuGx/z5Yej1DwQ==", "requires": { "tslib": "^2.0.0" } }, "@farmmaps/common-map": { - "version": "0.0.1-prerelease.508", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.508.tgz", - "integrity": "sha512-HXr3Sm0VVbl2fWwW2o5zxmYkkCWRHR6jkBFUWPE1lHEug0tab8k1mT7dKu6E1R30x025SPcv2sJh2ivOUI4E7Q==", + "version": "0.0.1-prerelease.517", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.517.tgz", + "integrity": "sha512-lRweec2NrYnCoDgpAb3ZIPNSOO9sUcfs6qi0RvzoYsPV557UZozbidNiYUTwYiPV+9rwliAAM9zR7lpipur6og==", "requires": { "tslib": "^2.0.0" } }, "@farmmaps/common-map3d": { - "version": "0.0.1-prerelease.508", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.508.tgz", - "integrity": "sha512-YLc3yaax+eRLETjPyFtywTi8rTxVico+e2Bd1uWqfstfsHhPgqNj+sabsl5kywZQQTRQiTq3n0/DFS6p+vN4Jg==", + "version": "0.0.1-prerelease.517", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.517.tgz", + "integrity": "sha512-xxxXWO3+9x9jGhepGamm1zqJqs2WaJHaOYNLCxreNrwK1mcQfVA+N65e2gI2YrMlMa1if1OYyXK48PXtdEtyoA==", "requires": { "tslib": "^2.0.0" } @@ -6651,7 +6651,8 @@ }, "ini": { "version": "1.3.5", - "resolved": "", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true }, "injection-js": { diff --git a/package.json b/package.json index 980affd..7d53ef8 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,9 @@ "@angular/platform-browser": "~10.2.4", "@angular/platform-browser-dynamic": "~10.2.4", "@angular/router": "~10.2.4", - "@farmmaps/common": ">=0.0.1-prerelease.508 <0.0.1", - "@farmmaps/common-map": ">=0.0.1-prerelease.508 <0.0.1", - "@farmmaps/common-map3d": ">=0.0.1-prerelease.508 <0.0.1", + "@farmmaps/common": ">=0.0.1-prerelease.517 <0.0.1", + "@farmmaps/common-map": ">=0.0.1-prerelease.517 <0.0.1", + "@farmmaps/common-map3d": ">=0.0.1-prerelease.517 <0.0.1", "@microsoft/signalr": "^3.1.3", "@ng-bootstrap/ng-bootstrap": "^7.0", "@ngrx/effects": "^10.0", @@ -29,7 +29,7 @@ "@ngrx/store": "^10.0", "angular-oauth2-oidc": "^10.0.3", "bootstrap": "^4.4.1", - "cesium": "^1.73.0", + "cesium": "^1.77.0", "core-js": "^2.6.11", "ngrx-store-localstorage": "^10.0", "ngx-bootstrap": "^5.6.1", diff --git a/projects/common-map/src/fm-map/components/map/map.component.ts b/projects/common-map/src/fm-map/components/map/map.component.ts index 1bac6f0..5ea9aed 100644 --- a/projects/common-map/src/fm-map/components/map/map.component.ts +++ b/projects/common-map/src/fm-map/components/map/map.component.ts @@ -242,7 +242,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { console.debug("View init"); this.noContent=true; this.route.children.forEach((entry) => { - if(entry.outlet=="") { + if(entry.outlet=="primary") { this.noContent=false; } });