bruce-cesium 0.2.2 → 0.2.3

package/dist/bruce-cesium.umd.js

@@ -120,6 +120,7 @@
             clearInterval(this.checkInterval);
         };
         CesiumViewMonitor.prototype.tryDoUpdate = function () {
+            var _a;
             var viewRect = null;
             var center = null;
             var camera = this.viewer.camera;
@@ -180,6 +181,7 @@
                 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))) ||
@@ -553,6 +555,25 @@
                 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 = {}));
     })(exports.RenderManager || (exports.RenderManager = {}));
 
@@ -1350,7 +1371,7 @@
 
     (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;
@@ -1360,6 +1381,7 @@
                 this.isRunningCheck = false;
                 this.viewMonitorRemoval = null;
                 this.viewer = viewer;
+                this.sharedGetters = sharedGetters;
                 this.apiGetter = apiGetter;
                 this.item = item;
                 this.visualsManager = visualsManager;
@@ -1373,15 +1395,21 @@
             });
             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 bruceModels.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 = exports.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);
                         });
@@ -1402,6 +1430,9 @@
                 }
                 (_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);
@@ -2798,6 +2829,34 @@
         TilesetCadRenderManager.Manager = Manager;
     })(exports.TilesetCadRenderManager || (exports.TilesetCadRenderManager = {}));
 
+    function createFilterGetterCacheKey(params) {
+        var cacheKey = "";
+        cacheKey += params.api.GetBaseUrl();
+        cacheKey += params.typeId;
+        cacheKey += params.batchSize;
+        cacheKey += JSON.stringify(params.attrFilter);
+        return cacheKey;
+    }
+    (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 bruceModels.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;
+    })(exports.SharedGetters || (exports.SharedGetters = {}));
+
     (function (MenuItemManager) {
         var Manager = /** @class */ (function () {
             function Manager(viewer, visualsRegister) {
@@ -2808,6 +2867,7 @@
                     visualsRegister = new exports.VisualsRegister.Register(viewer);
                 }
                 this.visualsRegister = visualsRegister;
+                this.sharedGetters = new exports.SharedGetters.Cache(this.viewer);
             }
             Object.defineProperty(Manager.prototype, "Viewer", {
                 get: function () {
@@ -2858,7 +2918,7 @@
                                 };
                                 switch (params.item.Type) {
                                     case bruceModels.MenuItem.EType.Entities:
-                                        rItem.renderManager = new exports.EntitiesRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, params.item);
+                                        rItem.renderManager = new exports.EntitiesRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, params.item, this.sharedGetters);
                                         break;
                                     case bruceModels.MenuItem.EType.EntitiesLoaded:
                                         rItem.renderManager = new exports.EntitiesLoadedRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, params.item);
@@ -3049,8 +3109,38 @@
         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: bruceModels.MenuItem.EType.Entities,
+                                Caption: "Rendering Filtered Entities",
+                                CameraZoomSettings: [
+                                    {
+                                        DisplayType: bruceModels.ZoomControl.EDisplayType.Model3D,
+                                        LODCategoryID: "glb",
+                                        LODLevel: 0,
+                                        MaxZoom: 100000,
+                                        MinZoom: 0,
+                                        StyleID: 0 // 0 = Attempt to get entity type's default.
+                                    }
+                                ],
+                                id: bruceModels.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()];
+                    }
                 });
             });
         }