@smarterplan/ngx-smarterplan-core 1.2.25 → 1.2.27

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 {
@@ -11611,9 +11611,12 @@ class MatterportImportService {
                 else {
                     console.log('Abandoning import because it was cancelled');
                     resolve(false);
+                    this.removeFrame();
                     break;
                 }
             }
+            resolve(true);
+            this.removeFrame();
         });
     }
     async getUploadedImageCount(modelID) {