bruce-cesium 0.6.4 → 0.6.5

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, Cartesian3, Color, HeightReference, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, HeadingPitchRange, OrthographicFrustum, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, Matrix4, Cesium3DTileset, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, JulianDate, createOsmBuildings, Cesium3DTileStyle } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Entity, Primitive, Cesium3DTileFeature, Color, HeightReference, Cartesian3, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, HeadingPitchRange, OrthographicFrustum, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileset, EllipsoidGeodesic, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, JulianDate, createOsmBuildings, Cesium3DTileStyle } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -563,14 +563,14 @@ var EntityUtils;
                     var points = Geometry.ParsePoints(pointStr);
                     var point = points.length > 0 ? points[0] : null;
                     if (point && Carto.ValidateCarto(point)) {
-                        return Cartesian3.fromDegrees(point.longitude, point.latitude, point.altitude);
+                        return Cartesian3.fromDegrees(Number(point.longitude), Number(point.latitude), Number(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(x.longitude, x.latitude, x.altitude); });
+                        var posses = points.map(function (x) { return Cartesian3.fromDegrees(Number(x.longitude), Number(x.latitude), Number(x.altitude)); });
                         var length_1 = MeasureUtils.MeasurePolyline(posses);
                         if (length_1 > 0) {
                             var point = DrawingUtils.PointAcrossPolyline(viewer, posses, length_1 / 2);
@@ -590,7 +590,7 @@ var EntityUtils;
                         var points = Geometry.ParsePoints(boundary.LinearRing);
                         var point = Carto.GetCenter(points);
                         if (point && Carto.ValidateCarto(point)) {
-                            return Cartesian3.fromDegrees(point.longitude, point.latitude, point.altitude);
+                            return Cartesian3.fromDegrees(Number(point.longitude), Number(point.latitude), Number(point.altitude));
                         }
                     }
                 }
@@ -845,7 +845,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(x.longitude, x.latitude, x.height); });
+            posses = points.map(function (x) { return Cartesian3.fromRadians(Number(x.longitude), Number(x.latitude), Number(x.height)); });
         }
     }
     // Step 2. Try get using geometry data.
@@ -871,6 +871,9 @@ function getPolygonExtrusion(entity, tags, ring, posses, heightRef, pStyle) {
         }
     }
     data.posses = posses;
