bruce-cesium 5.0.6 → 5.0.8

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttachment, EntityAttachmentType, EntityAttribute, AbstractApi, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, PolygonHierarchy, ShadowMode, PolylineGraphics, ArcType, CornerType, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 const TIME_LAG = 300;
 const POSITION_CHECK_TIMER = 950;
@@ -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)) {
@@ -26161,19 +26167,28 @@ var Walkthrough;
         });
         let lastCheck;
         let currentTime = new Date();
-        data.tickRemoval = viewer.clock.onTick.addEventListener(async () => {
+        const interval = setInterval(() => {
             lastCheck = new Date();
-            if (lastCheck.getTime() - currentTime.getTime() > (1000 / 60)) {
+            if (lastCheck.getTime() - currentTime.getTime() >= (1000 / 60)) {
                 doMovementTick(viewer);
                 currentTime = new Date();
             }
-        });
-        document.addEventListener("keydown", data.handlerKeyDown = (e) => {
+        }, 1000 / 60);
+        data.tickRemoval = () => {
+            clearInterval(interval);
+        };
+        let keyDown = (e) => {
             checkKeybind(viewer, e.key, true);
-        }, false);
-        document.addEventListener("keyup", data.handlerKeyUp = (e) => {
+        };
+        document.addEventListener("keydown", keyDown, false);
+        let keyUp = (e) => {
             checkKeybind(viewer, e.key, false);
-        }, false);
+        };
+        document.addEventListener("keyup", keyUp, false);
+        data.handlerKeysRemoval = () => {
+            document.removeEventListener("keydown", keyDown);
+            document.removeEventListener("keyup", keyUp);
+        };
         data.handlerScreenSpace.setInputAction((e) => {
             data.actions.set(EAction.Looking, true);
             data.mousePosCurrent = data.mousePosStart = Cartesian2.clone(e.position);
@@ -26195,17 +26210,13 @@ var Walkthrough;
             status: false
         });
         if (data) {
-            (_a = data.screenSpaceHandler) === null || _a === void 0 ? void 0 : _a.destroy();
-            data.screenSpaceHandler = null;
+            (_a = data.handlerScreenSpace) === null || _a === void 0 ? void 0 : _a.destroy();
+            data.handlerScreenSpace = null;
             (_b = data.tickRemoval) === null || _b === void 0 ? void 0 : _b.call(data);
             data.tickRemoval = null;
-            if (data.keyDownHandler) {
-                document.removeEventListener("keydown", data.keyDownHandler);
-                data.keyDownHandler = null;
-            }
-            if (data.keyUpHandler) {
-                document.removeEventListener("keyup", data.keyUpHandler);
-                data.keyUpHandler = null;
+            if (data.handlerKeysRemoval) {
+                data.handlerKeysRemoval();
+                data.handlerKeysRemoval = null;
             }
         }
     }
@@ -26880,6 +26891,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 +26904,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 +26937,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 +26956,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 +26990,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 +29365,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "5.0.6";
+const VERSION = "5.0.8";
 
 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