bruce-models 0.9.0 → 0.9.2

package/dist/lib/entity/getters/batched-data-getter.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BatchedDataGetter = void 0;
-var bruce_event_1 = require("../../common/bruce-event");
-var MAX_AREA_IN_DEGREES = 90;
-var GETTER_DELAY = 50;
+const bruce_event_1 = require("../../common/bruce-event");
+const MAX_AREA_IN_DEGREES = 90;
+const GETTER_DELAY = 50;
 /**
  * This is a batched "arbitrary data" getter.
  * You feed it an array of data, then it will emit that data in batches when the view changes.
  */
 var BatchedDataGetter;
 (function (BatchedDataGetter) {
-    var Getter = /** @class */ (function () {
-        function Getter(data, viewPort, batchSize) {
+    class Getter {
+        constructor(data, viewPort, batchSize) {
             this.viewPortRemoval = null;
             this.viewRect = null;
             this.viewCenter = null;
@@ -20,34 +20,29 @@ var BatchedDataGetter;
             this.viewPort = viewPort;
             this.batchSize = batchSize;
         }
-        Object.defineProperty(Getter.prototype, "OnUpdate", {
-            get: function () {
-                if (!this.onUpdate) {
-                    this.onUpdate = new bruce_event_1.BruceEvent();
-                }
-                return this.onUpdate;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Getter.prototype.Start = function () {
-            var _this = this;
-            this.viewPortRemoval = this.viewPort.Updated().Subscribe(function () {
-                _this.updateViewport();
+        get OnUpdate() {
+            if (!this.onUpdate) {
+                this.onUpdate = new bruce_event_1.BruceEvent();
+            }
+            return this.onUpdate;
+        }
+        Start() {
+            this.viewPortRemoval = this.viewPort.Updated().Subscribe(() => {
+                this.updateViewport();
             });
             this.updateViewport();
-        };
-        Getter.prototype.Dispose = function () {
+        }
+        Dispose() {
             var _a;
             (_a = this.viewPortRemoval) === null || _a === void 0 ? void 0 : _a.call(this);
-        };
-        Getter.prototype.updateViewport = function () {
+        }
+        updateViewport() {
             this.updateBounds();
             this.startGetterLoop();
-        };
-        Getter.prototype.updateBounds = function () {
-            var viewRect = this.viewPort.GetBounds();
-            var poi = this.viewPort.GetTarget();
+        }
+        updateBounds() {
+            const viewRect = this.viewPort.GetBounds();
+            const poi = this.viewPort.GetTarget();
             if (viewRect && poi) {
                 if (Math.abs(viewRect.west - viewRect.east) > MAX_AREA_IN_DEGREES) {
                     return;
@@ -58,35 +53,33 @@ var BatchedDataGetter;
                 this.viewRect = viewRect;
                 this.viewCenter = poi;
             }
-        };
-        Getter.prototype.startGetterLoop = function () {
-            var _this = this;
+        }
+        startGetterLoop() {
             clearInterval(this.getterInterval);
             if (!this.viewRect || !this.viewCenter) {
                 return;
             }
-            var index = 0;
-            var onTick = function () {
-                _this.processBatch(_this.data.slice(index, index + _this.batchSize));
-                index += _this.batchSize;
-                return index >= _this.data.length;
+            let index = 0;
+            const onTick = () => {
+                this.processBatch(this.data.slice(index, index + this.batchSize));
+                index += this.batchSize;
+                return index >= this.data.length;
             };
             if (!onTick()) {
-                this.getterInterval = setInterval(function () {
+                this.getterInterval = setInterval(() => {
                     if (onTick()) {
-                        clearInterval(_this.getterInterval);
+                        clearInterval(this.getterInterval);
                     }
                 }, GETTER_DELAY);
             }
-        };
-        Getter.prototype.processBatch = function (batch) {
+        }
+        processBatch(batch) {
             var _a;
             if (batch.length > 0) {
                 (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger(batch);
             }
-        };
-        return Getter;
-    }());
+        }
+    }
     BatchedDataGetter.Getter = Getter;
 })(BatchedDataGetter = exports.BatchedDataGetter || (exports.BatchedDataGetter = {}));
 //# sourceMappingURL=batched-data-getter.js.map

package/dist/lib/entity/getters/batched-data-getter.js.map

@@ -1 +1 @@
-{"version":3,"file":"batched-data-getter.js","sourceRoot":"","sources":["../../../../src/entity/getters/batched-data-getter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"batched-data-getter.js","sourceRoot":"","sources":["../../../../src/entity/getters/batched-data-getter.ts"],"names":[],"mappings":"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"}

package/dist/lib/entity/getters/entity-filter-getter.js

@@ -8,59 +8,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntityFilterGetter = void 0;
-var api_1 = require("../../api/api");
-var bruce_event_1 = require("../../common/bruce-event");
-var entity_1 = require("../entity");
-var entity_globe_1 = require("./entity-globe");
-var MAX_AREA_IN_DEGREES = 90;
-var MAX_RETRY_ATTEMPTS = 1;
-var RETRY_DELAY_INCREMENT = 500;
-var REQUEST_PAGE_DELAY = 50;
-var regMenuItemGetter = /** @class */ (function () {
-    function regMenuItemGetter(tagIds, minHeight, maxHeight) {
+const api_1 = require("../../api/api");
+const bruce_event_1 = require("../../common/bruce-event");
+const entity_1 = require("../entity");
+const entity_globe_1 = require("./entity-globe");
+const MAX_AREA_IN_DEGREES = 90;
+const MAX_RETRY_ATTEMPTS = 1;
+const RETRY_DELAY_INCREMENT = 500;
+const REQUEST_PAGE_DELAY = 50;
+class regMenuItemGetter {
+    constructor(tagIds, minHeight, maxHeight) {
         this.TagIds = tagIds;
         this.MinHeight = minHeight;
         this.MaxHeight = maxHeight;
     }
-    return regMenuItemGetter;
-}());
+}
 function delay(milliseconds) {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            return [2 /*return*/, new Promise(function (res) {
-                    setTimeout(function () {
-                        res();
-                    }, milliseconds);
-                })];
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((res) => {
+            setTimeout(() => {
+                res();
+            }, milliseconds);
         });
     });
 }
@@ -71,13 +41,13 @@ function delay(milliseconds) {
  */
 var EntityFilterGetter;
 (function (EntityFilterGetter) {
-    var EStatus;
+    let EStatus;
     (function (EStatus) {
         EStatus["Scanning"] = "SCANNING";
         EStatus["Loading"] = "LOADING";
     })(EStatus = EntityFilterGetter.EStatus || (EntityFilterGetter.EStatus = {}));
-    var Getter = /** @class */ (function () {
-        function Getter(api, viewPort, typeId, batchSize, attrFilter) {
+    class Getter {
+        constructor(api, viewPort, typeId, batchSize, attrFilter) {
             this.onUpdate = null;
             this.LastStateUpdates = {};
             this.onStateUpdate = null;
@@ -97,53 +67,44 @@ var EntityFilterGetter;
             this.attrFilter = attrFilter;
             this.updateBounds();
         }
-        Object.defineProperty(Getter.prototype, "OnUpdate", {
-            get: function () {
-                if (!this.onUpdate) {
-                    this.onUpdate = new bruce_event_1.BruceEvent();
-                }
-                return this.onUpdate;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(Getter.prototype, "OnStateUpdate", {
-            get: function () {
-                if (!this.onStateUpdate) {
-                    this.onStateUpdate = new bruce_event_1.BruceEvent();
-                }
-                return this.onStateUpdate;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Getter.prototype.viewAreaSub = function () {
-            var _this = this;
+        get OnUpdate() {
+            if (!this.onUpdate) {
+                this.onUpdate = new bruce_event_1.BruceEvent();
+            }
+            return this.onUpdate;
+        }
+        get OnStateUpdate() {
+            if (!this.onStateUpdate) {
+                this.onStateUpdate = new bruce_event_1.BruceEvent();
+            }
+            return this.onStateUpdate;
+        }
+        viewAreaSub() {
             this.viewAreaDispose();
-            this.viewPortChangeRemoval = this.viewPort.Updated().Subscribe(function () {
-                _this.updateBounds();
-                _this.startGetterLoop();
+            this.viewPortChangeRemoval = this.viewPort.Updated().Subscribe(() => {
+                this.updateBounds();
+                this.startGetterLoop();
             });
-        };
-        Getter.prototype.viewAreaDispose = function () {
+        }
+        viewAreaDispose() {
             var _a;
             (_a = this.viewPortChangeRemoval) === null || _a === void 0 ? void 0 : _a.call(this);
-        };
-        Getter.prototype.GetMenuItems = function () {
+        }
+        GetMenuItems() {
             return Object.keys(this.registeredItems);
-        };
-        Getter.prototype.IncludeMenuItem = function (menuItemId, layerIds, minHeight, maxHeight) {
+        }
+        IncludeMenuItem(menuItemId, layerIds, minHeight, maxHeight) {
             this.registeredItems[menuItemId] = new regMenuItemGetter(layerIds, minHeight, maxHeight);
             this.updateState();
-        };
-        Getter.prototype.ExcludeMenuItem = function (menuItemId) {
+        }
+        ExcludeMenuItem(menuItemId) {
             this.registeredItems[menuItemId] = null;
             delete this.registeredItems[menuItemId];
             this.updateState();
-        };
-        Getter.prototype.updateBounds = function () {
-            var viewRect = this.viewPort.GetBounds();
-            var poi = this.viewPort.GetTarget();
+        }
+        updateBounds() {
+            const viewRect = this.viewPort.GetBounds();
+            const poi = this.viewPort.GetTarget();
             if (viewRect && poi) {
                 if (Math.abs(viewRect.west - viewRect.east) > MAX_AREA_IN_DEGREES) {
                     return;
@@ -154,14 +115,14 @@ var EntityFilterGetter;
                 this.viewRect = viewRect;
                 this.viewCenter = poi;
             }
-        };
-        Getter.prototype.updateState = function () {
-            var tagIds = [];
-            var menuItemIds = this.GetMenuItems();
-            var minHeight = null;
-            var maxHeight = null;
-            for (var i = 0; i < menuItemIds.length; i++) {
-                var menuItem = this.registeredItems[menuItemIds[i]];
+        }
+        updateState() {
+            const tagIds = [];
+            const menuItemIds = this.GetMenuItems();
+            let minHeight = null;
+            let maxHeight = null;
+            for (let i = 0; i < menuItemIds.length; i++) {
+                const menuItem = this.registeredItems[menuItemIds[i]];
                 if (menuItem) {
                     if (maxHeight == null || maxHeight < menuItem.MaxHeight) {
                         maxHeight = menuItem.MaxHeight;
@@ -169,10 +130,10 @@ var EntityFilterGetter;
                     if (minHeight == null || minHeight > menuItem.MinHeight) {
                         minHeight = menuItem.MinHeight;
                     }
-                    var itemLayerIds = menuItem.TagIds;
+                    const itemLayerIds = menuItem.TagIds;
                     if (itemLayerIds) {
-                        for (var j = 0; j < itemLayerIds.length; j++) {
-                            var itemLayerId = itemLayerIds[j];
+                        for (let j = 0; j < itemLayerIds.length; j++) {
+                            const itemLayerId = itemLayerIds[j];
                             if (!tagIds.includes(itemLayerId)) {
                                 tagIds.push(itemLayerId);
                             }
@@ -194,152 +155,120 @@ var EntityFilterGetter;
                 this.getterLoopId = -1;
                 this.viewAreaDispose();
             }
-        };
-        Getter.prototype.postStatus = function (status) {
+        }
+        postStatus(status) {
             var _a;
             this.LastStateUpdates[status.msg] = status;
             (_a = this.onStateUpdate) === null || _a === void 0 ? void 0 : _a.Trigger(status);
-        };
-        Getter.prototype.startGetterLoop = function () {
-            var _this = this;
+        }
+        startGetterLoop() {
             // Increase id so that existing loops stop.
             this.getterLoopId += 1;
-            var loopId = this.getterLoopId;
-            new Promise(function () { return __awaiter(_this, void 0, void 0, function () {
-                var MIN_HEIGHT, MAX_HEIGHT, PAGE_SIZE, retryAttempts, retryDelay, prevFirstId, prevLastId, alt, cells, curCellIndex, postedScanning, postedLoading, curCell, page, first, last, e_1;
+            const loopId = this.getterLoopId;
+            new Promise(() => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b, _c, _d, _e;
-                return __generator(this, function (_f) {
-                    switch (_f.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)];
-                        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.
-                            _f.sent();
-                            MIN_HEIGHT = this.minHeight;
-                            MAX_HEIGHT = this.maxHeight;
-                            PAGE_SIZE = this.batchSize;
-                            retryAttempts = MAX_RETRY_ATTEMPTS;
-                            retryDelay = 0;
-                            prevFirstId = "";
-                            prevLastId = "";
-                            _f.label = 2;
-                        case 2:
-                            if (!((!this.viewCenter || !this.viewRect) && this.getterLoopId == loopId)) return [3 /*break*/, 4];
-                            return [4 /*yield*/, delay(RETRY_DELAY_INCREMENT)];
-                        case 3:
-                            _f.sent();
-                            return [3 /*break*/, 2];
-                        case 4:
-                            if (this.getterLoopId != loopId) {
-                                return [2 /*return*/];
-                            }
-                            alt = this.viewRect.alt;
-                            if (alt > MAX_HEIGHT || (alt < MIN_HEIGHT && MIN_HEIGHT > 0)) {
-                                return [2 /*return*/];
-                            }
-                            cells = this.cells.GetCellsForView(this.viewRect);
-                            curCellIndex = cells.length > 0 ? 0 : null;
-                            postedScanning = false;
-                            postedLoading = false;
-                            _f.label = 5;
-                        case 5:
-                            if (!(retryAttempts > 0 && curCellIndex != null)) return [3 /*break*/, 13];
-                            if (this.getterLoopId != loopId) {
-                                return [3 /*break*/, 13];
-                            }
-                            if (!(retryDelay > 0)) return [3 /*break*/, 7];
-                            return [4 /*yield*/, delay(retryDelay)];
-                        case 6:
-                            _f.sent();
-                            _f.label = 7;
-                        case 7:
-                            if (!postedScanning) {
-                                this.postStatus({ msg: EStatus.Scanning, revoking: false });
-                                postedScanning = true;
-                            }
-                            curCell = cells[curCellIndex];
-                            if (curCell.IsFetched()) {
-                                curCellIndex += 1;
-                                if (!cells[curCellIndex]) {
-                                    curCellIndex = null;
-                                }
-                                return [3 /*break*/, 5];
-                            }
-                            _f.label = 8;
-                        case 8:
-                            _f.trys.push([8, 10, , 11]);
-                            return [4 /*yield*/, entity_1.Entity.Filter.V1.GetList(this.api, {
-                                    pageSize: PAGE_SIZE,
-                                    pageIndex: curCell.FetchPageIndex,
-                                    entityTypeId: this.typeId,
-                                    layerIds: this.tagIds,
-                                    bounds: curCell.GetBounds(),
-                                    sortOrder: api_1.Api.ESortOrder.Asc,
-                                    entityTypeConditions: this.attrFilter
-                                })];
-                        case 9:
-                            page = _f.sent();
-                            if (this.getterLoopId != loopId) {
-                                return [3 /*break*/, 13];
-                            }
-                            if (page) {
-                                (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger(page);
-                            }
-                            if (!postedLoading) {
-                                this.postStatus({ msg: EStatus.Loading, revoking: false });
-                                postedLoading = true;
-                            }
-                            if (page.length <= 0) {
-                                curCell.Fetched = true; // Only mark as fetched when ALL pages are done.
-                                return [3 /*break*/, 5];
-                            }
-                            // Checking to make sure it's not just the same batch over and over again.
-                            if (page.length > 0) {
-                                first = (_c = (_b = page[0]) === null || _b === void 0 ? void 0 : _b.Bruce) === null || _c === void 0 ? void 0 : _c.ID;
-                                last = (_e = (_d = page[page.length - 1]) === null || _d === void 0 ? void 0 : _d.Bruce) === null || _e === void 0 ? void 0 : _e.ID;
-                                if (prevFirstId == first && prevLastId == last) {
-                                    return [3 /*break*/, 13];
-                                }
-                                else {
-                                    prevFirstId = first;
-                                    prevLastId = last;
-                                }
-                            }
-                            curCell.FetchPageIndex++;
-                            // Request passed so let's assume it was server hiccup and refresh counts.
-                            retryAttempts = MAX_RETRY_ATTEMPTS;
-                            retryDelay = 0;
-                            return [3 /*break*/, 11];
-                        case 10:
-                            e_1 = _f.sent();
-                            console.log(e_1);
-                            // Request failed so let's add a delay and try again soon.
-                            retryDelay += RETRY_DELAY_INCREMENT;
-                            retryAttempts -= 1;
-                            return [3 /*break*/, 11];
-                        case 11: return [4 /*yield*/, delay(REQUEST_PAGE_DELAY)];
-                        case 12:
-                            _f.sent();
-                            return [3 /*break*/, 5];
-                        case 13:
-                            if (postedLoading) {
-                                this.postStatus({ msg: EStatus.Loading, revoking: true });
+                // 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.
+                yield delay(100);
+                const MIN_HEIGHT = this.minHeight;
+                const MAX_HEIGHT = this.maxHeight;
+                const PAGE_SIZE = this.batchSize;
+                let retryAttempts = MAX_RETRY_ATTEMPTS;
+                let retryDelay = 0;
+                let prevFirstId = "";
+                let prevLastId = "";
+                while ((!this.viewCenter || !this.viewRect) && this.getterLoopId == loopId) {
+                    yield delay(RETRY_DELAY_INCREMENT);
+                }
+                if (this.getterLoopId != loopId) {
+                    return;
+                }
+                const alt = this.viewRect.alt;
+                if (alt > MAX_HEIGHT || (alt < MIN_HEIGHT && MIN_HEIGHT > 0)) {
+                    return;
+                }
+                const cells = this.cells.GetCellsForView(this.viewRect);
+                let curCellIndex = cells.length > 0 ? 0 : null;
+                let postedScanning = false;
+                let postedLoading = false;
+                while (retryAttempts > 0 && curCellIndex != null) {
+                    if (this.getterLoopId != loopId) {
+                        break;
+                    }
+                    if (retryDelay > 0) {
+                        yield delay(retryDelay);
+                    }
+                    if (!postedScanning) {
+                        this.postStatus({ msg: EStatus.Scanning, revoking: false });
+                        postedScanning = true;
+                    }
+                    const curCell = cells[curCellIndex];
+                    if (curCell.IsFetched()) {
+                        curCellIndex += 1;
+                        if (!cells[curCellIndex]) {
+                            curCellIndex = null;
+                        }
+                        continue;
+                    }
+                    try {
+                        const page = yield entity_1.Entity.Filter.V1.GetList(this.api, {
+                            pageSize: PAGE_SIZE,
+                            pageIndex: curCell.FetchPageIndex,
+                            entityTypeId: this.typeId,
+                            layerIds: this.tagIds,
+                            bounds: curCell.GetBounds(),
+                            sortOrder: api_1.Api.ESortOrder.Asc,
+                            entityTypeConditions: this.attrFilter
+                        });
+                        if (this.getterLoopId != loopId) {
+                            break;
+                        }
+                        if (page) {
+                            (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger(page);
+                        }
+                        if (!postedLoading) {
+                            this.postStatus({ msg: EStatus.Loading, revoking: false });
+                            postedLoading = true;
+                        }
+                        if (page.length <= 0) {
+                            curCell.Fetched = true; // Only mark as fetched when ALL pages are done.
+                            continue;
+                        }
+                        // Checking to make sure it's not just the same batch over and over again.
+                        if (page.length > 0) {
+                            const first = (_c = (_b = page[0]) === null || _b === void 0 ? void 0 : _b.Bruce) === null || _c === void 0 ? void 0 : _c.ID;
+                            const last = (_e = (_d = page[page.length - 1]) === null || _d === void 0 ? void 0 : _d.Bruce) === null || _e === void 0 ? void 0 : _e.ID;
+                            if (prevFirstId == first && prevLastId == last) {
+                                break;
                             }
-                            if (postedScanning) {
-                                this.postStatus({ msg: EStatus.Scanning, revoking: true });
+                            else {
+                                prevFirstId = first;
+                                prevLastId = last;
                             }
-                            return [2 /*return*/];
+                        }
+                        curCell.FetchPageIndex++;
+                        // Request passed so let's assume it was server hiccup and refresh counts.
+                        retryAttempts = MAX_RETRY_ATTEMPTS;
+                        retryDelay = 0;
                     }
-                });
-            }); });
-        };
-        return Getter;
-    }());
+                    catch (e) {
+                        console.log(e);
+                        // Request failed so let's add a delay and try again soon.
+                        retryDelay += RETRY_DELAY_INCREMENT;
+                        retryAttempts -= 1;
+                    }
+                    yield delay(REQUEST_PAGE_DELAY);
+                }
+                if (postedLoading) {
+                    this.postStatus({ msg: EStatus.Loading, revoking: true });
+                }
+                if (postedScanning) {
+                    this.postStatus({ msg: EStatus.Scanning, revoking: true });
+                }
+            }));
+        }
+    }
     EntityFilterGetter.Getter = Getter;
 })(EntityFilterGetter = exports.EntityFilterGetter || (exports.EntityFilterGetter = {}));
 //# sourceMappingURL=entity-filter-getter.js.map