bruce-models 1.0.4 → 1.0.6

package/dist/bruce-models.es5.js

@@ -1646,19 +1646,16 @@ var Entity;
                             ]
                         };
                     }
-                    let url = "entities" +
-                        // Page size and index.
-                        `?PageSize=${filter.pageSize}&PageIndex=${filter.pageIndex}` +
-                        // Entity type id.
-                        (filter.entityTypeId ? `&BruceEntityType=${filter.entityTypeId}` : "") +
-                        // Lod.
-                        (filter.lodCategoryId ? "&LODType=" + filter.lodCategoryId : "") +
-                        // Attribute filter.
-                        (!requestFilter ? "" : "&Filter=" + Api.Encode(JSON.stringify(requestFilter))) +
-                        // Order by attribute + sort order.
-                        (!filter.orderBy ? "" : "&OrderBy=" + filter.orderBy) +
-                        (filter.sortOrder ? `&SortOrder=${filter.sortOrder == Api.ESortOrder.Asc ? "ASC" : "DESC"}` : "");
-                    const data = yield api.GET(url, Api.PrepReqParams(reqParams));
+                    const body = {
+                        SortOrder: filter.sortOrder == Api.ESortOrder.Asc ? "ASC" : "DESC",
+                        OrderBy: filter.orderBy,
+                        Filter: requestFilter,
+                        LODType: filter.lodCategoryId,
+                        BruceEntityType: filter.entityTypeId,
+                        PageIndex: filter.pageIndex,
+                        PageSize: filter.pageSize
+                    };
+                    const data = yield api.POST("entities", body, Api.PrepReqParams(reqParams));
                     const entities = data.Items;
                     for (let i = 0; i < entities.length; i++) {
                         const entity = entities[i];
@@ -3332,6 +3329,7 @@ var EntityGlobe;
                 const lon2 = lon1 + cellDegreeSize;
                 const lat2 = lat1 + cellDegreeSize;
                 const [id, cell] = getOrCreateCell(this.cells, cellDegreeSize, lon1, lon2, lat1, lat2);
+                /*
                 {
                     const cell_bounds = { south: lat1, west: lon1, north: lat2, east: lon2 };
                     const subcells = [];
@@ -3358,11 +3356,13 @@ var EntityGlobe;
                         cell.Fetched = true;
                         return;
                     }
+
                     let [x2, y2] = max;
                     x2 = Math.max(x2, lon2);
                     y2 = Math.max(y2, lat2);
                     max = [x2, y2];
                 }
+                */
                 ids.push(id);
                 cells.push(cell);
                 cells[id] = cell;
@@ -3398,31 +3398,6 @@ function intersects(l, r) {
     const { west: wr, south: sr, north: nr, east: er } = r;
     return !(e <= wr || w >= er || n <= sr || s >= nr);
 }
-function contains(l, r) {
-    const { west: w, south: s, north: n, east: e } = l;
-    const { west: wr, south: sr, north: nr, east: er } = r;
-    return !(er < e || wr > w || nr > n || sr < s);
-}
-function crop(rect, by) {
-    let { west: w, south: s, north: n, east: e } = rect;
-    const { west: wc, south: sc, north: nc, east: ec } = by;
-    w = Math.max(w, ec);
-    e = Math.min(e, wc);
-    s = Math.max(s, nc);
-    n = Math.min(n, sc);
-    return { west: w, south: s, north: n, east: e };
-}
-function intersection(l, r) {
-    const { west: w, south: s, north: n, east: e } = l;
-    const { west: wr, south: sr, north: nr, east: er } = r;
-    const x = Math.min(e, er) - Math.max(w, wr);
-    const y = Math.min(n, nr) - Math.max(s, sr);
-    return (x > 0 && y > 0) ? x * y : 0;
-}
-function area(rect) {
-    let { west: w, south: s, north: n, east: e } = rect;
-    return Math.abs((e - w) * (n - s));
-}
 function floorValueToCellSize(size, value) {
     return Math.floor(value / size) * size;
 }
@@ -3553,6 +3528,14 @@ var EntityFilterGetter;
             }
             return this.onScanUpdate;
         }
+        /**
+         * Returns id that represents the combined menu item parameters.
+         * If integrity changes while a request is running, the request will not emit a response.
+         * @returns
+         */
+        getIntegrityId() {
+            return this.tagIds == null ? "" : this.tagIds.join();
+        }
         viewAreaSub() {
             this.viewAreaDispose();
             this.viewPortChangeRemoval = this.viewPort.Updated().Subscribe(() => {
@@ -3639,6 +3622,7 @@ var EntityFilterGetter;
             // Increase id so that existing loops stop.
             this.getterLoopId += 1;
             const loopId = this.getterLoopId;
+            const loopIntegrity = this.getIntegrityId();
             new Promise(() => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b, _c, _d, _e, _f, _g, _h;
                 // Minor delay to stop 50 menu items enabling doing their first request all together.
@@ -3697,12 +3681,13 @@ var EntityFilterGetter;
                             sortOrder: Api.ESortOrder.Asc,
                             entityTypeConditions: this.attrFilter
                         });
+                        const integrity = this.getIntegrityId();
+                        if (loopIntegrity == integrity && page) {
+                            (_c = this.onUpdate) === null || _c === void 0 ? void 0 : _c.Trigger(page);
+                        }
                         if (this.getterLoopId != loopId) {
                             break;
                         }
-                        if (page) {
-                            (_c = this.onUpdate) === null || _c === void 0 ? void 0 : _c.Trigger(page);
-                        }
                         if (!postedLoading) {
                             this.postStatus({ msg: EStatus.Loading, revoking: false });
                             postedLoading = true;