bruce-cesium 0.6.8 → 0.7.0

package/dist/bruce-cesium.es5.js

@@ -1,5 +1,5 @@
 import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, DelayQueue, Entity as Entity$1, BatchedDataGetter, ObjectUtils, Tileset, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, TilesetExtMapTiles, ProgramKey, Camera } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, HeadingPitchRange, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileset, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, EllipsoidGeodesic, KmlDataSource, createOsmBuildings, Cesium3DTileStyle } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, HeadingPitchRange, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileset, EllipsoidGeodesic, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, createOsmBuildings, Cesium3DTileStyle, KmlDataSource } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -423,6 +423,24 @@ var MeasureUtils;
     MeasureUtils.MeasurePolyline = MeasurePolyline;
 })(MeasureUtils || (MeasureUtils = {}));
 
+/**
+ * Ensures a number is returned from a given value.
+ * If given value cannot be parsed it will return defaultNum.
+ * @param value
+ * @param defaultNum default is 0.
+ * @returns
+ */
+function EnsureNumber(value, defaultNum) {
+    if (!defaultNum) {
+        defaultNum = 0;
+    }
+    value = Number(value);
+    if (isNaN(value)) {
+        return defaultNum;
+    }
+    return value;
+}
+
 function traverseEntity(cEntity, arr) {
     if (cEntity._parentEntity) {
         traverseEntity(cEntity._parentEntity, arr);
@@ -555,7 +573,7 @@ var EntityUtils;
         function evaluate() {
             if (entity.location && Carto.ValidateCarto(entity.location)) {
                 var location_1 = entity.location;
-                return Cartesian3.fromDegrees(Number(location_1.longitude), Number(location_1.latitude), Number(location_1.altitude));
+                return Cartesian3.fromDegrees(EnsureNumber(location_1.longitude), EnsureNumber(location_1.latitude), EnsureNumber(location_1.altitude));
             }
             if (entity.geometry && typeof entity.geometry == "object") {
                 var pointStr = entity.geometry.Point;
@@ -563,14 +581,14 @@ var EntityUtils;
                     var points = Geometry.ParsePoints(pointStr);
                     var point = points.length > 0 ? points[0] : null;
                     if (point && Carto.ValidateCarto(point)) {
-                        return Cartesian3.fromDegrees(Number(point.longitude), Number(point.latitude), Number(point.altitude));
+                        return Cartesian3.fromDegrees(EnsureNumber(point.longitude), EnsureNumber(point.latitude), EnsureNumber(point.altitude));
                     }
                 }
                 var lineStr = entity.geometry.LineString;
                 if (lineStr && typeof lineStr == "string") {
                     var points = Geometry.ParsePoints(lineStr);
                     if (points.length > 0) {
-                        var posses = points.map(function (x) { return Cartesian3.fromDegrees(Number(x.longitude), Number(x.latitude), Number(x.altitude)); });
+                        var posses = points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.altitude)); });
                         var length_1 = MeasureUtils.MeasurePolyline(posses);
                         if (length_1 > 0) {
                             var point = DrawingUtils.PointAcrossPolyline(viewer, posses, length_1 / 2);
@@ -590,15 +608,15 @@ var EntityUtils;
                         var points = Geometry.ParsePoints(boundary.LinearRing);
                         var point = Carto.GetCenter(points);
                         if (point && Carto.ValidateCarto(point)) {
-                            return Cartesian3.fromDegrees(Number(point.longitude), Number(point.latitude), Number(point.altitude));
+                            return Cartesian3.fromDegrees(EnsureNumber(point.longitude), EnsureNumber(point.latitude), EnsureNumber(point.altitude));
                         }
                     }
                 }
             }
             if (entity.boundaries) {
                 var point = {
-                    latitude: (Number(entity.boundaries.minLatitude) + Number(entity.boundaries.maxLatitude)) / 2,
-                    longitude: (Number(entity.boundaries.minLongitude) + Number(entity.boundaries.maxLongitude)) / 2,
+                    latitude: (EnsureNumber(entity.boundaries.minLatitude) + EnsureNumber(entity.boundaries.maxLatitude)) / 2,
+                    longitude: (EnsureNumber(entity.boundaries.minLongitude) + EnsureNumber(entity.boundaries.maxLongitude)) / 2,
                     altitude: 0
                 };
                 if (point && Carto.ValidateCarto(point)) {
@@ -766,7 +784,7 @@ var RenderManager;
         function GetZoomControlFromDistance(zoomControl, distance) {
             for (var i = 0; i < zoomControl.length; i++) {
                 var zoomItem = zoomControl[i];
-                if ((distance >= Number(zoomItem.MinZoom)) && (distance <= Number(zoomItem.MaxZoom))) {
+                if ((distance >= EnsureNumber(zoomItem.MinZoom)) && (distance <= EnsureNumber(zoomItem.MaxZoom))) {
                     return zoomItem;
                 }
             }
@@ -778,8 +796,8 @@ var RenderManager;
             var max = 100;
             for (var i = 0; i < zoomControl.length; i++) {
                 var zoomItem = zoomControl[i];
-                zoomItem.MinZoom = Number(zoomItem.MinZoom);
-                zoomItem.MaxZoom = Number(zoomItem.MaxZoom);
+                zoomItem.MinZoom = EnsureNumber(zoomItem.MinZoom);
+                zoomItem.MaxZoom = EnsureNumber(zoomItem.MaxZoom);
                 if (zoomItem.MinZoom != null) {
                     if (zoomItem.MinZoom < min) {
                         min = zoomItem.MinZoom;
@@ -845,7 +863,7 @@ function getPolygonExtrusion(entity, tags, ring, posses, heightRef, pStyle) {
             points.forEach(function (point) {
                 point.height = alt_1;
             });
-            posses = points.map(function (x) { return Cartesian3.fromRadians(Number(x.longitude), Number(x.latitude), Number(x.height)); });
+            posses = points.map(function (x) { return Cartesian3.fromRadians(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.height)); });
         }
     }
     // Step 2. Try get using geometry data.
@@ -872,7 +890,7 @@ function getPolygonExtrusion(entity, tags, ring, posses, heightRef, pStyle) {
     }
     data.posses = posses;
     if (data.value != undefined) {
-        data.value = Number(data.value);
+        data.value = EnsureNumber(data.value);
     }
     return data;
 }
@@ -893,7 +911,7 @@ function getZIndex(style, entity, tags) {
     if (zIndex == null) {
         zIndex = 0;
     }
-    return Number(zIndex);
+    return EnsureNumber(zIndex);
 }
 function getStyle(api, entity, styleId) {
     return __awaiter(this, void 0, void 0, function () {
@@ -1093,7 +1111,7 @@ var EntityRenderEngine;
                     iconUrl = ClientFile.GetUrl(params.api, style.iconId);
                 }
                 if (iconUrl) {
-                    var iconScale = Number(Calculator.GetValue(style.iconScale, entity, params.tags));
+                    var iconScale = EnsureNumber(Calculator.GetValue(style.iconScale, entity, params.tags));
                     if (!iconScale && iconScale != 0) {
                         iconScale = 1;
                     }
@@ -1120,7 +1138,7 @@ var EntityRenderEngine;
                 if (size == null) {
                     size = 30;
                 }
-                size = Number(size);
+                size = EnsureNumber(size);
                 if (size <= 0) {
                     return null;
                 }
@@ -1207,7 +1225,7 @@ var EntityRenderEngine;
             if (!isValid) {
                 return null;
             }
-            var posses = points.map(function (x) { return Cartesian3.fromDegrees(Number(x.longitude), Number(x.latitude), Number(x.altitude)); });
+            var posses = points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.altitude)); });
             // Making sure no 0 length lines coming through.
             // Ideally we would measure the full line but I fear that's too expensive.
             if (posses.length == 2 || posses.length == 3) {
@@ -1230,7 +1248,7 @@ var EntityRenderEngine;
             if (width == null) {
                 width = 4;
             }
-            width = Number(width);
+            width = EnsureNumber(width);
             if (width <= 0) {
                 return null;
             }
@@ -1318,20 +1336,20 @@ var EntityRenderEngine;
             if (width == null) {
                 width = 4;
             }
-            width = Number(width);
+            width = EnsureNumber(width);
             if (width <= 0) {
                 return null;
             }
             var heightRef = getHeightRef(style);
             var outerRing = pRings.find(function (x) { return x.Facing == Geometry.EPolygonRingType.Boundaries; });
             var points = Geometry.ParsePoints(outerRing === null || outerRing === void 0 ? void 0 : outerRing.LinearRing);
-            var posses = points.map(function (x) { return Cartesian3.fromDegrees(Number(x.longitude), Number(x.latitude), Number(x.altitude)); });
+            var posses = points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.altitude)); });
             var extrusion = getPolygonExtrusion(entity, params.tags, outerRing, posses, heightRef, style);
             posses = extrusion.posses;
             var holeRings = pRings.filter(function (x) { return x.Facing == Geometry.EPolygonRingType.Hole; });
             var holePosses = holeRings.map(function (x) {
                 var points = Geometry.ParsePoints(x.LinearRing);
-                return points.map(function (x) { return Cartesian3.fromDegrees(Number(x.longitude), Number(x.latitude), Number(x.altitude)); });
+                return points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.altitude)); });
             });
             var zIndex = getZIndex(style, entity, params.tags);
             var cEntity = new Entity({
@@ -1425,27 +1443,27 @@ var EntityRenderEngine;
         function Render(params) {
             var entity = params.entity;
             var transform = entity === null || entity === void 0 ? void 0 : entity.transform;
-            var heading = transform ? Number(transform.heading) : 0;
+            var heading = EnsureNumber(transform === null || transform === void 0 ? void 0 : transform.heading);
             heading = (heading + 90) % 360;
-            var pitch = transform ? Number(transform.pitch) : 0;
-            var roll = transform ? Number(transform.roll) : 0;
-            var scale = transform ? Number(transform.scale) : 1;
+            var pitch = EnsureNumber(transform === null || transform === void 0 ? void 0 : transform.pitch);
+            var roll = EnsureNumber(transform === null || transform === void 0 ? void 0 : transform.roll);
+            var scale = EnsureNumber(transform.scale, 1);
             if (scale <= 0) {
                 scale = 1;
             }
             var style = params.style;
             var styleScale = (style === null || style === void 0 ? void 0 : style.scale) ? Calculator.GetValue(style === null || style === void 0 ? void 0 : style.scale, entity, params.tags) : null;
-            styleScale = Number(styleScale);
-            if (!styleScale) {
+            styleScale = EnsureNumber(styleScale ? styleScale : 1);
+            if (styleScale <= 0) {
                 styleScale = 1;
             }
             scale *= styleScale;
-            var hpr = new HeadingPitchRoll(heading, pitch, roll);
+            var hpr = new HeadingPitchRoll(Math$1.toRadians(heading), Math$1.toRadians(pitch), Math$1.toRadians(roll));
             var heightRef = getHeightRef(style);
             var pos = EntityUtils.GetPos(params.viewer, entity);
             if (heightRef == HeightReference.CLAMP_TO_GROUND) {
                 var carto = Cartographic.fromCartesian(pos);
-                pos = Cartesian3.fromRadians(Number(carto.longitude), Number(carto.latitude), 0);
+                pos = Cartesian3.fromRadians(EnsureNumber(carto.longitude), EnsureNumber(carto.latitude), 0);
                 heightRef = HeightReference.RELATIVE_TO_GROUND;
             }
             var orientation = Transforms.headingPitchRollQuaternion(pos, hpr);
@@ -2652,17 +2670,17 @@ var TilesetRenderEngine;
             return;
         }
         transform = __assign({ heading: 0, pitch: 0, roll: 0, scale: 1, x: 0, y: 0, z: 0 }, transform);
-        transform.scale = Number(transform.scale);
+        transform.scale = EnsureNumber(transform.scale);
         if (transform.scale <= 0) {
             transform.scale = 0.000001;
         }
-        var pos = Cartesian3.fromDegrees(Number(location.longitude), Number(location.latitude), Number(location.altitude));
-        var hpr = HeadingPitchRoll.fromDegrees(Number(transform.heading), Number(transform.pitch), Number(transform.roll), new HeadingPitchRoll());
+        var pos = Cartesian3.fromDegrees(EnsureNumber(location.longitude), EnsureNumber(location.latitude), EnsureNumber(location.altitude));
+        var hpr = HeadingPitchRoll.fromDegrees(EnsureNumber(transform.heading), EnsureNumber(transform.pitch), EnsureNumber(transform.roll), new HeadingPitchRoll());
         var root = cTileset.root;
         root.transform = Transforms.headingPitchRollToFixedFrame(pos, hpr);
         var scaleMatrix = Matrix4.fromScale(new Cartesian3(transform.scale, transform.scale, transform.scale), new Matrix4());
         root.transform = Matrix4.multiply(root.transform, scaleMatrix, root.transform);
-        root.transform = Matrix4.multiplyByTranslation(root.transform, new Cartesian3(Number(transform.x), Number(transform.y), Number(transform.z)), root.transform);
+        root.transform = Matrix4.multiplyByTranslation(root.transform, new Cartesian3(EnsureNumber(transform.x), EnsureNumber(transform.y), EnsureNumber(transform.z)), root.transform);
         // Force matrix to update
         root.updateTransform();
     }
@@ -2672,14 +2690,14 @@ var TilesetRenderEngine;
             var settings = tileset.settings;
             var maxScreenSpaceError = settings.maximumScreenSpaceError;
             if (maxScreenSpaceError || maxScreenSpaceError == 0) {
-                cTileset.maximumScreenSpaceError = Number(maxScreenSpaceError);
+                cTileset.maximumScreenSpaceError = EnsureNumber(maxScreenSpaceError);
             }
         }
         else if (tileset.type == Tileset.EType.PointCloud) {
             var settings = tileset.settings;
             var maxScreenSpaceError = settings.maximumScreenSpaceError;
             if (maxScreenSpaceError || maxScreenSpaceError == 0) {
-                cTileset.maximumScreenSpaceError = Number(maxScreenSpaceError);
+                cTileset.maximumScreenSpaceError = EnsureNumber(maxScreenSpaceError);
             }
             var attenuation = settings.attenuation;
             if (attenuation != null) {
@@ -2687,7 +2705,7 @@ var TilesetRenderEngine;
             }
             var attenuationMax = settings.attenuationMax;
             if (attenuationMax || attenuationMax == 0) {
-                cTileset.pointCloudShading.maximumAttenuation = Number(attenuationMax);
+                cTileset.pointCloudShading.maximumAttenuation = EnsureNumber(attenuationMax);
             }
         }
         else {
@@ -5117,12 +5135,12 @@ var TileRenderEngine;
                                     var layer = curEnabledArr.find(function (x) { var _a, _b; return ((_a = x._bMeta) === null || _a === void 0 ? void 0 : _a.accountId) === enabled.accountId && ((_b = x._bMeta) === null || _b === void 0 ? void 0 : _b.tilesetId) === enabled.tilesetId; });
                                     if (layer) {
                                         params.viewer.imageryLayers.raiseToTop(layer);
-                                        layer.alpha = Number(enabled.alpha == null ? 1 : enabled.alpha);
-                                        layer.brightness = Number(enabled.brightness == null ? 1 : enabled.brightness);
-                                        layer.contrast = Number(enabled.contrast == null ? 1 : enabled.contrast);
-                                        layer.hue = Number(enabled.hue == null ? 0 : enabled.hue);
-                                        layer.saturation = Number(enabled.saturation == null ? 1 : enabled.saturation);
-                                        layer.gamma = Number(enabled.gamma == null ? 1 : enabled.gamma);
+                                        layer.alpha = EnsureNumber(enabled.alpha == null ? 1 : enabled.alpha);
+                                        layer.brightness = EnsureNumber(enabled.brightness == null ? 1 : enabled.brightness);
+                                        layer.contrast = EnsureNumber(enabled.contrast == null ? 1 : enabled.contrast);
+                                        layer.hue = EnsureNumber(enabled.hue == null ? 0 : enabled.hue);
+                                        layer.saturation = EnsureNumber(enabled.saturation == null ? 1 : enabled.saturation);
+                                        layer.gamma = EnsureNumber(enabled.gamma == null ? 1 : enabled.gamma);
                                     }
                                 };
                                 for (i = 0; i < params.tiles.length; i++) {
@@ -5444,7 +5462,7 @@ function renderV2(params, bookmark, view) {
                     if (shadows.enabled) {
                         viewer.shadows = true;
                         viewer.shadowMap.enabled = true;
-                        size = Number(shadows.pixelSize);
+                        size = EnsureNumber(shadows.pixelSize);
                         if (size < MIN_SHADOW_SIZE) {
                             size = MIN_SHADOW_SIZE;
                         }
@@ -5470,11 +5488,11 @@ function renderV2(params, bookmark, view) {
                     AO = viewer.scene.postProcessStages.ambientOcclusion;
                     if (ambientOcclusion.enabled) {
                         AO.enabled = true;
-                        AO.uniforms.intensity = Number(ambientOcclusion.intensity);
-                        AO.uniforms.lengthCap = Number(ambientOcclusion.lengthCap);
-                        AO.uniforms.bias = Number(ambientOcclusion.bias);
-                        AO.uniforms.stepSize = Number(ambientOcclusion.stepSize);
-                        AO.uniforms.blurStepSize = Number(ambientOcclusion.blurStepSize);
+                        AO.uniforms.intensity = EnsureNumber(ambientOcclusion.intensity);
+                        AO.uniforms.lengthCap = EnsureNumber(ambientOcclusion.lengthCap);
+                        AO.uniforms.bias = EnsureNumber(ambientOcclusion.bias);
+                        AO.uniforms.stepSize = EnsureNumber(ambientOcclusion.stepSize);
+                        AO.uniforms.blurStepSize = EnsureNumber(ambientOcclusion.blurStepSize);
                     }
                     else {
                         AO.enabled = false;
@@ -5492,7 +5510,7 @@ function renderV2(params, bookmark, view) {
                     light = viewer.scene.light;
                     if (light) {
                         light.color = Color.fromCssColorString(lighting.color);
-                        light.intensity = Number(lighting.intensity);
+                        light.intensity = EnsureNumber(lighting.intensity);
                     }
                     quality = bSettings === null || bSettings === void 0 ? void 0 : bSettings.quality;
                     if (quality == null) {
@@ -5697,5 +5715,5 @@ var ViewUtils;
     ViewUtils.GatherTerrainTile = GatherTerrainTile;
 })(ViewUtils || (ViewUtils = {}));
 
-export { CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, RenderHelper, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, SharedGetters, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils };
+export { CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, RenderHelper, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, SharedGetters, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, EnsureNumber };
 //# sourceMappingURL=bruce-cesium.es5.js.map