bruce-cesium 3.7.0 → 3.7.2

package/dist/bruce-cesium.umd.js

@@ -949,15 +949,19 @@
         if (!prop) {
             return Cesium.Color.WHITE;
         }
+        var date = viewer.scene.lastRenderTime;
+        if (!date) {
+            date = viewer.clock.currentTime;
+        }
         if (prop.getValue) {
-            prop = prop.getValue(viewer.scene.lastRenderTime);
+            prop = prop.getValue(date);
         }
         if (prop instanceof Cesium.Color) {
             return prop;
         }
         var tmp = prop === null || prop === void 0 ? void 0 : prop.color;
         if (tmp === null || tmp === void 0 ? void 0 : tmp.getValue) {
-            tmp = tmp.getValue(viewer.scene.lastRenderTime);
+            tmp = tmp.getValue(date);
         }
         return tmp ? tmp : Cesium.Color.WHITE;
     }
@@ -1087,7 +1091,7 @@
                 graphic.color = color;
             }
             else if (graphic instanceof Cesium.ModelGraphics) {
-                graphic.color = color;
+                graphic.color = new Cesium.ConstantProperty(color);
             }
             else if (graphic instanceof Cesium.PolygonGraphics) {
                 graphic.material = new Cesium.ColorMaterialProperty(color);
@@ -1099,10 +1103,10 @@
                 graphic.material = new Cesium.ColorMaterialProperty(color);
             }
             else if (graphic instanceof Cesium.PointGraphics) {
-                graphic.color = color;
+                graphic.color = new Cesium.ConstantProperty(color);
             }
             else if (graphic instanceof Cesium.BillboardGraphics) {
-                graphic.color = color;
+                graphic.color = new Cesium.ConstantProperty(color);
             }
             else if (graphic instanceof Cesium.EllipseGraphics) {
                 graphic.material = new Cesium.ColorMaterialProperty(color);
@@ -1623,7 +1627,11 @@
     }
     function GetValue(viewer, obj) {
         if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
-            return obj.getValue(viewer.scene.lastRenderTime);
+            var date = viewer.scene.lastRenderTime;
+            if (!date) {
+                date = viewer.clock.currentTime;
+            }
+            return obj.getValue(date);
         }
         return obj;
     }
@@ -2566,6 +2574,7 @@
                                     if (isNaN(roll)) {
                                         roll = 0;
                                     }
+                                    console.log(tSettings, entity);
                                     matrix4 = entity.worldPosition;
                                     offset = new Cesium.Cartesian3(+matrix4[0][3], +matrix4[1][3], +matrix4[2][3]);
                                     if (entity.worldPivot) //the position from worldMatrix + center of geometry offset
@@ -3241,19 +3250,28 @@
                 clock.startTime = startTime;
             }
             else if (startTimeIso) {
-                clock.startTime = Cesium.JulianDate.fromIso8601(params.startTimeIso);
+                var startDate = Cesium.JulianDate.fromIso8601(startTimeIso);
+                if (startDate) {
+                    clock.startTime = startDate;
+                }
             }
             if (currentTime) {
                 clock.currentTime = currentTime;
             }
             else if (currentTimeIso) {
-                clock.currentTime = Cesium.JulianDate.fromIso8601(params.currentTimeIso);
+                var currentDate = Cesium.JulianDate.fromIso8601(currentTimeIso);
+                if (currentDate) {
+                    clock.currentTime = currentDate;
+                }
             }
             if (stopTime) {
                 clock.stopTime = stopTime;
             }
             else if (stopTimeIso) {
-                clock.stopTime = Cesium.JulianDate.fromIso8601(params.stopTimeIso);
+                var stopDate = Cesium.JulianDate.fromIso8601(stopTimeIso);
+                if (stopDate) {
+                    clock.stopTime = stopDate;
+                }
             }
             clock.clockRange = Cesium.ClockRange.LOOP_STOP;
             var areCesiumValues = clock[CESIUM_TIMELINE_KEY] != true;
