bruce-cesium 3.6.9 → 3.7.1

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ProjectViewTile, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, Api, EntityRelationType, ENVIRONMENT, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, AbstractApi, ProjectViewBookmark, EntityAttachment, EntityAttachmentType, EntityAttribute, ProjectView, ProjectViewLegacyTile, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, DistanceDisplayCondition, NearFarScalar, Model, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, ColorMaterialProperty, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, OrthographicFrustum, EasingFunction, SceneTransforms, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Quaternion } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, SceneMode, DistanceDisplayCondition, NearFarScalar, Model, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, GeoJsonDataSource, ColorMaterialProperty, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, BoundingSphere, GeometryInstance, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, Intersect, CzmlDataSource, Quaternion } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4669,7 +4669,7 @@ var EntityRenderEngine;
         function Render(params) {
             var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl, metadata, api, image, e_5, iconScale, disableDepthTest, bColor, cColor, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, bOutline, heightRef, pos3d, extrusion, outlineExtrusion, bColor, cColor, size, heightRef, circleBillboard;
+                var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl, metadata, api, image, e_5, iconScale, disableDepthTest, bColor, cColor, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, bOutline, heightRef, pos3d, extrusion, outlineExtrusion, bColor, cColor, size, heightRef, circleBillboard, disableDepthTest;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -4855,6 +4855,7 @@ var EntityRenderEngine;
                                 }
                                 heightRef = getHeightRef(style);
                                 circleBillboard = createCircleBillboard(size, cColor.toCssColorString());
+                                disableDepthTest = Boolean(style.renderOnTop);
                                 cEntity = new Entity({
                                     id: ObjectUtils.UId(10),
                                     // point: {
@@ -4871,7 +4872,8 @@ var EntityRenderEngine;
                                         width: circleBillboard.width,
                                         image: circleBillboard.canvas,
                                         heightReference: heightRef,
-                                        distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
+                                        distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance),
+                                        disableDepthTestDistance: disableDepthTest ? Number.POSITIVE_INFINITY : undefined
                                     },
                                     position: EntityUtils.GetPos({
                                         viewer: params.viewer,
@@ -15634,8 +15636,6 @@ var DataSourceStaticCsvManager;
                                         });
                                     }
                                 }
-                                // Register alarms (and any other Entities that were created).
-                                console.log("entityMapping", entityMapping);
                                 cesiumEntityIds = Object.keys(entityMapping);
                                 for (i = 0; i < cesiumEntityIds.length; i++) {
                                     cesiumEntityId = cesiumEntityIds[i];
@@ -15770,6 +15770,7 @@ function createJourneyCzml(vehicleId, vehicleFileUrl, alarmFileUrl, lineColor, d
                     "name": "Path Segment",
                     "availability": startTime + "/" + endTime,
                     "polyline": {
+                        "clampToGround": true,
                         "positions": {
                             "cartographicDegrees": position.concat(nextPosition)
                         },
@@ -15806,14 +15807,16 @@ function createJourneyCzml(vehicleId, vehicleFileUrl, alarmFileUrl, lineColor, d
                     "pixelSize": 10,
                     "color": {
                         "rgba": [255, 0, 0, 255]
-                    }
+                    },
+                    "heightReference": "CLAMP_TO_GROUND"
                 } : undefined,
                 "billboard": alarmFileUrl ? {
                     "image": alarmFileUrl,
                     "scale": 1,
                     "pixelOffset": {
                         "cartesian2": [0, 0]
-                    }
+                    },
+                    "heightReference": "CLAMP_TO_GROUND"
                 } : undefined
             });
             var entityId = entityIdIndex > -1 ? row[entityIdIndex] : null;
@@ -15823,21 +15826,26 @@ function createJourneyCzml(vehicleId, vehicleFileUrl, alarmFileUrl, lineColor, d
         });
     }
     // Add animated point for the moving item.
-    var vehiclePositions = rows.map(function (row) { return [
-        (new Date(row[dateTimeIndex]).getTime() - new Date(rows[0][dateTimeIndex]).getTime()) / 1000,
-        Number(row[lonIndex]),
-        Number(row[latIndex]),
-        0
-    ]; }).flat();
+    var vehiclePositions = rows.map(function (row) {
+        var position = [
+            (new Date(row[dateTimeIndex]).getTime() - new Date(rows[0][dateTimeIndex]).getTime()) / 1000,
+            Number(row[lonIndex]),
+            Number(row[latIndex]),
+            0
+        ];
+        return position;
+    }).flat();
     czml.push({
         "id": vehicleId,
         "name": "Vehicle",
         "availability": rows[0][dateTimeIndex] + "/" + rows[rows.length - 1][dateTimeIndex],
         "model": vehicleFileUrl ? {
+            "heightReference": "CLAMP_TO_GROUND",
             "gltf": vehicleFileUrl,
             "scale": 1
         } : undefined,
         "point": !vehicleFileUrl ? {
+            "heightReference": "CLAMP_TO_GROUND",
             "pixelSize": 20,
             "color": {
                 "rgba": [0, 0, 255, 255]
@@ -15924,8 +15932,18 @@ function interpolateHeading(dateTimeIndex, rows, currentTime, headingIndex) {
         }
     }
     if (nearestBefore && nearestAfter) {
+        // Normalize headings to handle wraparound from 359 to 0.
+        var deltaHeading = nearestAfter.heading - nearestBefore.heading;
+        if (deltaHeading > 180) {
+            deltaHeading -= 360;
+        }
+        else if (deltaHeading < -180) {
+            deltaHeading += 360;
+        }
         var factor = (currentTimeMs - nearestBefore.time) / (nearestAfter.time - nearestBefore.time);
-        return nearestBefore.heading + factor * (nearestAfter.heading - nearestBefore.heading);
+        var interpolatedHeading = nearestBefore.heading + factor * deltaHeading;
+        interpolatedHeading = (interpolatedHeading + 360) % 360;
+        return interpolatedHeading;
     }
     else if (nearestBefore) {
         return nearestBefore.heading;
@@ -22508,7 +22526,7 @@ var ViewRenderEngine;
     ViewRenderEngine.Render = Render;
 })(ViewRenderEngine || (ViewRenderEngine = {}));
 
-var VERSION = "3.6.9";
+var VERSION = "3.7.1";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map