bruce-cesium 5.0.6 → 5.0.7

package/dist/bruce-cesium.es5.js

@@ -645,7 +645,7 @@ var DrawingUtils;
         let cacheTimestamp = null;
         let cachedCameraState = null;
         let cachedPickOnlyState = null;
-        return (viewer, cursor, pickOnly = false) => {
+        return (viewer, cursor, pickOnly = false, ignoredPickOnly) => {
             const scene = viewer.scene;
             const camera = scene.camera;
             // Check if we can use cached position.
@@ -686,12 +686,18 @@ var DrawingUtils;
                     pos3d = null;
                     const ray = scene.camera.getPickRay(cursor);
                     if (scene.pickPositionSupported) {
-                        const pickedObject = scene.pick(cursor, 1, 1);
-                        if (defined(pickedObject) &&
-                            (pickedObject instanceof Cesium3DTileFeature ||
-                                pickedObject.primitive instanceof Cesium3DTileset ||
-                                pickedObject.primitive instanceof Model)) {
-                            pos3d = scene.pickPosition(cursor);
+                        const pickedObjects = scene.drillPick(cursor, !(ignoredPickOnly === null || ignoredPickOnly === void 0 ? void 0 : ignoredPickOnly.length) ? 1 : ignoredPickOnly.length + 1, 3, 3);
+                        for (let i = 0; i < pickedObjects.length; i++) {
+                            let object = pickedObjects[i];
+                            object = (object && object.id && object.id instanceof Entity ? object.id : object);
+                            if (object &&
+                                (!ignoredPickOnly || !ignoredPickOnly.includes(object)) &&
+                                (object instanceof Cesium3DTileFeature ||
+                                    object instanceof Cesium3DTileset ||
+                                    (object instanceof Entity && object.model))) {
+                                pos3d = scene.pickPosition(cursor);
+                                break;
+                            }
                         }
                     }
                     if (!pickOnly && !defined(pos3d)) {
@@ -26880,6 +26886,10 @@ class WidgetCursorBar extends Widget.AWidget {
             </svg>
         `;
         this._generateSecondaryControl("Select", ESecondaryCursor.Select, () => {
+            if (this._walkthroughPinEventRemoval) {
+                this._walkthroughPinEventRemoval();
+                this._walkthroughPinEventRemoval = null;
+            }
             this._selectedSecondaryCursor = ESecondaryCursor.Select;
             this._listenSelection();
         }, selectSvg);
@@ -26889,6 +26899,10 @@ class WidgetCursorBar extends Widget.AWidget {
             </svg>
         `;
         this._generateSecondaryControl("Pan", ESecondaryCursor.Pan, () => {
+            if (this._walkthroughPinEventRemoval) {
+                this._walkthroughPinEventRemoval();
+                this._walkthroughPinEventRemoval = null;
+            }
             if (this._selectedSecondaryCursor == ESecondaryCursor.Pan) {
                 this._selectedSecondaryCursor = ESecondaryCursor.Select;
                 this._listenSelection();
@@ -26918,6 +26932,7 @@ class WidgetCursorBar extends Widget.AWidget {
     _initWalkthroughPin() {
         if (this._walkthroughPinEventRemoval) {
             this._walkthroughPinEventRemoval();
+            this._walkthroughPinEventRemoval = null;
         }
         let pointer;
         let events = new ScreenSpaceEventHandler(this._viewer.scene.canvas);
@@ -26936,35 +26951,20 @@ class WidgetCursorBar extends Widget.AWidget {
             }
         };
         let dropPosition3d;
-        let dropPosition2d;
         let dropOnTerrain = false;
         events.setInputAction((e) => {
             const pos2d = e.endPosition;
             // First try find a position on a 'thing'.
             // This lets us put our pin underground if there is something there.
-            let pos3d = DrawingUtils.GetAccuratePosition(this._viewer, pos2d, true);
+            let pos3d = DrawingUtils.GetAccuratePosition(this._viewer, pos2d, true, pointer ? [pointer] : null);
             dropOnTerrain = false;
             // Fallback to position including terrain as an option.
             if (!Cartes.ValidateCartes3(pos3d)) {
-                pos3d = DrawingUtils.GetAccuratePosition(this._viewer, pos2d, false);
+                pos3d = DrawingUtils.GetAccuratePosition(this._viewer, pos2d, false, pointer ? [pointer] : null);
                 dropOnTerrain = true;
             }
             if (Cartes.ValidateCartes3(pos3d)) {
                 dropPosition3d = pos3d;
-                dropPosition2d = pos2d;
-                if (!pointer) {
-                    pointer = this._viewer.entities.add({
-                        position: new CallbackProperty(() => dropPosition3d, false),
-                        point: {
-                            pixelSize: 10,
-                            color: Color.fromCssColorString("#33B1FF"),
-                            outlineColor: Color.WHITE,
-                            outlineWidth: 2,
-                            heightReference: HeightReference.NONE,
-                            show: true
-                        }
-                    });
-                }
             }
         }, ScreenSpaceEventType.MOUSE_MOVE);
         let processing = false;
@@ -26985,7 +26985,6 @@ class WidgetCursorBar extends Widget.AWidget {
                         dropOnTerrain = true;
                     }
                     dropPosition3d = pos3d;
-                    dropPosition2d = e.position;
                 }
                 let pos3d = dropPosition3d === null || dropPosition3d === void 0 ? void 0 : dropPosition3d.clone();
                 if (Cartes.ValidateCartes3(pos3d)) {
@@ -29361,7 +29360,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "5.0.6";
+const VERSION = "5.0.7";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, DataLabRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar, WidgetControlViewBar, WidgetControlViewBarSearch, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
 //# sourceMappingURL=bruce-cesium.es5.js.map