geosolutions-it#9548: fix issue of 3D point measurement

mahmoudadel54 · Dec 12, 2023 · c7c4807 · c7c4807
1 parent 468775b
commit c7c4807
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/web/client/utils/cesium/ClickUtils.js b/web/client/utils/cesium/ClickUtils.js
@@ -81,8 +81,9 @@ export function computePositionInfo(map, movement, {
 
     const feature = scene.pick(position);
     const depthCartesian = scene.pickPosition(position);
-
-    if (!!(feature && depthCartesian)) {
+    if (!(feature?.primitive instanceof Cesium.GroundPrimitive)
+    && !(feature?.primitive instanceof Cesium.GroundPolylinePrimitive)
+    && !!(feature && depthCartesian)) {
         return {
             cartesian: depthCartesian,
             cartographic: Cesium.Cartographic.fromCartesian(depthCartesian),

diff --git a/web/client/utils/cesium/DrawGeometryInteraction.js b/web/client/utils/cesium/DrawGeometryInteraction.js
@@ -215,7 +215,11 @@ class CesiumDrawGeometryInteraction {
         this._coordinatesLength = options?.coordinatesLength;
         this._geodesic = options?.geodesic;
         this._sampleTerrain = options?.sampleTerrain;
-        this._getObjectsToExcludeOnPick = options?.getObjectsToExcludeOnPick;
+        this._getObjectsToExcludeOnPick = () => [
+            ...(options?.getObjectsToExcludeOnPick ? options.getObjectsToExcludeOnPick() : []),
+            this._dynamicPrimitivesCollection,
+            this._dynamicBillboardCollection
+        ];
         this._depthTestAgainstTerrain = options?.depthTestAgainstTerrain;
         this._getPositionInfo =  options?.getPositionInfo || defaultGetPositionInfo;