@smarterplan/ngx-smarterplan-core 1.2.11 → 1.2.12

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

@@ -2806,22 +2806,41 @@ class MatterportService {
                 //   renderer.shadowMap.bias = 0.0001;
                 //   renderer.shadowMap.type = three.PCFSoftShadowMap;
                 // });
-                let sensorRadius = 3.5; // Meters
                 // Wait until Showcase is actually playing....
                 this.sdk.Tag.data.subscribe({
                     onAdded: async function (index, item, collection) {
                         let thisOpacity = 0.2;
                         this.sdk.Tag.editOpacity(index, thisOpacity);
-                        const source = await Promise.all([
-                            this.sdk.Sensor.createSource(this.sdk.Sensor.SourceType.SPHERE, {
-                                origin: item.discPosition,
-                                radius: sensorRadius,
-                                userData: {
-                                    id: index + '-sphere-source',
-                                },
-                            })
-                        ]);
-                        const sensor = await this.sdk.Sensor.createSensor(this.sdk.Sensor.SensorType.CAMERA);
+                        let source = null;
+                        try {
+                            source = await Promise.all([
+                                this.sdk.Sensor.createSource(this.sdk.Sensor.SourceType.SPHERE, {
+                                    origin: item.anchorPosition,
+                                    radius: Number(3),
+                                    userData: {
+                                        id: index + '-sphere-source',
+                                    },
+                                })
+                            ]);
+                        }
+                        catch (e) {
+                            console.log('could not create Sphere sensor');
+                            console.error(e);
+                        }
+                        if (!source) {
+                            return;
+                        }
+                        let sensor = null;
+                        try {
+                            sensor = await this.sdk.Sensor.createSensor(this.sdk.Sensor.SensorType.CAMERA);
+                        }
+                        catch (e) {
+                            console.log('could not create Camera sensor');
+                            console.error(e);
+                        }
+                        if (!sensor) {
+                            return;
+                        }
                         sensor.addSource(...source);
                         sensor.readings.subscribe({
                             onUpdated(source, reading) {
@@ -11359,7 +11378,7 @@ class MatterportImportService {
         this.importingImages = new Subject();
         this.sweepProcessedCount = new Subject();
         this.totalSweepsCount = new Subject();
-        this.MAX_SCANS_RELOAD = 100;
+        this.MAX_SCANS_RELOAD = 5;
     }
     get spaceID() {
         return this._spaceID;
@@ -11392,46 +11411,49 @@ class MatterportImportService {
         const element = document.querySelector('#viewer-frame');
         element.append(iframe);
         this.currentFrame = iframe;
-        try {
-            // @ts-ignore
-            this.sdk = await window.MP_SDK.connect(iframe, 'qn9wsasuy5h2fzrbrn1nzr0id', '3.11');
-            // Subscribe to Floor data
-            this.sdk.Floor.data.subscribe({
-                onCollectionUpdated: function upd(collection) {
-                    // console.log("Floors", collection);
-                    this.floors = collection;
-                }.bind(this),
-            });
-            // Subscribe to current Floor
-            this.sdk.Floor.current.subscribe(function upd(currentFloor) {
-                this.currentFloor = currentFloor;
-            }.bind(this));
-            // Subscribe to Sweep data
-            this.sdk.Sweep.data.subscribe({
-                onCollectionUpdated: function upd(collection) {
-                    console.log('the entire up-to-date collection', collection);
-                    this.sweeps = collection;
-                }.bind(this),
+        return new Promise((res, rej) => {
+            iframe.addEventListener('load', async () => {
+                try {
+                    this.sdk = await window.MP_SDK.connect(iframe, 'qn9wsasuy5h2fzrbrn1nzr0id', '3.11');
+                    // Subscribe to Floor data
+                    this.sdk.Floor.data.subscribe({
+                        onCollectionUpdated: function upd(collection) {
+                            // console.log("Floors", collection);
+                            this.floors = collection;
+                        }.bind(this),
+                    });
+                    // Subscribe to current Floor
+                    this.sdk.Floor.current.subscribe(function upd(currentFloor) {
+                        this.currentFloor = currentFloor;
+                    }.bind(this));
+                    // Subscribe to Sweep data
+                    this.sdk.Sweep.data.subscribe({
+                        onCollectionUpdated: function upd(collection) {
+                            console.log('the entire up-to-date collection', collection);
+                            this.sweeps = collection;
+                        }.bind(this),
+                    });
+                    // remove labels
+                    await this.sdk.Settings.update('labels', false);
+                    let timeoutExpired = false;
+                    // start timeout
+                    setTimeout(() => (timeoutExpired = true), 7000);
+                    await waitUntil(() => (this.sweeps !== undefined && this.floors !== undefined) ||
+                        timeoutExpired === true);
+                    if (timeoutExpired) {
+                        // we are likely in matterport error case (that we cannot catch!)
+                        console.log('timeout intitialising Matterport');
+                        return rej(new Error('error init Matterport'));
+                    }
+                    console.log('init done');
+                    return res(true);
+                }
+                catch (e) {
+                    console.error(e);
+                    rej(new Error('error init Matterport'));
+                }
             });
-            // remove labels
-            await this.sdk.Settings.update('labels', false);
-            let timeoutExpired = false;
-            // start timeout
-            setTimeout(() => (timeoutExpired = true), 7000);
-            await waitUntil(() => (this.sweeps !== undefined && this.floors !== undefined) ||
-                timeoutExpired === true);
-            if (timeoutExpired) {
-                // we are likely in matterport error case (that we cannot catch!)
-                console.log('timeout intitialising Matterport');
-                throw new Error('error init Matterport');
-            }
-            console.log('init done');
-            return true;
-        }
-        catch (e) {
-            console.error(e);
-            throw new Error('error init Matterport');
-        }
+        });
     }
     async importData(spaceID, surface, reloading = false, node = null) {
         if (!this.sweeps) {
@@ -11540,6 +11562,11 @@ class MatterportImportService {
             }
             for (let index = indexScan; index < maxScan; index += 1) {
                 if (!this.stop) {
+                    await new Promise((res) => {
+                        setTimeout(() => {
+                            res(null);
+                        }, 1000);
+                    });
                     await this.sdk.Sweep.moveTo(scans[index].uuid);
                     await this.sdk.Camera.setRotation({
                         x: 0,