bruce-cesium 0.2.1 → 0.2.3

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, EntityFilterGetter, BatchedDataGetter, ObjectUtils, Tileset, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTileSource, Camera, MathUtils } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Viewer, ArcGisMapServerImageryProvider, ScreenSpaceEventType, Cartesian3, HeadingPitchRange, Entity, Primitive, Cesium3DTileFeature, Color, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, OrthographicFrustum, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, createWorldTerrain, CesiumTerrainProvider, EllipsoidTerrainProvider, Matrix4, Cesium3DTileset, EllipsoidGeodesic } from 'cesium';
+import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, DelayQueue, Entity as Entity$1, BatchedDataGetter, ObjectUtils, Tileset, EntityFilterGetter, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTileSource, Camera, MathUtils } from 'bruce-models';
+import { Cartesian2, Cartographic, Math as Math$1, Viewer, ArcGisMapServerImageryProvider, ScreenSpaceEventType, Entity, Primitive, Cesium3DTileFeature, Color, HeightReference, Cartesian3, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, HeadingPitchRange, OrthographicFrustum, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, createWorldTerrain, CesiumTerrainProvider, EllipsoidTerrainProvider, Matrix4, Cesium3DTileset, EllipsoidGeodesic } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -117,6 +117,7 @@ var CesiumViewMonitor = /** @class */ (function () {
         clearInterval(this.checkInterval);
     };
     CesiumViewMonitor.prototype.tryDoUpdate = function () {
+        var _a;
         var viewRect = null;
         var center = null;
         var camera = this.viewer.camera;
@@ -177,6 +178,7 @@ var CesiumViewMonitor = /** @class */ (function () {
             viewRect.west = Math.min(viewRect.west, centerLong - (MINIMUM_VIEW_AREA_SIZE_DEGREES / 2));
             viewRect.south = Math.min(viewRect.south, centerLat - (MINIMUM_VIEW_AREA_SIZE_DEGREES / 2));
             viewRect.north = Math.max(viewRect.north, centerLat + (MINIMUM_VIEW_AREA_SIZE_DEGREES / 2));
+            viewRect.alt = (_a = this.viewer.scene.camera.positionCartographic) === null || _a === void 0 ? void 0 : _a.height;
         }
         if (center && viewRect) {
             if ((!this.target || (this.target && !arePosEqual(this.target, center))) ||
@@ -552,6 +554,25 @@ var RenderManager;
             return null;
         }
         Utils.GetZoomControlFromDistance = GetZoomControlFromDistance;
+        function GetZoomMinMax(zoomControl) {
+            var min = 0;
+            var max = 100;
+            for (var i = 0; i < zoomControl.length; i++) {
+                var zoomItem = zoomControl[i];
+                if (zoomItem.MinZoom != null) {
+                    if (zoomItem.MinZoom < min) {
+                        min = zoomItem.MinZoom;
+                    }
+                }
+                if (zoomItem.MaxZoom != null) {
+                    if (zoomItem.MaxZoom > max) {
+                        max = zoomItem.MaxZoom;
+                    }
+                }
+            }
+            return [min, max];
+        }
+        Utils.GetZoomMinMax = GetZoomMinMax;
     })(Utils = RenderManager.Utils || (RenderManager.Utils = {}));
 })(RenderManager || (RenderManager = {}));
 
