bruce-models 1.8.4 → 1.8.6

package/dist/bruce-models.es5.js

@@ -2086,6 +2086,7 @@ var Calculator;
     /**
      * Calculates the value of arbitrary field options.
      * The context calling this should validate results and parse stuff if needed.
+     * @deprecated use specific calls: eg GetColor or GetNumber.
      * @param fields
      * @param entity
      * @param tags
@@ -2190,6 +2191,77 @@ var Calculator;
         return null;
     }
     Calculator.GetColor = GetColor;
+    function GetNumber(fields, entity, tags) {
+        if (!tags) {
+            tags = [];
+        }
+        if (!entity) {
+            entity = {};
+        }
+        for (let i = 0; i < fields.length; i++) {
+            const field = fields[i];
+            let value;
+            switch (field.type) {
+                case EValueType.Gradient:
+                    value = Number(GetGradientValue(field.value, entity));
+                    break;
+                case EValueType.Color:
+                case EValueType.Input:
+                    value = Number(GetInputValue(field.value, entity));
+                    break;
+                case EValueType.Mapping:
+                    value = Number(GetMappingValue(field.value, entity));
+                    break;
+            }
+            if (value || value == 0) {
+                return value;
+            }
+        }
+        return null;
+    }
+    Calculator.GetNumber = GetNumber;
+    function GetString(fields, entity, tags) {
+        if (!tags) {
+            tags = [];
+        }
+        if (!entity) {
+            entity = {};
+        }
+        for (let i = 0; i < fields.length; i++) {
+            const field = fields[i];
+            let value;
+            switch (field.type) {
+                case EValueType.Gradient:
+                    value = String(GetGradientValue(field.value, entity));
+                    break;
+                case EValueType.Color:
+                case EValueType.Input:
+                    value = String(GetInputValue(field.value, entity));
+                    break;
+                case EValueType.Mapping:
+                    value = String(GetMappingValue(field.value, entity));
+                    break;
+                case EValueType.RandomColor:
+                    var color = Color.RandomColor();
+                    value = `rgba(${color.red},${color.green},${color.blue},${color.alpha})`;
+                    break;
+                case EValueType.TagColor:
+                    for (let i = 0; i < tags.length; i++) {
+                        const tag = tags[i];
+                        if (tag.Color) {
+                            value = tag.Color;
+                            break;
+                        }
+                    }
+                    break;
+            }
+            if (value) {
+                return value;
+            }
+        }
+        return null;
+    }
+    Calculator.GetString = GetString;
     function GetMappingValue(value, entity) {
         const attrPath = parseLegacyPath(value.field);
         let eValue = Entity.GetValue({
@@ -4300,7 +4372,7 @@ var EntityFilterGetter;
                 this.viewAreaSub();
             }
             else {
-                this.getterLoopId = -1;
+                this.getterLoopId += 1;
                 this.viewAreaDispose();
             }
         }
@@ -4342,13 +4414,14 @@ var EntityFilterGetter;
                 let curCellIndex = cells.length > 0 ? 0 : null;
                 let postedScanning = false;
                 let postedLoading = false;
+                let total = 0;
                 while (retryAttempts > 0 && curCellIndex != null) {
-                    if (this.getterLoopId != loopId) {
-                        break;
-                    }
                     if (retryDelay > 0) {
                         yield delay(retryDelay);
                     }
+                    if (this.getterLoopId != loopId) {
+                        break;
+                    }
                     if (!postedScanning) {
                         this.postStatus({ msg: EStatus.Scanning, revoking: false });
                         postedScanning = true;
@@ -4363,13 +4436,13 @@ var EntityFilterGetter;
                         continue;
                     }
                     try {
-                        const { entities } = yield Entity.GetList({
+                        let { entities } = yield Entity.GetList({
                             api: this.api,
                             filter: {
                                 pageSize: PAGE_SIZE,
                                 pageIndex: curCell.FetchPageIndex,
                                 entityTypeId: this.typeId,
-                                //layerIds: this.tagIds,
+                                layerIds: this.tagIds,
                                 bounds: curCell.GetBounds(),
                                 sortOrder: Api.ESortOrder.Asc,
                                 entityTypeConditions: this.attrFilter
@@ -4383,6 +4456,9 @@ var EntityFilterGetter;
                         if (this.getterLoopId != loopId) {
                             break;
                         }
+                        if (entities.length) {
+                            total += entities.length;
+                        }
                         if (!postedLoading) {
                             this.postStatus({ msg: EStatus.Loading, revoking: false });
                             postedLoading = true;