bruce-cesium 3.6.5 → 3.6.6

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, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, ColorMaterialProperty, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, PolygonPipeline, CesiumInspector, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, ColorMaterialProperty, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, HeadingPitchRoll, Transforms, Matrix3, IonResource, CesiumInspector, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, PolylineGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolygonHierarchy, ScreenSpaceEventHandler, ScreenSpaceEventType, ShadowMode, ClassificationType, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ArcType, CornerType, ColorBlendMode, CzmlDataSource, Quaternion, Intersect } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -15348,19 +15348,19 @@ var DataSourceStaticCsvManager;
         Manager.prototype.renderMovingItem = function () {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var api, vehicleFileUrl, alarmFileUrl, lineColor, fileStrings, files, i, file, fileId, externalURL, fileUrl, fileStr, csvData, i, delimiter, fileStr, headers, rows, rowsArr, j, row, rowArr, primary, pHeaders, pLatIndex, pLonIndex, pDateTimeIndex, i, row, lat, lon, dateTimeStr, dateTime, _b, datePart, timePart, _c, year, month, day, _d, hours, minutes, seconds, milliseconds, utcDate, vehicleId, czml, czmlAdjusted, curDateTime, source, errorsInARow_1, removal_1;
+                var api, vehicleFileUrl, alarmFileUrl, lineColor, fileStrings, files, i, file, fileId, externalURL, fileUrl, fileStr, csvData, i, delimiter, fileStr, headers, rows, rowsArr, j, row, rowArr, primary, pHeaders, pLatIndex, pLonIndex, pDateTimeIndex, i, row, lat, lon, dateTimeStr, utcDate, _b, datePart, timePart, _c, year, month, day, _d, hours, minutes, seconds, milliseconds, convertTo24HourFormat, dateTime24hr, _e, datePart, timePart, _f, day, month, year, _g, hours, minutes, seconds, _h, datePart, timePart, _j, year, month, day, _k, hours, minutes, seconds, vehicleId, czml, czmlAdjusted, curDateTime, source, pHeadingIndex_1, errorsInARow_1, removal_1;
                 var _this = this;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_l) {
+                    switch (_l.label) {
                         case 0:
                             api = this.apiGetter.getApi();
                             return [4 /*yield*/, api.Loading];
                         case 1:
-                            _e.sent();
+                            _l.sent();
                             fileStrings = [];
                             files = this.item.CSV;
                             i = 0;
-                            _e.label = 2;
+                            _l.label = 2;
                         case 2:
                             if (!(i < files.length)) return [3 /*break*/, 6];
                             file = files[i];
@@ -15381,9 +15381,9 @@ var DataSourceStaticCsvManager;
                                 fileUrl = externalURL;
                             }
                             return [4 /*yield*/, fetch(fileUrl)];
-                        case 3: return [4 /*yield*/, (_e.sent()).text()];
+                        case 3: return [4 /*yield*/, (_l.sent()).text()];
                         case 4:
-                            fileStr = _e.sent();
+                            fileStr = _l.sent();
                             fileStrings.push(fileStr);
                             if (this.disposed) {
                                 return [2 /*return*/];
@@ -15405,7 +15405,7 @@ var DataSourceStaticCsvManager;
                                     viaCdn: true
                                 });
                             }
-                            _e.label = 5;
+                            _l.label = 5;
                         case 5:
                             i++;
                             return [3 /*break*/, 2];
