qwc2 2026.8.14 → 2026.8.21

package/plugins/BottomBar.js

@@ -156,132 +156,144 @@ var BottomBar = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this2 = this;
-      if (this.props.fullscreen) {
-        return null;
-      }
-      var leftBottomLinks = (this.props.additionalBottomBarLinks || []).filter(function (entry) {
-        return entry.side === "left";
-      }).map(this.renderLink);
-      var rightBottomLinks = (this.props.additionalBottomBarLinks || []).filter(function (entry) {
-        return entry.side !== "left";
-      }).map(this.renderLink);
-      if (this.props.viewertitleUrl) {
-        var entry = {
-          url: this.props.viewertitleUrl,
-          urlTarget: this.props.viewertitleUrlTarget,
-          label: LocaleUtils.tr("bottombar.viewertitle_label"),
-          icon: this.props.viewertitleUrlIcon
-        };
-        rightBottomLinks.push(this.renderLink(entry));
-      }
-      if (this.props.termsUrl) {
-        var _entry = {
-          url: this.props.termsUrl,
-          urlTarget: this.props.termsUrlTarget,
-          label: LocaleUtils.tr("bottombar.terms_label"),
-          icon: this.props.termsUrlIcon
-        };
-        rightBottomLinks.push(this.renderLink(_entry));
-      }
-      var enabledMouseCrs = [].concat(_toConsumableArray(this.props.additionalMouseCrs || []), [this.props.map.projection, "EPSG:4326"]);
-      var availableCRS = Object.fromEntries(Object.entries(CoordinatesUtils.getAvailableCRS()).filter(function (_ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-          key = _ref2[0],
-          value = _ref2[1];
-        return enabledMouseCrs.includes(key);
-      }));
-      var scalebar = null;
+      var widgets = [];
       if (this.props.displayScalebar) {
-        scalebar = /*#__PURE__*/React.createElement("div", {
+        widgets.push(/*#__PURE__*/React.createElement("div", {
           className: "bottombar-scalebar-container",
+          key: "scalebar",
           ref: this.initScaleBar
-        });
-      }
-      var coordinates = null;
-      if (this.props.displayCoordinates) {
-        coordinates = /*#__PURE__*/React.createElement("div", {
-          className: "controlgroup"
-        }, /*#__PURE__*/React.createElement("span", {
-          className: "bottombar-mousepos-label"
-        }, LocaleUtils.tr("bottombar.mousepos_label"), ":\xA0"), /*#__PURE__*/React.createElement(CoordinateDisplayer, {
-          className: "bottombar-mousepos",
-          coordinateFormatter: this.props.coordinateFormatter,
-          displayCrs: this.props.map.displayCrs,
-          mapCrs: this.props.map.projection
-        }), /*#__PURE__*/React.createElement("select", {
-          onChange: function onChange(ev) {
-            return _this2.props.setDisplayCrs(ev.target.value);
-          },
-          value: this.props.map.displayCrs
-        }, Object.keys(availableCRS).map(function (crs) {
-          return /*#__PURE__*/React.createElement("option", {
-            key: crs,
-            value: crs
-          }, availableCRS[crs].label);
-        })));
-      }
-      var scales = null;
-      if (this.props.displayScales) {
-        scales = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
-          className: "bottombar-scales-label"
-        }, LocaleUtils.tr("bottombar.scale_label"), ":\xA0"), /*#__PURE__*/React.createElement(InputContainer, {
-          className: "bottombar-scale-combo"
-        }, /*#__PURE__*/React.createElement("span", {
-          className: "bottombar-scale-combo-prefix",
-          role: "prefix"
-        }, " 1 : "), /*#__PURE__*/React.createElement("select", {
-          onChange: function onChange(ev) {
-            return _this2.props.changeZoomLevel(parseInt(ev.target.value, 10));
-          },
-          role: "input",
-          value: Math.round(this.props.map.zoom)
-        }, this.props.map.scales.map(function (item, index) {
-          return /*#__PURE__*/React.createElement("option", {
-            key: index,
-            value: index
-          }, LocaleUtils.toLocaleFixed(item, 0));
-        })), /*#__PURE__*/React.createElement(NumberInput, {
-          decimals: 0,
-          hideArrows: true,
-          onChange: this.setScale,
-          role: "input",
-          value: this.state.scale
-        })));
+        }));
       }
