@smarterplan/ngx-smarterplan-core 1.2.23 → 1.2.25

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

@@ -4396,10 +4396,6 @@ const uploadFileToS3 = async (path, file, objectId) => {
         .then((result) => {
         console.log("Success =>", result);
         return result.key;
-    })
-        .catch((error) => {
-        console.log("error =>", error);
-        return null;
     });
 };
 const getSignedImageUrlForEquipment = async (equip) => {
@@ -4443,6 +4439,23 @@ const uploadBase64Image = async (uri, objectId, path, friendlyFileName) => {
         return uploadFileToS3(path, file, objectId);
     });
 };
+const uploadBase64ImageWithRetry = async (uri, objectId, path, friendlyFileName, retry) => {
+    return new Promise(async (resolve, reject) => {
+        while (retry > 0) {
+            try {
+                const r = await uploadBase64Image(uri, objectId, path, friendlyFileName);
+                resolve(r);
+                return;
+            }
+            catch (e) {
+                retry--;
+                console.error(`Upload error, retry n° ${retry} : `, e);
+            }
+        }
+        ;
+        reject("Max retry exceeded");
+    });
+};
 const removeAllFilesFromFolderS3 = async (folderPath) => {
     const arrayOfPromises = [];
     Storage.list(folderPath, { level: "public" })
@@ -6636,11 +6649,11 @@ class TicketsService extends BaseObjectService {
                 ticketsFiltered = ticketsFiltered.filter((ticket) => this.ticketTypeFilter.includes(ticket.type));
             }
             this.currentTickets.space = ticketsFiltered;
-            this.ticketTags.next(ticketsFiltered); // tags without zone filter
             if (this.zoneIDFilter) {
                 ticketsFiltered = await this.filterService.filterObjectsForZone(ticketsFiltered, this.zoneIDFilter);
             }
             this.currentTickets.zone = ticketsFiltered;
+            this.ticketTags.next(ticketsFiltered);
             this.ticketsUpdated.next(this.currentTickets);
             this.updating.next(false);
         }
