bruce-models 3.9.8 → 3.9.9

package/dist/bruce-models.umd.js

@@ -7485,6 +7485,80 @@
         ProgramKey.GetListCacheKey = GetListCacheKey;
     })(exports.ProgramKey || (exports.ProgramKey = {}));
 
+    /**
+     * Converts legacy records into something easier to work with alongside the newer ones.
+     * On save we'll convert back to the legacy format.
+     * @param record record we need to convert into a new version
+     * @param newer supplementary newer one that lacks the legacy fields
+     * @returns
+     */
+    function convertLegacyRec(record, newer) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        const tileset = {
+            id: record.ID,
+            name: record.Name,
+            type: (_a = record.Type) !== null && _a !== void 0 ? _a : newer === null || newer === void 0 ? void 0 : newer.type,
+            rootFileName: record.RootFileName,
+            settings: {
+                creationTypeId: record["TilesetCreation.EntityType.ID"],
+                creationEntityFilter: record["TilesetCreation.EntitiesFilter"],
+                creationTerrainSrc: record["TilesetCreation.TerrainSource"],
+                creationSettings: record["TilesetCreation.Settings"],
+                creationZoomControl: record["TilesetCreation.ZoomControl"],
+                origin: Object.assign({}, (_b = record.Settings) === null || _b === void 0 ? void 0 : _b.origin),
+                positionOffset: Object.assign({}, (_c = record.Settings) === null || _c === void 0 ? void 0 : _c.positionOffset),
+                rotation: Object.assign({}, (_d = record.Settings) === null || _d === void 0 ? void 0 : _d.rotation),
+                visual: Object.assign({}, (_e = record.Settings) === null || _e === void 0 ? void 0 : _e.visual),
+                dontRotate: (_g = (_f = record.Settings) === null || _f === void 0 ? void 0 : _f.etc) === null || _g === void 0 ? void 0 : _g.dontRotate,
+                dontTransform: (_j = (_h = record.Settings) === null || _h === void 0 ? void 0 : _h.etc) === null || _j === void 0 ? void 0 : _j.dontTransform,
+                ExternalTilesetURL: (_l = (_k = record.Settings) === null || _k === void 0 ? void 0 : _k.etc) === null || _l === void 0 ? void 0 : _l.ExternalTilesetURL,
+                showAdvancedSettings: (_o = (_m = record.Settings) === null || _m === void 0 ? void 0 : _m.etc) === null || _o === void 0 ? void 0 : _o.showAdvancedSettings
+            },
+            // Not returned in legacy data.
+            creationTime: newer === null || newer === void 0 ? void 0 : newer.creationTime,
+            // Not returned in legacy data.
+            fileIds: newer === null || newer === void 0 ? void 0 : newer.fileIds,
+            // Not returned in legacy data.
+            generateVersion: newer === null || newer === void 0 ? void 0 : newer.generateVersion,
+            // Not returned in legacy data.
+            loadUrl: null,
+            // Not returned in legacy data.
+            modificationTime: newer === null || newer === void 0 ? void 0 : newer.modificationTime,
+            // Not returned in legacy data.
+            isDeleteDisabled: newer === null || newer === void 0 ? void 0 : newer.isDeleteDisabled,
+            // Not returned in legacy data.
+            isRestricted: newer === null || newer === void 0 ? void 0 : newer.isRestricted
+        };
+        return tileset;
+    }
+    function convertBackToLegacy(tileset) {
+        var _a;
+        const settings = ((_a = tileset.settings) !== null && _a !== void 0 ? _a : {});
+        const record = {
+            ID: tileset.id,
+            Name: tileset.name,
+            Type: tileset.type,
+            RootFileName: tileset.rootFileName,
+            Settings: {
+                origin: Object.assign({}, settings === null || settings === void 0 ? void 0 : settings.origin),
+                positionOffset: Object.assign({}, settings === null || settings === void 0 ? void 0 : settings.positionOffset),
+                rotation: Object.assign({}, settings === null || settings === void 0 ? void 0 : settings.rotation),
+                visual: Object.assign({}, settings === null || settings === void 0 ? void 0 : settings.visual),
+                etc: {
+                    dontRotate: settings === null || settings === void 0 ? void 0 : settings.dontRotate,
+                    dontTransform: settings === null || settings === void 0 ? void 0 : settings.dontTransform,
+                    showAdvancedSettings: settings === null || settings === void 0 ? void 0 : settings.showAdvancedSettings,
+                    ExternalTilesetURL: settings === null || settings === void 0 ? void 0 : settings.ExternalTilesetURL
+                }
+            },
+            "TilesetCreation.EntityType.ID": settings === null || settings === void 0 ? void 0 : settings.creationTypeId,
+            "TilesetCreation.EntitiesFilter": settings === null || settings === void 0 ? void 0 : settings.creationEntityFilter,
+            "TilesetCreation.TerrainSource": settings === null || settings === void 0 ? void 0 : settings.creationTerrainSrc,
+            "TilesetCreation.Settings": settings === null || settings === void 0 ? void 0 : settings.creationSettings,
+            "TilesetCreation.ZoomControl": settings === null || settings === void 0 ? void 0 : settings.creationZoomControl
+        };
+        return record;
+    }
     (function (Tileset) {
         /**
          * Available tileset types.
@@ -7539,7 +7613,12 @@
                 }
                 const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
-                        const data = yield api.GET(`tileset/get/${tilesetId}?noFiles=${Boolean(loadFiles) ? 0 : 1}`, reqParams);
+                        let data = yield api.GET(`tileset/get/${tilesetId}?noFiles=${Boolean(loadFiles) ? 0 : 1}`, reqParams);
+                        // If this is a legacy record we have to re-request using the old endpoint and convert.
+                        if (data.type == EType.LegacyEntitiesSet || data.type == EType.LegacyStatic || data.type == EType.LegacyExternal) {
+                            const tmp = yield api.GET(`ui.tileset/${tilesetId}`, reqParams);
+                            data = convertLegacyRec(tmp, data);
+                        }
                         res({
                             tileset: data
                         });
@@ -7611,6 +7690,13 @@
                 const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const data = yield api.GET("tileset/getList", reqParams);
+                        // Convert legacy records.
+                        for (let i = 0; i < data.length; i++) {
+                            const record = data[i];
+                            if (record.type == EType.LegacyEntitiesSet || record.type == EType.LegacyStatic || record.type == EType.LegacyExternal) {
+                                data[i] = convertLegacyRec(yield api.GET(`ui.tileset/${record.id}`, reqParams), data[i]);
+                            }
+                        }
                         res({
                             tilesets: data
                         });
@@ -7666,7 +7752,14 @@
                     const res = yield api.GET(`tileset/new?type=${data.type}&name=${exports.Api.Encode(data.name)}`, reqParams);
                     data = Object.assign(Object.assign(Object.assign({}, res), data), { settings: Object.assign(Object.assign({}, res.settings), data.settings), id: res.id });
                 }
-                yield api.POST(`tileset/update/${data.id}`, data, exports.Api.PrepReqParams(reqParams));
+                // Legacy path. We use a different endpoint and we convert before saving.
+                if (data.type == EType.LegacyEntitiesSet || data.type == EType.LegacyStatic || data.type == EType.LegacyExternal) {
+                    const legacy = convertBackToLegacy(data);
+                    yield api.POST(`ui.tileset/${data.id}`, legacy, exports.Api.PrepReqParams(reqParams));
+                }
+                else {
+                    yield api.POST(`tileset/update/${data.id}`, data, exports.Api.PrepReqParams(reqParams));
+                }
                 yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset + exports.Api.ECacheKey.Id + data.id);
                 yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset);
                 return {
@@ -11291,7 +11384,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "3.9.8";
+    const VERSION = "3.9.9";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;