architwin 1.10.19 → 1.10.20

package/lib/architwin.js

@@ -671,12 +671,24 @@ function loadDefaultMpSpace(url, config, showcase, callbacks = undefined) {
                         _atwin.Mode.current.subscribe((mode) => {
                             _currentViewMode = mode;
                             if (mode == 'mode.floorplan') {
-                                log.info("_verticeComponentsCollection ", _verticeComponentsCollection);
-                                toggleVerticeRingVisibility(true);
+                                if (_transformComponent) {
+                                    _transformComponent.inputs.size = 0.01;
+                                }
+                                //Feature specific code
+                                if (isToolbarFeatureEnabled('roomCreation')) {
+                                    log.info("_verticeComponentsCollection ", _verticeComponentsCollection);
+                                    toggleVerticeRingVisibility(true);
+                                }
                             }
                             else {
-                                if (_verticeComponentsCollection && _verticeComponentsCollection.length > 0) {
-                                    toggleVerticeRingVisibility();
+                                if (_transformComponent) {
+                                    _transformComponent.inputs.size = 1;
+                                }
+                                //Feature specific code
+                                if (isToolbarFeatureEnabled('roomCreation')) {
+                                    if (_verticeComponentsCollection && _verticeComponentsCollection.length > 0) {
+                                        toggleVerticeRingVisibility();
+                                    }
                                 }
                             }
                         });
@@ -1620,13 +1632,13 @@ function getIframeSrc(config, url) {
             src += `architwin/bundle/showcase.html?m=${modelId}&applicationKey=${_appKey}&newtags=1`;
         }
     }
-    log.info('__src', src);
     for (let param of urlParams) {
-        if (param in config) {
+        if (config[param] != undefined) {
             // @ts-ignore
             src += `&${param}=${config[param]}`;
         }
     }
+    log.info('__src', src);
     return src;
 }
 // login user to fix cors error
@@ -2143,6 +2155,12 @@ function setTransformControls(selectedObject, mode = "translate" /* TRANSFORM_TY
         userNavigationEnabled: true,
     });
     _transformComponent = transformComponent;
+    if (_currentViewMode && _currentViewMode == "mode.floorplan") {
+        _transformComponent.inputs.size = 0.01;
+    }
+    else {
+        _transformComponent.inputs.size = 1;
+    }
     //_inputControlComponent = inputComponent.spyOnEvent(new DragSpy(selectedObject.object,selectedObject.node,selectedObject.component))
     if (selectedObject.object.object_data.object_type == 'GLB') {
         const eventPath = _sceneObject.addEmitPath(selectedObject.component, 'gltfevents');
@@ -5039,7 +5057,7 @@ function goToPosition(pos) {
         }).then((newSid) => {
             log.info("tags list", _tags);
             log.info("tag new SID", newSid);
-            _atwin.Mattertag.navigateToTag(newSid[0], _atwin.Mattertag.Transition.FLY).then(() => __awaiter(this, void 0, void 0, function* () {
+            _atwin.Mattertag.navigateToTag(newSid[0], _atwin.Mattertag.Transition.INSTANT).then(() => __awaiter(this, void 0, void 0, function* () {
                 yield _atwin.Tag.remove(newSid[0]);
                 yield _atwin.Camera.rotate(-10, 10);
             }));

package/lib/atwinui/components/toolbar/actionSettingsPane.d.ts

@@ -1,4 +1,4 @@
-import { IShowcaseObject } from "../../../types";
+import { IShowcaseObject, UNITS } from "../../../types";
 import { Vector3 } from "../../../../bundle/sdk";
 export declare let isAdjust: boolean;
 export declare function renderActionSettingsPane(): HTMLDivElement;
@@ -12,18 +12,18 @@ export declare function getCoordinateSystem(): string;
 export declare function setCoordinateSystem(value: string): void;
 export declare function getScaleFactor(): string;
 export declare function setScaleFactor(value: string): void;
-export declare function getMeasurementUnit(): "mm" | "cm" | "m" | "ft" | "in";
-export declare function setMeasurementUnit(value: "mm" | "cm" | "m" | "ft" | "in"): void;
-export declare function getRotationUnit(): string;
-export declare function setRotationUnit(value: string): void;
+export declare function getMeasurementUnit(): UNITS.MILLIMETER | UNITS.CENTIMETER | UNITS.METER | UNITS.FOOT | UNITS.INCH;
+export declare function setMeasurementUnit(value: UNITS.MILLIMETER | UNITS.CENTIMETER | UNITS.METER | UNITS.FOOT | UNITS.INCH): void;
+export declare function getRotationUnit(): UNITS.DEGREE | UNITS.RADIAN;
+export declare function setRotationUnit(value: UNITS.DEGREE | UNITS.RADIAN): void;
 export declare function setTempCoordinateSystem(value: string): void;
 export declare function getTempCoordinateSystem(): string;
 export declare function setTempScaleFactor(value: string): void;
 export declare function getTempScaleFactor(): string;
-export declare function setTempMeasurementUnit(value: "mm" | "cm" | "m" | "ft" | "in"): void;
-export declare function getTempMeasurementUnit(): "mm" | "cm" | "m" | "ft" | "in";
-export declare function setTempRotationUnit(value: string): void;
-export declare function getTempRotationUnit(): string;
+export declare function setTempMeasurementUnit(value: UNITS.MILLIMETER | UNITS.CENTIMETER | UNITS.METER | UNITS.FOOT | UNITS.INCH): void;
+export declare function getTempMeasurementUnit(): UNITS.MILLIMETER | UNITS.CENTIMETER | UNITS.METER | UNITS.FOOT | UNITS.INCH;
+export declare function setTempRotationUnit(value: UNITS.DEGREE | UNITS.RADIAN): void;
+export declare function getTempRotationUnit(): UNITS.DEGREE | UNITS.RADIAN;
 export declare function setBasepoint(value: Vector3): void;
 export declare function getBasepoint(): Vector3;
 export declare function getMPBasepoint(): Vector3;

package/lib/atwinui/components/toolbar/actionSettingsPane.js

@@ -16,12 +16,12 @@ import { toggleBasepointCalibratePane } from "./basepointCalibratePane";
 let actionSettingsPane;
 let coordinateSystem = COORDINATE_SYSTEM.MATTERPORT;
 let scaleFactor = "1";
-let measurementUnit = "m";
-let rotationUnit = "deg";
+let measurementUnit = UNITS.METER;
+let rotationUnit = UNITS.DEGREE;
 let tempCoordinateSystem = COORDINATE_SYSTEM.MATTERPORT;
 let tempScaleFactor = "1";
-let tempMeasurementUnit = "m";
-let tempRotationUnit = "deg";
+let tempMeasurementUnit = UNITS.METER;
+let tempRotationUnit = UNITS.DEGREE;
 let tempBasepoint = undefined;
 let basepoint = undefined;
 let basepointObjectPayload = undefined;
@@ -56,11 +56,13 @@ export function renderActionSettingsPane() {
                     <label class="at_text_xs">${i18n.t("MeasurementUnit")}</label>   
                     <div id="" data-cy=""> 
                         <div class="at_dropdown at_flex at_flex_row at_space_between" id="at-selected-measurement-unit">
-                            <div class="at_dropdown_toggle at_disabled" id="at-selected-measurement-unit-text">${i18n.t('Meter')}</div>
+                            <div class="at_dropdown_toggle" id="at-selected-measurement-unit-text">${i18n.t('Meter')}</div>
                             <span class="mdi mdi-triangle-down at_chevron"></span>
                         </div>
                         <div class="at_options_container">
                             <div class="at_dropdown_options" id="at-measurement-unit-options" data-cy="at-measurement-unit-options">
+                                <div class="at_option" data-value="${UNITS.MILLIMETER}">${i18n.t("Millimeter")}</div>
+                                <div class="at_option" data-value="${UNITS.CENTIMETER}">${i18n.t("Centimeter")}</div>
                                 <div class="at_option" data-value="${UNITS.METER}">${i18n.t("Meter")}</div>
                                 <div class="at_option" data-value="${UNITS.FOOT}">${i18n.t("Foot")}</div>
                                 <div class="at_option" data-value="${UNITS.INCH}">${i18n.t("Inch")}</div>
@@ -73,7 +75,7 @@ export function renderActionSettingsPane() {
                     <label class="at_text_xs">${i18n.t("RotationUnit")}</label>
                     <div id="" data-cy="">
                         <div class="at_dropdown at_flex at_flex_row at_space_between" id="at-selected-rotation-unit">
-                            <div class="at_dropdown_toggle at_disabled" id="at-selected-rotation-unit-text">${i18n.t('Degree')}</div>
+                            <div class="at_dropdown_toggle" id="at-selected-rotation-unit-text">${i18n.t('Degree')}</div>
                             <span class="mdi mdi-triangle-down at_chevron"></span>
                         </div>
                         <div class="at_options_container">
@@ -137,24 +139,26 @@ export function actionSettingsSelectOption(element, id) {
         let mpXInputValue;
         let mpYInputValue;
         let mpZInputValue;
-        if (tempMeasurementUnit != measurementUnit) {
-            mpXInputValue = convertMeasurement(basepointObjectPayload.object_position.x, UNITS.METER, tempMeasurementUnit);
-            mpYInputValue = convertMeasurement(basepointObjectPayload.object_position.y, UNITS.METER, tempMeasurementUnit);
-            mpZInputValue = convertMeasurement(basepointObjectPayload.object_position.z, UNITS.METER, tempMeasurementUnit);
-            const truncatedCoordinate = {
-                x: truncateToThreeDecimals(mpXInputValue),
-                y: truncateToThreeDecimals(mpYInputValue),
-                z: truncateToThreeDecimals(mpZInputValue),
-            };
-            displayConvertedCoordinates(truncatedCoordinate);
-        }
-        else {
-            const truncatedCoordinate = {
-                x: truncateToThreeDecimals(basepointObjectPayload.object_position.x),
-                y: truncateToThreeDecimals(basepointObjectPayload.object_position.y),
-                z: truncateToThreeDecimals(basepointObjectPayload.object_position.z),
-            };
-            displayConvertedCoordinates(truncatedCoordinate);
+        if (id == 'measurement-unit') {
+            if (tempMeasurementUnit != UNITS.METER) {
+                mpXInputValue = convertMeasurement(basepointObjectPayload.object_position.x, UNITS.METER, tempMeasurementUnit);
+                mpYInputValue = convertMeasurement(basepointObjectPayload.object_position.y, UNITS.METER, tempMeasurementUnit);
+                mpZInputValue = convertMeasurement(basepointObjectPayload.object_position.z, UNITS.METER, tempMeasurementUnit);
+                const truncatedCoordinate = {
+                    x: truncateToThreeDecimals(mpXInputValue),
+                    y: truncateToThreeDecimals(mpYInputValue),
+                    z: truncateToThreeDecimals(mpZInputValue),
+                };
+                displayConvertedCoordinates(truncatedCoordinate);
+            }
+            else {
+                const truncatedCoordinate = {
+                    x: truncateToThreeDecimals(basepointObjectPayload.object_position.x),
+                    y: truncateToThreeDecimals(basepointObjectPayload.object_position.y),
+                    z: truncateToThreeDecimals(basepointObjectPayload.object_position.z),
+                };
+                displayConvertedCoordinates(truncatedCoordinate);
+            }
         }
         // start of initializing units
         document.querySelectorAll('.at_action_settings_pane_unit').forEach(el => {
@@ -194,16 +198,23 @@ export function initSettingsValues() {
     else if (measurementUnit == UNITS.INCH) {
         measurementUnitValue = `${i18n.t('Inch')}`;
     }
+    else if (measurementUnit == UNITS.MILLIMETER) {
+        measurementUnitValue = `${i18n.t('Millimeter')}`;
+    }
+    else if (measurementUnit == UNITS.CENTIMETER) {
+        measurementUnitValue = `${i18n.t('Centimeter')}`;
+    }
     measurementUnitElement.innerText = i18n.t(measurementUnitValue);
     // set rotation unit
     const rotationUnitElement = document.getElementById(`at-selected-rotation-unit-text`);
     let rotationUnitValue = `${i18n.t('Degree')}`;
     // do not erase
-    // if(rotationUnit == UNITS.RADIAN){
-    //     rotationUnitValue = `${i18n.t('Radian')}`
-    // } else if(rotationUnit == UNITS.DEGREE){
-    //     rotationUnitValue = `${i18n.t('Degree')}`
-    // }
+    if (rotationUnit == UNITS.RADIAN) {
+        rotationUnitValue = `${i18n.t('Radian')}`;
+    }
+    else if (rotationUnit == UNITS.DEGREE) {
+        rotationUnitValue = `${i18n.t('Degree')}`;
+    }
     rotationUnitElement.innerText = i18n.t(rotationUnitValue);
     // set basepoint calibration
     const element = document.getElementById(`at-calibrate-basepoint-btn`);
@@ -583,19 +594,19 @@ export function getMeasurementUnit() {
     return measurementUnit;
 }
 export function setMeasurementUnit(value) {
-    if (value == 'm') {
+    if (value == UNITS.METER) {
         measurementUnit = UNITS.METER;
     }
-    else if (value == 'mm') {
+    else if (value == UNITS.MILLIMETER) {
         measurementUnit = UNITS.MILLIMETER;
     }
-    else if (value == 'cm') {
+    else if (value == UNITS.CENTIMETER) {
         measurementUnit = UNITS.CENTIMETER;
     }
-    else if (value == 'ft') {
+    else if (value == UNITS.FOOT) {
         measurementUnit = UNITS.FOOT;
     }
-    else if (value == 'in') {
+    else if (value == UNITS.INCH) {
         measurementUnit = UNITS.INCH;
     }
     console.log("Measurement Unit set to:", value);
@@ -620,19 +631,19 @@ export function getTempScaleFactor() {
     return tempScaleFactor;
 }
 export function setTempMeasurementUnit(value) {
-    if (value == 'm') {
+    if (value == UNITS.METER) {
         tempMeasurementUnit = UNITS.METER;
     }
-    else if (value == 'mm') {
+    else if (value == UNITS.MILLIMETER) {
         tempMeasurementUnit = UNITS.MILLIMETER;
     }
-    else if (value == 'cm') {
+    else if (value == UNITS.CENTIMETER) {
         tempMeasurementUnit = UNITS.CENTIMETER;
     }
-    else if (value == 'ft') {
+    else if (value == UNITS.FOOT) {
         tempMeasurementUnit = UNITS.FOOT;
     }
-    else if (value == 'in') {
+    else if (value == UNITS.INCH) {
         tempMeasurementUnit = UNITS.INCH;
     }
     console.log("Temp Measurement Unit set to:", value);

package/lib/atwinui/components/toolbar/card.js

@@ -7,7 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { goToModel, setSelectedObject, get3DXObjects, getLibrary, getTargetPosition, addObjectToSpace, _mpConfig, dispatchSpaceEvent, removeTransformControls, _onMouseClickInstance, cancelModelPlacement, isToolbarFeatureEnabled, convertYupToZup } from "../../../architwin";
+import { UNITS } from "../../../types";
+import { goToModel, setSelectedObject, get3DXObjects, getLibrary, getTargetPosition, addObjectToSpace, _mpConfig, dispatchSpaceEvent, removeTransformControls, _onMouseClickInstance, cancelModelPlacement, isToolbarFeatureEnabled, convertYupToZup, getViewMode } from "../../../architwin";
 import { SPACE_EVENTS } from "../../../types";
 import { toggleDisplayPane, cancelModelPlacementPrompt } from "../../events";
 import { clearActiveActionBtn } from "./actionBar";
@@ -149,7 +150,10 @@ export function setActiveCard(cardId) {
             console.error("Could not find target object", objId);
         }
         // await goTo3dx(Number.parseInt(objId))
-        yield goToModel(Number.parseInt(objId));
+        const viewMode = getViewMode();
+        if (viewMode && viewMode != "mode.floorplan") {
+            yield goToModel(Number.parseInt(objId));
+        }
         const parent = target.parentElement;
         activeCard = parent;
         parent.classList.add('at_card_active');
@@ -256,7 +260,7 @@ export function setActiveLibraryCard(cardId) {
                     payload.coordinate_system = getCoordinateSystem();
                     const thisObjBimPosition = convertYupToZup(payload.object_position, getMPBasepoint(), getBasepoint(), getMeasurementUnit(), parseInt(getScaleFactor()));
                     console.log("====== caroline thisObjBimPosition: ", thisObjBimPosition);
-                    const thisObjBimScale = convertYupScaleToZupScale(payload.object_scale, getMeasurementUnit(), parseInt(getScaleFactor()));
+                    const thisObjBimScale = convertYupScaleToZupScale(payload.object_scale, UNITS.METER, parseInt(getScaleFactor()));
                     console.log("====== caroline thisObjBimScale: ", thisObjBimScale);
                     const coordPayload = {
                         coord_system: getCoordinateSystem(),

package/lib/atwinui/components/toolbar/i18n.js

@@ -161,6 +161,8 @@ i18n
                 "PhysicalBasePointNote": "You should have already set the project's base point in your physical space, which is typically a fixed location like a specific corner or marked spot.",
                 "BasepointNote": "Note: You can modify the MP value manually to achieve precise positioning.",
                 "Default": "Default",
+                "Millimeter": "Millimeter",
+                "Centimeter": "Centimeter",
             }
         },
         ja: {
@@ -226,7 +228,7 @@ i18n
                 "Meeting": "打ち合わせ",
                 "Screenshot": "スクリーンショット",
                 "Close": "閉じる",
-                "Translate": "変形",
+                "Translate": "移動",
                 "Rotate": "回転",
                 "Scale": "拡大",
                 "Copy": "複写",
@@ -316,6 +318,8 @@ i18n
                 "PhysicalBasePointNote": "MPに配置された基準点にBIM上でのXYZを入力することでBIMのXYZ値を入力によりMPのXYZに変換することができます。",
                 "BasepointNote": "※MPの位置は数値入力で微調整が可能です。",
                 "Default": "デフォルト",
+                "Millimeter": "ミリメートル",
+                "Centimeter": "センチメートル",
             }
         }
     },

package/lib/atwinui/components/toolbar/menuBar.js

@@ -3,6 +3,8 @@ import log from 'loglevel';
 import i18n from "./i18n";
 import { toggleActionBar } from "../../events";
 import { getAssetUrl } from "../../../utils";
+import { toggleBasepointCalibratePane } from "./basepointCalibratePane";
+import { toggleModelControl } from "./modelControlsPane";
 export let activeMenu;
 export let isObjectListEnabled = true;
 export let isMeetingEnabled = false;
@@ -116,6 +118,8 @@ export function setActiveMenu(id) {
                 parent.classList.remove('at_sidebar_button_icon_active');
                 // Close action bar
                 toggleActionBar('hide');
+                toggleModelControl(false);
+                toggleBasepointCalibratePane(false);
             }
             else {
                 // activate

package/lib/atwinui/components/toolbar/modelControlsPane.d.ts

@@ -24,7 +24,7 @@ export declare function getTransformValues(): {
         z: string;
     };
 };
-export declare function showCurrentCoordinateValue(payload?: IShowcaseObject, isFromApi?: boolean): void;
+export declare function showCurrentCoordinateValue(payload?: IShowcaseObject): void;
 /**
  * This function gets the rotate XYZ values from the input field of the rotate screen.
  * @returns {Vector3} rotate values

package/lib/atwinui/components/toolbar/modelControlsPane.js

@@ -1,12 +1,11 @@
-import { degreesToRadians, radiansToDegrees, useCapitalizeFirstLetter } from "../../../utils";
+import { convertMeasurement, degreesToRadians, radiansToDegrees, useCapitalizeFirstLetter } from "../../../utils";
 import { getSelectedObject, setObjectTransformation, get3DXObjects, _3DXObjects, isToolbarFeatureEnabled } from "../../../architwin";
-import { COORDINATE_SYSTEM } from "../../../types";
+import { COORDINATE_SYSTEM, UNITS } from "../../../types";
 import { convertZupToYup, convertYupToZup, getOffsetPositionFromBasepoint, convertYupScaleToZupScale, convertZupScaleToYupScale } from "../../../worldConversion";
-import { getScaleFactor, getMeasurementUnit, getBasepoint, getCoordinateSystem, isAdjust, getMPBasepoint } from "./actionSettingsPane";
+import { getScaleFactor, getMeasurementUnit, getBasepoint, getCoordinateSystem, isAdjust, getMPBasepoint, getRotationUnit } from "./actionSettingsPane";
 import { Notyf } from 'notyf';
 import log from 'loglevel';
 import i18n from "./i18n";
-import { getBasepointObjectPayload } from "./actionSettingsPane";
 let notyf = new Notyf({ position: { x: 'left', y: 'bottom' }, duration: 4500 });
 export let activeModelControlPane = false;
 export let modelControlPane;
@@ -43,7 +42,8 @@ const transformValues = {
 let isInputEventListenerSet = false;
 let basepointCoord;
 let coordSystem = '';
-let measurementUnit = '';
+let measurementUnit = UNITS.METER;
+let rotationUnit = UNITS.DEGREE;
 let scaleFactor = '';
 let selectedObjectCoordinateSystem;
 let basepointObject;
@@ -64,7 +64,6 @@ export function renderModelControlPane(type = 'Translate') {
                     <span class="at_bolder at_text_base" id="at-transform-type-title">${i18n.t(type)}</span>
                     <span class="mdi mdi-close at_text_base" style="cursor:pointer" id="at-close-model-controls" data-cy="at-close-model-controls"></span>
                 </div>
-                <span style="display:${isToolbarFeatureEnabled('bim') ? 'block' : 'none'}" id="at-coordinate-system-text" class="at_text_xs">${i18n.t("CoordinateSystem")}: ${i18n.t("Matterport")}</span>
                 <div style="display:${isToolbarFeatureEnabled('bim') ? 'block' : 'none'}" class="at_flex at_flex_column at_gap_2" id="at-coordinate-container">
                     <label class="at_text_xs">${i18n.t("CoordinateSystem")}</label>
                     <div class="at_flex at_justify_center at_gap_4">
@@ -119,9 +118,12 @@ export function toggleModelControl(visible = true, type = 'translate') {
     }
     if (visible) {
         modelControlPane.style.display = 'block';
+        if (isToolbarFeatureEnabled('bim')) {
+            getBimDefaultSettings();
+            setCoordinateSystemType();
+        }
         setTransformType(type);
         showCurrentCoordinateValue();
-        setCoordinateSystemType();
         initCurrentTransformationValue();
         if (isToolbarFeatureEnabled('bim')) {
             if (type == 'rotate') {
@@ -135,7 +137,17 @@ export function toggleModelControl(visible = true, type = 'translate') {
         return;
     }
     modelControlPane.style.display = 'none';
-    clearCurrentTransformationValues();
+    if (currentPositionValues && currentRotationValues && currentScaleValues) {
+        const selectedObject = getSelectedObject();
+        const transform = {
+            object_position: currentPositionValues,
+            object_rotation: currentRotationValues,
+            object_scale: currentScaleValues
+        };
+        console.log('transform', transform);
+        setObjectTransformation(selectedObject.node, transform);
+        clearCurrentTransformationValues();
+    }
     return;
 }
 function showCoordinatesUI(visible = true) {
@@ -194,60 +206,90 @@ export function getCoordinateValues() {
     if (!inputZ) {
         inputZ = document.getElementById('at-input-z');
     }
+    const selectedObject = getSelectedObject();
+    let formCoords;
+    formCoords = {
+        x: parseFloat(inputX.value),
+        y: parseFloat(inputY.value),
+        z: parseFloat(inputZ.value)
+    };
+    log.info("___caroline formcoords xyz: ", formCoords);
+    let mpPosition;
+    let mpRotation;
+    let mpScale;
     if (isToolbarFeatureEnabled('bim')) {
-        const selectedObject = getSelectedObject();
-        let formCoords;
-        const basePointObj = _3DXObjects.find(obj => obj.type == 'BASEPOINT');
-        formCoords = {
-            x: parseFloat(inputX.value),
-            y: parseFloat(inputY.value),
-            z: parseFloat(inputZ.value)
-        };
-        log.info("___caroline formcoords xyz: ", formCoords);
-        let mpPosition;
-        let mpScale;
-        if (isToolbarFeatureEnabled('bim') && selectedObjectCoordinateSystem == COORDINATE_SYSTEM.BIM) {
+        if (selectedObjectCoordinateSystem == COORDINATE_SYSTEM.BIM) {
             setConvertedBimPosition(formCoords);
             if (transformType == 'translate') {
-                mpPosition = convertZupToYup(formCoords, getMPBasepoint(), getBasepoint(), getMeasurementUnit(), parseInt(getScaleFactor()));
+                mpPosition = convertZupToYup(formCoords, getMPBasepoint(), getBasepoint(), measurementUnit, parseInt(getScaleFactor()));
+            }
+            else if (transformType == 'rotate') {
+                if (rotationUnit == UNITS.RADIAN) {
+                    mpRotation = formCoords;
+                }
+                else if (rotationUnit == UNITS.DEGREE) {
+                    mpRotation = degreesToRadians(formCoords);
+                }
             }
             else if (transformType == 'scale') {
-                mpScale = convertZupScaleToYupScale(formCoords, getMeasurementUnit(), parseInt(getScaleFactor()));
+                mpScale = convertZupScaleToYupScale(formCoords, UNITS.METER, parseInt(getScaleFactor()));
             }
         }
-        else {
+        else if (selectedObjectCoordinateSystem == COORDINATE_SYSTEM.MATTERPORT) {
+            if (measurementUnit != UNITS.METER && transformType == 'translate') {
+                formCoords.x = convertMeasurement(formCoords.x, measurementUnit, UNITS.METER);
+                formCoords.y = convertMeasurement(formCoords.y, measurementUnit, UNITS.METER);
+                formCoords.z = convertMeasurement(formCoords.z, measurementUnit, UNITS.METER);
+            }
             mpPosition = formCoords;
+            if (rotationUnit == UNITS.RADIAN) {
+                mpRotation = formCoords;
+            }
+            else if (rotationUnit == UNITS.DEGREE) {
+                mpRotation = degreesToRadians(formCoords);
+            }
             mpScale = formCoords;
             if (isToolbarFeatureEnabled('bim')) {
                 setConvertedBimPosition(convertYupToZup(mpPosition, getMPBasepoint(), getBasepoint(), getMeasurementUnit(), parseInt(getScaleFactor())));
             }
         }
-        console.log("getCoordinateValues parsed values", formCoords);
-        if (formCoords.x === undefined || formCoords.y === undefined || formCoords.z === undefined) {
-            console.error("One of the coordinates in the form is undefined ", formCoords);
-            notyf.error("One of the coordinates in the form is undefined");
-            return;
+    }
+    else {
+        mpPosition = formCoords;
+        if (rotationUnit == UNITS.RADIAN) {
+            mpRotation = formCoords;
         }
-        const transform = {};
-        let newRotationValue;
-        if (selectedObject && selectedObject.type == "BASEPOINT") {
-            newRotationValue = { x: Math.PI / 2, y: 0, z: 0 };
+        else if (rotationUnit == UNITS.DEGREE) {
+            mpRotation = degreesToRadians(formCoords);
         }
-        else {
-            if (isToolbarFeatureEnabled('bim')) {
-                newRotationValue = transformType === 'rotate' ? degreesToRadians(formCoords) : selectedObject.object.object_rotation;
-            }
-            else {
-                newRotationValue = transformType === 'rotate' ? degreesToRadians(formCoords) : selectedObject.node.quaternion;
-            }
+        mpScale = formCoords;
+        if (isToolbarFeatureEnabled('bim')) {
+            setConvertedBimPosition(convertYupToZup(mpPosition, getMPBasepoint(), getBasepoint(), getMeasurementUnit(), parseInt(getScaleFactor())));
         }
-        log.info("degreeToRadianRotation ", newRotationValue);
-        transform.object_position = transformType === 'translate' ? mpPosition : selectedObject.node.position;
-        transform.object_scale = transformType === 'scale' ? mpScale : selectedObject.node.scale;
-        transform.object_rotation = newRotationValue;
-        console.log("getCoordinateValues rotation quaternion values", selectedObject.node.quaternion);
-        return transform;
     }
+    console.log("getCoordinateValues parsed values", formCoords);
+    if (formCoords.x === undefined || formCoords.y === undefined || formCoords.z === undefined) {
+        console.error("One of the coordinates in the form is undefined ", formCoords);
+        notyf.error("One of the coordinates in the form is undefined");
+        return;
+    }
+    const transform = {};
+    // let newRotationValue: Vector3
+    // if(selectedObject && selectedObject.type == "BASEPOINT"){
+    //     newRotationValue = { x: Math.PI/2, y: 0, z: 0 }
+    // } else {
+    //     if (isToolbarFeatureEnabled('bim')) {
+    //         newRotationValue = 
+    //     } else { 
+    //         newRotationValue = transformType === 'rotate' ? degreesToRadians(formCoords) : selectedObject.node.quaternion
+    //     }
+    // }
+    // log.info("degreeToRadianRotation ", newRotationValue)
+    transform.object_position = transformType === 'translate' ? mpPosition : selectedObject.node.position;
+    transform.object_scale = transformType === 'scale' ? mpScale : selectedObject.node.scale;
+    transform.object_rotation = transformType === 'rotate' ? mpRotation : selectedObject.object.object_rotation;
+    console.log("getCoordinateValues rotation quaternion values", selectedObject.node.quaternion);
+    return transform;
 }
 export function clearCoordinateInputs() {
     console.log("clearCoordinateInputs()");
@@ -307,8 +349,7 @@ export function clearCoordinateInputs() {
 export function getTransformValues() {
     return transformValues;
 }
-export function showCurrentCoordinateValue(payload, isFromApi = true) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+export function showCurrentCoordinateValue(payload) {
     console.log("showCurrentCoordinateValue()");
     if (!inputX) {
         inputX = document.getElementById('at-input-x');
@@ -325,57 +366,38 @@ export function showCurrentCoordinateValue(payload, isFromApi = true) {
         console.error("selectedObject is undefined");
         return;
     }
-    if (isToolbarFeatureEnabled('bim')) {
-        getCoordinateSetup();
-        initObjectCoordinateSystem();
-    }
     if (transformType == 'translate') {
         log.info("___caroline SHOW TRANSLATE");
         const currentPos = selectedObject.node.position;
         console.log("======translate: ", currentPos);
+        const convertedMpPosition = {
+            x: convertMeasurement(currentPos.x, UNITS.METER, measurementUnit),
+            y: convertMeasurement(currentPos.y, UNITS.METER, measurementUnit),
+            z: convertMeasurement(currentPos.z, UNITS.METER, measurementUnit)
+        };
         if (isToolbarFeatureEnabled('bim')) {
-            const bimJsondata = selectedObject.object.json_data;
-            let parsedBimJson;
-            parsedBimJson = bimJsondata ? JSON.parse(bimJsondata) : null;
-            log.info("caroline coord sys: ", getSelectedObjectCoordinateSystem());
-            if (parsedBimJson && isFromApi) {
-                log.info("caroline from json_data: ", (_a = parsedBimJson === null || parsedBimJson === void 0 ? void 0 : parsedBimJson["coordSystemCalibration"]) === null || _a === void 0 ? void 0 : _a.coord_system);
-                const thisCoordSystem = 
-                // getSelectedObjectCoordinateSystem() ??
-                (_b = parsedBimJson === null || parsedBimJson === void 0 ? void 0 : parsedBimJson["coordSystemCalibration"]) === null || _b === void 0 ? void 0 : _b.coord_system;
-                setSelectedObjectCoordinateSystem(thisCoordSystem);
-                console.log("caroline thisCoordSystem: ", thisCoordSystem);
-                if (thisCoordSystem == COORDINATE_SYSTEM.BIM) {
-                    const thisBimPosition = (_d = (_c = parsedBimJson === null || parsedBimJson === void 0 ? void 0 : parsedBimJson["coordSystemCalibration"]) === null || _c === void 0 ? void 0 : _c.bim_coordinates) === null || _d === void 0 ? void 0 : _d.position;
-                    console.log("caroline thisBimPosition", thisBimPosition);
-                    inputX.value = thisBimPosition.x.toFixed(3).toString();
-                    inputY.value = thisBimPosition.y.toFixed(3).toString();
-                    inputZ.value = thisBimPosition.z.toFixed(3).toString();
-                }
-                else if (thisCoordSystem == COORDINATE_SYSTEM.MATTERPORT) {
-                    console.log("caroline MP coords", currentPos);
-                    inputX.value = currentPos.x.toFixed(3).toString();
-                    inputY.value = currentPos.y.toFixed(3).toString();
-                    inputZ.value = currentPos.z.toFixed(3).toString();
-                }
+            if (getSelectedObjectCoordinateSystem() == COORDINATE_SYSTEM.BIM) {
+                const bimPos = convertYupToZup(currentPos, getMPBasepoint(), getBasepoint(), UNITS.METER, parseInt(scaleFactor));
+                const convertBimPosition = {
+                    x: convertMeasurement(bimPos.x, UNITS.METER, measurementUnit),
+                    y: convertMeasurement(bimPos.y, UNITS.METER, measurementUnit),
+                    z: convertMeasurement(bimPos.z, UNITS.METER, measurementUnit)
+                };
+                console.log("__@ caroline bimPos: ", bimPos);
+                inputX.value = convertBimPosition.x.toFixed(3).toString();
+                inputY.value = convertBimPosition.y.toFixed(3).toString();
+                inputZ.value = convertBimPosition.z.toFixed(3).toString();
             }
             else {
-                setSelectedObjectCoordinateSystem(getCoordinateSystem());
-                if (isToolbarFeatureEnabled('bim') && selectedObject.object.coordinate_system == COORDINATE_SYSTEM.BIM) {
-                    const bimPos = convertYupToZup(currentPos, getMPBasepoint(), getBasepoint(), getMeasurementUnit(), parseInt(getScaleFactor()));
-                    console.log("__@ caroline bimPos: ", bimPos);
-                    inputX.value = bimPos.x.toFixed(3).toString();
-                    inputY.value = bimPos.y.toFixed(3).toString();
-                    inputZ.value = bimPos.z.toFixed(3).toString();
-                }
-                else {
-                    console.log("__@ caroline mpPos: ", currentPos);
-                    inputX.value = currentPos.x.toFixed(3).toString();
-                    inputY.value = currentPos.y.toFixed(3).toString();
-                    inputZ.value = currentPos.z.toFixed(3).toString();
-                }
+                console.log("__@ caroline mpPos: ", currentPos);
+                inputX.value = convertedMpPosition.x.toFixed(3).toString();
+                inputY.value = convertedMpPosition.y.toFixed(3).toString();
+                inputZ.value = convertedMpPosition.z.toFixed(3).toString();
+                // inputX.value = currentPos.x.toFixed(3).toString()
+                // inputY.value = currentPos.y.toFixed(3).toString()
+                // inputZ.value = currentPos.z.toFixed(3).toString()
             }
-            displayMPPosCoordinates(currentPos);
+            displayMPPosCoordinates(convertedMpPosition);
         }
         else {
             console.log("__@ caroline mpPos: ", currentPos);
@@ -397,7 +419,13 @@ export function showCurrentCoordinateValue(payload, isFromApi = true) {
         log.info("currentRotation quaternion", currentRotation);
         //@ts-expect-error
         log.info("currentRotation rotation", selectedObject.node.obj3D.rotation);
-        const rotationDegreeFormat = radiansToDegrees(currentRotation);
+        let rotationDegreeFormat;
+        if (rotationUnit == UNITS.DEGREE) {
+            rotationDegreeFormat = radiansToDegrees(currentRotation);
+        }
+        else {
+            rotationDegreeFormat = currentRotation;
+        }
         log.info("rotationDegreeFormat ", rotationDegreeFormat);
         inputX.value = rotationDegreeFormat.x.toFixed(3).toString();
         inputY.value = rotationDegreeFormat.y.toFixed(3).toString();
@@ -425,42 +453,18 @@ export function showCurrentCoordinateValue(payload, isFromApi = true) {
         }
         const currentScale = selectedObject.node.scale;
         if (isToolbarFeatureEnabled('bim')) {
-            const bimJsondata = selectedObject.object.json_data;
-            let parsedBimJson;
-            parsedBimJson = bimJsondata ? JSON.parse(bimJsondata) : null;
-            if (parsedBimJson && isFromApi) {
-                const thisCoordSystem = (_e = getSelectedObjectCoordinateSystem()) !== null && _e !== void 0 ? _e : (_f = parsedBimJson === null || parsedBimJson === void 0 ? void 0 : parsedBimJson["coordSystemCalibration"]) === null || _f === void 0 ? void 0 : _f.coord_system;
-                setSelectedObjectCoordinateSystem(thisCoordSystem);
-                console.log("caroline thisCoordSystem: ", thisCoordSystem);
-                if (thisCoordSystem == COORDINATE_SYSTEM.BIM) {
-                    const thisBimScale = (_h = (_g = parsedBimJson === null || parsedBimJson === void 0 ? void 0 : parsedBimJson["coordSystemCalibration"]) === null || _g === void 0 ? void 0 : _g.bim_coordinates) === null || _h === void 0 ? void 0 : _h.scale;
-                    console.log("caroline thisBimScale", thisBimScale);
-                    inputX.value = thisBimScale.x.toFixed(3).toString();
-                    inputY.value = thisBimScale.y.toFixed(3).toString();
-                    inputZ.value = thisBimScale.z.toFixed(3).toString();
-                }
-                else if (thisCoordSystem == COORDINATE_SYSTEM.MATTERPORT) {
-                    console.log("caroline mPScale", currentScale);
-                    inputX.value = currentScale.x.toFixed(3).toString();
-                    inputY.value = currentScale.y.toFixed(3).toString();
-                    inputZ.value = currentScale.z.toFixed(3).toString();
-                }
+            if (isToolbarFeatureEnabled('bim') && getSelectedObjectCoordinateSystem() == COORDINATE_SYSTEM.BIM) {
+                const bimScale = convertYupScaleToZupScale(currentScale, UNITS.METER, parseInt(scaleFactor));
+                console.log("__@ caroline bimScale: ", bimScale);
+                inputX.value = bimScale.x.toFixed(3).toString();
+                inputY.value = bimScale.y.toFixed(3).toString();
+                inputZ.value = bimScale.z.toFixed(3).toString();
             }
             else {
-                setSelectedObjectCoordinateSystem(getCoordinateSystem());
-                if (isToolbarFeatureEnabled('bim') && selectedObject.object.coordinate_system == COORDINATE_SYSTEM.BIM) {
-                    const bimScale = convertYupScaleToZupScale(currentScale, getMeasurementUnit(), parseInt(getScaleFactor()));
-                    console.log("__@ caroline bimScale: ", bimScale);
-                    inputX.value = bimScale.x.toFixed(3).toString();
-                    inputY.value = bimScale.y.toFixed(3).toString();
-                    inputZ.value = bimScale.z.toFixed(3).toString();
-                }
-                else {
-                    console.log("__@ caroline mpScale: ", currentScale);
-                    inputX.value = currentScale.x.toFixed(3).toString();
-                    inputY.value = currentScale.y.toFixed(3).toString();
-                    inputZ.value = currentScale.z.toFixed(3).toString();
-                }
+                console.log("__@ caroline mpScale: ", currentScale);
+                inputX.value = currentScale.x.toFixed(3).toString();
+                inputY.value = currentScale.y.toFixed(3).toString();
+                inputZ.value = currentScale.z.toFixed(3).toString();
             }
             displayMPScaleCoordinates(currentScale);
         }
@@ -559,10 +563,10 @@ function setModelInputUnit(type) {
     if (elements && elements.length > 0) {
         elements.forEach((element) => {
             if (type === 'translate') {
-                element.textContent = 'm';
+                element.textContent = measurementUnit;
             }
             else if (type === 'rotate') {
-                element.textContent = '°';
+                element.textContent = rotationUnit;
             }
             else if (type === 'scale') {
                 element.textContent = '%';
@@ -668,11 +672,11 @@ export function handleModelControlInputs() {
     // inputY.addEventListener('input',onModelControlInput)
     // inputZ.addEventListener('input', onModelControlInput)
     if (isToolbarFeatureEnabled('bim')) {
-        displayConvertedObjectCoordinates();
+        // displayConvertedObjectCoordinates()
     }
 }
-function getCoordinateSetup() {
-    log.info("getCoordinateSetup()");
+function getBimDefaultSettings() {
+    log.info("getBimDefaultSettings()");
     if (isToolbarFeatureEnabled('bim')) {
         // gets basepoint value
         if (getBasepoint()) {
@@ -689,6 +693,9 @@ function getCoordinateSetup() {
         if (getMeasurementUnit()) {
             measurementUnit = getMeasurementUnit();
         }
+        if (getRotationUnit()) {
+            rotationUnit = getRotationUnit();
+        }
         // get the scale factor
         if (getScaleFactor()) {
             scaleFactor = getScaleFactor();
@@ -716,7 +723,7 @@ export function updateSelectedObject() {
             const mpBP = basePointObj.object.object_position;
             console.log("__@@ Basepoints: bim, mp", bimBP, mpBP);
             if (selectedObject.object.coordinate_system == COORDINATE_SYSTEM.BIM || basepointObject) {
-                convert = convertZupToYup(object, mpBP, bimBP, getMeasurementUnit(), parseInt(getScaleFactor()));
+                convert = convertZupToYup(object, mpBP, bimBP, UNITS.METER, parseInt(rotationUnit));
             }
             // basepoint exists and is adjusting its coordinates
             if (basepointObject && isAdjust == true) {
@@ -735,7 +742,7 @@ export function updateSelectedObject() {
                 console.log("__@@ Basepoints: bim, mp", bimBP, mpBP);
                 for (let i = 0; i < filteredObjects.length; i++) {
                     if (filteredObjects[i].object.coordinate_system == COORDINATE_SYSTEM.BIM) {
-                        const convertedPosition = convertYupToZup(filteredObjects[i].object.object_position, mpBP, bimBP, getMeasurementUnit(), parseInt(getScaleFactor()));
+                        const convertedPosition = convertYupToZup(filteredObjects[i].object.object_position, mpBP, bimBP, measurementUnit, parseInt(scaleFactor));
                         const offsettedPosition = getOffsetPositionFromBasepoint(convertedPosition, basepointCoords.object_position);
                         setObjectTransformation(filteredObjects[i].node, {
                             object_position: offsettedPosition,
@@ -802,27 +809,19 @@ function initObjectCoordinateSystem() {
     }
 }
 export function setCoordinateSystemType() {
+    var _a;
     if (isToolbarFeatureEnabled('bim')) {
-        const coordinateText = document.getElementById('at-coordinate-system-text');
-        const mtStaticText = document.getElementById('at-mt-static-text-container');
-        const coordinateCont = document.getElementById('at-coordinate-container');
-        const selectedObj = getSelectedObject();
-        if (selectedObj.type === "BASEPOINT") {
-            const basepointPayload = getBasepointObjectPayload();
-            if (basepointPayload.coordinate_system === COORDINATE_SYSTEM.MATTERPORT) {
-                coordinateText.innerText = `${i18n.t("CoordinateSystem")}: ${i18n.t('Matterport')}`;
-            }
-            else if (basepointPayload.coordinate_system === COORDINATE_SYSTEM.BIM) {
-                coordinateText.innerText = `${i18n.t("CoordinateSystem")}: ${i18n.t('Bim')}`;
-            }
-            coordinateCont.style.display = 'none';
-            coordinateText.style.display = 'block';
-            mtStaticText.classList.add('hidden');
+        const selectedObject = getSelectedObject();
+        const bimJsondata = selectedObject.object.json_data;
+        let parsedBimJson;
+        parsedBimJson = bimJsondata ? JSON.parse(bimJsondata) : null;
+        // let coordClass
+        if (parsedBimJson) {
+            const thisCoordSystem = (_a = parsedBimJson === null || parsedBimJson === void 0 ? void 0 : parsedBimJson["coordSystemCalibration"]) === null || _a === void 0 ? void 0 : _a.coord_system;
+            setSelectedObjectCoordinateSystem(thisCoordSystem);
         }
         else {
-            // mtStaticText.classList.remove('hidden')
-            // coordinateCont.style.display = 'block'
-            coordinateText.style.display = 'none';
+            setSelectedObjectCoordinateSystem(coordSystem);
         }
     }
 }
@@ -853,7 +852,7 @@ export function displayConvertedObjectCoordinates() {
                 if (selectedObjectCoordinateSystem == COORDINATE_SYSTEM.BIM && basePointObj) {
                     if (transformType == 'translate') {
                         // Convert input position from MP to BIM
-                        const bimPosition = convertYupToZup(inputPosition, getMPBasepoint(), getBasepoint(), getMeasurementUnit(), parseInt(getScaleFactor()));
+                        const bimPosition = convertYupToZup(inputPosition, getMPBasepoint(), getBasepoint(), measurementUnit, parseInt(scaleFactor));
                         inputX.value = Number(bimPosition.x).toFixed(3);
                         inputY.value = Number(bimPosition.y).toFixed(3);
                         inputZ.value = Number(bimPosition.z).toFixed(3);
@@ -861,7 +860,7 @@ export function displayConvertedObjectCoordinates() {
                     }
                     else if (transformType == 'scale') {
                         // Convert input position from MP to BIM
-                        const bimScale = convertYupScaleToZupScale(inputScale, getMeasurementUnit(), parseInt(getScaleFactor()));
+                        const bimScale = convertYupScaleToZupScale(inputScale, UNITS.METER, parseInt(scaleFactor));
                         inputX.value = Number(bimScale.x).toFixed(3);
                         inputY.value = Number(bimScale.y).toFixed(3);
                         inputZ.value = Number(bimScale.z).toFixed(3);
@@ -870,14 +869,14 @@ export function displayConvertedObjectCoordinates() {
                 }
                 else if (selectedObject && selectedObjectCoordinateSystem == COORDINATE_SYSTEM.MATTERPORT && basePointObj) {
                     if (transformType == 'translate') {
-                        const mpPosition = convertZupToYup(inputPosition, getMPBasepoint(), getBasepoint(), getMeasurementUnit(), parseInt(getScaleFactor()));
+                        const mpPosition = convertZupToYup(inputPosition, getMPBasepoint(), getBasepoint(), UNITS.METER, parseInt(scaleFactor));
                         inputX.value = Number(mpPosition.x).toFixed(3);
                         inputY.value = Number(mpPosition.y).toFixed(3);
                         inputZ.value = Number(mpPosition.z).toFixed(3);
                         console.log("[MP SEL] POSITION inputPos, mp: ", inputPosition, mpPosition);
                     }
                     else if (transformType == 'scale') {
-                        const mpScale = convertZupScaleToYupScale(inputScale, getMeasurementUnit(), parseInt(getScaleFactor()));
+                        const mpScale = convertZupScaleToYupScale(inputScale, UNITS.METER, parseInt(scaleFactor));
                         inputX.value = Number(mpScale.x).toFixed(3);
                         inputY.value = Number(mpScale.y).toFixed(3);
                         inputZ.value = Number(mpScale.z).toFixed(3);
@@ -925,9 +924,21 @@ function updateObjectViaInput() {
     // }
     if ((inputX && inputY && inputZ)) {
         const transform = getCoordinateValues();
+        console.log("JAMES transform", transform);
         const selectedObject = getSelectedObject();
         setObjectTransformation(selectedObject.node, transform);
-        displayMPPosCoordinates(transform.object_position);
+        if (transformType == 'translate') {
+            let convertedPosition = transform.object_position;
+            if (measurementUnit != UNITS.METER) {
+                convertedPosition.x = convertMeasurement(transform.object_position.x, UNITS.METER, measurementUnit);
+                convertedPosition.y = convertMeasurement(transform.object_position.y, UNITS.METER, measurementUnit);
+                convertedPosition.z = convertMeasurement(transform.object_position.z, UNITS.METER, measurementUnit);
+            }
+            displayMPPosCoordinates(convertedPosition);
+        }
+        else if (transformType == 'scale') {
+            displayMPPosCoordinates(transform.object_scale);
+        }
     }
 }
 export function setConvertedBimPosition(bimPos) {

package/lib/atwinui/components/toolbar/objectListPane.js

@@ -72,30 +72,27 @@ export function renderObjectCards(cardList, objectComponents) {
             //@ts-ignore
             console.log('Event', event.target.id);
             toggleActionBar('show');
+            toggleModelControl(false);
             //@ts-ignore
             yield setActiveCard(event.target.id);
-            toggleModelControl(false);
-            // clearCurrentTransformationValues()
         }));
         batchAddEventListenerByClassName('at_card-body', (event) => __awaiter(this, void 0, void 0, function* () {
             //@ts-ignore
             console.log('Event', event.target.id);
             toggleActionBar('show');
+            toggleModelControl(false);
             //@ts-ignore
             yield setActiveCard(event.target.id);
-            toggleModelControl(false);
-            // clearCurrentTransformationValues()
         }));
         batchAddEventListenerByClassName('at_card-footer', (event) => __awaiter(this, void 0, void 0, function* () {
             //@ts-ignore
             console.log('Event', event.target.id);
             toggleActionBar('show');
+            toggleModelControl(false);
             if (event.target === event.currentTarget) {
                 //@ts-ignore
                 yield setActiveCard(event.target.id);
             }
-            toggleModelControl(false);
-            // clearCurrentTransformationValues()
         }));
         batchAddEventListenerByClassName('at_model_visibility_btn', (event) => {
             //@ts-ignore

package/lib/atwinui/events.js

@@ -16,7 +16,7 @@ import { initFormData } from "./components/toolbar/tagFormPane";
 import { renderObjectList } from "./components/toolbar/objectListPane";
 import { renderLibraryList } from "./components/toolbar/libraryPane";
 import { renderObjectCard } from "./components/toolbar/card";
-import { toggleModelControl, getCoordinateValues, showCurrentCoordinateValue, handleModelControlInputs, setSelectedObjectCoordinateSystem, getSelectedObjectCoordinateSystem, getCurrentTransformationValues, getTransformValues, clearCurrentTransformationValues } from "./components/toolbar/modelControlsPane";
+import { toggleModelControl, getCoordinateValues, showCurrentCoordinateValue, handleModelControlInputs, setSelectedObjectCoordinateSystem, getSelectedObjectCoordinateSystem, getCurrentTransformationValues, setCurrentTransformationValues, getTransformValues, clearCurrentTransformationValues } from "./components/toolbar/modelControlsPane";
 import { attachTagMedia, handleTagPlacerCreated, cancelMoveTag } from "../tag";
 import i18n from './components/toolbar/i18n';
 import { isValidUrl, debounce, isElementVisible, extractUUID } from "../utils";
@@ -25,8 +25,7 @@ import * as minimap from '../minimap';
 import { clearActiveThemeCard, getSelectedTheme } from "./components/toolbar/themePane";
 import { getCurrentEditRoomData, displayRoomTree, updatePartitionVisibilityUI, getSelectedPartitionId, updatePolygonVisibilityData, toggleVisibilityState, setFilteredDisplay, updateRoomVisibilityUI } from "./components/toolbar/spacePartition/roomTreePane";
 import { toggleDrawPartitionButton, displayPartitionFormMode, setPartitionFormMode, clearPartitionForm, setPolygonData, getPartitionFormData, getPartitionSavingMode, setPartitionSavingMode, getPartitionFormMode, getNewlyAddedPartition, setCurrentPartitionData, getTempCurrentPolygon, clearTempCurrentPolygon } from "./components/toolbar/spacePartition/roomFormPane";
-import { actionSettingsSelectOption, getTempCoordinateSystem, getTempMeasurementUnit, getTempRotationUnit, setCoordinateSystem, setMeasurementUnit, setRotationUnit, initSettingsValues, setTempCoordinateSystem, setTempMeasurementUnit, setTempRotationUnit, toggleCalibrateBasepoint, setScaleFactor, getTempScaleFactor, setTempScaleFactor, setBasepoint, getTempBasepoint, setTempBasepoint, getBasepoint, toggleActionSettings, getBasepointObjectPayload, displayConvertedCoordinates, getCoordinateSystem, getScaleFactor, getMeasurementUnit, getRotationUnit, setBasepointObjectPayload } from "./components/toolbar/actionSettingsPane";
-import { displayConvertedObjectCoordinates } from './components/toolbar/modelControlsPane';
+import { actionSettingsSelectOption, getTempCoordinateSystem, getTempMeasurementUnit, getTempRotationUnit, setCoordinateSystem, setMeasurementUnit, setRotationUnit, initSettingsValues, setTempCoordinateSystem, setTempMeasurementUnit, setTempRotationUnit, toggleActionSettingsDropdown, toggleCalibrateBasepoint, setScaleFactor, getTempScaleFactor, setTempScaleFactor, setBasepoint, getTempBasepoint, setTempBasepoint, getBasepoint, toggleActionSettings, getBasepointObjectPayload, displayConvertedCoordinates, getCoordinateSystem, getScaleFactor, getMeasurementUnit, getRotationUnit, setBasepointObjectPayload } from "./components/toolbar/actionSettingsPane";
 import { getBasepointCalibrateBpCoordinateValues, getBasepointCalibrateMpCoordinateValues, initBsepointCalibratePane, toggleBasepointCalibratePane } from "./components/toolbar/basepointCalibratePane";
 let activeToolbarItem, activeActionItem, activePane, activeActionPane, cancelTagPlacementPrompt, cancelModelPlacementPrompt;
 let notyf = new Notyf({ position: { x: 'left', y: 'bottom' }, duration: 4500, types: [
@@ -1192,6 +1191,7 @@ function handleConfirmTransform() {
                 payload.object_scale = transform.object_scale;
                 console.log("caroline payload to confirm: ", payload);
                 dispatchSpaceEvent(SPACE_EVENTS.DRAG_END, payload);
+                clearCurrentTransformationValues();
                 const activeElement = document.querySelector('.at_sidebar_button_icon_active');
                 activeElement.classList.remove("at_sidebar_button_icon_active");
                 removeTransformControls();
@@ -1250,13 +1250,19 @@ function handleDragEnd(payload) {
                 mpCoordValues.y = mpInputY.value;
                 mpCoordValues.z = mpInputZ.value;
                 displayConvertedCoordinates(mpCoordValues);
+                return;
             }
             displayConvertedCoordinates(mpCoordValues);
             return;
         }
     }
-    showCurrentCoordinateValue(undefined, false);
-    clearCurrentTransformationValues();
+    showCurrentCoordinateValue();
+    const transformValues = {
+        object_position: payload.object_position,
+        object_rotation: payload.object_rotation,
+        object_scale: payload.object_scale,
+    };
+    setCurrentTransformationValues(transformValues);
 }
 function handleDrawHistory(payload) {
     console.log("payload", payload);
@@ -1341,9 +1347,11 @@ function handleMouseClickObject(object) {
             toggleDisplayPane('at-object-list-btn');
             setActiveMenu('at-object-list-btn');
         }
+        toggleActionBar('show');
+        toggleModelControl(false);
         setActiveCard(`at-card-image-${objectId}`);
         handleScrollToView('at-object-cards', `at-card-${objectId}`);
-        toggleActionBar('show');
+        // clearActiveActionBtn()
         //setActiveActionBtn('at-translate-action-btn')
     }
 }
@@ -2223,7 +2231,7 @@ function handleMeasurementUnitDropdown() {
     const dropdownBtn = document.getElementById('at-selected-measurement-unit');
     const optionsContainer = document.getElementById('at-measurement-unit-options');
     dropdownBtn === null || dropdownBtn === void 0 ? void 0 : dropdownBtn.addEventListener('click', () => {
-        // toggleActionSettingsDropdown('at-measurement-unit-options');
+        toggleActionSettingsDropdown('at-measurement-unit-options');
     });
     optionsContainer === null || optionsContainer === void 0 ? void 0 : optionsContainer.addEventListener('click', (event) => {
         const target = event.target;
@@ -2237,7 +2245,7 @@ function handleRotationUnitDropdown() {
     const dropdownBtn = document.getElementById('at-selected-rotation-unit');
     const optionsContainer = document.getElementById('at-rotation-unit-options');
     dropdownBtn === null || dropdownBtn === void 0 ? void 0 : dropdownBtn.addEventListener('click', () => {
-        // toggleActionSettingsDropdown('at-rotation-unit-options');
+        toggleActionSettingsDropdown('at-rotation-unit-options');
     });
     optionsContainer === null || optionsContainer === void 0 ? void 0 : optionsContainer.addEventListener('click', (event) => {
         const target = event.target;
@@ -2358,7 +2366,8 @@ function handleObjectCoordinateSystem() {
             const target = event.target;
             if (target.value) {
                 setSelectedObjectCoordinateSystem(target.value);
-                displayConvertedObjectCoordinates();
+                showCurrentCoordinateValue();
+                // displayConvertedObjectCoordinates()   
                 // getObjectCoordinateSystem(target.value)
             }
         });

package/lib/utils.js

@@ -375,22 +375,42 @@ export function convertMeasurement(value, fromUnit, toUnit) {
     const conversionFactors = {
         m: {
             m: 1,
+            cm: 100,
+            mm: 1000,
             in: 39.3701,
             ft: 3.28084
         },
+        cm: {
+            m: 0.01,
+            cm: 1,
+            mm: 10,
+            in: 0.393701,
+            ft: 0.0328084
+        },
+        mm: {
+            m: 0.001,
+            cm: 0.1,
+            mm: 1,
+            in: 0.0393701,
+            ft: 0.00328084
+        },
         in: {
             m: 0.0254,
+            cm: 2.54,
+            mm: 25.4,
             in: 1,
             ft: 1 / 12
         },
         ft: {
             m: 0.3048,
+            cm: 30.48,
+            mm: 304.8,
             in: 12,
             ft: 1
         }
     };
-    if (!conversionFactors[fromUnit] || !conversionFactors[toUnit]) {
-        throw new Error("Invalid unit type. Please use 'm', 'in', or 'ft'.");
+    if (!conversionFactors[fromUnit] || !conversionFactors[fromUnit][toUnit]) {
+        throw new Error("Invalid unit type. Please use 'm', 'cm', 'mm', 'in', or 'ft'.");
     }
     return value * conversionFactors[fromUnit][toUnit];
 }

package/lib/worldConversion.d.ts

@@ -1,4 +1,5 @@
 import { Vector3 } from "../bundle/sdk";
+import { UNITS } from "./types";
 /**
  * Convert BIM (Z-up) to Matterport (Y-up)
  * Converts a coordinate from a right handed Z-up coordinates system to a right handed Y-up coordinate system
@@ -21,7 +22,7 @@ export declare function convertZupToYup(revitCoords: {
     x: number;
     y: number;
     z: number;
-}, unit?: 'mm' | 'cm' | 'm' | 'ft' | 'in', scaleFactor?: number): Vector3;
+}, unit?: UNITS.MILLIMETER | UNITS.CENTIMETER | UNITS.METER | UNITS.FOOT | UNITS.INCH, scaleFactor?: number): Vector3;
 /**
  * Converts degress to quaternions
  * @param revitRotX
@@ -41,7 +42,7 @@ export declare function convertZupScaleToYupScale(scale: {
     x: number;
     y: number;
     z: number;
-}, unit?: 'mm' | 'cm' | 'm' | 'ft' | 'in', scaleFactor?: number): {
+}, unit?: UNITS.MILLIMETER | UNITS.CENTIMETER | UNITS.METER | UNITS.FOOT | UNITS.INCH, scaleFactor?: number): {
     x: number;
     y: number;
     z: number;
@@ -64,7 +65,7 @@ export declare function convertYupToZup(objectPosition: Vector3, mpBasePoint?: {
     x: number;
     y: number;
     z: number;
-}, unit?: 'mm' | 'cm' | 'm' | 'ft' | 'in', scaleFactor?: number): {
+}, unit?: UNITS.MILLIMETER | UNITS.CENTIMETER | UNITS.METER | UNITS.FOOT | UNITS.INCH, scaleFactor?: number): {
     x: number;
     y: number;
     z: number;
@@ -85,7 +86,7 @@ export declare function convertYupScaleToZupScale(scale: {
     x: number;
     y: number;
     z: number;
-}, unit?: 'mm' | 'cm' | 'm' | 'ft' | 'in', scaleFactor?: number): {
+}, unit?: UNITS.MILLIMETER | UNITS.CENTIMETER | UNITS.METER | UNITS.FOOT | UNITS.INCH, scaleFactor?: number): {
     x: number;
     y: number;
     z: number;

package/lib/worldConversion.js

@@ -1,4 +1,5 @@
 import { _3DXObjects } from "./architwin";
+import { UNITS } from "./types";
 import { getUnitConverter } from "./utils";
 import log from "loglevel";
 /**
@@ -11,17 +12,22 @@ import log from "loglevel";
  * @param scaleFactor - (optional) - default is 1 (1:1 scale). Applied after conversion to meters
  * @returns coordinates in meters
  */
-export function convertZupToYup(revitCoords, mpBasePoint = { x: 0, y: 0, z: 0 }, bimBasepoint = { x: 0, y: 0, z: 0 }, unit = 'm', scaleFactor = 1) {
+export function convertZupToYup(revitCoords, mpBasePoint = { x: 0, y: 0, z: 0 }, bimBasepoint = { x: 0, y: 0, z: 0 }, unit = UNITS.METER, scaleFactor = 1) {
     const unitConverter = getUnitConverter(unit);
+    const bimObjPos = {
+        x: unitConverter(revitCoords.x) * scaleFactor,
+        y: unitConverter(revitCoords.z) * scaleFactor,
+        z: unitConverter(revitCoords.y) * scaleFactor
+    };
     const THREE = _3DXObjects.find(obj => obj.type == 'BASEPOINT').component.context.three;
     const _mpBP = new THREE.Vector3(mpBasePoint.x, mpBasePoint.y, mpBasePoint.z);
     const _bimBP = new THREE.Vector3(bimBasepoint.x, bimBasepoint.y, bimBasepoint.z);
-    const _bimObjPos = new THREE.Vector3(revitCoords.x, revitCoords.z, revitCoords.y); // swap yz for revit/bim
+    const _bimObjPos = new THREE.Vector3(bimObjPos.x, bimObjPos.y, bimObjPos.z); // swap yz for revit/bim
     _bimBP.addVectors(_mpBP, _bimObjPos);
     return {
-        x: unitConverter((_bimBP.x - bimBasepoint.x)) * scaleFactor,
-        y: unitConverter((_bimBP.y - bimBasepoint.z)) * scaleFactor,
-        z: unitConverter((_bimBP.z - bimBasepoint.y)) * scaleFactor
+        x: (_bimBP.x - bimBasepoint.x),
+        y: (_bimBP.y - bimBasepoint.z),
+        z: (_bimBP.z - bimBasepoint.y)
     };
 }
 /**
@@ -56,7 +62,7 @@ export function convertDegreeToQuarternion(revitRotX, revitRotY, revitRotZ) {
  * @param scaleFactor - (optional) - default is 1 (1:1 scale). Applied after conversion to meters
  * @returns
  */
-export function convertZupScaleToYupScale(scale, unit = 'm', scaleFactor = 1) {
+export function convertZupScaleToYupScale(scale, unit = UNITS.METER, scaleFactor = 1) {
     const unitConverter = getUnitConverter(unit);
     const revitX = unitConverter(scale.x) * scaleFactor;
     const revitY = unitConverter(scale.y) * scaleFactor;
@@ -77,7 +83,8 @@ export function convertZupScaleToYupScale(scale, unit = 'm', scaleFactor = 1) {
  * @param scaleFactor - (optional) - default is 1 (1:1 scale). Applied to coordinates in meters
  * @returns coordinates in the specified unit
  */
-export function convertYupToZup(objectPosition, mpBasePoint = { x: 0, y: 0, z: 0 }, bimBasepoint = { x: 0, y: 0, z: 0 }, unit = 'm', scaleFactor = 1) {
+export function convertYupToZup(objectPosition, mpBasePoint = { x: 0, y: 0, z: 0 }, bimBasepoint = { x: 0, y: 0, z: 0 }, unit = UNITS.METER, scaleFactor = 1) {
+    log.info("convertYupToZup()", objectPosition, mpBasePoint, bimBasepoint, unit, scaleFactor);
     const unitConverter = getUnitConverter(unit);
     const THREE = _3DXObjects.find(obj => obj.type == 'BASEPOINT').component.context.three;
     const _bimBP = new THREE.Vector3(bimBasepoint.x, bimBasepoint.y, bimBasepoint.z);
@@ -113,11 +120,8 @@ export function convertQuaternionToDegree(quaternion) {
  * @param scaleFactor - (optional) - default is 1 (1:1 scale).
  * @returns
  */
-export function convertYupScaleToZupScale(scale, unit = 'm', scaleFactor = 1) {
+export function convertYupScaleToZupScale(scale, unit = UNITS.METER, scaleFactor = 1) {
     const unitConverter = getUnitConverter(unit);
-    // const scaleX = unitConverter(scale.x) * scaleFactor;
-    // const scaleY = unitConverter(scale.y) * scaleFactor;
-    // const scaleZ = unitConverter(scale.z) * scaleFactor;
     const scaleX = unitConverter(scale.x) / scaleFactor;
     const scaleY = unitConverter(scale.y) / scaleFactor;
     const scaleZ = unitConverter(scale.z) / scaleFactor;

package/package.json

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

package/static/atwinui.css

@@ -1595,8 +1595,6 @@
     text-align: center;
     background: var(--bg-secondary-azusa);
     padding-bottom: 5px;
-    margin-right: 25px;
-    margin-left: 25px;
 }
 
 .at_mt_static_text_container.hidden{
@@ -1712,7 +1710,7 @@
 }
 
 .at_bim_icon_right {
-    width: 20px;
+    width: auto;
     height: 20px;
     line-height: 1;
     /* background-color:hsla(0,0%,100%,0.8) ; */