-      var quickSelectDropdown = null;
-      if (this.props.displayQuickSelectDropdown && (this.props.bookmarks && this.props.bookmarks.length > 0 || this.props.visibilityPresets && this.props.visibilityPresets.length > 0)) {
-        var bookmarks = this.filterByActiveTheme(this.props.bookmarks || []);
-        var visibilityPresets = this.filterByActiveTheme(this.props.visibilityPresets || []);
-        var options = _defineProperty(_defineProperty({}, LocaleUtils.tr("appmenu.items.Bookmark"), bookmarks.map(function (bm) {
-          return ["bk:" + bm.key, bm.description];
-        })), LocaleUtils.tr("appmenu.items.VisibilityPresets"), visibilityPresets.map(function (bm) {
-          return ["vp:" + bm.key, bm.description];
+      if (!this.props.fullscreen) {
+        var _this$props$bookmarks, _this$props$visibilit;
+        var leftBottomLinks = (this.props.additionalBottomBarLinks || []).filter(function (entry) {
+          return entry.side === "left";
+        }).map(this.renderLink);
+        widgets.push(/*#__PURE__*/React.createElement("span", {
+          className: "bottombar-links",
+          key: "leftlinks"
+        }, leftBottomLinks));
+        widgets.push(/*#__PURE__*/React.createElement("span", {
+          className: "bottombar-spacer",
+          key: "spacer1"
         }));
-        quickSelectDropdown = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
-          className: "bottombar-quick-select-label"
-        }, LocaleUtils.tr("bottombar.quick_select_label"), ":\xA0"), /*#__PURE__*/React.createElement(GroupSelect, {
-          onChange: this.openBookmarkOrPreset,
-          options: options,
-          placeholder: LocaleUtils.tr("common.select")
+        if (this.props.displayCoordinates) {
+          var enabledMouseCrs = [].concat(_toConsumableArray(this.props.additionalMouseCrs || []), [this.props.map.projection, "EPSG:4326"]);
+          var availableCRS = Object.fromEntries(Object.entries(CoordinatesUtils.getAvailableCRS()).filter(function (_ref) {
+            var _ref2 = _slicedToArray(_ref, 2),
+              key = _ref2[0],
+              value = _ref2[1];
+            return enabledMouseCrs.includes(key);
+          }));
+          widgets.push(/*#__PURE__*/React.createElement("div", {
+            className: "controlgroup",
+            key: "coordinates"
+          }, /*#__PURE__*/React.createElement("span", {
+            className: "bottombar-mousepos-label"
+          }, LocaleUtils.tr("bottombar.mousepos_label"), ":\xA0"), /*#__PURE__*/React.createElement(CoordinateDisplayer, {
+            className: "bottombar-mousepos",
+            coordinateFormatter: this.props.coordinateFormatter,
+            displayCrs: this.props.map.displayCrs,
+            mapCrs: this.props.map.projection
+          }), /*#__PURE__*/React.createElement("select", {
+            onChange: function onChange(ev) {
+              return _this2.props.setDisplayCrs(ev.target.value);
+            },
+            value: this.props.map.displayCrs
+          }, Object.keys(availableCRS).map(function (crs) {
+            return /*#__PURE__*/React.createElement("option", {
+              key: crs,
+              value: crs
+            }, availableCRS[crs].label);
+          }))));
+        }
+        if (this.props.displayScales) {
+          widgets.push(/*#__PURE__*/React.createElement("div", {
+            key: "scales"
+          }, /*#__PURE__*/React.createElement("span", {
+            className: "bottombar-scales-label"
+          }, LocaleUtils.tr("bottombar.scale_label"), ":\xA0"), /*#__PURE__*/React.createElement(InputContainer, {
+            className: "bottombar-scale-combo"
+          }, /*#__PURE__*/React.createElement("span", {
+            className: "bottombar-scale-combo-prefix",
+            role: "prefix"
+          }, " 1 : "), /*#__PURE__*/React.createElement("select", {
+            onChange: function onChange(ev) {
+              return _this2.props.changeZoomLevel(parseInt(ev.target.value, 10));
+            },
+            role: "input",
+            value: Math.round(this.props.map.zoom)
+          }, this.props.map.scales.map(function (item, index) {
+            return /*#__PURE__*/React.createElement("option", {
+              key: index,
+              value: index
+            }, LocaleUtils.toLocaleFixed(item, 0));
+          })), /*#__PURE__*/React.createElement(NumberInput, {
+            decimals: 0,
+            hideArrows: true,
+            onChange: this.setScale,
+            role: "input",
+            value: this.state.scale
+          }))));
+        }
+        if (this.props.displayQuickSelectDropdown && (((_this$props$bookmarks = this.props.bookmarks) === null || _this$props$bookmarks === void 0 ? void 0 : _this$props$bookmarks.length) > 0 || ((_this$props$visibilit = this.props.visibilityPresets) === null || _this$props$visibilit === void 0 ? void 0 : _this$props$visibilit.length) > 0)) {
+          var bookmarks = this.filterByActiveTheme(this.props.bookmarks || []);
+          var visibilityPresets = this.filterByActiveTheme(this.props.visibilityPresets || []);
+          var options = _defineProperty(_defineProperty({}, LocaleUtils.tr("appmenu.items.Bookmark"), bookmarks.map(function (bm) {
+            return ["bk:" + bm.key, bm.description];
+          })), LocaleUtils.tr("appmenu.items.VisibilityPresets"), visibilityPresets.map(function (bm) {
+            return ["vp:" + bm.key, bm.description];
+          }));
+          widgets.push(/*#__PURE__*/React.createElement("div", {
+            key: "quickselect"
+          }, /*#__PURE__*/React.createElement("span", {
+            className: "bottombar-quick-select-label"
+          }, LocaleUtils.tr("bottombar.quick_select_label"), ":\xA0"), /*#__PURE__*/React.createElement(GroupSelect, {
+            onChange: this.openBookmarkOrPreset,
+            options: options,
+            placeholder: LocaleUtils.tr("common.select")
+          })));
+        }
+        var rightBottomLinks = (this.props.additionalBottomBarLinks || []).filter(function (entry) {
+          return entry.side !== "left";
+        }).map(this.renderLink);
+        if (this.props.viewertitleUrl) {
+          var entry = {
+            url: this.props.viewertitleUrl,
+            urlTarget: this.props.viewertitleUrlTarget,
+            label: LocaleUtils.tr("bottombar.viewertitle_label"),
+            icon: this.props.viewertitleUrlIcon
+          };
+          rightBottomLinks.push(this.renderLink(entry));
+        }
+        if (this.props.termsUrl) {
+          var _entry = {
+            url: this.props.termsUrl,
+            urlTarget: this.props.termsUrlTarget,
+            label: LocaleUtils.tr("bottombar.terms_label"),
+            icon: this.props.termsUrlIcon
+          };
+          rightBottomLinks.push(this.renderLink(_entry));
+        }
+        widgets.push(/*#__PURE__*/React.createElement("span", {
+          className: "bottombar-spacer",
+          key: "spacer2"
         }));
+        widgets.push(/*#__PURE__*/React.createElement("span", {
+          className: "bottombar-links",
+          key: "rightlinks"
+        }, rightBottomLinks));
       }
       var style = {
         marginLeft: this.props.mapMargins.outerLeft + 'px',
         marginRight: this.props.mapMargins.outerRight + 'px'
       };
       return /*#__PURE__*/React.createElement("div", {
+        className: this.props.fullscreen ? "bottombar-fullscreen" : "",
         id: "BottomBar",
         ref: this.storeHeight,
         style: style
-      }, scalebar, /*#__PURE__*/React.createElement("span", {
-        className: "bottombar-links"
-      }, leftBottomLinks), /*#__PURE__*/React.createElement("span", {
-        className: "bottombar-spacer"
-      }), coordinates, scales, quickSelectDropdown, /*#__PURE__*/React.createElement("span", {
-        className: "bottombar-spacer"
-      }), /*#__PURE__*/React.createElement("span", {
-        className: "bottombar-links"
-      }, rightBottomLinks));
+      }, widgets);
     }
   }]);
 }(React.Component);