@@ -3381,7 +3399,11 @@
     }
     function getValue(viewer, obj) {
         if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
-            return obj.getValue(viewer.scene.lastRenderTime);
+            var date = viewer.scene.lastRenderTime;
+            if (!date) {
+                date = viewer.clock.currentTime;
+            }
+            return obj.getValue(date);
         }
         return obj;
     }
@@ -3992,7 +4014,11 @@
     }
     function getValue$1(viewer, obj) {
         if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
-            return obj.getValue(viewer.scene.lastRenderTime);
+            var date = viewer.scene.lastRenderTime;
+            if (!date) {
+                date = viewer.clock.currentTime;
+            }
+            return obj.getValue(date);
         }
         return obj;
     }
@@ -4659,7 +4685,7 @@
             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:
@@ -4845,6 +4871,7 @@
                                     }
                                     heightRef = getHeightRef(style);
                                     circleBillboard = createCircleBillboard(size, cColor.toCssColorString());
+                                    disableDepthTest = Boolean(style.renderOnTop);
                                     cEntity = new Cesium.Entity({
                                         id: bruceModels.ObjectUtils.UId(10),
                                         // point: {
@@ -4861,7 +4888,8 @@
                                             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: exports.EntityUtils.GetPos({
                                             viewer: params.viewer,
@@ -5424,7 +5452,7 @@
                         color: color,
                         distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
                     },
-                    orientation: orientation,
+                    orientation: new Cesium.ConstantProperty(orientation),
                     position: pos,
                     show: true
                 });
@@ -6337,7 +6365,11 @@
     */
     function getValue$2(viewer, obj) {
         if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
-            return obj.getValue(viewer.scene.lastRenderTime);
+            var date = viewer.scene.lastRenderTime;
+            if (!date) {
+                date = viewer.clock.currentTime;
+            }
+            return obj.getValue(date);
         }
         return obj;
     }
@@ -7936,7 +7968,11 @@
 
     function GetValue$1(viewer, obj) {
         if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
-            return obj.getValue(viewer.scene.lastRenderTime);
+            var date = viewer.scene.lastRenderTime;
+            if (!date) {
+                date = viewer.clock.currentTime;
+            }
+            return obj.getValue(date);
         }
         return obj;
     }
@@ -8536,12 +8572,12 @@
                 var centroid = this_1.calculateCentroid(cluster.points);
                 var count = cluster.points.length;
                 if (clusterEntity) {
-                    clusterEntity.position = Cesium.Cartesian3.fromDegrees(centroid.lon, centroid.lat, 150);
+                    clusterEntity.position = new Cesium.ConstantPositionProperty(Cesium.Cartesian3.fromDegrees(centroid.lon, centroid.lat, 150));
                     clusterEntity.billboard.image = new Cesium.CallbackProperty(function () {
                         return getCanvas(count);
                     }, false),
-                        clusterEntity.billboard.width = getScale(cluster.points.length);
-                    clusterEntity.billboard.height = getScale(cluster.points.length);
+                        clusterEntity.billboard.width = new Cesium.ConstantProperty(getScale(cluster.points.length));
+                    clusterEntity.billboard.height = new Cesium.ConstantProperty(getScale(cluster.points.length));
                 }
                 else {
                     clusterEntity = this_1.viewer.entities.add({
@@ -8796,7 +8832,11 @@
     var CHECK_BATCH_SIZE = 250;
     function getValue$3(viewer, obj) {
         if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
-            return obj.getValue(viewer.scene.lastRenderTime);
+            var date = viewer.scene.lastRenderTime;
+            if (!date) {
+                date = viewer.clock.currentTime;
+            }
+            return obj.getValue(date);
         }
         return obj;
     }
@@ -9376,9 +9416,9 @@
                                             curWidth == width) {
                                             return;
                                         }
-                                        thing.polygon.material = cFillColor_1;
-                                        thing.polygon.outlineColor = cLineColor_1;
-                                        thing.polygon.outlineWidth = width;
+                                        thing.polygon.material = new Cesium.ColorMaterialProperty(cFillColor_1);
+                                        thing.polygon.outlineColor = new Cesium.ConstantProperty(cLineColor_1);
+                                        thing.polygon.outlineWidth = new Cesium.ConstantProperty(width);
                                     }
                                     else if (thing.polyline) {
                                         var bColor = lStyle.lineColor ? bruceModels.Calculator.GetColor(lStyle.lineColor, data, []) : null;
@@ -9400,8 +9440,8 @@
                                             curWidth == width) {
                                             return;
                                         }