+    if (data.value != undefined) {
+        data.value = Number(data.value);
+    }
     return data;
 }
 function getHeightRef(style) {
@@ -890,7 +893,7 @@ function getZIndex(style, entity, tags) {
     if (zIndex == null) {
         zIndex = 0;
     }
-    return zIndex;
+    return Number(zIndex);
 }
 function getStyle(api, entity, styleId) {
     return __awaiter(this, void 0, void 0, function () {
@@ -1090,7 +1093,7 @@ var EntityRenderEngine;
                     iconUrl = ClientFile.GetUrl(params.api, style.iconId);
                 }
                 if (iconUrl) {
-                    var iconScale = +Calculator.GetValue(style.iconScale, entity, params.tags);
+                    var iconScale = Number(Calculator.GetValue(style.iconScale, entity, params.tags));
                     if (!iconScale && iconScale != 0) {
                         iconScale = 1;
                     }
@@ -1100,7 +1103,8 @@ var EntityRenderEngine;
                                 horizontalOrigin: HorizontalOrigin.CENTER,
                                 verticalOrigin: VerticalOrigin.BOTTOM,
                                 image: iconUrl,
-                                heightReference: getHeightRef(style)
+                                heightReference: getHeightRef(style),
+                                scale: iconScale
                             },
                             position: EntityUtils.GetPos(params.viewer, entity),
                             show: false
@@ -1116,6 +1120,7 @@ var EntityRenderEngine;
                 if (size == null) {
                     size = 30;
                 }
+                size = Number(size);
                 if (size <= 0) {
                     return null;
                 }
@@ -1202,7 +1207,7 @@ var EntityRenderEngine;
             if (!isValid) {
                 return null;
             }
-            var posses = points.map(function (x) { return Cartesian3.fromDegrees(x.longitude, x.latitude, x.altitude); });
+            var posses = points.map(function (x) { return Cartesian3.fromDegrees(Number(x.longitude), Number(x.latitude), Number(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) {
@@ -1225,6 +1230,7 @@ var EntityRenderEngine;
             if (width == null) {
                 width = 4;
             }
+            width = Number(width);
             if (width <= 0) {
                 return null;
             }
@@ -1312,19 +1318,20 @@ var EntityRenderEngine;
             if (width == null) {
                 width = 4;
             }
+            width = Number(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(x.longitude, x.latitude, x.altitude); });
+            var posses = points.map(function (x) { return Cartesian3.fromDegrees(Number(x.longitude), Number(x.latitude), Number(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(x.longitude, x.latitude, x.altitude); });
+                return points.map(function (x) { return Cartesian3.fromDegrees(Number(x.longitude), Number(x.latitude), Number(x.altitude)); });
             });
             var zIndex = getZIndex(style, entity, params.tags);
             var cEntity = new Entity({
@@ -1418,16 +1425,17 @@ var EntityRenderEngine;
         function Render(params) {
             var entity = params.entity;
             var transform = entity === null || entity === void 0 ? void 0 : entity.transform;
-            var heading = transform ? +transform.heading : 0;
+            var heading = transform ? Number(transform.heading) : 0;
             heading = (heading + 90) % 360;
-            var pitch = transform ? +transform.pitch : 0;
-            var roll = transform ? +transform.roll : 0;
-            var scale = transform ? +transform.scale : 1;
+            var pitch = transform ? Number(transform.pitch) : 0;
+            var roll = transform ? Number(transform.roll) : 0;
+            var scale = transform ? Number(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;
+            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 = 1;
             }
@@ -1437,7 +1445,7 @@ var EntityRenderEngine;
             var pos = EntityUtils.GetPos(params.viewer, entity);
             if (heightRef == HeightReference.CLAMP_TO_GROUND) {
                 var carto = Cartographic.fromCartesian(pos);
-                pos = Cartesian3.fromRadians(carto.longitude, carto.latitude, 0);
+                pos = Cartesian3.fromRadians(Number(carto.longitude), Number(carto.latitude), 0);
                 heightRef = HeightReference.RELATIVE_TO_GROUND;
             }
             var orientation = Transforms.headingPitchRollQuaternion(pos, hpr);
@@ -2644,16 +2652,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);
         if (transform.scale <= 0) {
             transform.scale = 0.000001;
         }
-        var pos = Cartesian3.fromDegrees(location.longitude, location.latitude, location.altitude);
-        var hpr = HeadingPitchRoll.fromDegrees(transform.heading, transform.pitch, transform.roll, new HeadingPitchRoll());
+        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 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(transform.x, transform.y, transform.z), root.transform);
+        root.transform = Matrix4.multiplyByTranslation(root.transform, new Cartesian3(Number(transform.x), Number(transform.y), Number(transform.z)), root.transform);
         // Force matrix to update
         root.updateTransform();
     }
@@ -2663,22 +2672,22 @@ var TilesetRenderEngine;
             var settings = tileset.settings;
             var maxScreenSpaceError = settings.maximumScreenSpaceError;
             if (maxScreenSpaceError || maxScreenSpaceError == 0) {
-                cTileset.maximumScreenSpaceError = maxScreenSpaceError;
+                cTileset.maximumScreenSpaceError = Number(maxScreenSpaceError);
             }
         }
         else if (tileset.type == Tileset.EType.PointCloud) {
             var settings = tileset.settings;
             var maxScreenSpaceError = settings.maximumScreenSpaceError;
             if (maxScreenSpaceError || maxScreenSpaceError == 0) {
-                cTileset.maximumScreenSpaceError = maxScreenSpaceError;
+                cTileset.maximumScreenSpaceError = Number(maxScreenSpaceError);
             }
             var attenuation = settings.attenuation;
             if (attenuation != null) {
-                cTileset.pointCloudShading.attenuation = attenuation;
+                cTileset.pointCloudShading.attenuation = Boolean(attenuation);
             }
             var attenuationMax = settings.attenuationMax;
             if (attenuationMax || attenuationMax == 0) {
-                cTileset.pointCloudShading.maximumAttenuation = attenuationMax;
+                cTileset.pointCloudShading.maximumAttenuation = Number(attenuationMax);
             }
         }
         else {