architwin 1.18.9 → 1.18.11

package/lib/atwinui/events.js

@@ -14,7 +14,7 @@ import { getTargetPosition, addMediaScreen, _3DXObjects, selectedObject, setTran
 import { Notyf } from 'notyf';
 import 'notyf/notyf.min.css';
 import { SPACE_EVENTS, COORDINATE_SYSTEM, UNITS, DEGREE, MAP_OPTIONS, sortTagOptions, sortObjectOptions, CUSTOM_MAP_MODE, TAG_TYPE } from "../types";
-import { initFormData, hideTagsFromSpace, renderTagsInSpace, setTagFormMode } from "./components/toolbar/tagFormPane";
+import { initFormData, setTagFormMode } from "./components/toolbar/tagFormPane";
 import { renderObjectList, resetSelectedObjectSortOption, selectedObjectSortOption, sortShowcaseObjects, updateSelectedObjectSortOption } from "./components/toolbar/objectListPane";
 import { renderLibraryList } from "./components/toolbar/libraryPane";
 import { renderObjectCard } from "./components/toolbar/card";
@@ -181,7 +181,13 @@ function toggleDisplayPane(targetId) {
                     if (tag) {
                         const tagId = tag.getAttribute('tag-id');
                         if (tagId && tagId !== null) {
+                            const deletedTag = _tags.find(t => t.json_data.id.toString() === tagId);
                             yield disposeTag({ tagId: tagId });
+                            if (deletedTag) {
+                                const tagType = deletedTag.tag_type || TAG_TYPE.MP;
+                                delete tagVisibility[tagType][tagId];
+                                updateShowAllButton();
+                            }
                             const tagRow = document.getElementById(`at-tag-row-${tagId}`);
                             log.info("tagRow", tagRow);
                             tagRow.remove();
@@ -817,6 +823,15 @@ function handlePlaceTag() {
                             const tags = getMpTags();
                             _tags[tags.length - 1].category_uuid = payload.tagSubcategoryId;
                             currentTag = _tags[_tags.length - 1];
+                            if (currentTag) {
+                                const tagType = currentTag.tag_type || TAG_TYPE.MP;
+                                const tagId = currentTag.json_data.id;
+                                if (!tagVisibility[tagType])
+                                    tagVisibility[tagType] = {};
+                                tagVisibility[tagType][tagId] = true;
+                                updateShowAllButton();
+                                saveTagVisibilityToStorage(tagVisibility);
+                            }
                             log.info('_tags', _tags);
                             log.info("Last Tag Pushed", currentTag);
                             cancelTagPlacementPrompt.style.display = 'none';
@@ -850,6 +865,15 @@ function handlePlaceTag() {
                             notyf.success(`${i18n.t('SuccessAddTagToSpace')}`);
                             const tags = getMpTags();
                             currentTag = tags[tags.length - 1];
+                            if (currentTag) {
+                                const tagType = currentTag.tag_type || TAG_TYPE.MP;
+                                const tagId = currentTag.json_data.id;
+                                if (!tagVisibility[tagType])
+                                    tagVisibility[tagType] = {};
+                                tagVisibility[tagType][tagId] = true;
+                                updateShowAllButton();
+                                saveTagVisibilityToStorage(tagVisibility);
+                            }
                             log.info("Last Tag Pushed", tags[tags.length - 1]);
                             cancelTagPlacementPrompt.style.display = 'none';
                             isPlacingTag = false;
@@ -907,6 +931,14 @@ function handlePlaceTag() {
                             if (index !== -1) {
                                 log.info("tag found");
                                 _tags[index].category_uuid = payload.tagSubcategoryId;
+                                const newTag = _tags[index];
+                                const tagType = newTag.tag_type || TAG_TYPE.MP;
+                                const tagId = newTag.json_data.id;
+                                if (!tagVisibility[tagType])
+                                    tagVisibility[tagType] = {};
+                                tagVisibility[tagType][tagId] = true;
+                                updateShowAllButton();
+                                saveTagVisibilityToStorage(tagVisibility);
                             }
                             else {
                                 log.info("tag not found");
@@ -946,6 +978,14 @@ function handlePlaceTag() {
                             if (index !== -1) {
                                 log.info("tag found");
                                 _tags[index].category_uuid = payload.tagSubcategoryId;
+                                const newTag = _tags[index];
+                                const tagType = newTag.tag_type || TAG_TYPE.MP;
+                                const tagId = newTag.json_data.id;
+                                if (!tagVisibility[tagType])
+                                    tagVisibility[tagType] = {};
+                                tagVisibility[tagType][tagId] = true;
+                                updateShowAllButton();
+                                saveTagVisibilityToStorage(tagVisibility);
                             }
                             else {
                                 log.info("tag not found");
@@ -975,7 +1015,13 @@ function onDisposeTag() {
             if (tag) {
                 const tagId = tag.getAttribute('tag-id');
                 if (tagId && tagId !== null) {
+                    const deletedTag = _tags.find(t => t.json_data.id.toString() === tagId);
                     yield disposeTag({ tagId: tagId });
+                    if (deletedTag) {
+                        const tagType = deletedTag.tag_type || TAG_TYPE.MP;
+                        delete tagVisibility[tagType][tagId];
+                        updateShowAllButton();
+                    }
                     const tagRow = document.getElementById(`at-tag-row-${tagId}`);
                     log.info("tagRow", tagRow);
                     tagRow.remove();
@@ -994,7 +1040,13 @@ function onDisposeTag() {
         }
         cancelMoveTag();
         if (iTag !== null) {
+            const deletedTag = _tags.find(t => t.id.toString() === iTag.id.toString());
             yield disposeTag({ tagId: iTag.id });
+            if (deletedTag) {
+                const tagType = deletedTag.tag_type || TAG_TYPE.MP;
+                delete tagVisibility[tagType][iTag.id.toString()];
+                updateShowAllButton();
+            }
         }
         iTag = null;
         if (cancelTagPlacementPrompt) {
@@ -1230,7 +1282,7 @@ function handleToggleVisibilityTags() {
     const updateAll = (visible) => __awaiter(this, void 0, void 0, function* () {
         // Determine which tags to update based on current mode
         const tagsToUpdate = currentTagPaneMode
-            ? _tags.filter(tag => tag.tag_type === currentTagPaneMode)
+            ? _tags.filter(tag => (tag.tag_type || TAG_TYPE.MP) === currentTagPaneMode)
             : _tags;
         for (const tag of tagsToUpdate) {
             const tagType = tag.tag_type || TAG_TYPE.MP;
@@ -3281,35 +3333,37 @@ function handleClearSearchTagName() {
     log.info('handleClearSearchTagName()');
     const searchTagName = document.getElementById('at-clear-search-tag-name');
     if (searchTagName) {
-        searchTagName.addEventListener('click', () => __awaiter(this, void 0, void 0, function* () {
+        searchTagName.addEventListener('click', () => {
             searchClearfield();
             // commented out due to iot Dummy Data
             // const tags = getMpTags()
             const tags = [..._tags];
+            const filteredTags = filterTagList(tags);
             if (selectedCategoryFilterId || selectedSubCategoryFilterId && isTagPaneActive) {
-                const filteredTags = filterTagList(tags).filter(tag => tag.tag_type === TAG_TYPE.MP);
-                // show filtered tags only
-                yield renderTagsInSpace(filteredTags, true);
+                const filteredTags = filterTagList(tags);
                 renderTags(filteredTags);
             }
             else if (tags.length > 0 && isTagPaneActive) {
-                const filteredMPTags = tags.filter(tag => tag.tag_type === TAG_TYPE.MP);
-                yield renderTagsInSpace(filteredMPTags, true);
-                renderTags(filteredMPTags, true);
+                renderTags(tags, true);
             }
             else if (!isTagPaneActive) {
                 const filteredIotTags = filterIotTagList(tags);
-                yield renderTagsInSpace(filteredIotTags, true);
                 renderTags(filteredIotTags);
+                // if (selectedCategoryFilterId || selectedSubCategoryFilterId) {
+                //     const sortedTags = sortTags(filteredTags, {by: 'label', order: 'asc'})
+                //     renderTags(sortedTags)                
+                // } else if (tags.length > 0) {
+                //     const sortedTags = sortTags(tags, {by: 'label', order: 'asc'})
+                //     renderTags(sortedTags,true)
             }
-        }));
+        });
     }
 }
 function handleSearchFromTagListButton() {
     log.info('handleSearchFromTagListButton()');
     const searchTagNameButton = document.getElementById('at-search-tag-button');
     if (searchTagNameButton) {
-        searchTagNameButton.addEventListener('click', () => __awaiter(this, void 0, void 0, function* () {
+        searchTagNameButton.addEventListener('click', () => {
             const tags = getMpTags();
             const tagSearch = getSearchTagTerm();
             if (tagSearch) {
@@ -3319,36 +3373,18 @@ function handleSearchFromTagListButton() {
                 if (foundTag) {
                     if (selectedCategoryFilterId || selectedSubCategoryFilterId && isTagPaneActive) {
                         const filteredTags = filterTagList(foundTag);
-                        const removeTags = tags.filter(tag => !filteredTags.some(ft => ft.id === tag.id) && tag.tag_type === TAG_TYPE.MP);
-                        log.info("removeTags", removeTags);
-                        // remove tags that is not part in the sorted Tags
-                        yield hideTagsFromSpace(removeTags);
-                        // show filtered tags only
-                        yield renderTagsInSpace(filteredTags, true);
                         renderTags(filteredTags);
                     }
                     else if (foundTag.length > 0 && isTagPaneActive) {
-                        const removeTags = tags.filter(tag => !foundTag.some(ft => ft.id === tag.id) && tag.tag_type === TAG_TYPE.MP);
-                        log.info("removeTags", removeTags);
-                        // remove tags that is not part in the sorted Tags
-                        yield hideTagsFromSpace(removeTags);
-                        // show filtered tags only
-                        yield renderTagsInSpace(foundTag, true);
                         renderTags(foundTag, true);
                     }
                     else if (!isTagPaneActive) {
                         const filteredIotTags = filterIotTagList(foundTag);
-                        const removeTags = tags.filter(tag => !filteredIotTags.some(ft => ft.id === tag.id) && tag.tag_type === TAG_TYPE.IOT);
-                        log.info("removeTags", removeTags);
-                        // remove tags that is not part in the sorted Tags
-                        yield hideTagsFromSpace(removeTags);
-                        // show filtered tags only
-                        yield renderTagsInSpace(filteredIotTags, true);
                         renderTags(filteredIotTags);
                     }
                 }
             }
-        }));
+        });
     }
 }
 function handleCustomMapFloorImageUploaded(payload) {
@@ -3556,6 +3592,15 @@ function handlePlaceIotTag() {
                             const tags = getMpTags();
                             currentTag = _tags[tags.length - 1];
                             _tags[tags.length - 1].category_uuid = payload.tagCategoryId;
+                            if (currentTag) {
+                                const tagType = currentTag.tag_type || TAG_TYPE.IOT;
+                                const tagId = currentTag.json_data.id;
+                                if (!tagVisibility[tagType])
+                                    tagVisibility[tagType] = {};
+                                tagVisibility[tagType][tagId] = true;
+                                updateShowAllButton();
+                                saveTagVisibilityToStorage(tagVisibility);
+                            }
                             cancelTagPlacementPrompt.style.display = 'none';
                             isPlacingTag = false;
                         });
@@ -3587,6 +3632,15 @@ function handlePlaceIotTag() {
                             notyf.success(`${i18n.t('SuccessAddTagToSpace')}`);
                             const tags = getMpTags();
                             currentTag = tags[tags.length - 1];
+                            if (currentTag) {
+                                const tagType = currentTag.tag_type || TAG_TYPE.IOT;
+                                const tagId = currentTag.json_data.id;
+                                if (!tagVisibility[tagType])
+                                    tagVisibility[tagType] = {};
+                                tagVisibility[tagType][tagId] = true;
+                                updateShowAllButton();
+                                saveTagVisibilityToStorage(tagVisibility);
+                            }
                             log.info("Last IoT Tag Pushed", tags[tags.length - 1]);
                             cancelTagPlacementPrompt.style.display = 'none';
                             isPlacingTag = false;

package/lib/loaders/polydrawerLoader.js

@@ -621,11 +621,13 @@ export class BufferGeometry {
             // }
         };
         this.renderPolygon = () => {
-            var _a;
+            var _a, _b, _c, _d;
             const THREE = this.context.three;
+            if (!this.inputs.path || this.inputs.path.length === 0)
+                return;
             const polyData = this.inputs.polygonData;
             console.log("polyData ", polyData);
-            const WALL_HEIGHT = polyData && polyData.walls[0].wall_height ? polyData.walls[0].wall_height : this.inputs.wallHeight;
+            const WALL_HEIGHT = (_c = (_b = (_a = polyData === null || polyData === void 0 ? void 0 : polyData.walls) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.wall_height) !== null && _c !== void 0 ? _c : this.inputs.wallHeight;
             this.groupedMesh = new THREE.Group();
             let floorDataArray = [];
             let wallDataArray = [];
@@ -637,7 +639,7 @@ export class BufferGeometry {
                 return point;
             });
             let floorLevel;
-            console.log("floorLevel polyData.floor.floor_level", (_a = polyData === null || polyData === void 0 ? void 0 : polyData.floor) === null || _a === void 0 ? void 0 : _a.floor_level);
+            console.log("floorLevel polyData.floor.floor_level", (_d = polyData === null || polyData === void 0 ? void 0 : polyData.floor) === null || _d === void 0 ? void 0 : _d.floor_level);
             floorLevel = this.inputs.path[0].y;
             console.log("floorLevel ", floorLevel);
             console.log("floorLevel this.inputs.path[0].y", this.inputs.path[0].y);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "architwin",
-  "version": "1.18.9",
+  "version": "1.18.11",
   "description": "ArchiTwin Library for Matterport",
   "main": "./lib/architwin.js",
   "types": "./lib/architwin.d.ts",