-                                        thing.polyline.material = cColor;
-                                        thing.polyline.width = width;
+                                        thing.polyline.material = new Cesium.ColorMaterialProperty(cColor);
+                                        thing.polyline.width = new Cesium.ConstantProperty(width);
                                     }
                                 };
                                 toForceUpdate = [];
@@ -9663,7 +9703,11 @@
     var CHECK_BATCH_SIZE$1 = 250;
     function getValue$4(viewer, obj) {
         if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
-            return obj.getValue(viewer.scene.lastRenderTime);
+            var date = viewer.scene.lastRenderTime;
+            if (!date) {
+                date = viewer.clock.currentTime;
+            }
+            return obj.getValue(date);
         }
         return obj;
     }
@@ -10183,9 +10227,9 @@
                                             curWidth == width) {
                                             return;
                                         }
-                                        thing.polygon.material = cFillColor_1;
-                                        thing.polygon.outlineColor = cLineColor_1;
-                                        thing.polygon.outlineWidth = width;
+                                        thing.polygon.material = new Cesium.ColorMaterialProperty(cFillColor_1);
+                                        thing.polygon.outlineColor = new Cesium.ConstantProperty(cLineColor_1);
+                                        thing.polygon.outlineWidth = new Cesium.ConstantProperty(width);
                                     }
                                     else if (thing.polyline) {
                                         var bColor = lStyle.lineColor ? bruceModels.Calculator.GetColor(lStyle.lineColor, data, []) : null;
@@ -10207,8 +10251,8 @@
                                             curWidth == width) {
                                             return;
                                         }
-                                        thing.polyline.material = cColor;
-                                        thing.polyline.width = width;
+                                        thing.polyline.material = new Cesium.ColorMaterialProperty(cColor);
+                                        thing.polyline.width = new Cesium.ConstantProperty(width);
                                     }
                                 };
                                 toForceUpdate = [];
@@ -10378,7 +10422,11 @@
     var BATCH_SIZE$2 = 500;
     function getValue$5(viewer, obj) {
         if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
-            return obj.getValue(viewer.scene.lastRenderTime);
+            var date = viewer.scene.lastRenderTime;
+            if (!date) {
+                date = viewer.clock.currentTime;
+            }
+            return obj.getValue(date);
         }
         return obj;
     }
@@ -10783,9 +10831,9 @@
                                             curWidth == width) {
                                             return;
                                         }
-                                        thing.polygon.material = cFillColor_1;
-                                        thing.polygon.outlineColor = cLineColor_1;
-                                        thing.polygon.outlineWidth = width;
+                                        thing.polygon.material = new Cesium.ColorMaterialProperty(cFillColor_1);
+                                        thing.polygon.outlineColor = new Cesium.ConstantProperty(cLineColor_1);
+                                        thing.polygon.outlineWidth = new Cesium.ConstantProperty(width);
                                     }
                                     else if (thing.polyline) {
                                         var bColor = lStyle.lineColor ? bruceModels.Calculator.GetColor(lStyle.lineColor, data, []) : null;
@@ -10807,8 +10855,8 @@
                                             curWidth == width) {
                                             return;
                                         }