@@ -6996,8 +7009,21 @@ class TicketsService extends BaseObjectService {
             return;
         }
         if (!forceSwitchVisit) {
-            /** Si on ne force pas la visite, on demande si on veut etre switch */
-            openModalForVisitSwitch(this.modalService, result.model3D, ticket.spaceID, { sweepToMove: result.sweep, rotation: result.rotation });
+            // check if we are moving within the same 3D model
+            const currentModel = localStorage.getItem('model3D');
+            if (currentModel && currentModel === result.model3D) {
+                // we add tag to the visit
+                const poi = ticket.pois.items[0];
+                if (poi.coordinate) {
+                    // we force add because we might be in an another zone
+                    await this.viewerService.actionAddObjectFromPOI(ticket, poi);
+                    await this.viewerService.action_move_to_tag(ticket.id);
+                }
+            }
+            else {
+                /** Si on ne force pas la visite, on demande si on veut etre switch */
+                openModalForVisitSwitch(this.modalService, result.model3D, ticket.spaceID, { sweepToMove: result.sweep, rotation: result.rotation });
+            }
         }
         else {
             /** Si on force le switch de la visit */
@@ -10069,11 +10095,11 @@ class FeatureService extends BaseObjectService {
             filteredFeatures = [...filteredPointInterest, ...filteredDesks];
             this.currentFeatures.space = filteredFeatures.sort((a, b) => a.index - b.index);
             // emit on tags should be after setting current.space !!
-            this.featureTags.next(filteredFeatures); // for tags update without zone filtering
             if (this.zoneIDFilter) {
                 filteredFeatures =
                     (await this.filterService.filterObjectsForZone(filteredFeatures, this.zoneIDFilter));
             }
+            this.featureTags.next(filteredFeatures); // for this zone
             this.currentFeatures.zone = filteredFeatures.sort((a, b) => a.index - b.index);
             // console.log(this.currentFeatures);
             this.featureUpdated.next(this.currentFeatures); // for lateral menu
@@ -10365,11 +10391,11 @@ class MeasurementService {
                 }
                 this.currentMeasurements.space = measurements;
                 // emit on tags should be after setting current.space !!
-                this.measurementsTags.next(measurements.map((m) => m.comment));
                 if (this.zoneIDFilter) {
                     const commentsZone = await this.filterService.filterObjectsForZone(measurements.map((measure) => measure.comment), this.zoneIDFilter);
                     measurements = measurements.filter((measure) => commentsZone.includes(measure.comment));
                 }
+                this.measurementsTags.next(measurements.map((m) => m.comment));
                 measurements.sort((a, b) => {
                     return (
                     // @ts-ignore
@@ -11401,7 +11427,6 @@ class MatterportImportService {
         this.importingImages = new Subject();
         this.sweepProcessedCount = new Subject();
         this.totalSweepsCount = new Subject();
-        this.MAX_SCANS_RELOAD = 10;
     }
     get spaceID() {
         return this._spaceID;
@@ -11479,7 +11504,7 @@ class MatterportImportService {
             });
         });
     }
-    async importData(spaceID, surface, reloading = false, node = null) {
+    async importData(spaceID, surface, reloading = false, node = null, overrideExisting = true) {
         if (!this.sweeps) {
             return Promise.reject(new Error('no sweeps initialized'));
         }
@@ -11495,10 +11520,9 @@ class MatterportImportService {
         await waitUntil(() => appIsLoaded === true);
         if (reloading) {
             // perform only 360 import since we are reloading
-            await this.import360images();
+            await this.import360images(overrideExisting);
             return Promise.resolve(true);
         }
-        this.cleanLocalStorage(); // we are importing new visit
         this.spaceID = spaceID;
         let floorZones = [];
         const zones = await this.zoneService.getZonesBySpace(spaceID);
@@ -11535,7 +11559,7 @@ class MatterportImportService {
                 console.log('could create navigation', navigationInput.id);
             }
         }));
-        await this.import360images();
+        await this.import360images(overrideExisting);
         return Promise.resolve(true);
     }
     async createZone(name, layerID, surface = null, parentID = null, sweeps = [], node = null, metadata = null) {
@@ -11559,46 +11583,30 @@ class MatterportImportService {
         const newLocal = await this.zoneService.create(zoneInput);
         return newLocal;
     }
-    async import360images() {
+    async import360images(overrideExisting = true) {
         console.log('Importing 360 images');
         this.importingImages.next(true);
         return new Promise(async (resolve) => {
             const scans = Object.values(this.sweeps);
-            let maxScan;
-            let indexScan;
             const nmbScans = Object.keys(scans).length;
-            console.log('Total number of scan points :', nmbScans);
             this.totalSweepsCount.next(nmbScans);
-            // check if we started to load images already
-            if (localStorage.getItem('indexScanLoad')) {
-                console.log('retaking import from scan', localStorage.getItem('indexScanLoad'));
-                indexScan = +localStorage.getItem('indexScanLoad');
-                nmbScans < indexScan + this.MAX_SCANS_RELOAD
-                    ? (maxScan = nmbScans)
-                    : (maxScan = indexScan + this.MAX_SCANS_RELOAD);
-            }
-            else {
-                indexScan = 0;
-                nmbScans < this.MAX_SCANS_RELOAD
-                    ? (maxScan = nmbScans)
-                    : (maxScan = this.MAX_SCANS_RELOAD);
-            }
-            for (let index = indexScan; index < maxScan; index += 1) {
+            const start = overrideExisting ? 0 : await this.getUploadedImageCount(this.modelID);
+            for (let index = start; index < nmbScans; 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,
-                        y: 0,
-                    });
+                    await this.sdk.Sweep.moveTo(scans[index].uuid, { rotation: { x: 0, y: 0 }, transition: this.sdk.Sweep.Transition.INSTANT, transitionTime: 0 });
                     const img = await this.sdk.Renderer.takeEquirectangular({ width: 2048, height: 1024 }, { mattertags: false, sweeps: true });
-                    await uploadBase64Image(img, scans[index].uuid, `visits/${this.modelID}/sweeps/`, 'sweep');
-                    this.sweepProcessedCount.next(index);
-                    localStorage.setItem('indexScanLoad', index.toString());
+                    /**Upload on S3 are asynchronous, in order to no slow down the process*/
+                    uploadBase64ImageWithRetry(img, scans[index].uuid, `visits/${this.modelID}/sweeps/`, 'sweep', 5).then((r) => {
+                        this.sweepProcessedCount.next(index);
+                        if (index === nmbScans - 1) {
+                            console.log('Import 360 done');
+                            resolve(true);
+                            this.removeFrame();
+                            this.stop = true;
+                        }
+                    }).catch((e) => {
+                        console.log("Error uploading scan : ", e);
+                    });
                 }
                 else {
                     console.log('Abandoning import because it was cancelled');
@@ -11606,22 +11614,17 @@ class MatterportImportService {
                     break;
                 }
             }
-            if (maxScan === nmbScans) {
-                console.log('Import 360 done');
-                this.cleanLocalStorage();
-                this.removeFrame();
-                this.stop = true;
-                resolve(true);
-            }
-            else if (!this.stop) {
-                // to restart the procedure from where we left of
-                localStorage.setItem('indexScanLoad', maxScan.toString());
-                localStorage.setItem('visitInImport', this.modelID);
-                this.removeFrame();
-                window.location.reload();
-            }
         });
     }
+    async getUploadedImageCount(modelID) {
+        try {
+            const images = await listFilesInFolder(`visits/${modelID}/sweeps/`);
+            return images.length;
+        }
+        catch (e) {
+            return 0;
+        }
+    }
     async moveToFloor(floorName, matterportFloorSequence = null) {
         if (!this.floors) {
             console.log('Floor are not loaded yet');
@@ -11708,7 +11711,6 @@ class MatterportImportService {
     abandon() {
         setTimeout(() => {
             console.log('abandonning import');
-            localStorage.removeItem('visitInImport');
             this.stop = true;
             this.removeFrame();
         }, 500);
@@ -11718,10 +11720,6 @@ class MatterportImportService {
             this.currentFrame.remove();
         }
     }
-    cleanLocalStorage() {
-        localStorage.removeItem('indexScanLoad');
-        localStorage.removeItem('visitInImport');
-    }
     async getLayerByName(name) {
         const mission = this.userService.currentMission(this.spaceID);
         const currentOrgId = mission.organisationID;
@@ -12303,5 +12301,5 @@ function floatValidator() {
  * Generated bundle index. Do not edit.
  */
 
-export { AffectationService, AvatarComponent, BaseLateralTabService, BaseTagService, BaseUserService, BaseVisibilityService, CameraMode, CaptureService, CaptureViewer, CommentService, CommentType, Config, ContentService, CsvExportComponent, DomainService, DomainType, DurationToStringPipe, EmailStatus, EquipmentService, EventService, EventStatus, EventType, FeatureService, FeatureType, FilterService, HashtagFromIdPipe, HashtagService, InterventionService, InventoryStatus, LayerService, LevelStatus, LoaderComponent, Locale, LocaleService, MatterportImportService, MatterportService, MattertagActionMode, MattertagData, MeasurementService, MenuBarComponent, MissionService, NavigationService, NavigatorService, NgxSmarterplanCoreModule, NgxSmarterplanCoreService, NodeService, Object3DService, OperationService, OrganisationService, PaymentStatus, PlanService, PoiService, PoiType, ProfileEntity, ProfileService, ProfileStatus, PropertyService, PropertyType, RoleStatus, SafeUrlPipe, SearchBarComponent, SearchObjectType, SearchService, SpModule, SpaceService, SpaceStatus, StatusEquipment, SupportModalComponent, SupportService, TagAction, TemplateService, TicketPriority, TicketStatus, TicketType, TicketsService, TimeDateToLocalStringPipe, TypeNote, UsernameFromIdPipe, ValidatorsService, ViewerInteractions, ViewerService, VisitService, ZoneChangeService, ZoneService, arraysContainSameElements, checkElementById, convertTimestampToLocalZone, dateHasExpired, dateTimeToLocalString, deleteFromS3, downloadBlob, downloadEquipmentDocument, downloadFile, downloadFileAsObject, durationToString, emailValidator, enumToArray, filterUniqueArrayByID, floatValidator, getBufferForFileFromS3, getCoefficientsForImage, getDistanceBetweenTwoPoints, getHighestLevelForMissions, getHighestRoleForMissions, getLevelsBelow, getLocaleLong, getLocaleShort, getMetaForImage, getRolesBelowForManager, getSignedFile, getSignedImageUrlForEquipment, getSignedImageUrlForProfile, getSignedImageUrlForSpace, getSpaceIDFromUrl, getVisitUrl, isEmptyObject, listFilesInFolder, mean, noEmptyValidator, numberToDateString, openDocument, openModalForVisitSwitch, poiTypeToString, removeAllFilesFromFolderS3, removeNullKeysFromObject, showScanPointsOnPlanInDiv, shuffleArray, sortAlphabeticallyOnName, stringLocaleToEnum, stringToLowercaseNoSpaces, styleButton, textValidator, translateDatePeriod, uploadBase64Image, uploadFileToS3, uploadJsonToS3, validEmail, wait, waitUntil };
+export { AffectationService, AvatarComponent, BaseLateralTabService, BaseTagService, BaseUserService, BaseVisibilityService, CameraMode, CaptureService, CaptureViewer, CommentService, CommentType, Config, ContentService, CsvExportComponent, DomainService, DomainType, DurationToStringPipe, EmailStatus, EquipmentService, EventService, EventStatus, EventType, FeatureService, FeatureType, FilterService, HashtagFromIdPipe, HashtagService, InterventionService, InventoryStatus, LayerService, LevelStatus, LoaderComponent, Locale, LocaleService, MatterportImportService, MatterportService, MattertagActionMode, MattertagData, MeasurementService, MenuBarComponent, MissionService, NavigationService, NavigatorService, NgxSmarterplanCoreModule, NgxSmarterplanCoreService, NodeService, Object3DService, OperationService, OrganisationService, PaymentStatus, PlanService, PoiService, PoiType, ProfileEntity, ProfileService, ProfileStatus, PropertyService, PropertyType, RoleStatus, SafeUrlPipe, SearchBarComponent, SearchObjectType, SearchService, SpModule, SpaceService, SpaceStatus, StatusEquipment, SupportModalComponent, SupportService, TagAction, TemplateService, TicketPriority, TicketStatus, TicketType, TicketsService, TimeDateToLocalStringPipe, TypeNote, UsernameFromIdPipe, ValidatorsService, ViewerInteractions, ViewerService, VisitService, ZoneChangeService, ZoneService, arraysContainSameElements, checkElementById, convertTimestampToLocalZone, dateHasExpired, dateTimeToLocalString, deleteFromS3, downloadBlob, downloadEquipmentDocument, downloadFile, downloadFileAsObject, durationToString, emailValidator, enumToArray, filterUniqueArrayByID, floatValidator, getBufferForFileFromS3, getCoefficientsForImage, getDistanceBetweenTwoPoints, getHighestLevelForMissions, getHighestRoleForMissions, getLevelsBelow, getLocaleLong, getLocaleShort, getMetaForImage, getRolesBelowForManager, getSignedFile, getSignedImageUrlForEquipment, getSignedImageUrlForProfile, getSignedImageUrlForSpace, getSpaceIDFromUrl, getVisitUrl, isEmptyObject, listFilesInFolder, mean, noEmptyValidator, numberToDateString, openDocument, openModalForVisitSwitch, poiTypeToString, removeAllFilesFromFolderS3, removeNullKeysFromObject, showScanPointsOnPlanInDiv, shuffleArray, sortAlphabeticallyOnName, stringLocaleToEnum, stringToLowercaseNoSpaces, styleButton, textValidator, translateDatePeriod, uploadBase64Image, uploadBase64ImageWithRetry, uploadFileToS3, uploadJsonToS3, validEmail, wait, waitUntil };
 //# sourceMappingURL=smarterplan-ngx-smarterplan-core.mjs.map