@@ -1355,7 +1376,7 @@ var EntityRenderEngine;
 var EntitiesRenderManager;
 (function (EntitiesRenderManager) {
     var Manager = /** @class */ (function () {
-        function Manager(viewer, visualsManager, apiGetter, item) {
+        function Manager(viewer, visualsManager, apiGetter, item, sharedGetters) {
             this.getter = null;
             this.getterSub = null;
             this.disposed = false;
@@ -1365,6 +1386,7 @@ var EntitiesRenderManager;
             this.isRunningCheck = false;
             this.viewMonitorRemoval = null;
             this.viewer = viewer;
+            this.sharedGetters = sharedGetters;
             this.apiGetter = apiGetter;
             this.item = item;
             this.visualsManager = visualsManager;
@@ -1378,15 +1400,21 @@ var EntitiesRenderManager;
         });
         Manager.prototype.Init = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var api;
+                var api, minMax;
                 var _this = this;
                 return __generator(this, function (_a) {
                     if (this.disposed) {
                         throw (new Error("This item is disposed."));
                     }
                     api = this.apiGetter.getApi(this.apiGetter.accountId, this.apiGetter.env);
-                    this.getter = new EntityFilterGetter.Getter(api, new CesiumViewMonitor(this.viewer), this.item.BruceEntity["EntityType.ID"], 500, {});
-                    this.getter.IncludeMenuItem(this.item.id, [], 0, 100000);
+                    this.getter = this.sharedGetters.GetOrCreateFilterGetter({
+                        api: api,
+                        attrFilter: {},
+                        batchSize: 500,
+                        typeId: this.item.BruceEntity["EntityType.ID"]
+                    });
+                    minMax = RenderManager.Utils.GetZoomMinMax(this.item.CameraZoomSettings);
+                    this.getter.IncludeMenuItem(this.item.id, [], minMax[0], minMax[1]);
                     this.getterSub = this.getter.OnUpdate.Subscribe(function (entities) {
                         _this.onGetterUpdate(entities);
                     });
@@ -1407,6 +1435,9 @@ var EntitiesRenderManager;
             }
             (_a = this.getterSub) === null || _a === void 0 ? void 0 : _a.call(this);
             this.getterSub = null;
+            if (this.getter) {
+                this.getter.ExcludeMenuItem(this.item.id);
+            }
             this.disposed = true;
             this.visualsManager.RemoveByMenuItemId(this.item.id);
             (_b = this.entityCheckRemoval) === null || _b === void 0 ? void 0 : _b.call(this);
@@ -2828,6 +2859,35 @@ var TilesetCadRenderManager;
     TilesetCadRenderManager.Manager = Manager;
 })(TilesetCadRenderManager || (TilesetCadRenderManager = {}));
 
+function createFilterGetterCacheKey(params) {
+    var cacheKey = "";
+    cacheKey += params.api.GetBaseUrl();
+    cacheKey += params.typeId;
+    cacheKey += params.batchSize;
+    cacheKey += JSON.stringify(params.attrFilter);
+    return cacheKey;
+}
+var SharedGetters;
+(function (SharedGetters) {
+    var Cache = /** @class */ (function () {
+        function Cache(viewer) {
+            this.data = {};
+            this.viewer = viewer;
+        }
+        Cache.prototype.GetOrCreateFilterGetter = function (params) {
+            var cacheKey = createFilterGetterCacheKey(params);
+            var getter = this.data[cacheKey];
+            if (!getter) {
+                getter = new EntityFilterGetter.Getter(params.api, new CesiumViewMonitor(this.viewer), params.typeId, params.batchSize, params.attrFilter);
+                this.data[cacheKey] = getter;
+            }
+            return getter;
+        };
+        return Cache;
+    }());
+    SharedGetters.Cache = Cache;
+})(SharedGetters || (SharedGetters = {}));
+
 /**
  * Utility to keep track of enabled menu items within a Cesium viewer.
  */
@@ -2842,6 +2902,7 @@ var MenuItemManager;
                 visualsRegister = new VisualsRegister.Register(viewer);
             }
             this.visualsRegister = visualsRegister;
+            this.sharedGetters = new SharedGetters.Cache(this.viewer);
         }
         Object.defineProperty(Manager.prototype, "Viewer", {
             get: function () {
@@ -2892,7 +2953,7 @@ var MenuItemManager;
                             };
                             switch (params.item.Type) {
                                 case MenuItem.EType.Entities:
-                                    rItem.renderManager = new EntitiesRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, params.item);
+                                    rItem.renderManager = new EntitiesRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, params.item, this.sharedGetters);
                                     break;
                                 case MenuItem.EType.EntitiesLoaded:
                                     rItem.renderManager = new EntitiesLoadedRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, params.item);
@@ -3087,8 +3148,38 @@ var RenderHelper;
     RenderHelper.RenderEntityTypes = RenderEntityTypes;
     function RenderEntityFilter(params, filter) {
         return __awaiter(this, void 0, void 0, function () {
+            var item;
             return __generator(this, function (_a) {
-                throw (new Error("Not implemented."));
+                switch (_a.label) {
+                    case 0:
+                        item = {
+                            BruceEntity: {
+                                "EntityType.ID": filter.entityTypeId
+                            },
+                            Type: MenuItem.EType.Entities,
+                            Caption: "Rendering Filtered Entities",
+                            CameraZoomSettings: [
+                                {
+                                    DisplayType: ZoomControl.EDisplayType.Model3D,
+                                    LODCategoryID: "glb",
+                                    LODLevel: 0,
+                                    MaxZoom: 100000,
+                                    MinZoom: 0,
+                                    StyleID: 0 // 0 = Attempt to get entity type's default.
+                                }
+                            ],
+                            id: ObjectUtils.UId(),
+                            Children: [],
+                            showAllLayers: true,
+                            showAllLayersExcludeBelow: false,
+                            tagIds: []
+                        };
+                        return [4 /*yield*/, params.manager.RenderItem({
+                                apiGetter: params.apiGetter,
+                                item: item
+                            })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     }
@@ -3869,6 +3960,7 @@ var MPoint;
                 var text = lat + ", " + lon + ", " + alt;
                 element.innerText = text;
                 var bounds = element.getBoundingClientRect();
+                // TODO: Account for billboard image size.
                 element.style.marginLeft = (-bounds.width / 2) + "px";
                 element.style.marginTop = (-bounds.height - 30) + "px";
                 container.appendChild(element);
@@ -3930,7 +4022,7 @@ var MeasureAddon = /** @class */ (function () {
             if (entity.polyline) {
                 this.items = MPolyline.Render(this.container, this.viewer, entity);
             }
-            else if (entity.point) {
+            else if (entity.point || entity.billboard) {
                 this.items = MPoint.Render(this.container, this.viewer, entity);
             }
         }
@@ -3960,5 +4052,5 @@ var MeasureAddon = /** @class */ (function () {
     return MeasureAddon;
 }());
 
-export { CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, RenderHelper, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, ViewRenderEngine, TileRenderEngine, MeasureAddon };
+export { CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, RenderHelper, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, ViewRenderEngine, TileRenderEngine, MeasureAddon, SharedGetters };
 //# sourceMappingURL=bruce-cesium.es5.js.map