@inweb/viewer-visualize 25.9.8 → 25.11.0

package/dist/viewer-visualize.module.js

@@ -99,7 +99,8 @@ function defaultOptions() {
         reverseZoomWheel: false,
         enableZoomWheel: true,
         enableGestures: true,
-        geometryType: "vsfx"
+        geometryType: "vsfx",
+        rulerUnit: "Default"
     };
 }
 
@@ -359,6 +360,13 @@ class Options {
         this._data.geometryType = value;
         this.change();
     }
+    get rulerUnit() {
+        return this._data.rulerUnit;
+    }
+    set rulerUnit(value) {
+        this._data.rulerUnit = value;
+        this.change();
+    }
 }
 
 const CanvasEvents = [ "click", "contextmenu", "dblclick", "mousedown", "mouseleave", "mousemove", "mouseup", "pointercancel", "pointerdown", "pointerleave", "pointermove", "pointerup", "touchcancel", "touchend", "touchmove", "touchstart", "wheel" ];
@@ -413,6 +421,22 @@ commands("VisualizeJS").registerCommand("clearMarkup", (viewer => viewer.clearOv
 
 commands("VisualizeJS").registerCommandAlias("clearMarkup", "clearOverlay");
 
+function clearSelected(viewer) {
+    if (!viewer.visualizeJs) return;
+    const visViewer = viewer.visViewer();
+    visViewer.unselect();
+    viewer.update();
+    viewer.emitEvent({
+        type: "select",
+        data: undefined,
+        handles: []
+    });
+}
+
+commands("VisualizeJS").registerCommand("clearSelected", clearSelected);
+
+commands("VisualizeJS").registerCommandAlias("clearSelected", "unselect");
+
 commands("VisualizeJS").registerCommand("clearSlices", (viewer => viewer.clearSlices()));
 
 function createPreview(viewer, type = "image/jpeg", encoderOptions = .25) {
@@ -428,7 +452,7 @@ function explode(viewer, index = 0) {
     const visViewer = viewer.visViewer();
     visViewer.explode(index);
     viewer.update();
-    viewer.emit({
+    viewer.emitEvent({
         type: "explode",
         data: index
     });
@@ -490,9 +514,14 @@ function hideSelected(viewer) {
     const visViewer = viewer.visViewer();
     visViewer.hideSelectedObjects(false);
     viewer.update();
-    viewer.emit({
+    viewer.emitEvent({
         type: "hide"
     });
+    viewer.emitEvent({
+        type: "select",
+        data: undefined,
+        handles: []
+    });
 }
 
 commands("VisualizeJS").registerCommand("hideSelected", hideSelected);
@@ -502,7 +531,7 @@ function isolateSelected(viewer) {
     const visViewer = viewer.visViewer();
     visViewer.isolateSelectedObjects(false);
     viewer.update();
-    viewer.emit({
+    viewer.emitEvent({
         type: "isolate"
     });
 }
@@ -527,7 +556,7 @@ function resetView(viewer) {
     viewer.executeCommand("clearSlices");
     viewer.executeCommand("clearOverlay");
     viewer.executeCommand("setMarkupColor");
-    viewer.executeCommand("unselect");
+    viewer.executeCommand("clearSelected");
     viewer.executeCommand("showAll");
     viewer.executeCommand("explode", 0);
     viewer.executeCommand("zoomToExtents", true);
@@ -634,27 +663,13 @@ function showAll(viewer) {
     const visViewer = viewer.visViewer();
     visViewer.unisolateSelectedObjects(false);
     viewer.update();
-    viewer.emit({
+    viewer.emitEvent({
         type: "showall"
     });
 }
 
 commands("VisualizeJS").registerCommand("showAll", showAll);
 
-function unselect(viewer) {
-    if (!viewer.visualizeJs) return;
-    const visViewer = viewer.visViewer();
-    visViewer.unselect();
-    viewer.update();
-    viewer.emitEvent({
-        type: "select",
-        data: visViewer.getSelected(),
-        handles: []
-    });
-}
-
-commands("VisualizeJS").registerCommand("unselect", unselect);
-
 function zoomToExtents(viewer, force = false, animate = viewer.options.cameraAnimation) {
     if (!viewer.visualizeJs) return;
     const visViewer = viewer.visViewer();
@@ -1770,33 +1785,21 @@ class KonvaMarkup {
             this._konvaStage.height(height);
         };
         this.pan = event => {
-            const pointer = this._konvaStage.getPointerPosition();
-            const pointTo = {
-                x: (pointer.x - this._konvaStage.x()) / this._konvaStage.scaleX(),
-                y: (pointer.y - this._konvaStage.y()) / this._konvaStage.scaleX()
-            };
             const newPos = {
-                x: pointer.x - pointTo.x * this._konvaStage.scale().x + event.dX,
-                y: pointer.y - pointTo.y * this._konvaStage.scale().x + event.dY
+                x: this._konvaStage.x() + event.dX,
+                y: this._konvaStage.y() + event.dY
             };
             this._konvaStage.position(newPos);
         };
         this.zoomAt = event => {
-            const oldScale = this._konvaStage.scaleX();
-            const pointer = this._konvaStage.getPointerPosition();
-            const mousePointTo = {
-                x: (pointer.x - this._konvaStage.x()) / oldScale,
-                y: (pointer.y - this._konvaStage.y()) / oldScale
-            };
-            const direction = event.data > 0 ? 1 : -1;
-            const newScale = direction > 0 ? oldScale * event.data : oldScale / event.data;
+            const newScale = this._konvaStage.scaleX() * event.data;
             this._konvaStage.scale({
                 x: newScale,
                 y: newScale
             });
             const newPos = {
-                x: pointer.x - mousePointTo.x * newScale,
-                y: pointer.y - mousePointTo.y * newScale
+                x: event.x - (event.x - this._konvaStage.x()) * event.data,
+                y: event.y - (event.y - this._konvaStage.y()) * event.data
             };
             this._konvaStage.position(newPos);
         };
@@ -1822,6 +1825,7 @@ class KonvaMarkup {
         this._markupContainer.style.top = "0px";
         this._markupContainer.style.left = "0px";
         this._markupContainer.style.outline = "0px";
+        this._markupContainer.style.pointerEvents = "none";
         const parentDiv = this._container.parentElement;
         parentDiv.appendChild(this._markupContainer);
         this._resizeObserver = new ResizeObserver(this.resizeContainer);
@@ -1829,7 +1833,6 @@ class KonvaMarkup {
         this._markupColor.setColor(255, 0, 0);
         this.initializeKonva();
         if (this._viewer) {
-            this._containerEvents.forEach((x => this._markupContainer.addEventListener(x, this.redirectToViewer)));
             this._viewer.addEventListener("changeactivedragger", this.changeActiveDragger);
             this._viewer.addEventListener("pan", this.pan);
             this._viewer.addEventListener("zoomat", this.zoomAt);
@@ -1841,7 +1844,6 @@ class KonvaMarkup {
             this._viewer.removeEventListener("zoomat", this.zoomAt);
             this._viewer.removeEventListener("pan", this.pan);
             this._viewer.removeEventListener("changeactivedragger", this.changeActiveDragger);
-            this._containerEvents.forEach((x => this._markupContainer.removeEventListener(x, this.redirectToViewer)));
         }
         this.destroyKonva();
         (_a = this._resizeObserver) === null || _a === void 0 ? void 0 : _a.disconnect();
@@ -1865,6 +1867,14 @@ class KonvaMarkup {
     }
     setMarkupColor(r, g, b) {
         this._markupColor.setColor(r, g, b);
+        this._viewer.emit({
+            type: "changemarkupcolor",
+            data: {
+                r: r,
+                g: g,
+                b: b
+            }
+        });
     }
     colorizeAllMarkup(r, g, b) {
         const hexColor = new MarkupColor(r, g, b).asHex();
@@ -1957,9 +1967,11 @@ class KonvaMarkup {
             this.clearSelected();
             this.removeTextInput();
             this.removeImageInput();
+            this._markupContainer.style.pointerEvents = "none";
             this._markupIsActive = false;
         } else {
             this._markupMode = mode;
+            this._markupContainer.style.pointerEvents = "all";
             this._markupIsActive = true;
         }
         return this;
@@ -2814,7 +2826,7 @@ class OdBaseDragger extends OdaGeAction {
         }
         ev.target.releasePointerCapture(ev.pointerId);
         const relCoord = this.relativeCoords(ev);
-        this.end(relCoord.x, relCoord.y);
+        this.end(relCoord.x, relCoord.y, ev.clientX, ev.clientY);
         this.isDragging = false;
         this.subject.update();
     }
@@ -2829,7 +2841,7 @@ class OdBaseDragger extends OdaGeAction {
             return;
         }
         const relCoord = this.relativeCoords(ev);
-        this.drag(relCoord.x, relCoord.y, ev.movementX, ev.movementY);
+        this.drag(relCoord.x, relCoord.y, ev.clientX, ev.clientY);
         if (this.isDragging) {
             this.subject.update();
         }
@@ -2884,7 +2896,7 @@ class OdBaseDragger extends OdaGeAction {
     }
     start(x, y, absoluteX = 0, absoluteY = 0) {}
     drag(x, y, absoluteX = 0, absoluteY = 0) {}
-    end(x, y) {}
+    end(x, y, absoluteX = 0, absoluteY = 0) {}
     getActiveMarkupEntity(entityName) {
         return this.subject.addMarkupEntity(entityName);
     }
@@ -3180,7 +3192,11 @@ class MeasureLineItem {
         }
     }
     getDistance() {
-        return getDistance(this.startPoint, this.endPoint, this.moduleInstance) / this.scale;
+        let distance = getDistance(this.startPoint, this.endPoint, this.moduleInstance);
+        if (Math.abs(this.scale - 1) > 1e-4) {
+            distance = (distance / this.scale).toFixed(2);
+        }
+        return distance;
     }
     setStartPoint(gePoint) {
         this.startPoint = gePoint;
@@ -3237,6 +3253,7 @@ function renameUnit(table, unit) {
 
 class MeasureLineDragger extends OdBaseDragger {
     constructor(subject) {
+        var _a;
         super(subject);
         this.lineThickness = 2;
         this.press = false;
@@ -3254,10 +3271,12 @@ class MeasureLineDragger extends OdBaseDragger {
             Miles: "mi",
             Micrometers: "µm",
             MicroInches: "µin",
-            Undefined: " "
+            Default: "unit"
         };
         this.items = [];
         this.canvasEvents.push("resize");
+        this.oldRulerUnit = (_a = subject.options.rulerUnit) !== null && _a !== void 0 ? _a : "Default";
+        this.optionsChange = this.optionsChange.bind(this);
     }
     initialize() {
         super.initialize();
@@ -3267,11 +3286,13 @@ class MeasureLineDragger extends OdBaseDragger {
         this.m_overlayElement.style.zIndex = "1";
         this.m_overlayElement.style.pointerEvents = "none";
         document.body.appendChild(this.m_overlayElement);
+        this.subject.addEventListener("optionschange", this.optionsChange);
         this.resize();
     }
     dispose() {
         super.dispose();
         this.m_overlayElement.remove();
+        this.subject.removeEventListener("optionschange", this.optionsChange);
     }
     updatePreview() {
         this.items.forEach((item => item.update()));
@@ -3346,10 +3367,86 @@ class MeasureLineDragger extends OdBaseDragger {
         const viewer = this.m_module.getViewer();
         const item = new MeasureLineItem(this.m_overlayElement, viewer, this.m_module);
         item.lineThickness = this.lineThickness || item.lineThickness;
-        item.setUnit(renameUnit(this.renameUnitTable, viewer.getUnit()));
+        const isDefaultUnit = !this.subject.options.rulerUnit || this.subject.options.rulerUnit === "Default";
+        item.setUnit(renameUnit(this.renameUnitTable, isDefaultUnit ? viewer.getUnit() : this.subject.options.rulerUnit));
+        if (!isDefaultUnit) {
+            const fromUnit = this.getKUnitByName(viewer.getUnit());
+            const toUnit = this.getKUnitByName(this.subject.options.rulerUnit);
+            const multiplier = viewer.getUnitsConversionCoef(fromUnit, toUnit);
+            this.conversionFactor = 1 / multiplier;
+            item.setConversionFactor(this.conversionFactor);
+        } else {
+            item.setConversionFactor(1);
+        }
         this.items.push(item);
         return item;
     }
+    optionsChange(event) {
+        var _a;
+        const options = event.data;
+        const toUnitName = (_a = options.rulerUnit) !== null && _a !== void 0 ? _a : "Default";
+        if (this.oldRulerUnit === toUnitName) return;
+        this.oldRulerUnit = toUnitName;
+        const drawingUnit = this.m_module.getViewer().getUnit();
+        const eToUnit = this.getKUnitByName(toUnitName);
+        const eFromUnit = this.getKUnitByName(drawingUnit);
+        this.items.forEach((item => {
+            if (toUnitName === "Default") {
+                item.setUnit(renameUnit(this.renameUnitTable, drawingUnit));
+                item.setConversionFactor(1);
+            } else {
+                item.setUnit(renameUnit(this.renameUnitTable, toUnitName));
+                const multiplier = this.m_module.getViewer().getUnitsConversionCoef(eFromUnit, eToUnit);
+                this.conversionFactor = 1 / multiplier;
+                item.setConversionFactor(this.conversionFactor);
+            }
+        }));
+    }
+    getKUnitByName(unitName) {
+        let eUnit = this.m_module.Units.kUserDefined;
+        switch (unitName) {
+          case "Millimeters":
+            eUnit = this.m_module.Units.kMillimeters;
+            break;
+
+          case "Centimeters":
+            eUnit = this.m_module.Units.kCentimeters;
+            break;
+
+          case "Meters":
+            eUnit = this.m_module.Units.kMeters;
+            break;
+
+          case "Feet":
+            eUnit = this.m_module.Units.kFeet;
+            break;
+
+          case "Inches":
+            eUnit = this.m_module.Units.kInches;
+            break;
+
+          case "Yards":
+            eUnit = this.m_module.Units.kYards;
+            break;
+
+          case "Kilometers":
+            eUnit = this.m_module.Units.kKilometers;
+            break;
+
+          case "Miles":
+            eUnit = this.m_module.Units.kMiles;
+            break;
+
+          case "Micrometers":
+            eUnit = this.m_module.Units.kMicrometers;
+            break;
+
+          case "MicroInches":
+            eUnit = this.m_module.Units.kMicroInches;
+            break;
+        }
+        return eUnit;
+    }
 }
 
 const FocalLengthConst = 42;
@@ -3881,7 +3978,7 @@ class OdOrbitDragger extends OdBaseDragger {
         extView.setView(this.startCameraParams.position, this.startCameraParams.target, this.startCameraParams.upVector, this.startCameraParams.viewFieldWidth, this.startCameraParams.viewFieldHeight, this.startCameraParams.perspective);
         extView.delete();
     }
-    drag(x, y, dltX, dltY) {
+    drag(x, y) {
         if (this.press) {
             this._orbitAction.action(x, y);
         }
@@ -3901,15 +3998,15 @@ class PanAction {
         this._getViewParams = getViewParams;
         this._setViewParams = setViewParams;
     }
-    beginAction(x, y) {
+    beginAction(x, y, absoluteX, absoluteY) {
         this._m_start = this.screenToWorld(x, y);
         this._deltaScreenPosition = {
-            x: x,
-            y: y
+            x: absoluteX,
+            y: absoluteY
         };
         this._beginInteractivity();
     }
-    action(x, y) {
+    action(x, y, absoluteX, absoluteY) {
         var _a;
         const {Vector3d: Vector3d} = this._m_module;
         const params = this._getViewParams();
@@ -3930,14 +4027,14 @@ class PanAction {
         (_a = this._subject.activeDragger()) === null || _a === void 0 ? void 0 : _a.updatePreview();
         this._subject.emitEvent({
             type: "pan",
-            x: x,
-            y: y,
-            dX: x - this._deltaScreenPosition.x,
-            dY: y - this._deltaScreenPosition.y
+            x: absoluteX,
+            y: absoluteY,
+            dX: absoluteX - this._deltaScreenPosition.x,
+            dY: absoluteY - this._deltaScreenPosition.y
         });
         this._deltaScreenPosition = {
-            x: x,
-            y: y
+            x: absoluteX,
+            y: absoluteY
         };
     }
     endAction() {
@@ -3955,13 +4052,13 @@ class OdPanDragger extends OdBaseDragger {
         this.press = false;
         this._panAction = new PanAction(this.m_module, this.subject, this.beginInteractivity, this.endInteractivity, this.getViewParams, this.setViewParams);
     }
-    start(x, y) {
+    start(x, y, absoluteX, absoluteY) {
         this.press = true;
-        this._panAction.beginAction(x, y);
+        this._panAction.beginAction(x, y, absoluteX, absoluteY);
     }
-    drag(x, y, dltX, dltY) {
+    drag(x, y, absoluteX, absoluteY) {
         if (this.press) {
-            this._panAction.action(x, y);
+            this._panAction.action(x, y, absoluteX, absoluteY);
         }
     }
     end(x, y) {
@@ -3975,7 +4072,7 @@ class ZoomAction {
         this._m_module = m_module;
         this._subject = subject;
     }
-    action(x, y, zoomFactor) {
+    action(x, y, zoomFactor, absoluteX, absoluteY) {
         var _a;
         const viewer = this._m_module.getViewer();
         viewer.zoomAt(zoomFactor, x, y);
@@ -3983,7 +4080,9 @@ class ZoomAction {
         (_a = this._subject.activeDragger()) === null || _a === void 0 ? void 0 : _a.updatePreview();
         this._subject.emitEvent({
             type: "zoomat",
-            data: zoomFactor
+            data: zoomFactor,
+            x: absoluteX,
+            y: absoluteY
         });
     }
 }
@@ -3995,17 +4094,22 @@ class OdZoomDragger extends OdBaseDragger {
         this.press = false;
         this._zoomAction = new ZoomAction(this.m_module, this.subject);
     }
-    start(x, y) {
+    start(x, y, absoluteX = 0, absoluteY = 0) {
         this.press = true;
         this.pressX = x;
         this.pressY = y;
+        this.absoluteX = absoluteX;
+        this.absoluteY = absoluteY;
+        this.prevY = y;
         this.beginInteractivity();
     }
-    drag(x, y, dltX, dltY) {
+    drag(x, y) {
+        const dltY = y - this.prevY;
+        this.prevY = y;
         if (this.press && Math.abs(dltY) >= 1e-5) {
             const ZOOM_SPEED = .025;
             const zoomFactor = dltY > 0 ? 1 + ZOOM_SPEED : 1 - ZOOM_SPEED;
-            this._zoomAction.action(this.pressX, this.pressY, zoomFactor);
+            this._zoomAction.action(this.pressX, this.pressY, zoomFactor, this.absoluteX, this.absoluteY);
         }
     }
     end() {
@@ -4035,7 +4139,7 @@ class OdZoomWheelDragger extends OdBaseDragger {
         const viewer = this.getViewer();
         if (viewer) {
             const zoomFactor = event.deltaY > 0 ? 1 + zoomSpeed : 1 - zoomSpeed;
-            this._zoomAction.action(event.offsetX * window.devicePixelRatio, event.offsetY * window.devicePixelRatio, zoomFactor);
+            this._zoomAction.action(event.offsetX * window.devicePixelRatio, event.offsetY * window.devicePixelRatio, zoomFactor, event.offsetX, event.offsetY);
             if (!this._isEnableInteractivityMode) {
                 this._isEnableInteractivityMode = true;
                 this.beginInteractivity();
@@ -4158,7 +4262,7 @@ class OdZoomWindowDragger extends OdBaseDragger {
         const startPoint = this.screenToWorld(x, y);
         this.m_frame.setStartPoint(startPoint);
     }
-    drag(x, y, dltX, dltY) {
+    drag(x, y) {
         if (this.press) {
             this.m_maxX = x;
             this.m_maxY = y;
@@ -4201,7 +4305,7 @@ class OrbitAroundBuildingDragger extends OdBaseDragger {
     setDefaultViewParams() {
         this.setViewParams(this.startCameraParams);
     }
-    drag(x, y, dltX, dltY) {
+    drag(x, y) {
         if (this.press) {
             let dX = x - this.m_startPoint.x;
             let dY = y - this.m_startPoint.y;
@@ -4386,7 +4490,7 @@ class GestureManager extends OdBaseDragger {
         const zoomSpeed = (currentDistance - previousDistance) / 700;
         const zoomFactor = 1 + zoomSpeed;
         const middlePoint = this.getMiddlePoint(this._currentEvents);
-        this._zoomAction.action(middlePoint.x, middlePoint.y, zoomFactor);
+        this._zoomAction.action(middlePoint.x, middlePoint.y, zoomFactor, middlePoint.x, middlePoint.y);
         this.subject.update();
     }
     executePanAction(currentPoint) {
@@ -4394,9 +4498,9 @@ class GestureManager extends OdBaseDragger {
             this.executeEndAction(this._lastGestureAction);
             this._lastGestureAction = GestureAction.Pan;
             OdBaseDragger.isGestureActive = true;
-            this._panAction.beginAction(currentPoint.x, currentPoint.y);
+            this._panAction.beginAction(currentPoint.x, currentPoint.y, currentPoint.x, currentPoint.y);
         }
-        this._panAction.action(currentPoint.x, currentPoint.y);
+        this._panAction.action(currentPoint.x, currentPoint.y, currentPoint.x, currentPoint.y);
         this.subject.update();
     }
     executeOrbitAction(currentPoint) {
@@ -5074,6 +5178,10 @@ class VisualizeMarkup {
             b: b
         };
         this._markupColor = color;
+        this._viewer.emitEvent({
+            type: "changemarkupcolor",
+            data: color
+        });
     }
     colorizeAllMarkup(r = 255, g = 0, b = 0) {
         if (!this._viewer.visualizeJs) return;
@@ -5289,7 +5397,7 @@ class Viewer extends EventEmitter2 {
         return this._markup;
     }
     configure(params) {
-        this._visualizeJsUrl = params.visualizeJsUrl || "https://opencloud.azureedge.net/libs/visualizejs/master/Visualize.js";
+        this._visualizeJsUrl = params.visualizeJsUrl || "https://public-fhemb7e3embacwec.z02.azurefd.net/libs/visualizejs/master/Visualize.js";
         return this;
     }
     async initialize(canvas, onProgress) {
@@ -5349,7 +5457,7 @@ class Viewer extends EventEmitter2 {
         });
         if (this.frameId) cancelAnimationFrame(this.frameId);
         this.frameId = 0;
-        this.setActiveDragger("");
+        this.setActiveDragger();
         this.removeAllListeners();
         if (this._gestureManager) this._gestureManager.dispose();
         this._gestureManager = undefined;
@@ -5594,7 +5702,7 @@ class Viewer extends EventEmitter2 {
     activeDragger() {
         return this._activeDragger;
     }
-    setActiveDragger(name) {
+    setActiveDragger(name = "") {
         var _a;
         if (((_a = this._activeDragger) === null || _a === void 0 ? void 0 : _a.name) !== name) {
             if (this._activeDragger) {
@@ -5623,7 +5731,7 @@ class Viewer extends EventEmitter2 {
     resetActiveDragger() {
         const dragger = this._activeDragger;
         if (dragger) {
-            this.setActiveDragger("");
+            this.setActiveDragger();
             this.setActiveDragger(dragger.name);
         }
     }
@@ -5725,6 +5833,24 @@ class Viewer extends EventEmitter2 {
     setSelected(handles) {
         this.executeCommand("setSelected", handles);
     }
+    clearSelected() {
+        this.executeCommand("clearSelected");
+    }
+    hideSelected() {
+        this.executeCommand("hideSelected");
+    }
+    isolateSelected() {
+        this.executeCommand("isolateSelected");
+    }
+    showAll() {
+        this.executeCommand("showAll");
+    }
+    explode(index = 0) {
+        this.executeCommand("explode", index);
+    }
+    collect() {
+        this.executeCommand("collect");
+    }
     async loadReferences(model) {
         var _a;
         if (!this.visualizeJs) return this;
@@ -5774,7 +5900,8 @@ class Viewer extends EventEmitter2 {
         const overrideOptions = new Options;
         overrideOptions.data = this._options.data;
         if (file.type === ".rcs" && !overrideOptions.enablePartialMode) {
-            console.log("Partial load mode is forced for RCS file");
+            console.log("Partial streaming mode is forced for RCS file");
+            overrideOptions.enableStreamingMode = true;
             overrideOptions.enablePartialMode = true;
         }
         const loaderFactory = new LoaderFactory;
@@ -5892,6 +6019,7 @@ class Viewer extends EventEmitter2 {
         if (!this.visualizeJs) return this;
         const visLib = this.visLib();
         const visViewer = visLib.getViewer();
+        this.setActiveDragger();
         this.clearOverlay();
         visViewer.clear();
         visViewer.createLocalDatabase();
@@ -5904,21 +6032,15 @@ class Viewer extends EventEmitter2 {
         return this;
     }
     getMarkupColor() {
+        console.warn("Viewer.getMarkupColor() has been deprecated since 25.11 and will be removed in a future release, use Viewer.markup.getMarkupColor() instead.");
         return this._markup.getMarkupColor();
     }
     setMarkupColor(r = 255, g = 0, b = 0) {
+        console.warn("Viewer.setMarkupColor() has been deprecated since 25.11 and will be removed in a future release, use Viewer.markup.setMarkupColor() instead.");
         this._markup.setMarkupColor(r, g, b);
-        const color = {
-            r: r,
-            g: g,
-            b: b
-        };
-        this.emitEvent({
-            type: "changemarkupcolor",
-            data: color
-        });
     }
     colorizeAllMarkup(r = 255, g = 0, b = 0) {
+        console.warn("Viewer.colorizeAllMarkup() has been deprecated since 25.11 and will be removed in a future release, use Viewer.markup.colorizeAllMarkup() instead.");
         this._markup.colorizeAllMarkup(r, g, b);
     }
     colorizeSelectedMarkups(r = 255, g = 0, b = 0) {
@@ -5944,10 +6066,10 @@ class Viewer extends EventEmitter2 {
         this._markup.setViewpoint(viewpoint);
     }
     createViewpoint() {
-        const vp = this._markup.getViewpoint();
-        vp.orthogonal_camera = this.getOrthogonalCameraSettings();
-        vp.clipping_planes = this.getClippingPlanes();
-        return vp;
+        const viewpoint = this._markup.getViewpoint();
+        viewpoint.orthogonal_camera = this.getOrthogonalCameraSettings();
+        viewpoint.clipping_planes = this.getClippingPlanes();
+        return viewpoint;
     }
     getPoint3dFromArray(array) {
         return {