package/plugins/style/BottomBar.css

@@ -5,13 +5,20 @@
     bottom: 0;
     height: 3em;
     z-index: 100;
+    font-size: 75%;
+    display: flex;
+    align-items: center;
+}
+
+#BottomBar:not(.bottombar-fullscreen) {
     color: var(--panel-text-color);
     background-color: var(--panel-bg-color);
     box-shadow: 0 -2px 4px rgba(136, 136, 136, 0.5);
     backdrop-filter: blur(3px);
-    font-size: 75%;
-    display: flex;
-    align-items: center;
+}
+
+#BottomBar.bottombar-fullscreen {
+    pointer-events: none;
 }
 
 #BottomBar > * {

package/utils/LayerUtils.js

@@ -703,8 +703,8 @@ var LayerUtils = {
         var entry = _step1.value;
         var _layer2 = entry.layer;
 
-        // Attempt to merge with previous if possible
-        if (((_prevlayer = prevlayer) === null || _prevlayer === void 0 ? void 0 : _prevlayer.srcid) === _layer2.srcid) {
+        // Attempt to merge with previous if possible (same srcid when defined)
+        if (_layer2 !== null && _layer2 !== void 0 && _layer2.srcid && ((_prevlayer = prevlayer) === null || _prevlayer === void 0 ? void 0 : _prevlayer.srcid) === _layer2.srcid) {
           if (isEmpty(prevlayer.sublayers)) {
             prevlayer.sublayers = _layer2.sublayers;
           } else if (!isEmpty(_layer2.sublayers)) {