bruce-models 3.0.1 → 3.0.3

package/dist/bruce-models.es5.js

@@ -2066,10 +2066,10 @@ var Entity;
         return `${Api.ECacheKey.Entity}${Api.ECacheKey.Id}${entityId}${String(entityTypeId)}${String(Boolean(expandLocation))}`;
     }
     Entity.GetCacheKey = GetCacheKey;
-    function GetStartsWithKey(entityId) {
+    function GetContainsKey(entityId) {
         return `${Api.ECacheKey.Entity}${Api.ECacheKey.Id}${entityId}`;
     }
-    Entity.GetStartsWithKey = GetStartsWithKey;
+    Entity.GetContainsKey = GetContainsKey;
     function Get(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let { api, entityId, req: reqParams, expandLocation, entityTypeId } = params;
@@ -2183,7 +2183,7 @@ var Entity;
                 throw ("Entity ID is required.");
             }
             yield api.DELETE(`entity/${entityId}`, Api.PrepReqParams(reqParams));
-            api.Cache.RemoveByStartsWith(GetStartsWithKey(entityId));
+            api.Cache.RemoveByContains(GetContainsKey(entityId));
         });
     }
     Entity.Delete = Delete;
@@ -2201,7 +2201,7 @@ var Entity;
             }, Api.PrepReqParams(reqParams));
             for (let i = 0; i < entityIds.length; i++) {
                 const entityId = entityIds[i];
-                api.Cache.RemoveByStartsWith(GetStartsWithKey(entityId));
+                api.Cache.RemoveByContains(GetContainsKey(entityId));
             }
         });
     }
@@ -2221,7 +2221,7 @@ var Entity;
             }
             const reqUrl = `entity/${data.Bruce.ID}/?dataoverride=${override}&BruceEntityType=${data.Bruce["EntityType.ID"]}`;
             const res = yield api.POST(reqUrl, data, Api.PrepReqParams(reqParams));
-            api.Cache.RemoveByStartsWith(GetStartsWithKey(data.Bruce.ID));
+            api.Cache.RemoveByContains(GetContainsKey(data.Bruce.ID));
             return {
                 entity: res
             };
@@ -2690,16 +2690,35 @@ var Calculator;
             let value;
             switch (field.type) {
                 case EValueType.Gradient:
-                    value = String(GetGradientValue(field.value, entity));
+                    {
+                        const tmp = GetGradientValue(field.value, entity);
+                        // This avoids null turning into "null".
+                        if (tmp) {
+                            value = String(tmp);
+                        }
+                    }
                     break;
                 case EValueType.Color:
                 case EValueType.Input:
-                    value = String(GetInputValue(field.value, entity));
+                    {
+                        const tmp = GetInputValue(field.value, entity);
+                        // This avoids null turning into "null".
+                        if (tmp) {
+                            value = String(tmp);
+                        }
+                    }
                     break;
                 case EValueType.Mapping:
-                    value = String(GetMappingValue(field.value, entity));
+                    {
+                        const tmp = GetMappingValue(field.value, entity);
+                        // This avoids null turning into "null".
+                        if (tmp) {
+                            value = String(tmp);
+                        }
+                    }
                     break;
                 case EValueType.RandomColor:
+                    // Would be nice to randomize based on an attribute or entity ID instead of pure random.
                     var color = Color.RandomColor();
                     value = `rgba(${color.red},${color.green},${color.blue},${color.alpha})`;
                     break;
@@ -9108,7 +9127,7 @@ var DataSource;
     DataSource.GetList = GetList;
 })(DataSource || (DataSource = {}));
 
-const VERSION = "3.0.1";
+const VERSION = "3.0.3";
 
 export { VERSION, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, CamApi, IdmApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityGlobe, EntityFilterGetter, BatchedDataGetter, EntityCoords, EntityTypeVisualSettings, EntityAttribute, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, ImportCad, ImportCsv, ImportJson, ImportKml, ImportedFile, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
 //# sourceMappingURL=bruce-models.es5.js.map