-                                        thing.polyline.material = cColor;
-                                        thing.polyline.width = width;
+                                        thing.polyline.material = new Cesium.ColorMaterialProperty(cColor);
+                                        thing.polyline.width = new Cesium.ConstantProperty(width);
                                     }
                                 };
                                 toForceUpdate = [];
@@ -15837,7 +15885,7 @@
                     var radians = Cesium.Math.toRadians(interpolatedHeading - 90);
                     var quaternion = Cesium.Transforms.headingPitchRollQuaternion(currentPosition, new Cesium.HeadingPitchRoll(radians, 0, 0));
                     if (!isNaN(quaternion.w) && !isNaN(quaternion.x) && !isNaN(quaternion.y) && !isNaN(quaternion.z)) {
-                        vehicleEntity.orientation = quaternion;
+                        vehicleEntity.orientation = new Cesium.ConstantProperty(quaternion);
                         return;
                     }
                     else {
@@ -15855,7 +15903,7 @@
             var direction = Cesium.Cartesian3.subtract(currentPosition, previousPosition, new Cesium.Cartesian3());
             Cesium.Cartesian3.normalize(direction, direction);
             var rotationMatrix = Cesium.Transforms.rotationMatrixFromPositionVelocity(previousPosition, direction);
-            vehicleEntity.orientation = Cesium.Quaternion.fromRotationMatrix(rotationMatrix);
+            vehicleEntity.orientation = new Cesium.ConstantProperty(Cesium.Quaternion.fromRotationMatrix(rotationMatrix));
         }
     }
     function interpolateHeading(dateTimeIndex, rows, currentTime, headingIndex) {
@@ -19637,16 +19685,21 @@
                 clearInterval(interval);
                 return;
             }
-            // Check if last render time is greater than 3 seconds ago.
-            // We check in case something else is also requesting renders.
-            var lastRenderTime = viewer.scene.lastRenderTime;
-            if (!lastRenderTime || Cesium.JulianDate.secondsDifference(Cesium.JulianDate.now(), lastRenderTime) > 3) {
-                // Check if window is active/in focus.
-                // TODO: Should render the moment it is in focus as well.
-                if (document.hasFocus()) {
-                    viewer.scene.requestRender();
+            try {
+                // Check if last render time is greater than 3 seconds ago.
+                // We check in case something else is also requesting renders.
+                var lastRenderTime = viewer.scene.lastRenderTime;
+                if (!lastRenderTime || Cesium.JulianDate.secondsDifference(Cesium.JulianDate.now(), lastRenderTime) > 3) {
+                    // Check if window is active/in focus.
+                    // TODO: Should render the moment it is in focus as well.
+                    if (document.hasFocus()) {
+                        viewer.scene.requestRender();
+                    }
                 }
             }
+            catch (e) {
+                console.error("backgroundRendering", e);
+            }
         }, 1500);
     }
     // Cache of Cesium Token -> Validity.
@@ -21825,7 +21878,9 @@
                         if (pointer != null) {
                             clock = manager.Viewer.clock;
                             timeStr = Cesium.JulianDate.toIso8601(pointer);
-                            clock.currentTime = Cesium.JulianDate.fromIso8601(timeStr);
+                            if (timeStr) {
+                                clock.currentTime = Cesium.JulianDate.fromIso8601(timeStr);
+                            }
                         }
                         enabledItems = manager.GetEnabledItemIds();
                         newItemIds = (_d = bSettings === null || bSettings === void 0 ? void 0 : bSettings.selectedItemIds) !== null && _d !== void 0 ? _d : [];
@@ -22460,7 +22515,7 @@
         ViewRenderEngine.Render = Render;
     })(exports.ViewRenderEngine || (exports.ViewRenderEngine = {}));
 
-    var VERSION = "3.7.0";
+    var VERSION = "3.7.2";
 
     exports.VERSION = VERSION;
     exports.CesiumParabola = CesiumParabola;