@smarterplan/ngx-smarterplan-core 1.2.23 → 1.2.24

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

@@ -6636,11 +6636,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 +6996,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 +10082,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 +10378,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