architwin 1.12.2 → 1.12.4

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

@@ -1,4 +1,4 @@
-import { convertMeasurement, degreesToRadians, radiansToDegrees, useCapitalizeFirstLetter } from "../../../utils";
+import { convertMeasurement, degreesToRadians, percentToScale, radiansToDegrees, scaleToPercent, useCapitalizeFirstLetter } from "../../../utils";
 import { getSelectedObject, setObjectTransformation, get3DXObjects, _mpConfig, _3DXObjects, isToolbarFeatureEnabled, actionHistory, transformHistory } from "../../../architwin";
 import { COORDINATE_SYSTEM, UNITS } from "../../../types";
 import { convertZupToYup, convertYupToZup, getOffsetPositionFromBasepoint, convertYupScaleToZupScale, convertZupScaleToYupScale } from "../../../worldConversion";
@@ -249,7 +249,7 @@ export function getCoordinateValues() {
             else if (rotationUnit == UNITS.DEGREE) {
                 mpRotation = degreesToRadians(formCoords);
             }
-            mpScale = formCoords;
+            mpScale = percentToScale(formCoords);
             if (isToolbarFeatureEnabled('bim')) {
                 setConvertedBimPosition(convertYupToZup(mpPosition, getMPBasepoint(), getBasepoint(), getMeasurementUnit(), parseInt(getScaleFactor())));
             }
@@ -263,7 +263,7 @@ export function getCoordinateValues() {
         else if (rotationUnit == UNITS.DEGREE) {
             mpRotation = degreesToRadians(formCoords);
         }
-        mpScale = formCoords;
+        mpScale = percentToScale(formCoords);
         if (isToolbarFeatureEnabled('bim')) {
             setConvertedBimPosition(convertYupToZup(mpPosition, getMPBasepoint(), getBasepoint(), getMeasurementUnit(), parseInt(getScaleFactor())));
         }
@@ -488,9 +488,10 @@ export function showCurrentCoordinateValue(payload) {
             displayMPScaleCoordinates(currentScale);
         }
         else {
-            inputX.value = currentScale.x.toFixed(3).toString();
-            inputY.value = currentScale.y.toFixed(3).toString();
-            inputZ.value = currentScale.z.toFixed(3).toString();
+            const percentScale = scaleToPercent(currentScale);
+            inputX.value = percentScale.x.toFixed(0).toString();
+            inputY.value = percentScale.y.toFixed(0).toString();
+            inputZ.value = percentScale.z.toFixed(0).toString();
         }
         transformValues['scale'].x = inputX.value;
         transformValues['scale'].y = inputY.value;
@@ -928,10 +929,11 @@ function displayMPPosCoordinates(mpObjectPos) {
  * @param mpObjectPos Matterport object position
  */
 function displayMPScaleCoordinates(mpObjectSCale) {
+    const percentScale = scaleToPercent(mpObjectSCale);
     if (isToolbarFeatureEnabled('bim')) {
-        document.getElementById("at-mt-coordx").textContent = mpObjectSCale.x.toFixed(3).toString();
-        document.getElementById("at-mt-coordy").textContent = mpObjectSCale.y.toFixed(3).toString();
-        document.getElementById("at-mt-coordz").textContent = mpObjectSCale.z.toFixed(3).toString();
+        document.getElementById("at-mt-coordx").textContent = percentScale.x.toFixed(0).toString();
+        document.getElementById("at-mt-coordy").textContent = percentScale.y.toFixed(0).toString();
+        document.getElementById("at-mt-coordz").textContent = percentScale.z.toFixed(0).toString();
     }
 }
 function updateObjectViaInput() {

package/lib/minimap.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import * as superviz from './superviz';
-import { _mpConfig, getCurrentCameraPose, getCurrentSweep, getMapConfig, dispatchSpaceEvent, isCdnMapDataAvailable, getCurrentFloor } from "./architwin";
+import { _mpConfig, getCurrentCameraPose, getCurrentSweep, getMapConfig, dispatchSpaceEvent, isCdnMapDataAvailable, getCurrentFloor, minimap } from "./architwin";
 import { SPACE_EVENTS, DEGREE, MAP_OPTIONS } from "./types";
 import { isValidCSSColor } from "./color";
 import { _participants } from "./participant";
@@ -1060,7 +1060,6 @@ function setupCustomMinimapPane() {
         log.info('setupCustomMinimap');
         log.info("_minimapPosition: ", _minimapPosition);
         return `
-        <div id="at-custom-minimap-pane" class="at_overlay_left_minimap ${_minimapPosition}" style="display:none">
             <div>
                 ${setMapPositionDropdown()}
             </div>
@@ -1078,9 +1077,27 @@ function setupCustomMinimapPane() {
             </div>
 
             ${setupCustomMinimapSettingUI()}
-        </div>
         
     `;
+        // return `
+        //     <div id="at-custom-minimap-pane" class="at_overlay_left_minimap ${_minimapPosition}" style="display:none">
+        //         <div>
+        //             ${setMapPositionDropdown()}
+        //         </div>
+        //         <div id="at-custom-map-close-btn" class="at_close_minimap">
+        //             <span class="mdi mdi-window-close" id="at-close-minimap-btn" data-cy="at-close-minimap-btn"></span>
+        //         </div>
+        //         <div id="at-custom-map-settings-btn" class="at_setting_icon">
+        //             <span class="mdi mdi-cog"  id="at-map-setting-btn" data-cy="at-map-setting-btn"></span>
+        //         </div>
+        //         <div id="at-spinner" class="at_spinner"></div>
+        //         <canvas id="at-custom-map-canvas" class="at_custom_map_canvas" width="379" height="379"></canvas>
+        //         <div id="at-custom-map" class="at_custom_map">
+        //             <img id="at-custom-map-img" src="${getAssetUrl('images/377.png')}" alt="Minimap">
+        //         </div>
+        //         ${setupCustomMinimapSettingUI()}
+        //     </div>
+        // `
     });
 }
 function setMapPositionDropdown() {
@@ -1176,6 +1193,9 @@ function setCustomMap(mpSdk) {
         const minimapElement = yield setupCustomMinimapPane();
         const showcase = document.getElementById('showcase-container');
         const mapContainer = document.createElement('div');
+        mapContainer.setAttribute('id', 'at-custom-minimap-pane');
+        mapContainer.classList.add('at_overlay_left_minimap', `${minimap.getMinimapPosition()}`);
+        mapContainer.style.display = 'none';
         mapContainer.innerHTML = minimapElement;
         // Inject to DOM
         showcase.append(mapContainer);
@@ -1246,13 +1266,14 @@ function generateCustomMinimap(mpSdk) {
                 //     log.info("You are enabling to show sweep markers by default. You should probably increase the fixedSize to avoid the sweep markers overcrowding the map")
                 //     document.documentElement.style.setProperty("--map-sweep-display",`inline-block`)
                 // }
-                // if (_mpConfig.mapConfig.sweepMarker.backgroundColor) {
-                //     if (isValidCSSColor(_mpConfig.mapConfig.sweepMarker.backgroundColor)) {
-                //         document.documentElement.style.setProperty("--map-sweep-color",`${_mpConfig.mapConfig.sweepMarker.backgroundColor}`)
-                //     }else{
-                //         log.error("Invalid custom color value for sweep marker backgroundColor")
-                //     }
-                // }
+                if (_mpConfig.mapConfig.sweepMarker.backgroundColor) {
+                    if (isValidCSSColor(_mpConfig.mapConfig.sweepMarker.backgroundColor)) {
+                        document.documentElement.style.setProperty("--map-sweep-color", `${_mpConfig.mapConfig.sweepMarker.backgroundColor}`);
+                    }
+                    else {
+                        log.error("Invalid custom color value for sweep marker backgroundColor");
+                    }
+                }
                 // if (_mpConfig.mapConfig.sweepMarker.activeColor) {
                 //     if (isValidCSSColor(_mpConfig.mapConfig.sweepMarker.activeColor)) {
                 //         document.documentElement.style.setProperty("--map-sweep-active-color",`${_mpConfig.mapConfig.sweepMarker.activeColor}`)

package/lib/utils.d.ts

@@ -89,3 +89,5 @@ export declare function getUnitConverter(unit: 'mm' | 'cm' | 'm' | 'ft' | 'in'):
 export declare function getAssetUrl(filename: string): string;
 export declare function convertMeasurement(value: any, fromUnit: any, toUnit: any): number;
 export declare function showLoader(visible: boolean): void;
+export declare function percentToScale(percentValue: Vector3): Vector3;
+export declare function scaleToPercent(scaleValue: Vector3): Vector3;

package/lib/utils.js

@@ -433,3 +433,19 @@ export function showLoader(visible) {
         log.error("Error show loader: ", error);
     }
 }
+export function percentToScale(percentValue) {
+    const clampMin = (value) => Math.max(0, value);
+    return {
+        x: parseFloat((clampMin(percentValue.x) / 100).toFixed(4)),
+        y: parseFloat((clampMin(percentValue.y) / 100).toFixed(4)),
+        z: parseFloat((clampMin(percentValue.z) / 100).toFixed(4)),
+    };
+}
+export function scaleToPercent(scaleValue) {
+    const clampMin = (value) => Math.max(0, value);
+    return {
+        x: parseFloat((clampMin(scaleValue.x) * 100).toFixed(2)),
+        y: parseFloat((clampMin(scaleValue.y) * 100).toFixed(2)),
+        z: parseFloat((clampMin(scaleValue.z) * 100).toFixed(2)),
+    };
+}

package/package.json

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

package/static/map.css

@@ -163,15 +163,17 @@ display: inline-block;
 }
 
 .at_overlay_left_minimap.topLeft {
-    bottom: calc(var(--position-top) + 27rem);
-    /* top: calc(var(--position-top) + 0.5rem); */
-    left: 0;
+    /* bottom: calc(var(--position-bottom) + 48vh);
+    left: 0; */
+    top: calc(var(--position-top) + 0.5rem);
+    left: calc(var(--position-left) + 0.5rem);
 }
 
 .at_overlay_left_minimap.topRight {
-    /* top: calc(var(--position-top) + 0.5rem); */
-    bottom: calc(var(--position-top) + 27rem);
-    right: 0;
+    /* bottom: calc(var(--position-bottom) + 48vh);
+    right: 0; */
+    top: calc(var(--position-top) + 0.5rem);
+    right: calc(var(--position-right) + 0.5rem);
 }
 
 .at_overlay_left_minimap.bottomLeft {
@@ -394,7 +396,8 @@ display: inline-block;
 	height: 0.5rem;
 	width: 0.5rem;
     opacity: var(--map-sweep-opacity);
-	border: 0.20rem solid rgba(255, 255, 0, 0.79);
+	/* border: 0.20rem solid rgba(255, 255, 0, 0.79); */
+	border: 0.20rem solid var(--map-sweep-color);
 	border-radius: 50%;
 	box-sizing: content-box;
 	background-color: transparent;
@@ -404,12 +407,15 @@ display: inline-block;
 
 .at_custom_sweep.active {
 	background-color: orangered;
+	/* background-color: var(--map-sweep-color); */
     opacity: var(--map-sweep-opacity);
 	border: 0.23rem solid rgba(255, 255, 0, 0.79);
+	/* border: 0.23rem solid var(--map-sweep-color); */
 }
 
 .at_custom_sweep:hover {
-	background-color: rgba(255, 255, 0, 0.79);
+	/* background-color: rgba(255, 255, 0, 0.79); */
+	background-color: var(--map-sweep-hover-color);
 }