bruce-cesium 0.4.5 → 0.4.7

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, Camera, MathUtils } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Viewer, ArcGisMapServerImageryProvider, ScreenSpaceEventType, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, HeadingPitchRange, OrthographicFrustum, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileset, EllipsoidGeodesic, createOsmBuildings, Cesium3DTileStyle, Rectangle } 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, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileset, EllipsoidGeodesic, createOsmBuildings, Cesium3DTileStyle, Rectangle } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -230,38 +230,19 @@ var CesiumViewMonitor = /** @class */ (function () {
 var ViewerUtils;
 (function (ViewerUtils) {
     /**
-     * Creates a Cesium viewer in a given HTML container and returns it.
-     * This will kill all widgets in the process.
-     * @param container
-     * @returns
+     * Destroys all the junk that cesium viewer ships with.
+     * @param viewer
      */
-    function InitViewer(container) {
-        if (container._cViewer) {
-            throw new Error("Container already has a viewer.");
-        }
-        var cViewer = new Viewer(container, {
-            imageryProvider: new ArcGisMapServerImageryProvider({
-                url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer",
-                enablePickFeatures: false
-            })
-        });
-        cViewer.cesiumWidget.screenSpaceEventHandler.removeInputAction(ScreenSpaceEventType.LEFT_DOUBLE_CLICK);
-        cViewer.camera.percentageChanged = 0.05;
-        ViewerUtils.DestroyWidget(cViewer.timeline);
-        ViewerUtils.DestroyWidget(cViewer.vrButton);
-        ViewerUtils.DestroyWidget(cViewer.sceneModePicker);
-        ViewerUtils.DestroyWidget(cViewer.homeButton);
-        ViewerUtils.DestroyWidget(cViewer.fullscreenButton);
-        ViewerUtils.DestroyWidget(cViewer.baseLayerPicker);
-        ViewerUtils.StyleContainer(cViewer);
-        container._cViewer = cViewer;
-        return cViewer;
+    function InitViewer(viewer) {
+        ViewerUtils.DestroyWidget(viewer.timeline);
+        ViewerUtils.DestroyWidget(viewer.vrButton);
+        ViewerUtils.DestroyWidget(viewer.sceneModePicker);
+        ViewerUtils.DestroyWidget(viewer.homeButton);
+        ViewerUtils.DestroyWidget(viewer.fullscreenButton);
+        ViewerUtils.DestroyWidget(viewer.baseLayerPicker);
+        ViewerUtils.StyleContainer(viewer);
     }
     ViewerUtils.InitViewer = InitViewer;
-    function GetViewerFromContainer(container) {
-        return container._cViewer;
-    }
-    ViewerUtils.GetViewerFromContainer = GetViewerFromContainer;
     function DestroyWidget(widget) {
         if (widget && !widget.isDestroyed()) {
             widget.destroy();
@@ -464,59 +445,62 @@ var EntityUtils;
      * @returns
      */
     function GetPos(viewer, entity) {
-        if (entity.location && Carto.ValidateCarto(entity.location)) {
-            var location_1 = entity.location;
-            return Cartesian3.fromDegrees(location_1.longitude, location_1.latitude, location_1.altitude);
-        }
-        if (entity.geometry && typeof entity.geometry == "object") {
-            var pointStr = entity.geometry.Point;
-            if (pointStr && typeof pointStr == "string") {
-                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);
+        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));
+            }
+            if (entity.geometry && typeof entity.geometry == "object") {
+                var pointStr = entity.geometry.Point;
+                if (pointStr && typeof pointStr == "string") {
+                    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);
+                    }
                 }
-            }
-            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 length_1 = MeasureUtils.MeasurePolyline(posses);
-                    if (length_1 > 0) {
-                        var point = DrawingUtils.PointAcrossPolyline(viewer, posses, length_1 / 2);
-                        if (point && Cartes.ValidateCartes3(point)) {
-                            return point;
+                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 length_1 = MeasureUtils.MeasurePolyline(posses);
+                        if (length_1 > 0) {
+                            var point = DrawingUtils.PointAcrossPolyline(viewer, posses, length_1 / 2);
+                            if (point && Cartes.ValidateCartes3(point)) {
+                                return point;
+                            }
+                        }
+                        else {
+                            return posses[0];
                         }
-                    }
-                    else {
-                        return posses[0];
                     }
                 }
-            }
-            var pRings = entity.geometry.Polygon;
-            if (pRings && typeof pRings == "object") {
-                var boundary = pRings.find(function (x) { return x.Facing == Geometry.EPolygonRingType.Boundaries; });
-                if (boundary === null || boundary === void 0 ? void 0 : boundary.LinearRing) {
-                    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);
+                var pRings = entity.geometry.Polygon;
+                if (pRings && typeof pRings == "object") {
+                    var boundary = pRings.find(function (x) { return x.Facing == Geometry.EPolygonRingType.Boundaries; });
+                    if (boundary === null || boundary === void 0 ? void 0 : boundary.LinearRing) {
+                        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);
+                        }
                     }
                 }
             }
-        }
-        if (entity.boundaries) {
-            var point = {
-                latitude: (entity.boundaries.minLatitude + entity.boundaries.maxLatitude) / 2,
-                longitude: (entity.boundaries.minLongitude + entity.boundaries.maxLongitude) / 2,
-                altitude: 0
-            };
-            if (point && Carto.ValidateCarto(point)) {
-                return Cartesian3.fromDegrees(point.longitude, point.latitude, 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,
+                    altitude: 0
+                };
+                if (point && Carto.ValidateCarto(point)) {
+                    return Cartesian3.fromDegrees(point.longitude, point.latitude, point.altitude);
+                }
             }
         }
-        return null;
+        var pos3d = evaluate();
+        return Cartes.ValidateCartes3(pos3d) ? pos3d : null;
     }
     EntityUtils.GetPos = GetPos;
     /**
@@ -545,14 +529,17 @@ var RenderManager;
                 return null;
             }
             var cameraPos = viewer.camera.position;
+            if (!Cartes.ValidateCartes3(cameraPos)) {
+                return null;
+            }
             var distance = Cartesian3.distance(pos, cameraPos);
-            return GetZoomControlFromDistance(zoomControl, distance);
+            return (!distance && distance != 0) ? null : GetZoomControlFromDistance(zoomControl, distance);
         }
         Utils.DetermineZoomItem = DetermineZoomItem;
         function GetZoomControlFromDistance(zoomControl, distance) {
             for (var i = 0; i < zoomControl.length; i++) {
                 var zoomItem = zoomControl[i];
-                if ((distance >= zoomItem.MinZoom) && (distance <= zoomItem.MaxZoom)) {
+                if ((distance >= Number(zoomItem.MinZoom)) && (distance <= Number(zoomItem.MaxZoom))) {
                     return zoomItem;
                 }
             }
@@ -564,6 +551,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);
                 if (zoomItem.MinZoom != null) {
                     if (zoomItem.MinZoom < min) {
                         min = zoomItem.MinZoom;