@@ -15448,19 +15448,47 @@ var DataSourceStaticCsvManager;
                                 }
                                 dateTimeStr = row[pDateTimeIndex];
                                 if (typeof dateTimeStr === "string") {
-                                    // Check if format is expected.
-                                    if (!dateTimeStr.includes("/") || !dateTimeStr.includes(":")) {
-                                        dateTime = new Date(row[pDateTimeIndex]);
-                                        row[pDateTimeIndex] = dateTime.toISOString();
-                                    }
-                                    else {
+                                    utcDate = void 0;
+                                    // Dates are assumed to be in UTC.
+                                    // Check for the format: `2023/12/24 04:15:00.743`.
+                                    if (dateTimeStr.includes("/") && dateTimeStr.includes(":")) {
                                         _b = dateTimeStr.split(" "), datePart = _b[0], timePart = _b[1];
                                         _c = datePart.split("/").map(Number), year = _c[0], month = _c[1], day = _c[2];
                                         _d = timePart.split(":").map(Number), hours = _d[0], minutes = _d[1], seconds = _d[2];
                                         milliseconds = seconds % 1 * 1000;
                                         utcDate = new Date(Date.UTC(year, month - 1, day, hours, minutes, Math.floor(seconds), milliseconds));
-                                        row[pDateTimeIndex] = utcDate.toISOString();
                                     }
+                                    // Check for the format: `24-12-2023  4:15:12 AM`.
+                                    else if (dateTimeStr.includes("-") && dateTimeStr.includes(":") && (dateTimeStr.includes("AM") || dateTimeStr.includes("PM"))) {
+                                        convertTo24HourFormat = function (dateTimeStr) {
+                                            var _a = dateTimeStr.split(/[: ]+/), datePart = _a[0], timePart = _a[1], meridian = _a[2];
+                                            var _b = timePart.split(":").map(Number), hours = _b[0], minutes = _b[1], seconds = _b[2];
+                                            if (meridian === 'PM' && hours < 12) {
+                                                hours += 12;
+                                            }
+                                            if (meridian === 'AM' && hours === 12) {
+                                                hours = 0;
+                                            }
+                                            return "".concat(datePart, " ").concat(hours.toString().padStart(2, '0'), ":").concat(minutes.toString().padStart(2, '0'), ":").concat(seconds.toString().padStart(2, '0'));
+                                        };
+                                        dateTime24hr = convertTo24HourFormat(dateTimeStr);
+                                        _e = dateTime24hr.split(" "), datePart = _e[0], timePart = _e[1];
+                                        _f = datePart.split("-").map(Number), day = _f[0], month = _f[1], year = _f[2];
+                                        _g = timePart.split(":").map(Number), hours = _g[0], minutes = _g[1], seconds = _g[2];
+                                        utcDate = new Date(Date.UTC(year, month - 1, day, hours, minutes, seconds));
+                                    }
+                                    // Format: `2023-12-24 04:19:17.196`.
+                                    else if (dateTimeStr.includes("-") && dateTimeStr.includes(":")) {
+                                        _h = dateTimeStr.split(" "), datePart = _h[0], timePart = _h[1];
+                                        _j = datePart.split("-").map(Number), year = _j[0], month = _j[1], day = _j[2];
+                                        _k = timePart.split(":").map(Number), hours = _k[0], minutes = _k[1], seconds = _k[2];
+                                        utcDate = new Date(Date.UTC(year, month - 1, day, hours, minutes, seconds));
+                                    }
+                                    else {
+                                        // Fallback to parsing in local time.
+                                        utcDate = new Date(dateTimeStr);
+                                    }
+                                    row[pDateTimeIndex] = utcDate.toISOString();
                                 }
                             }
                             // Sort by date.
@@ -15479,19 +15507,20 @@ var DataSourceStaticCsvManager;
                             curDateTime = this.viewer.clock.currentTime;
                             return [4 /*yield*/, this.viewer.dataSources.add(CzmlDataSource.load(czmlAdjusted))];
                         case 7:
-                            source = _e.sent();
+                            source = _l.sent();
                             this.dataSource = source;
                             // Reset back to the previous dateTime.
                             // Adding the czml data source will have changed the clock.
                             this.viewer.clock.currentTime = curDateTime;
                             // Listen to update ticks and ensure orientation of moving item is correct.
                             if (this.viewer.clock) {
+                                pHeadingIndex_1 = pHeaders.findIndex(function (x) { return x.toLowerCase().includes("head"); });
                                 errorsInARow_1 = 0;
                                 removal_1 = this.viewer.clock.onTick.addEventListener(function () {
                                     var vehicle = source.entities.getById(vehicleId);
                                     if (vehicle) {
                                         try {
-                                            updateOrientation(_this.viewer, vehicle);
+                                            updateOrientation(primary.rows, pHeadingIndex_1, pDateTimeIndex, _this.viewer, vehicle);
                                             errorsInARow_1 = 0;
                                         }
                                         catch (e) {
@@ -15573,6 +15602,7 @@ function createJourneyCzml(vehicleId, vehicleFileUrl, alarmFileUrl, lineColor, d
             }
         },
     ];
+    // Create a polyline for the full path.
     // If segmented we'll break it into pieces and display each piece based on relative time to the cesium viewer clock.
     {
         // Calculate the total duration of the journey in milliseconds.
@@ -15616,49 +15646,38 @@ function createJourneyCzml(vehicleId, vehicleFileUrl, alarmFileUrl, lineColor, d
                 });
             }
         });
-    }
-    // Add points for the alarms.
-    rows.filter(function (row) { return row[alarmIndex]; }).forEach(function (row, index) {
-        czml.push({
-            "id": ObjectUtils.UId(),
-            "name": "Alarm",
-            "position": {
-                "cartographicDegrees": [
-                    Number(row[lonIndex]),
-                    Number(row[latIndex]),
-                    5
-                ]
-            },
-            "point": !alarmFileUrl ? {
-                "pixelSize": 10,
-                "color": {
-                    "rgba": [255, 0, 0, 255]
-                }
-            } : undefined,
-            "billboard": alarmFileUrl ? {
-                "image": alarmFileUrl,
-                "scale": 1,
-                "pixelOffset": {
-                    "cartesian2": [0, 0]
-                }
-            } : undefined,
-            /*
-            "label": {
-                "text": row[alarmIndex],
-                "show": true,
-                "font": "11pt monospace",
-                "style": "FILL",
-                "outlineColor": {
-                    "rgba": [0, 0, 0, 255]
+        // Alarm points.
+        rows.filter(function (row) { return row[alarmIndex]; }).forEach(function (row, index) {
+            var alarmTime = new Date(row[dateTimeIndex]).getTime();
+            var startTime = new Date(alarmTime - visibilityDuration_1 / 2).toISOString();
+            var endTime = new Date(alarmTime + visibilityDuration_1 / 2).toISOString();
+            czml.push({
+                "id": ObjectUtils.UId(),
+                "name": "Alarm",
+                "availability": startTime + "/" + endTime,
+                "position": {
+                    "cartographicDegrees": [
+                        Number(row[lonIndex]),
+                        Number(row[latIndex]),
+                        5
+                    ]
                 },
-                "outlineWidth": 2,
-                "pixelOffset": {
-                    "cartesian2": [0, -16]
-                }
-            }
-            */
+                "point": !alarmFileUrl ? {
+                    "pixelSize": 10,
+                    "color": {
+                        "rgba": [255, 0, 0, 255]
+                    }
+                } : undefined,
+                "billboard": alarmFileUrl ? {
+                    "image": alarmFileUrl,
+                    "scale": 1,
+                    "pixelOffset": {
+                        "cartesian2": [0, 0]
+                    }
+                } : undefined
+            });
         });
