@smarterplan/ngx-smarterplan-core 1.4.12 → 1.4.13

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

@@ -426,6 +426,14 @@ var SpModule;
     SpModule["HOTEL"] = "HOTEL";
     SpModule["IMMO"] = "IMMO";
 })(SpModule || (SpModule = {}));
+var MatterportViewType;
+(function (MatterportViewType) {
+    MatterportViewType["BASE"] = "viewtype.base";
+    MatterportViewType["DEFURNISH"] = "viewtype.defurnish";
+    MatterportViewType["LAYERED_BASE"] = "viewtype.layeredbase";
+    MatterportViewType["OTHER"] = "viewtype.other";
+    MatterportViewType["USER"] = "viewtype.user";
+})(MatterportViewType || (MatterportViewType = {}));
 
 /**
  * The base of all `SceneComponent` created with the sdk.
@@ -3407,6 +3415,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
 
 class MatterportTagService {
     navigationService;
+    /** Name of the common layer every Smarterplan tag is created in. */
+    static SHARED_TAG_LAYER_NAME = 'smarterplan-shared-tags';
     dictionnaryTags = new Map();
     tagAddQueue = Promise.resolve();
     mattertagToFollow = null;
@@ -3417,6 +3427,22 @@ class MatterportTagService {
     tagService = null;
     tagsCurrentOpacity = new Map();
     tagsCurrentEnabled = new Map();
+    /**
+     * Single layer holding every Smarterplan tag, added to every view of the space so a
+     * tag stays in place — same sid, same content — when the user switches between the
+     * furnished and the Defurnished view. Tags added to the global sdk.Tag (or to a
+     * view's own layer) belong to that view only, which is what made them pop in and out
+     * on every view change.
+     *
+     * Deliberately NOT created with `{ common: true }`: in SDK 26.7.5 a common layer is
+     * pushed into `getOrderedModelViews()` at creation time, and that call defaults to
+     * `includeDefurnish: false`, so the Defurnished view never receives it — while
+     * `View.addLayer()` refuses to repair it ("Layer is common. No need to add."). A
+     * plain layer we attach to each view ourselves reaches every view, Defurnished
+     * included. See attachSharedTagLayerToViews().
+     */
+    sharedTagLayer = null;
+    sharedTagLayerPromise = null;
     constructor(navigationService) {
         this.navigationService = navigationService;
     }
@@ -3429,6 +3455,7 @@ class MatterportTagService {
             return;
         try {
             this.onGoToTag.next(sid);
+            // `open` only exists on the global Tag module, never on a layer-scoped one.
             await sdk.Tag.open(sid);
         }
         catch (e) {
@@ -3436,6 +3463,102 @@ class MatterportTagService {
                 console.warn('Cannot open tag', sid, e);
         }
     }
+    /**
+     * Returns the SDK Tag module to use for an operation addressing an existing tag by ID
+     * (icon, opacity, position, attachments, removal...): always the global sdk.Tag.
+     *
+     * A layer-scoped Tag module only exposes the *replayable* mutations, meant to build
+     * the layer's own content; applying them to an already-created tag silently does
+     * nothing — which is what left every pin white instead of carrying its icon. Only
+     * `add` has to go through the layer, see getTagCreationModule().
+     */
+    getTagModule(sdk, tagId) {
+        return sdk?.Tag;
+    }
+    /**
+     * Returns the Tag module every new tag must be created through: the shared layer
+     * when the View API is available, the global sdk.Tag otherwise.
+     */
+    async getTagCreationModule(sdk) {
+        const layer = await this.ensureSharedTagLayer(sdk);
+        return layer?.Tag || sdk?.Tag;
+    }
+    /**
+     * Creates (once per SDK session) and returns the shared tag layer.
+     * Resolves to null when the View API is unavailable, so callers transparently fall
+     * back to the global sdk.Tag.
+     */
+    async ensureSharedTagLayer(sdk) {
+        if (this.sharedTagLayer)
+            return this.sharedTagLayer;
+        if (!sdk?.View?.createLayer)
+            return null;
+        if (!this.sharedTagLayerPromise) {
+            this.sharedTagLayerPromise = Promise.resolve(sdk.View.createLayer(MatterportTagService.SHARED_TAG_LAYER_NAME))
+                .then(async (layer) => {
+                this.sharedTagLayer = layer;
+                // A freshly created layer can come back toggled off, which hides its tags.
+                if (layer && layer.toggled === false) {
+                    await layer.toggle(true).catch(() => { });
+                }
+                return layer;
+            })
+                .catch((e) => {
+                // Allow a later retry (e.g. the SDK was not fully ready yet).
+                this.sharedTagLayerPromise = null;
+                if (isDevMode())
+                    console.warn('[MatterportTagService] Could not create the shared tag layer', e);
+                return null;
+            });
+        }
+        return this.sharedTagLayerPromise;
+    }
+    /**
+     * Makes sure the shared layer is part of every view of the space, Defurnished
+     * included. This is what actually shares the tags across views, and the reason the
+     * layer must not be a common one: the SDK only performs the attachment for
+     * non-common layers. Idempotent, so it can run on every view collection update.
+     */
+    async attachSharedTagLayerToViews(sdk, views) {
+        const layer = await this.ensureSharedTagLayer(sdk);
+        if (!layer)
+            return;
+        for (const view of views) {
+            if (!view?.addLayer || view.hasLayer?.(layer))
+                continue;
+            try {
+                await view.addLayer(layer);
+            }
+            catch (e) {
+                if (isDevMode())
+                    console.warn('[MatterportTagService] Cannot add the shared tag layer to view', view?.id, e);
+            }
+        }
+    }
+    /**
+     * Adds a tag through the shared layer so it exists in every view. Falls back
+     * to the global sdk.Tag when the View API is unavailable; that call is raced against
+     * a timeout as a safety net, since it never resolves while a Defurnished view is
+     * active.
+     */
+    async addTagToSdk(sdk, descriptor) {
+        const sharedTagModule = await this.getTagCreationModule(sdk);
+        try {
+            const sidList = (await Promise.race([
+                sharedTagModule.add(descriptor),
+                new Promise((_, reject) => setTimeout(() => reject(new Error('Tag.add timed out')), 4000)),
+            ]));
+            if (sidList?.length)
+                return sidList[0];
+        }
+        catch (error) {
+            if (error?.message?.includes('already in use'))
+                throw error;
+            if (isDevMode())
+                console.warn('[MatterportTagService] Tag.add failed/timed out', error?.message);
+        }
+        return null;
+    }
     /** Opens the most recently created tag in the viewer. */
     async goToLastTag(sdk) {
         if (!sdk || this.mattertagIDs.length === 0)
@@ -3450,36 +3573,40 @@ class MatterportTagService {
     async addMattertagToViewer(sdk, mattertagData) {
         if (!sdk)
             return null;
-        console.log('---------------');
-        console.log('element id ' + mattertagData.elementID);
-        console.log('position: ', mattertagData.getPosition());
-        console.log('rotation: ', mattertagData.getRotation());
-        console.log('sweep id: ', mattertagData.getSweepID());
-        console.log('---------------');
-        this.tagAddQueue = this.tagAddQueue.then(async () => {
-            const data = mattertagData.getData();
-            const existingId = data?.id || null;
+        this.tagAddQueue = this.tagAddQueue
+            .then(async () => {
+            const descriptor = mattertagData.getMattertagDescriptor()[0];
+            const existingId = descriptor?.id || null;
             try {
-                const sidList = await sdk.Tag.add(data);
-                if (sidList && sidList.length > 0) {
-                    const mattertagID = sidList[0];
-                    this.mattertagIDs.push(mattertagID);
-                    this.dictionnaryTags.set(mattertagID, mattertagData);
-                    return mattertagID;
+                const sid = await this.addTagToSdk(sdk, descriptor);
+                if (sid) {
+                    mattertagData.setMatterportSid(sid);
+                    if (!this.mattertagIDs.includes(sid)) {
+                        this.mattertagIDs.push(sid);
+                    }
+                    this.dictionnaryTags.set(sid, mattertagData);
+                    return sid;
                 }
+                if (isDevMode())
+                    console.warn('[MatterportTagService] Tag.add returned no sid', descriptor);
             }
             catch (error) {
                 if (error?.message?.includes('already in use') && existingId) {
                     if (!this.dictionnaryTags.has(existingId)) {
                         this.mattertagIDs.push(existingId);
-                        this.dictionnaryTags.set(existingId, mattertagData);
                     }
+                    this.dictionnaryTags.set(existingId, mattertagData);
                     return existingId;
                 }
                 if (isDevMode())
-                    console.warn('Failed to add tag to viewer', error);
+                    console.warn('[MatterportTagService] addMattertagToViewer failed', error);
             }
             return null;
+        })
+            .catch((e) => {
+            if (isDevMode())
+                console.warn('[MatterportTagService] tagAddQueue rejected', e);
+            return null;
         });
         return this.tagAddQueue;
     }
@@ -3498,7 +3625,8 @@ class MatterportTagService {
         }
         this.tagAddQueue = this.tagAddQueue.then(async () => {
             try {
-                const [createdSid] = await sdk.Tag.add(...descriptor);
+                const tagModule = await this.getTagCreationModule(sdk);
+                const [createdSid] = await tagModule.add(...descriptor);
                 this.mattertagIDs.push(createdSid);
                 this.dictionnaryTags.set(createdSid, mattertagData);
                 await wait(100);
@@ -3545,36 +3673,6 @@ class MatterportTagService {
                 tagPos.z >= min.z - margin && tagPos.z <= max.z + margin);
         });
     }
-    /**
-     * Computes the final context-aware opacity for a single tag.
-     * @param currentFloorSequence  Authoritative current floor sequence from sdk.Floor.current
-     *                              (null = single-floor model or unknown).
-     * @param currentRooms          Array of active rooms the camera is in.
-     */
-    /*computeSingleTagContextOpacity(
-      mattertagData: MattertagData,
-      poseCamera: any,
-      sweepCollection: any,
-      currentFloorSequence: number | null,
-      currentRooms: any[]
-    ): number {
-      const mode = this.navigationService.currentCameraMode;
-  
-      // 1. Check Floor
-      const tagFloorId = this.getFloorIdForTag(mattertagData, sweepCollection);
-      const currentFloorId = currentFloorSequence?.toString();
-      if (tagFloorId && currentFloorId && tagFloorId !== currentFloorId) {
-        return 0;
-      }
-  
-      // 2. Si Dollhouse -> Pleine opacité
-      //if (mode !== CameraMode.INSIDE) return 1;
-  
-      // 3. Si Inside -> Check pièce + Distance progressive
-      //if (!this.isTagInRooms(mattertagData, currentRooms)) return 0;
-  
-      return 1;
-    }*/
     /** Returns the ID of the most recently added tag. */
     getLastTag() {
         if (this.mattertagIDs.length === 0)
@@ -3624,10 +3722,11 @@ class MatterportTagService {
             }
             // Apply changes
             // Tooltip and click management
+            const tagModule = this.getTagModule(sdk, tagId);
             const lastEnabled = this.tagsCurrentEnabled.get(tagId);
             if (lastEnabled !== shouldBeEnabled) {
                 this.tagsCurrentEnabled.set(tagId, shouldBeEnabled);
-                promises.push(sdk.Tag.allowAction(tagId, {
+                promises.push(tagModule.allowAction(tagId, {
                     opening: shouldBeEnabled,
                     navigating: shouldBeEnabled,
                     docking: false
@@ -3637,16 +3736,26 @@ class MatterportTagService {
             const lastOpacity = this.tagsCurrentOpacity.get(tagId) ?? -1;
             if (Math.abs(lastOpacity - targetOpacity) > 0.05) {
                 this.tagsCurrentOpacity.set(tagId, targetOpacity);
-                promises.push(sdk.Tag.editOpacity(tagId, targetOpacity).catch(() => { }));
+                promises.push(tagModule.editOpacity(tagId, targetOpacity).catch(() => { }));
             }
         }
         await Promise.all(promises);
     }
+    /**
+     * Drops the memoized opacity/enabled state so the next visibility pass re-applies it
+     * to every tag. Needed after a view switch (furnished <-> defurnished): the SDK
+     * re-renders the shared layer's tags and the cached values would otherwise make
+     * updateTagsVisibilityForContext() skip them, leaving tags stuck invisible.
+     */
+    resetVisibilityCache() {
+        this.tagsCurrentOpacity.clear();
+        this.tagsCurrentEnabled.clear();
+    }
     /** Removes a specific tag from the viewer and local dictionaries. */
     async deleteMattertagFromId(sdk, mattertagID) {
         try {
             if (sdk)
-                await sdk.Tag.remove(mattertagID);
+                await this.getTagModule(sdk, mattertagID).remove(mattertagID);
             this.dictionnaryTags.delete(mattertagID);
             const index = this.mattertagIDs.indexOf(mattertagID);
             if (index > -1)
@@ -3669,7 +3778,7 @@ class MatterportTagService {
             const sidsToRemove = [...this.mattertagIDs];
             for (const sid of sidsToRemove) {
                 try {
-                    await sdk.Tag.remove(sid);
+                    await this.getTagModule(sdk, sid).remove(sid);
                 }
                 catch (e) { }
             }
@@ -3680,7 +3789,7 @@ class MatterportTagService {
      * Creates and configures a Mattertag from a POI, handling coordinates, normals, and sweep ID.
      * Skips creation if a tag for the object already exists.
      */
-    async createMattertagFromPOI(sdk, tagType, object, poi, poseCamera, getTagFromElementId, setTagIconAndOpacity, injectHtmlInTag) {
+    async createMattertagFromPOI(sdk, tagType, object, poi, getTagFromElementId, setTagIconAndOpacity, injectHtmlInTag) {
         const { tag } = getTagFromElementId(object.id);
         if (tag)
             return;
@@ -3742,10 +3851,11 @@ class MatterportTagService {
             return;
         try {
             const iconName = `custom-icon-${mattertagID}`;
+            const tagModule = this.getTagModule(sdk, mattertagID);
             await sdk.Asset.registerTexture(iconName, iconPath);
-            await sdk.Tag.editIcon(mattertagID, iconName);
+            await tagModule.editIcon(mattertagID, iconName);
             if (applyOpacity) {
-                await sdk.Tag.editOpacity(mattertagID, opacity);
+                await tagModule.editOpacity(mattertagID, opacity);
             }
         }
         catch (error) {
@@ -3809,16 +3919,17 @@ class MatterportTagService {
             if (html && html.trim().length > 0 && sdk) {
                 const scriptTag = this.tagService.getScriptForTag(object, tagType);
                 html += `${scriptTag}`;
+                const tagModule = this.getTagModule(sdk, tagID);
                 const [sandboxId, messenger] = await sdk.Tag.registerSandbox(html);
                 const attachmentID = this.tagsAttachments[tagID];
                 if (attachmentID) {
                     try {
-                        await sdk.Tag.detach(tagID, attachmentID);
+                        await tagModule.detach(tagID, attachmentID);
                     }
                     catch (e) { }
                 }
                 this.tagsAttachments[tagID] = sandboxId;
-                await sdk.Tag.attach(tagID, sandboxId);
+                await tagModule.attach(tagID, sandboxId);
                 // Attach the "View informations" handler in tooltip
                 messenger.on(TagAction.DETAIL_CLICK, this.tagService.onActionDetailClick.bind(this.tagService));
                 messenger.on(TagAction.TICKET_CLICK, this.tagService.onActionDetailClick.bind(this.tagService));
@@ -3831,11 +3942,12 @@ class MatterportTagService {
             else if (sdk) {
                 const { comment, tagDescription } = this.tagService.getBillboardMediaToEmbed(object);
                 if (comment) {
+                    const tagModule = this.getTagModule(sdk, tagID);
                     // 1) Register the media attachment by passing the URL string(s).
                     //    registerAttachment returns an array of attachment IDs.
                     const [attachmentID] = await sdk.Tag.registerAttachment(comment.externalLink);
                     // 2) Attach the registered media to the tag.
-                    await sdk.Tag.attach(tagID, attachmentID);
+                    await tagModule.attach(tagID, attachmentID);
                     // 3) Determine media type for the billboard (PHOTO or VIDEO).
                     //    Use a simple heuristic: YouTube/Vimeo -> VIDEO, otherwise PHOTO.
                     //    The SDK exposes MediaType on the Tag namespace.
@@ -3843,7 +3955,7 @@ class MatterportTagService {
                     const mediaType = isVideo ? sdk.Mattertag.MediaType.VIDEO : sdk.Mattertag.MediaType.PHOTO;
                     // 4) Update the billboard text and media using editBillboard.
                     //    editBillboard accepts Partial<Tag.EditableProperties> such as label, description, media.
-                    await sdk.Tag.editBillboard(tagID, {
+                    await tagModule.editBillboard(tagID, {
                         label: object.title || 'Media',
                         description: tagDescription || '',
                         media: {
@@ -3869,9 +3981,14 @@ class MatterportTagService {
     /** Clears all local tag data and resets the addition queue. */
     clear() {
         this.dictionnaryTags.clear();
+        this.tagsCurrentOpacity.clear();
+        this.tagsCurrentEnabled.clear();
         this.tagAddQueue = Promise.resolve();
         this.mattertagToFollow = null;
         this.mattertagIDs = [];
+        // A new space means a new SDK session, hence a new shared layer to create.
+        this.sharedTagLayer = null;
+        this.sharedTagLayerPromise = null;
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: MatterportTagService, deps: [{ token: MatterportNavigationService }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: MatterportTagService, providedIn: 'root' });
@@ -3987,6 +4104,15 @@ class MatterportService {
         this.navigationService.forbiddenSweeps = value;
     }
     tagAction = new Subject();
+    /** Views (furnished, defurnished...) exposed by the SDK for the current space. */
+    viewsByType = new Map();
+    currentView = null;
+    viewSubscriptions = [];
+    /** Emits the active view every time the user switches between furnished/defurnished. */
+    onViewChanged = new Subject();
+    /** Delay left to the SDK to rebuild the layer's tags after a view switch. */
+    static VIEW_SWITCH_REFRESH_DELAY_MS = 800;
+    viewSwitchRestoreTimer = null;
     get mattertagToFollow() {
         return this.matterportTagService.mattertagToFollow;
     }
@@ -4142,7 +4268,9 @@ class MatterportService {
                     default:
                         break;
                 }
-                this.sdk.Asset.registerTexture('icon-position', this.config.my_config.icon_position);
+                this.sdk.Asset.registerTexture('icon-position', this.config.my_config.icon_position)
+                    .catch((e) => { if (isDevMode())
+                    console.warn('icon-position texture registration failed', e); });
                 // Current Room (used for getting bounding box and eventually lazy load mattertag or object3D inside current Room)
                 this.sdk.Room.current.subscribe((currentRoom) => {
                     const rooms = Array.isArray(currentRoom) ? currentRoom : (currentRoom ? [currentRoom] : []);
@@ -4240,8 +4368,9 @@ class MatterportService {
                     if (!this.sdk || sid === this.mattertagToFollow)
                         return; // ignore when we are in positioning mode
                     try {
-                        if (this.sdk.Tag?.allowAction) {
-                            this.sdk.Tag.allowAction(sid, { opening: true, navigating: true, docking: false });
+                        const tagModule = this.matterportTagService.getTagModule(this.sdk, sid);
+                        if (tagModule?.allowAction) {
+                            tagModule.allowAction(sid, { opening: true, navigating: true, docking: false });
                         }
                     }
                     catch (e) {
@@ -4253,7 +4382,11 @@ class MatterportService {
                 };
                 // Wait for the application to reach PLAYING phase
                 if (this.sdk.App && this.sdk.App.state) {
-                    this.sdk.App.state.waitUntil((s) => s.phase === this.sdk.App.Phase.PLAYING).then(() => {
+                    this.sdk.App.state.waitUntil((s) => s.phase === this.sdk.App.Phase.PLAYING).then(async () => {
+                        // Create the common layer holding every tag before any tag is added, so that
+                        // tags are shared between the furnished and the defurnished views.
+                        await this.matterportTagService.ensureSharedTagLayer(this.sdk);
+                        this.initViews();
                         this.sdk.Camera.pose.subscribe((pose) => {
                             this.poseCamera = pose;
                             this.matterportTagService.updateTagsVisibilityForContext(this.sdk, this.sweepCollection, this.navigationService.currentCameraMode, this.mattertagToFollow, this.navigationService.currentFloorSequence, this.navigationService.currentRooms);
@@ -4393,7 +4526,7 @@ class MatterportService {
      */
     enable_following_tag(mattertag) {
         const OFFSET = 0.0001; // quasi-invisible mais suffit à éviter l'interception
-        this.sdk.Tag.editPosition(mattertag, {
+        this.matterportTagService.getTagModule(this.sdk, mattertag).editPosition(mattertag, {
             anchorPosition: {
                 x: this.poseMatterport.position.x + OFFSET,
                 y: this.poseMatterport.position.y,
@@ -4420,28 +4553,42 @@ class MatterportService {
     //
     /** Creates a temporary Mattertag that follows the user's cursor for positioning. */
     async addCursorMattertag(mattertagData) {
+        if (!this.poseMatterport && this.poseCamera) {
+            this.poseMatterport = {
+                position: { ...this.poseCamera.position },
+                normal: { x: 0, y: -0.15, z: 0 },
+                time: new Date().getTime()
+            };
+        }
         if (!this.poseMatterport)
             return;
         this.mattertagToFollow = await this.addMattertagToViewer(mattertagData);
+        if (!this.mattertagToFollow) {
+            if (isDevMode())
+                console.warn('addCursorMattertag: tag creation failed, mattertagToFollow is null');
+            return;
+        }
         await wait(50);
-        this.sdk.Tag.editIcon(this.mattertagToFollow, 'icon-position');
-        this.sdk.Tag.editOpacity(this.mattertagToFollow, 1);
-        this.sdk.Tag.editPosition(this.mattertagToFollow, {
-            anchorPosition: { ...this.poseMatterport.position },
-            stemVector: {
-                x: this.poseMatterport.normal.x * 0.3,
-                y: this.poseMatterport.normal.y * 0.3,
-                z: this.poseMatterport.normal.z * 0.3,
-            }
-        });
+        const tagModule = this.matterportTagService.getTagModule(this.sdk, this.mattertagToFollow);
         try {
-            await this.sdk.Tag.allowAction(this.mattertagToFollow, {
-                opening: true,
-                navigating: false,
-                docking: false
+            await tagModule.editIcon(this.mattertagToFollow, 'icon-position');
+            await tagModule.editOpacity(this.mattertagToFollow, 1);
+            await tagModule.editPosition(this.mattertagToFollow, {
+                anchorPosition: { ...this.poseMatterport.position },
+                stemVector: {
+                    x: (this.poseMatterport.normal?.x ?? 0) * 0.3,
+                    y: (this.poseMatterport.normal?.y ?? -0.15) * 0.3,
+                    z: (this.poseMatterport.normal?.z ?? 0) * 0.3,
+                }
             });
+            await tagModule.allowAction(this.mattertagToFollow, {
+                opening: true, navigating: false, docking: false
+            });
+        }
+        catch (e) {
+            if (isDevMode())
+                console.warn('addCursorMattertag: error configuring cursor tag', e);
         }
-        catch (e) { }
     }
     get tagAddQueue() {
         return this.matterportTagService.tagAddQueue;
@@ -4470,7 +4617,7 @@ class MatterportService {
     /** Applies a pre-registered icon to a Mattertag. */
     async setRegistredIconForTag(mattertagID, iconName) {
         try {
-            this.sdk.Tag.editIcon(mattertagID, iconName);
+            this.matterportTagService.getTagModule(this.sdk, mattertagID).editIcon(mattertagID, iconName);
         }
         catch (e) {
             if (isDevMode())
@@ -4488,7 +4635,7 @@ class MatterportService {
             else {
                 iconName = `${iconName}_unavailable`;
             }
-            this.sdk.Tag.editIcon(mattertagID, iconName);
+            await this.editTagIcon(mattertagID, iconName);
             return;
         }
         const stringTagType = poiTypeToString(mattertagData.getType());
@@ -4520,11 +4667,19 @@ class MatterportService {
                 opacity = tagIcon.opacity;
             }
         }
+        await this.editTagIcon(mattertagID, iconName);
+    }
+    /**
+     * Applies an icon to a tag. The call is awaited and its rejection reported: a
+     * silently dropped promise here leaves the pin with its default white look.
+     */
+    async editTagIcon(mattertagID, iconName) {
         try {
-            this.sdk.Tag.editIcon(mattertagID, iconName);
+            await this.matterportTagService.getTagModule(this.sdk, mattertagID).editIcon(mattertagID, iconName);
         }
         catch (error) {
-            console.log('Error editIcon or opacity', error);
+            if (isDevMode())
+                console.warn('[MatterportService] editIcon failed for', mattertagID, iconName, error);
         }
     }
     /** Navigates the camera to the most recently created tag. */
@@ -4545,12 +4700,9 @@ class MatterportService {
                 await this.sdk.Camera.lookAt(position, {
                     transition: this.sdk.Camera.TransitionType.FLY
                 });
-                await this.sdk.Tag.open(mattertagID);
-            }
-            else {
-                // Fallback for cases where we don't have local data yet
-                await this.sdk.Tag.open(mattertagID);
             }
+            // `open` only exists on the global Tag module, never on a layer-scoped one.
+            await this.sdk.Tag.open(mattertagID);
         }
         catch (error) {
             if (isDevMode())
@@ -4634,6 +4786,9 @@ class MatterportService {
       .logo-link,
       .footer-logo,
       .bottom-ui,
+      img.logo-image,
+      img[class^="logo-image"],
+      img[class*=" logo-image"],
       [data-testid="showcase-footer"] {
         opacity: 0 !important;
         visibility: hidden !important;
@@ -4660,7 +4815,7 @@ class MatterportService {
      */
     async updateMatterTagContentForTagID(mattertagID, object = null, tagType = null) {
         if (this.sdk) {
-            await this.sdk.Tag.editBillboard(mattertagID, this.dictionnaryTags.get(mattertagID).getData());
+            await this.matterportTagService.getTagModule(this.sdk, mattertagID).editBillboard(mattertagID, this.dictionnaryTags.get(mattertagID).getData());
         }
         // Mise à jour de l'icône immédiate
         await this.matterportTagService.updateMatterTagContentForTagID(this.sdk, mattertagID, object, tagType, this.setTagIconAndOpacity.bind(this), 
@@ -4703,7 +4858,7 @@ class MatterportService {
      * @returns
      */
     async createMattertagFromPOI(tagType, object, poi) {
-        return this.matterportTagService.createMattertagFromPOI(this.sdk, tagType, object, poi, this.poseCamera, this.getTagFromElementId.bind(this), this.setTagIconAndOpacity.bind(this), this.injectHtmlInTag.bind(this));
+        return this.matterportTagService.createMattertagFromPOI(this.sdk, tagType, object, poi, this.getTagFromElementId.bind(this), this.setTagIconAndOpacity.bind(this), this.injectHtmlInTag.bind(this));
     }
     /**
      * Inject custom HTML as Mattertag content
@@ -4768,6 +4923,10 @@ class MatterportService {
         const mattertagData = new MattertagData(poiType);
         mattertagData.setSweepID(this.navigationService.resolveSweepUuid(this.poseCamera.sweep));
         mattertagData.setRotation(this.poseCamera.rotation);
+        const initialPosition = this.poseMatterport?.position ?? this.poseCamera.position;
+        const initialNormal = this.poseMatterport?.normal ?? { x: 0, y: -0.15, z: 0 };
+        mattertagData.setPosition({ ...initialPosition });
+        mattertagData.setNormal({ ...initialNormal });
         this.setInteractionMode(ViewerInteractions.ADDING);
         await this.addCursorMattertag(mattertagData);
     }
@@ -4885,8 +5044,14 @@ class MatterportService {
         }
     }
     async updateMatterTagPosInSdkViewer(mattertagID, object, poiType, poi = null) {
-        const IndexToUpdate = object.pois.items.findIndex((u) => u.id === poi.id);
-        object.pois.items[IndexToUpdate] = poi;
+        if (!poi || !poi.coordinate) {
+            console.warn('updateMatterTagPosInSdkViewer: poi or poi.coordinate is missing', poi);
+            return;
+        }
+        const IndexToUpdate = object.pois?.items ? object.pois.items.findIndex((u) => u?.id === poi.id) : -1;
+        if (IndexToUpdate !== -1 && object.pois?.items) {
+            object.pois.items[IndexToUpdate] = poi;
+        }
         const { x, y, z } = JSON.parse(poi.coordinate);
         const newPosition = {
             anchorPosition: {
@@ -4901,8 +5066,7 @@ class MatterportService {
                 z: 0,
             },
         };
-        //this.sdk.Mattertag.editPosition(mattertagID, newPosition);
-        this.sdk.Tag.editPosition(mattertagID, newPosition);
+        this.matterportTagService.getTagModule(this.sdk, mattertagID).editPosition(mattertagID, newPosition);
         this.dictionnaryTags
             .get(mattertagID)
             .setPosition(newPosition.anchorPosition);
@@ -4912,8 +5076,7 @@ class MatterportService {
                 continue;
             }
             if (currentTag.elementID === object.id && tagId !== mattertagID) {
-                this.dictionnaryTags.delete(tagId);
-                this.sdk.Tag.remove(tagId);
+                await this.matterportTagService.deleteMattertagFromId(this.sdk, tagId);
                 break;
             }
         }
@@ -4955,6 +5118,140 @@ class MatterportService {
         return null;
     }
     //
+    // ---------- Views (furnished / defurnished) ----------
+    //
+    /**
+     * Subscribes to the SDK View API to keep track of the views available for the space
+     * and of the active one. Tags live in a shared common layer, so a view change only
+     * requires re-applying their visibility, never re-creating them.
+     */
+    initViews() {
+        this.clearViewSubscriptions();
+        this.viewsByType.clear();
+        this.currentView = null;
+        if (!this.sdk?.View?.views) {
+            if (isDevMode())
+                console.warn('[MatterportService] View API unavailable on this SDK version');
+            return;
+        }
+        this.viewSubscriptions.push(this.sdk.View.views.subscribe({
+            onCollectionUpdated: (collection) => {
+                // SDK callbacks run outside Angular: re-enter the zone so the views made
+                // available here (defurnish button...) are picked up by change detection.
+                this.ngZone.run(() => {
+                    this.viewsByType.clear();
+                    for (const view of Object.values(collection)) {
+                        this.viewsByType.set(view.type, view);
+                    }
+                });
+                // Views are discovered progressively: make sure each one carries the shared
+                // tag layer, otherwise its tags would not exist in that view.
+                this.matterportTagService.attachSharedTagLayerToViews(this.sdk, Object.values(collection));
+            },
+        }));
+        this.viewSubscriptions.push(this.sdk.View.current.subscribe((view) => {
+            const changed = this.currentView?.id !== view?.id;
+            this.currentView = view;
+            if (!changed)
+                return;
+            this.restoreTagsForActiveView(view);
+            this.ngZone.run(() => this.onViewChanged.next(view));
+        }));
+    }
+    /**
+     * Forces the opacity/enabled state to be pushed again to every tag. The SDK
+     * re-renders the shared layer's tags on a view swap, and the memoized values would
+     * otherwise make updateTagsVisibilityForContext() skip them, leaving tags invisible.
+     */
+    reapplyTagsVisibility() {
+        this.matterportTagService.resetVisibilityCache();
+        this.refreshTagsVisibility();
+    }
+    /**
+     * Puts the tags back in shape in the view that just became active.
+     *
+     * Activating a view re-materializes the shared layer's tags from the descriptors
+     * recorded when they were added, so everything applied to a tag *afterwards* through
+     * the global Tag module is dropped along the way: the custom icon (the pin falls back
+     * to the descriptor's white) and the sandbox carrying the hover content. They have to
+     * be applied again on the freshly rebuilt tags.
+     *
+     * Visibility is refreshed straight away so the tags show up without waiting, then
+     * content is re-applied once the transition is over — re-applying it too early would
+     * target tags the SDK has not rebuilt yet.
+     */
+    restoreTagsForActiveView(view) {
+        // A view only materializes its layers once activated: (re)attach the shared one.
+        this.matterportTagService.attachSharedTagLayerToViews(this.sdk, [view])
+            .then(() => this.reapplyTagsVisibility());
+        this.reapplyTagsVisibility();
+        clearTimeout(this.viewSwitchRestoreTimer);
+        this.viewSwitchRestoreTimer = setTimeout(() => {
+            this.refreshTagsContent()
+                .catch((e) => {
+                if (isDevMode())
+                    console.warn('[MatterportService] Cannot restore tags for view', view?.id, e);
+            })
+                .then(() => this.reapplyTagsVisibility());
+        }, MatterportService.VIEW_SWITCH_REFRESH_DELAY_MS);
+    }
+    /**
+     * Re-applies the icon and the injected HTML of every tag we own. Used after a view
+     * switch, see restoreTagsForActiveView().
+     */
+    async refreshTagsContent() {
+        if (!this.sdk)
+            return;
+        // Snapshot: the dictionary can be mutated while the awaits below are pending.
+        for (const [sid, mattertagData] of [...this.dictionnaryTags]) {
+            if (sid === this.mattertagToFollow)
+                continue;
+            await this.setTagIconAndOpacity(sid, mattertagData);
+            this.injectHtmlInTag(mattertagData.getType(), mattertagData.getObject(), sid)
+                .catch((err) => {
+                if (isDevMode())
+                    console.warn('[MatterportService] HTML re-injection failed for', sid, err);
+            });
+        }
+    }
+    clearViewSubscriptions() {
+        clearTimeout(this.viewSwitchRestoreTimer);
+        this.viewSwitchRestoreTimer = null;
+        for (const subscription of this.viewSubscriptions) {
+            try {
+                subscription.cancel();
+            }
+            catch (e) {
+                if (isDevMode())
+                    console.warn('[MatterportService] Cannot cancel view subscription', e);
+            }
+        }
+        this.viewSubscriptions = [];
+    }
+    /** True when the space provides a defurnished view. */
+    get hasDefurnishView() {
+        return this.viewsByType.has(MatterportViewType.DEFURNISH);
+    }
+    /** True when the defurnished view is the active one. */
+    get isDefurnishedView() {
+        return this.currentView?.type === MatterportViewType.DEFURNISH;
+    }
+    /**
+     * Switches between the defurnished view and the furnished one.
+     * @param returnToStart Move the camera back to the view's start location.
+     */
+    async toggleDefurnishView(returnToStart = false) {
+        const target = this.isDefurnishedView
+            ? this.viewsByType.get(MatterportViewType.LAYERED_BASE) ?? this.viewsByType.get(MatterportViewType.BASE)
+            : this.viewsByType.get(MatterportViewType.DEFURNISH);
+        if (!target) {
+            if (isDevMode())
+                console.warn('[MatterportService] No target view to switch to');
+            return;
+        }
+        await target.setActive(returnToStart);
+    }
+    //
     // ---------- Viewer related (switch views, go to) ----------
     //
     async action_toolbox_floorplan() {
@@ -5006,6 +5303,9 @@ class MatterportService {
      */
     async clearAll() {
         console.log('removing viewer');
+        this.clearViewSubscriptions();
+        this.viewsByType.clear();
+        this.currentView = null;
         await this.action_delete_all_mattertags();
         this.floors = null;
         this.sweeps = null;
@@ -5253,6 +5553,13 @@ class ViewerService {
                 await this.actionAddObjectFromPOI(object, poi);
             }
         }));
+        // Newly created tags have no opacity/allowAction applied yet (only set by
+        // updateTagsVisibilityForContext, which runs on Mode/Sweep/Floor/Room/Camera
+        // events). If this batch loaded after those fired, the tags stay in whatever
+        // default state the SDK gave them until something else nudges a refresh.
+        if (this.checkMode('Matterport')) {
+            this.matterportService.refreshTagsVisibility();
+        }
     }
     async actionAddObjectFromPOI(object, poi) {
         if (this.checkMode('Matterport')) {
@@ -14840,5 +15147,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, MATTERPORT_SDK_KEY, MatterportImportService, MatterportService, MatterportTagCopyService, 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, applyRigidTransformToPoint, applyRigidTransformToYRotationDeg, arraysContainSameElements, checkElementById, computeRigidTransform, convertTimestampToLocalZone, copyFileInS3, dateHasExpired, dateTimeToLocalString, deleteFromS3, distance, downloadBlob, downloadEquipmentDocument, downloadFile, downloadFileAsObject, durationToString, emailValidator, enumToArray, filterUniqueArrayByID, floatValidator, getBufferForFileFromS3, getCoefficientsForImage, getCurrentLang, getDistanceBetweenTwoPoints, getHighestLevelForMissions, getHighestRoleForMissions, getLevelsBelow, getLocaleLong, getLocaleShort, getMetaForImage, getRolesBelowForManager, getSignedFile, getSignedImageUrlForEquipment, getSignedImageUrlForProfile, getSignedImageUrlForSpace, getSpaceIDFromUrl, getVisitUrl, isEmptyObject, listFilesInFolder, mean, noEmptyValidator, numberToDateString, openDocument, openModalForVisitSwitch, poiTypeToString, pointToString, removeAllFilesFromFolderS3, removeNullKeysFromObject, showScanPointsOnPlanInDiv, shuffleArray, sortAlphabeticallyOnName, stringLocaleToEnum, stringToLowercaseNoSpaces, styleButton, textValidator, translateDatePeriod, uploadBase64Image, uploadBase64ImageWithRetry, 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, MATTERPORT_SDK_KEY, MatterportImportService, MatterportService, MatterportTagCopyService, MatterportViewType, 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, applyRigidTransformToPoint, applyRigidTransformToYRotationDeg, arraysContainSameElements, checkElementById, computeRigidTransform, convertTimestampToLocalZone, copyFileInS3, dateHasExpired, dateTimeToLocalString, deleteFromS3, distance, downloadBlob, downloadEquipmentDocument, downloadFile, downloadFileAsObject, durationToString, emailValidator, enumToArray, filterUniqueArrayByID, floatValidator, getBufferForFileFromS3, getCoefficientsForImage, getCurrentLang, getDistanceBetweenTwoPoints, getHighestLevelForMissions, getHighestRoleForMissions, getLevelsBelow, getLocaleLong, getLocaleShort, getMetaForImage, getRolesBelowForManager, getSignedFile, getSignedImageUrlForEquipment, getSignedImageUrlForProfile, getSignedImageUrlForSpace, getSpaceIDFromUrl, getVisitUrl, isEmptyObject, listFilesInFolder, mean, noEmptyValidator, numberToDateString, openDocument, openModalForVisitSwitch, poiTypeToString, pointToString, removeAllFilesFromFolderS3, removeNullKeysFromObject, showScanPointsOnPlanInDiv, shuffleArray, sortAlphabeticallyOnName, stringLocaleToEnum, stringToLowercaseNoSpaces, styleButton, textValidator, translateDatePeriod, uploadBase64Image, uploadBase64ImageWithRetry, uploadFileToS3, uploadJsonToS3, validEmail, wait, waitUntil };
 //# sourceMappingURL=smarterplan-ngx-smarterplan-core.mjs.map