@smarterplan/ngx-smarterplan-core 1.2.26 → 1.2.28

package/fesm2020/smarterplan-ngx-smarterplan-core.mjs

@@ -2487,8 +2487,9 @@ class Config {
 }
 
 class MatterportService {
-    constructor(config, router, visibilityService, ngZone) {
+    constructor(config, router, activeRoute, visibilityService, ngZone) {
         this.router = router;
+        this.activeRoute = activeRoute;
         this.visibilityService = visibilityService;
         this.ngZone = ngZone;
         this.slots = []; //SlotNode[] = [];
@@ -3442,21 +3443,20 @@ class MatterportService {
                 break;
             case MattertagActionMode.POSITION_DATA:
                 if (lastTag) {
-                    this.router.navigate([`${this.router.url}`], {
-                        queryParams: { positioning: true },
+                    this.router.navigate([], {
+                        relativeTo: this.activeRoute,
+                        queryParams: { positioning: true }, queryParamsHandling: "merge"
                     });
                 }
                 break;
             case MattertagActionMode.POSITION_ROOM:
                 if (lastTag) {
-                    this.router.navigate([`${this.router.url}`], {
-                        queryParams: { positioning: true },
+                    this.router.navigate([], {
+                        relativeTo: this.activeRoute,
+                        queryParams: { positioning: true }, queryParamsHandling: "merge"
                     });
                 }
                 break;
-            default:
-                this.router.navigate([`${this.router.url}`]);
-                break;
         }
     }
     /**
@@ -3956,7 +3956,7 @@ class MatterportService {
         this.securityCameraAnimator.toggleViewFrustum();
     }
 }
-MatterportService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: MatterportService, deps: [{ token: 'config' }, { token: i1$1.Router }, { token: BaseVisibilityService }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Injectable });
+MatterportService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: MatterportService, deps: [{ token: 'config' }, { token: i1$1.Router }, { token: i1$1.ActivatedRoute }, { token: BaseVisibilityService }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Injectable });
 MatterportService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: MatterportService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: MatterportService, decorators: [{
             type: Injectable,
@@ -3966,7 +3966,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.7", ngImpor
         }], ctorParameters: function () { return [{ type: Config, decorators: [{
                     type: Inject,
                     args: ['config']
-                }] }, { type: i1$1.Router }, { type: BaseVisibilityService }, { type: i0.NgZone }]; } });
+                }] }, { type: i1$1.Router }, { type: i1$1.ActivatedRoute }, { type: BaseVisibilityService }, { type: i0.NgZone }]; } });
 
 /* eslint-disable no-await-in-loop */
 class ViewerService {
@@ -6180,12 +6180,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.7", ngImpor
                 }] }]; } });
 
 class NavigatorService {
-    constructor(matterportService, viewerService, zoneService, userService, zoneChangeService) {
+    constructor(matterportService, viewerService, zoneService, userService, zoneChangeService, router, route) {
         this.matterportService = matterportService;
         this.viewerService = viewerService;
         this.zoneService = zoneService;
         this.userService = userService;
         this.zoneChangeService = zoneChangeService;
+        this.router = router;
+        this.route = route;
         this.visitLastPosition = new Map();
         this.locationIDChange = new Subject();
         this.navBarZoneIDChange = new Subject();
@@ -6225,16 +6227,18 @@ class NavigatorService {
                 const lastPose = this.matterportService.poseCamera;
                 if (lastPose && this.currentModel3D && this.userService.cu) {
                     this.visitLastPosition.set(this.currentModel3D, {
-                        sweep: lastPose.sweep,
-                        rotation: lastPose.rotation,
+                        /**Override sweep/rotation if exist */
+                        sweep: this.targetSweep ?? lastPose.sweep,
+                        rotation: this.targetRotation ?? lastPose.rotation,
                     });
                 }
                 this.currentModel3D = data.model3D;
             }
             else {
                 this.currentModel3D = data.model3D;
-                this.targetSweep = data.sweep;
-                this.targetRotation = data.rotation;
+                /**Override sweep/rotation if exist. Target is reset after (null)*/
+                this.targetSweep = this.targetSweep ?? data.sweep;
+                this.targetRotation = this.targetRotation ?? data.rotation;
                 this.onViewerLoaded().catch((e) => console.log(e));
             }
         });
@@ -6244,6 +6248,35 @@ class NavigatorService {
                 this.visitLastPosition = new Map();
             }
         });
+        this.route.queryParams.subscribe(params => {
+            const deepParamsBase64 = params['deepParams'];
+            if (deepParamsBase64) {
+                const deepParams = JSON.parse(atob(deepParamsBase64));
+                this.targetSweep = deepParams.sweepID;
+                this.targetRotation = deepParams.rotation;
+                /**Clear this query params */
+                this.router.navigate([], {
+                    queryParams: { deepParams: null }, queryParamsHandling: "merge"
+                });
+            }
+        });
+    }
+    getDeepLink() {
+        let data = null;
+        if (this.currentSweep) { /**Todo check matterport mod and adapt */
+            data = {
+                sweepID: this.currentSweep,
+                rotation: this.matterportService.getCurrentCameraPosition().rotation
+            };
+            data = btoa(JSON.stringify(data));
+        }
+        const model3D = this.currentModel3D;
+        const url = this.router.createUrlTree([], {
+            relativeTo: this.route,
+            queryParams: { deepParams: data, model3D },
+            queryParamsHandling: "merge"
+        });
+        return `${location.origin}${url.toString()}`;
     }
     getLastPositionForModel(model3D) {
         return this.visitLastPosition.get(model3D);
@@ -6269,6 +6302,9 @@ class NavigatorService {
             rotation = this.targetRotation
                 ? this.targetRotation
                 : this.checkRotationForSweep(this.targetSweep);
+            /**Reset / Consume target */
+            this.targetRotation = null;
+            this.targetSweep = null;
         }
         else {
             const lastPostion = this.getLastPositionForModel(this.currentModel3D);
@@ -6336,14 +6372,14 @@ class NavigatorService {
         // }
     }
 }
-NavigatorService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: NavigatorService, deps: [{ token: MatterportService }, { token: ViewerService }, { token: ZoneService }, { token: BaseUserService }, { token: ZoneChangeService }], target: i0.ɵɵFactoryTarget.Injectable });
+NavigatorService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: NavigatorService, deps: [{ token: MatterportService }, { token: ViewerService }, { token: ZoneService }, { token: BaseUserService }, { token: ZoneChangeService }, { token: i1$1.Router }, { token: i1$1.ActivatedRoute }], target: i0.ɵɵFactoryTarget.Injectable });
 NavigatorService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: NavigatorService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: NavigatorService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: MatterportService }, { type: ViewerService }, { type: ZoneService }, { type: BaseUserService }, { type: ZoneChangeService }]; } });
+        }], ctorParameters: function () { return [{ type: MatterportService }, { type: ViewerService }, { type: ZoneService }, { type: BaseUserService }, { type: ZoneChangeService }, { type: i1$1.Router }, { type: i1$1.ActivatedRoute }]; } });
 
 /* eslint-disable class-methods-use-this */
 class InterventionService {