-    });
+    }
     // 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,
@@ -15692,27 +15711,80 @@ function createJourneyCzml(vehicleId, vehicleFileUrl, alarmFileUrl, lineColor, d
 }
 /**
  * Updates the orientation of the moving item.
- * This is done by calculating the direction of travel between the current and previous positions.
+ * If there is a heading in the file then it will calculate based on the file data,
+ * if there isn't then it will calculate one based on the previous and current position.
+ * @param rows
+ * @param headingIndex
+ * @param dateTimeIndex
  * @param viewer
  * @param vehicleEntity
  * @returns
  */
-function updateOrientation(viewer, vehicleEntity) {
+function updateOrientation(rows, headingIndex, dateTimeIndex, viewer, vehicleEntity) {
     if (!vehicleEntity || !vehicleEntity.position) {
         return;
     }
     var positionProperty = vehicleEntity.position;
     var currentTime = viewer.clock.currentTime;
-    var previousTime = JulianDate.addSeconds(currentTime, -1, new JulianDate());
     var currentPosition = positionProperty.getValue(currentTime);
+    if (!currentPosition) {
+        return;
+    }
+    if (headingIndex > -1) {
+        try {
+            var interpolatedHeading = interpolateHeading(dateTimeIndex, rows, currentTime, headingIndex);
+            if (interpolatedHeading !== null) {
+                var radians = Math$1.toRadians(interpolatedHeading - 90);
+                var quaternion = Transforms.headingPitchRollQuaternion(currentPosition, new HeadingPitchRoll(radians, 0, 0));
+                if (!isNaN(quaternion.w) && !isNaN(quaternion.x) && !isNaN(quaternion.y) && !isNaN(quaternion.z)) {
+                    vehicleEntity.orientation = quaternion;
+                    return;
+                }
+                else {
+                    console.error("Invalid quaternion", quaternion);
+                }
+            }
+        }
+        catch (e) {
+            console.error(e);
+        }
+    }
+    var previousTime = JulianDate.addSeconds(currentTime, -1, new JulianDate());
     var previousPosition = positionProperty.getValue(previousTime);
-    if (currentPosition && previousPosition && !Cartesian3.equals(currentPosition, previousPosition)) {
+    if (previousPosition && !Cartesian3.equals(currentPosition, previousPosition)) {
         var direction = Cartesian3.subtract(currentPosition, previousPosition, new Cartesian3());
         Cartesian3.normalize(direction, direction);
         var rotationMatrix = Transforms.rotationMatrixFromPositionVelocity(previousPosition, direction);
         vehicleEntity.orientation = Quaternion.fromRotationMatrix(rotationMatrix);
     }
 }
+function interpolateHeading(dateTimeIndex, rows, currentTime, headingIndex) {
+    var currentTimeMs = JulianDate.toDate(currentTime).getTime();
+    var nearestBefore = null;
+    var nearestAfter = null;
+    for (var _i = 0, rows_1 = rows; _i < rows_1.length; _i++) {
+        var row = rows_1[_i];
+        var time = new Date(row[dateTimeIndex]).getTime();
+        var heading = parseFloat(String(row[headingIndex]));
+        if (!isNaN(heading)) {
+            if (time <= currentTimeMs) {
+                nearestBefore = { time: time, heading: heading };
+            }
+            else if (time > currentTimeMs && nearestAfter === null) {
+                nearestAfter = { time: time, heading: heading };
+                break;
+            }
+        }
+    }
+    if (nearestBefore && nearestAfter) {
+        var factor = (currentTimeMs - nearestBefore.time) / (nearestAfter.time - nearestBefore.time);
+        return nearestBefore.heading + factor * (nearestAfter.heading - nearestBefore.heading);
+    }
+    else if (nearestBefore) {
+        return nearestBefore.heading;
+    }
+    return null;
+}
 
 var TilesetI3sRenderManager;
 (function (TilesetI3sRenderManager) {
@@ -22272,7 +22344,7 @@ var ViewRenderEngine;
     ViewRenderEngine.Render = Render;
 })(ViewRenderEngine || (ViewRenderEngine = {}));
 
-var VERSION = "3.6.5";
+var VERSION = "3.6.6";
 
 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, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map