bruce-cesium 3.3.8 → 3.3.9

package/dist/bruce-cesium.umd.js

@@ -742,6 +742,66 @@
             }
         }
         CesiumEntityStyler.UpdateColorSetting = UpdateColorSetting;
+        /**
+         * Updates the default colour of a graphic.
+         * This will not change the graphic's state to use it if the entity is selected/highlighted.
+         * @param params
+         * @returns
+         */
+        function SetDefaultColor(params) {
+            var viewer = params.viewer, entity = params.entity, requestRender = params.requestRender;
+            if (!entity) {
+                return;
+            }
+            var parts = exports.EntityUtils.GatherEntity({
+                entity: entity
+            });
+            for (var i = 0; i < parts.length; i++) {
+                var part = parts[i];
+                if (!isAlive(viewer, part)) {
+                    continue;
+                }
+                if (part instanceof Cesium.Cesium3DTileFeature) {
+                    var opacity = getAppliedOpacity(part);
+                    storeColor(viewer, "default", params.color, part);
+                    refreshColor(viewer, part, opacity);
+                }
+                else if (part instanceof Cesium.Entity) {
+                    if (part.billboard) {
+                        storeColor(viewer, "default", params.color, part.billboard);
+                        refreshColor(viewer, part.billboard, getAppliedOpacity(part.billboard));
+                    }
+                    if (part.model) {
+                        storeColor(viewer, "default", params.color, part.model);
+                        refreshColor(viewer, part.model, getAppliedOpacity(part.model));
+                    }
+                    if (part.polyline) {
+                        storeColor(viewer, "default", params.color, part.polyline);
+                        refreshColor(viewer, part.polyline, getAppliedOpacity(part.polyline));
+                    }
+                    if (part.polygon) {
+                        storeColor(viewer, "default", params.color, part.polygon);
+                        refreshColor(viewer, part.polygon, getAppliedOpacity(part.polygon));
+                    }
+                    if (part.corridor) {
+                        storeColor(viewer, "default", params.color, part.corridor);
+                        refreshColor(viewer, part.corridor, getAppliedOpacity(part.corridor));
+                    }
+                    if (part.point) {
+                        storeColor(viewer, "default", params.color, part.point);
+                        refreshColor(viewer, part.point, getAppliedOpacity(part.point));
+                    }
+                    if (part.ellipse) {
+                        storeColor(viewer, "default", params.color, part.ellipse);
+                        refreshColor(viewer, part.ellipse, getAppliedOpacity(part.ellipse));
+                    }
+                }
+            }
+            if (requestRender != false) {
+                viewer.scene.requestRender();
+            }
+        }
+        CesiumEntityStyler.SetDefaultColor = SetDefaultColor;
         /**
          * Updates the opacity of the graphic.
          * This will multiply against the current colour's opacity before applying.
@@ -8401,12 +8461,12 @@
              * @param force TODO: This should re-render entities that are already rendered.
              */
             Manager.prototype.renderAsGeojson = function (entities, force) {
-                var _a, _b, _c, _d, _e, _f, _g, _h;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j;
                 return __awaiter(this, void 0, void 0, function () {
-                    var zoomItem, style, e_4, entityType, e_5, pStyle, polygonsClamped, bFillColor, cFillColor, bLineColor, cLineColor, lineWidthPx, geojson, source, groups, register, sEntities, i, cEntity;
+                    var zoomItem, style, e_4, entityType, e_5, pStyle, lStyle, polygonsClamped, bFillColor, cFillColor, bLineColor, cLineColor, lineWidthPx, geojson, source, groups, applyStyle, register, sEntities, i, cEntity;
                     var _this = this;
-                    return __generator(this, function (_j) {
-                        switch (_j.label) {
+                    return __generator(this, function (_k) {
+                        switch (_k.label) {
                             case 0:
                                 entities = entities.filter(function (entity) {
                                     var _a;
@@ -8420,28 +8480,28 @@
                                 zoomItem = this.item.CameraZoomSettings[0];
                                 style = null;
                                 if (!(zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID)) return [3 /*break*/, 4];
-                                _j.label = 1;
+                                _k.label = 1;
                             case 1:
-                                _j.trys.push([1, 3, , 4]);
+                                _k.trys.push([1, 3, , 4]);
                                 return [4 /*yield*/, bruceModels.Style.Get({
                                         api: this.apiGetter.getApi(),
                                         styleId: zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID
                                     })];
                             case 2:
-                                style = (_a = (_j.sent()).style) === null || _a === void 0 ? void 0 : _a.Settings;
+                                style = (_a = (_k.sent()).style) === null || _a === void 0 ? void 0 : _a.Settings;
                                 return [3 /*break*/, 4];
                             case 3:
-                                e_4 = _j.sent();
+                                e_4 = _k.sent();
                                 console.error(e_4);
                                 return [3 /*break*/, 4];
                             case 4:
-                                _j.trys.push([4, 8, , 9]);
+                                _k.trys.push([4, 8, , 9]);
                                 return [4 /*yield*/, bruceModels.EntityType.Get({
                                         entityTypeId: this.item.BruceEntity["EntityType.ID"],
                                         api: this.apiGetter.getApi()
                                     })];
                             case 5:
-                                entityType = (_b = (_j.sent())) === null || _b === void 0 ? void 0 : _b.entityType;
+                                entityType = (_b = (_k.sent())) === null || _b === void 0 ? void 0 : _b.entityType;
                                 if (!(!style && ((_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c["EntityType.ID"]))) return [3 /*break*/, 7];
                                 if (!entityType["DisplaySetting.ID"]) return [3 /*break*/, 7];
                                 return [4 /*yield*/, bruceModels.Style.Get({
@@ -8449,16 +8509,17 @@
                                         styleId: entityType["DisplaySetting.ID"]
                                     })];
                             case 6:
-                                style = (_d = (_j.sent()).style) === null || _d === void 0 ? void 0 : _d.Settings;
-                                _j.label = 7;
+                                style = (_d = (_k.sent()).style) === null || _d === void 0 ? void 0 : _d.Settings;
+                                _k.label = 7;
                             case 7: return [3 /*break*/, 9];
                             case 8:
-                                e_5 = _j.sent();
+                                e_5 = _k.sent();
                                 console.error(e_5);
                                 return [3 /*break*/, 9];
                             case 9:
                                 pStyle = (_e = style === null || style === void 0 ? void 0 : style.polygonStyle) !== null && _e !== void 0 ? _e : {};
-                                polygonsClamped = ((_f = pStyle === null || pStyle === void 0 ? void 0 : pStyle.altitudeOption) === null || _f === void 0 ? void 0 : _f.id) == null ? true : ((_g = pStyle === null || pStyle === void 0 ? void 0 : pStyle.altitudeOption) === null || _g === void 0 ? void 0 : _g.id) == 0;
+                                lStyle = (_f = style === null || style === void 0 ? void 0 : style.polylineStyle) !== null && _f !== void 0 ? _f : {};
+                                polygonsClamped = ((_g = pStyle === null || pStyle === void 0 ? void 0 : pStyle.altitudeOption) === null || _g === void 0 ? void 0 : _g.id) == null ? true : ((_h = pStyle === null || pStyle === void 0 ? void 0 : pStyle.altitudeOption) === null || _h === void 0 ? void 0 : _h.id) == 0;
                                 bFillColor = bruceModels.Calculator.GetColor(pStyle.fillColor, {}, []);
                                 cFillColor = bFillColor ? colorToCColor$2(bFillColor) : Cesium.Color.fromCssColorString("rgba(139, 195, 74, 0.8)");
                                 bLineColor = bruceModels.Calculator.GetColor(pStyle.lineColor, {}, []);
@@ -8480,7 +8541,7 @@
                                     // No points.
                                     allowedDisplayTypes: [bruceModels.ZoomControl.EDisplayType.Geometry]
                                 });
-                                if (!((_h = geojson === null || geojson === void 0 ? void 0 : geojson.features) === null || _h === void 0 ? void 0 : _h.length)) {
+                                if (!((_j = geojson === null || geojson === void 0 ? void 0 : geojson.features) === null || _j === void 0 ? void 0 : _j.length)) {
                                     return [2 /*return*/];
                                 }
                                 return [4 /*yield*/, Cesium.GeoJsonDataSource.load(geojson, {
@@ -8490,7 +8551,7 @@
                                         clampToGround: lineWidthPx <= 0 && polygonsClamped
                                     })];
                             case 10:
-                                source = _j.sent();
+                                source = _k.sent();
                                 this.viewer.dataSources.add(source);
                                 this.sources.push(source);
                                 if (this.disposed) {
@@ -8498,6 +8559,62 @@
                                     return [2 /*return*/];
                                 }
                                 groups = [];
+                                applyStyle = function (thing, entityId, data) {
+                                    if (thing.polygon) {
+                                        var bFillColor_1 = bruceModels.Calculator.GetColor(pStyle.fillColor, data, []);
+                                        var cFillColor_1 = bFillColor_1 ? colorToCColor$2(bFillColor_1) : Cesium.Color.fromCssColorString("rgba(139, 195, 74, 0.8)");
+                                        var bLineColor_1 = bruceModels.Calculator.GetColor(pStyle.lineColor, data, []);
+                                        var cLineColor_1 = bLineColor_1 ? colorToCColor$2(bLineColor_1) : Cesium.Color.fromCssColorString("rgba(80, 80, 80, 0.8)");
+                                        var width = pStyle.lineWidth ? bruceModels.Calculator.GetNumber(pStyle.lineWidth, data, []) : null;
+                                        if (width == null) {
+                                            width = 1;
+                                        }
+                                        width = EnsureNumber(width);
+                                        if (width < 0.01) {
+                                            width = 0;
+                                        }
+                                        var curFillColor = getValue$3(_this.viewer, thing.polygon.material);
+                                        if (curFillColor && curFillColor instanceof Cesium.ColorMaterialProperty) {
+                                            curFillColor = curFillColor.color;
+                                        }
+                                        var curLineColor = getValue$3(_this.viewer, thing.polygon.outlineColor);
+                                        if (curLineColor && curLineColor instanceof Cesium.ColorMaterialProperty) {
+                                            curLineColor = curLineColor.color;
+                                        }
+                                        var curWidth = getValue$3(_this.viewer, thing.polygon.outlineWidth);
+                                        if ((curFillColor instanceof Cesium.Color && curFillColor.equals(cFillColor_1)) &&
+                                            (curLineColor instanceof Cesium.Color && curLineColor.equals(cLineColor_1)) &&
+                                            curWidth == width) {
+                                            return;
+                                        }
+                                        thing.polygon.material = cFillColor_1;
+                                        thing.polygon.outlineColor = cLineColor_1;
+                                        thing.polygon.outlineWidth = width;
+                                    }
+                                    else if (thing.polyline) {
+                                        var bColor = lStyle.lineColor ? bruceModels.Calculator.GetColor(lStyle.lineColor, data, []) : null;
+                                        var cColor = bColor ? colorToCColor$2(bColor) : Cesium.Color.fromCssColorString("rgba(255, 193, 7, 0.8)");
+                                        var width = lStyle.lineWidth ? bruceModels.Calculator.GetNumber(lStyle.lineWidth, data, []) : null;
+                                        if (width == null) {
+                                            width = 2;
+                                        }
+                                        width = EnsureNumber(width);
+                                        if (width < 0.01) {
+                                            width = 0;
+                                        }
+                                        var curColor = getValue$3(_this.viewer, thing.polyline.material);
+                                        if (curColor && curColor instanceof Cesium.ColorMaterialProperty) {
+                                            curColor = curColor.color;
+                                        }
+                                        var curWidth = getValue$3(_this.viewer, thing.polyline.width);
+                                        if ((curColor instanceof Cesium.Color && curColor.equals(cColor)) &&
+                                            curWidth == width) {
+                                            return;
+                                        }
+                                        thing.polyline.material = cColor;
+                                        thing.polyline.width = width;
+                                    }
+                                };
                                 register = function (thing) {
                                     var _a, _b, _c, _d;
                                     // See if the cesium entity already exists in a group.
@@ -8557,8 +8674,7 @@
                                             });
                                         }
                                     }
-                                    // Won't do individual styles for now. More stability that way.
-                                    // applyStyle(thing, entityId, group.data);
+                                    applyStyle(thing, entityId, group.data);
                                 };
                                 sEntities = source.entities.values;
                                 for (i = 0; i < sEntities.length; i++) {
@@ -9974,6 +10090,7 @@
                 this.styleMappingLoaded = false;
                 this.styleMappingsLoaded = {};
                 this.fallbackStyle = null;
+                this.loadingCounter = 0;
                 this.runningQueues = 0;
                 this.recordLoadQueue = [];
                 this.recordCheckQueue = [];
@@ -9985,6 +10102,7 @@
                 // ND-1641. BOOKMARKS - (DEMO) View does not match bookmark.
                 // We have some evil hard-coded style mappings that need to be fixed.
                 // These exist within legacy project views.
+                // Update: This now also lets people have a style mapping without a real style record.
                 if ((_a = this.styleMapping) === null || _a === void 0 ? void 0 : _a.length) {
                     for (var i = 0; i < this.styleMapping.length; i++) {
                         var mapItem = this.styleMapping[i];
@@ -10003,6 +10121,42 @@
                 enumerable: false,
                 configurable: true
             });
+            /**
+             * Updates style mapping and fallback style.
+             * This will trigger a re-style of all entities, and will stop existing style loads.
+             * @param params
+             */
+            Styler.prototype.UpdateStyleMapping = function (params) {
+                var _a;
+                if (params.styleMapping) {
+                    this.styleMapping = params.styleMapping;
+                    // ND-1641. BOOKMARKS - (DEMO) View does not match bookmark.
+                    // We have some evil hard-coded style mappings that need to be fixed.
+                    // These exist within legacy project views.
+                    // Update: This now also lets people have a style mapping without a real style record.
+                    if ((_a = this.styleMapping) === null || _a === void 0 ? void 0 : _a.length) {
+                        for (var i = 0; i < this.styleMapping.length; i++) {
+                            var mapItem = this.styleMapping[i];
+                            var mapStyle = mapItem.style ? mapItem.style : mapItem.Style;
+                            this.styleMapping[i].style = correctStyle(mapStyle);
+                        }
+                    }
+                }
+                if (isNaN(params.fallbackStyleId) && params.fallbackStyleId != null) {
+                    this.fallbackStyleId = params.fallbackStyleId;
+                }
+                // Empty queues.
+                // Requeue all.
+                this.recordLoadQueue = [];
+                this.recordCheckQueue = [];
+                var regos = this.register.GetRegos({
+                    menuItemId: this.menuItemId
+                });
+                this.styleMappingLoaded = false;
+                this.styleMappingsLoaded = {};
+                this.QueueEntities(regos);
+                this.loadStyles();
+            };
             Styler.prototype.QueueEntities = function (entities, highPriority) {
                 if (highPriority === void 0) { highPriority = false; }
                 for (var i = 0; i < entities.length; i++) {
@@ -10094,10 +10248,14 @@
             Styler.prototype.loadStyles = function () {
                 var _a, _b;
                 return __awaiter(this, void 0, void 0, function () {
-                    var fallbackStyleId, data, e_1, styleMapping, modelTree, entityTypeIds, _loop_2, i, i, styleMap, styleId, entityType, e_2, data, e_3;
+                    var counter, fallbackStyleId, data, e_1, styleMapping, modelTree, entityTypeIds, _loop_2, i, i, styleMap, styleId, entityType, e_2, data, e_3;
                     return __generator(this, function (_c) {
                         switch (_c.label) {
                             case 0:
+                                counter = ++this.loadingCounter;
+                                this.styleMappingLoaded = false;
+                                this.styleMappingsLoaded = {};
+                                this.fallbackStyle = null;
                                 fallbackStyleId = this.fallbackStyleId;
                                 if (!(fallbackStyleId && fallbackStyleId > 0)) return [3 /*break*/, 4];
                                 _c.label = 1;
@@ -10116,6 +10274,9 @@
                                 console.error(e_1);
                                 return [3 /*break*/, 4];
                             case 4:
+                                if (this.loadingCounter != counter) {
+                                    return [2 /*return*/];
+                                }
                                 styleMapping = this.styleMapping;
                                 if (!styleMapping) {
                                     styleMapping = [];
@@ -10148,12 +10309,12 @@
                                 i = 0;
                                 _c.label = 5;
                             case 5:
-                                if (!(i < styleMapping.length)) return [3 /*break*/, 15];
+                                if (!(i < styleMapping.length)) return [3 /*break*/, 16];
                                 if (this.disposed) {
-                                    return [3 /*break*/, 15];
+                                    return [3 /*break*/, 16];
                                 }
                                 styleMap = styleMapping[i];
-                                if (!(!styleMap.style && styleMap.StyleID != -1)) return [3 /*break*/, 13];
+                                if (!(!styleMap.style && styleMap.StyleID != -1)) return [3 /*break*/, 14];
                                 styleId = styleMap.StyleID;
                                 if (!!styleId) return [3 /*break*/, 9];
                                 _c.label = 6;
@@ -10192,22 +10353,33 @@
                                 console.error(e_3);
                                 return [3 /*break*/, 13];
                             case 13:
+                                if (this.loadingCounter != counter) {
+                                    return [2 /*return*/];
+                                }
+                                _c.label = 14;
+                            case 14:
                                 this.styleMappingsLoaded[styleMap.EntityTypeID] = true;
                                 this.processTilesetFeatureCheckQueue();
                                 this.processQueue();
-                                _c.label = 14;
-                            case 14:
+                                _c.label = 15;
+                            case 15:
                                 i++;
                                 return [3 /*break*/, 5];
-                            case 15:
+                            case 16:
+                                if (this.loadingCounter != counter) {
+                                    return [2 /*return*/];
+                                }
                                 this.styleMappingLoaded = true;
-                                if (!!this.disposed) return [3 /*break*/, 17];
+                                if (!!this.disposed) return [3 /*break*/, 18];
                                 return [4 /*yield*/, this.processTilesetFeatureCheckQueue()];
-                            case 16:
+                            case 17:
                                 _c.sent();
+                                if (this.loadingCounter != counter) {
+                                    return [2 /*return*/];
+                                }
                                 this.processQueue();
-                                _c.label = 17;
-                            case 17: return [2 /*return*/];
+                                _c.label = 18;
+                            case 18: return [2 /*return*/];
                         }
                     });
                 });
@@ -10322,18 +10494,24 @@
             };
             Styler.prototype.styleTilesetFeatureFullData = function (entity, data) {
                 var _a;
-                var style = this.getTilesetFeatureStyle(entity.entityId, entity.entityTypeId);
-                if (!style) {
+                var visual = entity.visual;
+                if (!visual || !(visual instanceof Cesium.Cesium3DTileFeature)) {
                     return;
                 }
-                var bColor = ((_a = style.modelStyle) === null || _a === void 0 ? void 0 : _a.fillColor) ? bruceModels.Calculator.GetColor(style.modelStyle.fillColor, data, []) : null;
-                if (bColor != null) {
-                    var cColor = colorToCColor$3(bColor);
-                    var visual = entity.visual;
-                    if (visual && visual instanceof Cesium.Cesium3DTileFeature) {
-                        visual.color = cColor;
-                    }
+                var style = this.getTilesetFeatureStyle(entity.entityId, entity.entityTypeId);
+                var bColor = style && ((_a = style.modelStyle) === null || _a === void 0 ? void 0 : _a.fillColor) ? bruceModels.Calculator.GetColor(style.modelStyle.fillColor, data, []) : null;
+                var cColor = null;
+                if (bColor == null) {
+                    cColor = Cesium.Color.WHITE;
                 }
+                else {
+                    cColor = colorToCColor$3(bColor);
+                }
+                CesiumEntityStyler.SetDefaultColor({
+                    color: cColor,
+                    entity: visual,
+                    viewer: this.viewer
+                });
             };
             Styler.prototype.getTilesetFeatureStyle = function (entityId, entityTypeId) {
                 var _a, _b, _c, _d;
@@ -10482,6 +10660,13 @@
                 enumerable: false,
                 configurable: true
             });
+            Object.defineProperty(Manager.prototype, "Styler", {
+                get: function () {
+                    return this.styler;
+                },
+                enumerable: false,
+                configurable: true
+            });
             Manager.prototype.Init = function () {
                 var _this = this;
                 var _a;
@@ -12307,6 +12492,13 @@
                 enumerable: false,
                 configurable: true
             });
+            Object.defineProperty(Manager.prototype, "Styler", {
+                get: function () {
+                    return this.styler;
+                },
+                enumerable: false,
+                configurable: true
+            });
             Manager.prototype.Init = function () {
                 var _this = this;
                 var _a, _b, _c;
@@ -20295,7 +20487,7 @@
         CesiumViewMonitor.Monitor = Monitor;
     })(exports.CesiumViewMonitor || (exports.CesiumViewMonitor = {}));
 
-    var VERSION$1 = "3.3.8";
+    var VERSION$1 = "3.3.9";
 
     exports.VERSION = VERSION$1;
     exports.CesiumParabola = CesiumParabola;