Merge pull request #6841 from hisayan/fix-userdrawing-drag

fix UserDrawing
TerriaJS · Aug 28, 2023 · 5d10080 · 5d10080
2 parents b14835b + 79e794a
commit 5d10080
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,7 @@
 
 #### next release (8.3.3)
 
+- Fixes broken point dragging interaction for user drawing in 3d-mode.
 - [The next improvement]
 
 #### 8.3.2 - 2023-08-11

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -62,3 +62,4 @@ The following people have contributed to TerriaJS:
 - [Zoran Kokeza](https://github.com/zoran995)
 - [J. Garcia](https://github.com/ctwhome)
 - [Yusuke Kiuchi](https://github.com/ykiu)
+- [Tomoyuki Hisada](https://github.com/hisayan)
diff --git a/lib/Map/DragPoints/CesiumDragPoints.js b/lib/Map/DragPoints/CesiumDragPoints.js
@@ -64,13 +64,13 @@ CesiumDragPoints.prototype.setUp = function () {
   if (
     !defined(this._terria.cesium) ||
     !defined(this._terria.cesium.scene) ||
-    !defined(this._terria.cesium.viewer)
+    !defined(this._terria.cesium.cesiumWidget)
   ) {
     // Test context or something has gone *so* badly wrong
     return;
   }
   this._scene = this._terria.cesium.scene;
-  this._viewer = this._terria.cesium.viewer;
+  this._viewer = this._terria.cesium.cesiumWidget;
   this._mouseHandler = new ScreenSpaceEventHandler(this._scene.canvas, false);
 
   var that = this;

diff --git a/lib/Map/DragPoints/DragPoints.js b/lib/Map/DragPoints/DragPoints.js
@@ -3,7 +3,7 @@
 var defined = require("terriajs-cesium/Source/Core/defined").default;
 var CesiumDragPoints = require("./CesiumDragPoints");
 var LeafletDragPoints = require("./LeafletDragPoints");
-var ViewerMode = require("../../Models/ViewerMode");
+var ViewerMode = require("../../Models/ViewerMode").default;
 
 /**
  * Callback for when a point is moved.
@@ -79,7 +79,7 @@ DragPoints.prototype._createDragPointsHelper = function (pointMovedCallback) {
   if (defined(this._dragPointsHelper)) {
     this._dragPointsHelper.destroy();
   }
-  if (this._terria.viewerMode === ViewerMode.Leaflet) {
+  if (this._terria.mainViewer.viewerMode === ViewerMode.Leaflet) {
     this._dragPointsHelper = new LeafletDragPoints(
       this._terria,
       pointMovedCallback