bruce-cesium 4.6.3 → 4.6.5

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
-import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, ProjectViewLegacyTile, Camera, EntityAttribute, EntityAttachment, EntityAttachmentType, AbstractApi, Session } from 'bruce-models';
+import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, ProjectViewLegacyTile, Camera, AbstractApi, Session, EntityAttribute, EntityAttachment, EntityAttachmentType } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, CesiumInspector, ClockRange, PolygonPipeline, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, BoundingSphere, GeometryInstance, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, ClassificationType, PolygonHierarchy, ShadowMode, ConstantProperty, ConstantPositionProperty, PolylineGraphics, ArcType, CornerType, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, HorizontalOrigin, VerticalOrigin, Primitive, Cesium3DTileFeature, GeoJsonDataSource, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Cesium3DTileset, Matrix4, Matrix3, IonResource, PolygonPipeline, CesiumInspector, ClockRange, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8414,16 +8414,16 @@ var EntityRenderEngine;
             min = 0;
         }
         // Adjusting slightly because I distrust our initial calculation vs Cesium's one.
-        max = (+max) * 1.2;
+        max = (+max) * 1.8;
         min = +min;
         if (min > 0) {
             min = (+min) * 0.8;
         }
         meterSize = +meterSize;
         if (!isNaN(meterSize) && meterSize > 0) {
-            // A 1m thing at 2000m distance is barely visible, so we can cull it.
+            // A 1m thing at 3000m distance is barely visible, so we can cull it.
             // So we'll multiply this magic distance by the size of the thing and determine when it'll be too small to see.
-            var METER_DISTANCE_PER_METER = isPolygon ? 100 : 2000;
+            var METER_DISTANCE_PER_METER = isPolygon ? 200 : 3000;
             var newMax = meterSize * METER_DISTANCE_PER_METER;
             // Enforcing a minimum max distance in case something goes wrong we want stuff to always be visible when close.
             var MIN_MAX = 300;
@@ -16032,10 +16032,10 @@ var EntityGlobe;
                 return range;
             }
             // Add minor decimal as API crashes when giving it whole numbers.
-            var maxLon = prepareRangeForBounds(this.Boundaries.maxLongitude) + 0.00001;
-            var minLon = prepareRangeForBounds(this.Boundaries.minLongitude) - 0.00001;
-            var maxLat = prepareRangeForBounds(this.Boundaries.maxLatitude) + 0.00001;
-            var minLat = prepareRangeForBounds(this.Boundaries.minLatitude) - 0.00001;
+            var maxLon = prepareRangeForBounds(this.Boundaries.maxLongitude);
+            var minLon = prepareRangeForBounds(this.Boundaries.minLongitude);
+            var maxLat = prepareRangeForBounds(this.Boundaries.maxLatitude);
+            var minLat = prepareRangeForBounds(this.Boundaries.minLatitude);
             return {
                 east: maxLon,
                 north: maxLat,
@@ -16058,6 +16058,7 @@ var EntityGlobe;
             var maxLon = viewRect.east;
             var MAX_CELLS = 150;
             var cellDegreeSize = getCellSizeFromHeight(viewRect.alt);
+            // console.log("cell size", cellDegreeSize, "height", viewRect.alt);
             var curMinLon = floorValueToCellSize(cellDegreeSize, minLon);
             var curMinLat = floorValueToCellSize(cellDegreeSize, minLat);
             // For larger views we add additional padding because our view-area culling is too strong.
@@ -16114,39 +16115,45 @@ function getCellSizeFromHeight(height) {
         return 0.01;
     }
     if (height < 5000) {
-        return 0.025;
+        return 0.05;
     }
     else if (height < 10000) {
         return 0.05;
     }
     else if (height < 30000) {
-        return 0.1;
+        return 0.2;
     }
     else if (height < 70000) {
         return 0.2;
     }
     else if (height < 100000) {
-        return 0.3;
+        return 0.5;
     }
     else if (height < 150000) {
-        return 0.4;
+        return 0.5;
     }
     else if (height < 200000) {
-        return 0.5;
+        return 1.5;
     }
     else if (height < 300000) {
-        return 0.6;
+        return 1.5;
     }
     else if (height < 500000) {
-        return 1;
+        return 3;
     }
     else if (height < 1000000) {
-        return 1.3;
+        return 3;
     }
     else if (height < 1200000) {
-        return 1.8;
+        return 4;
+    }
+    else if (height < 2000000) {
+        return 6;
+    }
+    else if (height < 3000000) {
+        return 20;
     }
-    return 4;
+    return 35;
 }
 function isCellFetched(cell) {
     if (cell.Fetched) {
@@ -16475,14 +16482,14 @@ var EntityFilterGetter;
                 return __generator(this, function (_j) {
                     switch (_j.label) {
                         case 0: 
-                        // Minor delay to stop 50 menu items enabling doing their first request all together.
-                        // This gives it time to recognize only 1 request is needed.
-                        // Would be better to not use this delay but we're on a clock.
-                        return [4 /*yield*/, delay(100)];
+                        // Larger initial delay for the first loops because terrain is likely loading in.
+                        // We also delay because if we enable 50 Menu Items at the same time, common requests we be made if we wait a bit.
+                        // Eg: same entity type will be grouped into the same filter getter instance.
+                        return [4 /*yield*/, delay(loopId <= 3 ? 800 : 300)];
                         case 1:
-                            // Minor delay to stop 50 menu items enabling doing their first request all together.
-                            // This gives it time to recognize only 1 request is needed.
-                            // Would be better to not use this delay but we're on a clock.
+                            // Larger initial delay for the first loops because terrain is likely loading in.
+                            // We also delay because if we enable 50 Menu Items at the same time, common requests we be made if we wait a bit.
+                            // Eg: same entity type will be grouped into the same filter getter instance.
                             _j.sent();
                             MIN_HEIGHT = this.minHeight;
                             MAX_HEIGHT = this.maxHeight;
@@ -16678,12 +16685,11 @@ var EntityFilterGetter;
                 this.historicRefreshAbortController = null;
             }
             (function () { return __awaiter(_this, void 0, void 0, function () {
-                var pageIndex, i, batch, controller, entities, e_2;
+                var i, batch, controller, entities, e_2;
                 var _a;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            pageIndex = 0;
                             _b.label = 1;
                         case 1:
                             _b.trys.push([1, 6, , 7]);
@@ -16702,8 +16708,8 @@ var EntityFilterGetter;
                                     historicPoint: historicAttrDateTime,
                                     schemaId: this.schemaId,
                                     filter: {
-                                        pageSize: SCAN_BATCH_SIZE,
-                                        pageIndex: pageIndex,
+                                        pageSize: batch.length,
+                                        pageIndex: 0,
                                         entityTypeId: this.typeId,
                                         layerIds: this.tagIds,
                                         layerIdsOperator: "in",
@@ -16738,7 +16744,6 @@ var EntityFilterGetter;
                                 return [3 /*break*/, 5];
                             }
                             (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger(entities);
-                            pageIndex += 1;
                             _b.label = 4;
                         case 4:
                             i += SCAN_BATCH_SIZE;
@@ -28071,7 +28076,7 @@ var WidgetViewBar = /** @class */ (function (_super) {
     return WidgetViewBar;
 }(Widget.AWidget));
 
-var VERSION = "4.6.3";
+var VERSION = "4.6.5";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar, WidgetControlViewBar, WidgetControlViewBarSearch, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
 //# sourceMappingURL=bruce-cesium.es5.js.map