qwc2 2026.7.8 → 2026.7.18

package/components/EditUploadField.js

@@ -40,7 +40,8 @@ var EditUploadField = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "state", {
       camera: false,
       imageData: null,
-      imageFilename: null
+      imageFilename: null,
+      fileSelected: false
     });
     _defineProperty(_this, "fileSelected", function (ev) {
       if (ev.target.files[0].type.startsWith("image/")) {
@@ -57,6 +58,9 @@ var EditUploadField = /*#__PURE__*/function (_React$Component) {
           _this.props.updateField(_this.props.fieldId, ev.target.files[0].name);
         };
       } else {
+        _this.setState({
+          fileSelected: true
+        });
         _this.props.updateFile(_this.props.fieldId, ev.target.files[0]);
         _this.props.updateField(_this.props.fieldId, ev.target.files[0].name);
       }
@@ -277,7 +281,7 @@ var EditUploadField = /*#__PURE__*/function (_React$Component) {
             onClick: this.props.disabled ? null : this.clearImage
           }));
         }
-      } else if (fileValue) {
+      } else if (fileValue && !this.state.fileSelected) {
         return /*#__PURE__*/React.createElement("span", {
           className: "edit-upload-field edit-upload-field-imagelink" + (this.props.disabled ? " edit-upload-field-disabled" : "")
         }, /*#__PURE__*/React.createElement("a", {

package/components/ExportSelection.js

@@ -128,10 +128,37 @@ var ExportSelection = /*#__PURE__*/function (_React$Component) {
       }
       if (this.props.frameRatio !== prevProps.frameRatio) {
         this.setState(function (state) {
-          var newheight = _this2.props.frameRatio ? Math.round(state.width * _this2.props.frameRatio) : state.height;
+          var containerWidth = _this2.exportContainer.offsetWidth;
+          var containerHeight = _this2.exportContainer.offsetHeight;
+          var maxWidth = 0.75 * containerWidth;
+          var maxHeight = 0.75 * containerHeight;
+          var newwidth;
+          var newheight;
+          if (_this2.props.frameRatio) {
+            if (_this2.props.frameRatio >= 1) {
+              newwidth = maxWidth;
+              newheight = Math.round(newwidth * _this2.props.frameRatio);
+              if (newheight > maxHeight) {
+                newheight = maxHeight;
+                newwidth = Math.round(newheight / _this2.props.frameRatio);
+              }
+            } else {
+              newheight = maxHeight;
+              newwidth = Math.round(newheight / _this2.props.frameRatio);
+              if (newwidth > maxWidth) {
+                newwidth = maxWidth;
+                newheight = Math.round(newwidth * _this2.props.frameRatio);
+              }
+            }
+          } else {
+            newwidth = state.width;
+            newheight = state.height;
+          }
           return {
             frameRatio: _this2.props.frameRatio,
-            y: state.y + 0.5 * (state.height - newheight),
+            x: 0.5 * (containerWidth - newwidth),
+            y: 0.5 * (containerHeight - newheight),
+            width: newwidth,
             height: newheight
           };
         }, function () {
@@ -150,7 +177,10 @@ var ExportSelection = /*#__PURE__*/function (_React$Component) {
         height: this.state.height + 'px'
       };
       return /*#__PURE__*/React.createElement("div", {
-        className: "export-selection-container"
+        className: "export-selection-container",
+        ref: function ref(el) {
+          _this3.exportContainer = el;
+        }
       }, /*#__PURE__*/React.createElement("div", {
         className: "export-selection",
         onContextMenu: MiscUtils.killEvent,

package/components/MapSelection.js

@@ -124,7 +124,6 @@ var MapSelection = /*#__PURE__*/function (_React$Component) {
       if (!geometry) {
         return;
       }
-      var coords = _this.props.geomType === 'Circle' ? null : geometry.getCoordinates();
       if (_this.props.geomType === "Circle") {
         // Also store poligonized circle
         var center = geometry.getCenter();
@@ -141,19 +140,11 @@ var MapSelection = /*#__PURE__*/function (_React$Component) {
             radius: radius
           }
         });
-      } else if (_this.props.geomType === "DragBox" || _this.props.geomType === "Box") {
-        var boxcoords = [[Math.min(coords[0][0][0], coords[0][2][0]), Math.min(coords[0][0][1], coords[0][2][1]), Math.max(coords[0][0][0], coords[0][2][0]), Math.max(coords[0][0][1], coords[0][2][1])]];
-        _this.setState({
-          geometry: {
-            type: "Polygon",
-            coordinates: boxcoords
-          }
-        });
       } else {
         _this.setState({
           geometry: {
-            type: _this.props.geomType,
-            coordinates: coords
+            type: geometry.getType(),
+            coordinates: geometry.getCoordinates()
           }
         });
       }

package/components/SearchBox.js

@@ -422,21 +422,21 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
       }) : null);
     });
     _defineProperty(_this, "renderLayerResult", function (provider, group, result) {
-      var _result$label3, _result$layer;
+      var _ConfigUtils$getPlugi, _result$label3, _result$layer;
       var parent = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
       var level = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
       var key = provider + ":" + group.id + ":" + result.id;
       var addThemes = ConfigUtils.getConfigProp("allowAddingOtherThemes", _this.props.theme);
       var icon = null;
+      var toggleLayerGroup = function toggleLayerGroup(ev) {
+        MiscUtils.killEvent(ev);
+        _this.setState(function (state) {
+          return {
+            expandedLayerGroup: state.expandedLayerGroup === key ? null : key
+          };
+        });
+      };
       if (result.sublayers) {
-        var toggleLayerGroup = function toggleLayerGroup(ev) {
-          MiscUtils.killEvent(ev);
-          _this.setState(function (state) {
-            return {
-              expandedLayerGroup: state.expandedLayerGroup === key ? null : key
-            };
-          });
-        };
         icon = /*#__PURE__*/React.createElement(Icon, {
           icon: _this.state.expandedLayerGroup === key ? "minus" : "plus",
           onClick: function onClick(ev) {
@@ -456,7 +456,7 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
       return [/*#__PURE__*/React.createElement("div", {
         className: "searchbox-result",
         key: key,
-        onClick: function onClick() {
+        onClick: (_ConfigUtils$getPlugi = ConfigUtils.getPluginConfig("LayerCatalog")) !== null && _ConfigUtils$getPlugi !== void 0 && (_ConfigUtils$getPlugi = _ConfigUtils$getPlugi.cfg) !== null && _ConfigUtils$getPlugi !== void 0 && _ConfigUtils$getPlugi.toggleGroupOnClick && result.sublayers ? toggleLayerGroup : function () {
           return selectResult(provider, group, result);
         },
         style: {

package/components/share/ShareSocials.js

@@ -1,5 +1,4 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
@@ -23,7 +22,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 */
 
 import React from 'react';
-import { FacebookShareButton, LinkedinShareButton, TwitterShareButton, WhatsappShareButton, EmailShareButton, FacebookShareCount, FacebookIcon, TwitterIcon, LinkedinIcon, WhatsappIcon, EmailIcon } from 'react-share';
+import { FacebookShareButton, LinkedinShareButton, TwitterShareButton, WhatsappShareButton, EmailShareButton, FacebookIcon, TwitterIcon, LinkedinIcon, WhatsappIcon, EmailIcon } from 'react-share';
 import PropTypes from 'prop-types';
 import LocaleUtils from '../../utils/LocaleUtils';
 import './style/ShareSocials.css';
@@ -52,7 +51,7 @@ var ShareSocials = /*#__PURE__*/function (_React$Component) {
         }, /*#__PURE__*/React.createElement(EmailIcon, {
           round: true,
           size: 32
-        })), /*#__PURE__*/React.createElement("div", null, "\xA0")),
+        }))),
         facebook: /*#__PURE__*/React.createElement("div", {
           className: "social-box",
           key: "facebook"
@@ -62,11 +61,7 @@ var ShareSocials = /*#__PURE__*/function (_React$Component) {
         }, /*#__PURE__*/React.createElement(FacebookIcon, {
           round: true,
           size: 32
-        })), /*#__PURE__*/React.createElement(FacebookShareCount, _extends({
-          url: url
-        }, countProps), function (count) {
-          return count;
-        })),
+        }))),
         twitter: /*#__PURE__*/React.createElement("div", {
           className: "social-box",
           key: "twitter"
@@ -76,7 +71,7 @@ var ShareSocials = /*#__PURE__*/function (_React$Component) {
         }, /*#__PURE__*/React.createElement(TwitterIcon, {
           round: true,
           size: 32
-        })), /*#__PURE__*/React.createElement("div", null, "\xA0")),
+        }))),
         linkedin: /*#__PURE__*/React.createElement("div", {
           className: "social-box",
           key: "linkedin"
@@ -86,7 +81,7 @@ var ShareSocials = /*#__PURE__*/function (_React$Component) {
         }, /*#__PURE__*/React.createElement(LinkedinIcon, {
           round: true,
           size: 32
-        })), /*#__PURE__*/React.createElement("div", null, "\xA0")),
+        }))),
         whatsapp: /*#__PURE__*/React.createElement("div", {
           className: "social-box",
           key: "whatsapp"
@@ -96,7 +91,7 @@ var ShareSocials = /*#__PURE__*/function (_React$Component) {
         }, /*#__PURE__*/React.createElement(WhatsappIcon, {
           round: true,
           size: 32
-        })), /*#__PURE__*/React.createElement("div", null, "\xA0"))
+        })))
       };
       var socialBoxes = [];
       if (this.props.showSocials === true) {
@@ -125,7 +120,4 @@ _defineProperty(ShareSocials, "propTypes", {
   shareUrl: PropTypes.string,
   showSocials: PropTypes.oneOfType([PropTypes.bool, PropTypes.array])
 });
-_defineProperty(ShareSocials, "defaultProps", {
-  shareTitle: 'GeoSolutions'
-});
 export { ShareSocials as default };

package/components/widgets/LayerCatalogWidget.js

@@ -55,7 +55,11 @@ var LayerCatalogWidget = /*#__PURE__*/function (_React$PureComponent) {
             _this.checkAddServiceLayer(entry, true);
           }
         } else {
-          _this.checkAddServiceLayer(entry, false);
+          if (_this.props.toggleGroupOnClick && !isEmpty(entry.sublayers)) {
+            _this.toggleLayerListEntry(path);
+          } else {
+            _this.checkAddServiceLayer(entry, false);
+          }
         }
       } else {
         _this.toggleLayerListEntry(path);
@@ -162,7 +166,7 @@ var LayerCatalogWidget = /*#__PURE__*/function (_React$PureComponent) {
       var _collectSublayers = function collectSublayers(entry) {
         var _entry$resource2;
         var entryParams = LayerUtils.splitLayerUrlParam((_entry$resource2 = entry.resource) !== null && _entry$resource2 !== void 0 ? _entry$resource2 : "");
-        if (stripQuery(entryParams.url) === groupUrl) {
+        if (isEmpty(entry.sublayers) && stripQuery(entryParams.url) === groupUrl) {
           sublayers[entryParams.name] = entryParams;
         }
         (entry.sublayers || []).forEach(_collectSublayers);
@@ -214,10 +218,12 @@ var LayerCatalogWidget = /*#__PURE__*/function (_React$PureComponent) {
             } else if (sublayerSubset) {
               var _filterSublayers = function filterSublayers(sublayers) {
                 return sublayers.map(function (sublayer) {
-                  if (sublayer.sublayers) {
-                    return _filterSublayers(sublayer.sublayers);
-                  } else if (sublayer.name in sublayerSubset) {
-                    return _objectSpread(_objectSpread({}, sublayer), sublayerSubset);
+                  if (sublayer.name in sublayerSubset) {
+                    return _objectSpread(_objectSpread({}, sublayer), sublayerSubset[sublayer.name]);
+                  } else if (sublayer.sublayers) {
+                    return _objectSpread(_objectSpread({}, sublayer), {}, {
+                      sublayers: _filterSublayers(sublayer.sublayers)
+                    });
                   } else {
                     return null;
                   }
@@ -380,7 +386,8 @@ _defineProperty(LayerCatalogWidget, "propTypes", {
   pendingRequests: PropTypes.number,
   removeLayer: PropTypes.func,
   replacePlaceholderLayer: PropTypes.func,
-  showNotification: PropTypes.func
+  showNotification: PropTypes.func,
+  toggleGroupOnClick: PropTypes.bool
 });
 export default connect(function (state) {
   return {

package/components/widgets/MenuButton.js

@@ -40,7 +40,8 @@ var MenuButton = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "onButtonClicked", function (ev) {
       ev.stopPropagation();
       if (_this.state.selected) {
-        _this.props.onActivate(_this.state.selected);
+        var _this$props$onActivat, _this$props;
+        (_this$props$onActivat = (_this$props = _this.props).onActivate) === null || _this$props$onActivat === void 0 || _this$props$onActivat.call(_this$props, _this.state.selected);
         _this.setState({
           popup: false
         });
@@ -48,14 +49,16 @@ var MenuButton = /*#__PURE__*/function (_React$Component) {
         _this.onMenuClicked();
       }
     });
-    _defineProperty(_this, "onChildClicked", function (child) {
+    _defineProperty(_this, "onChildClicked", function (ev, child) {
       if (!child.props.disabled) {
+        var _this$props$onActivat2, _this$props2, _child$props$onClick, _child$props;
         if (_this.state.selected) {
           _this.setState({
             selected: child.props.value
           });
         }
-        _this.props.onActivate(child.props.value);
+        (_this$props$onActivat2 = (_this$props2 = _this.props).onActivate) === null || _this$props$onActivat2 === void 0 || _this$props$onActivat2.call(_this$props2, child.props.value);
+        (_child$props$onClick = (_child$props = child.props).onClick) === null || _child$props$onClick === void 0 || _child$props$onClick.call(_child$props, ev);
       }
     });
     _this.el = null;
@@ -140,8 +143,8 @@ var MenuButton = /*#__PURE__*/function (_React$Component) {
         return /*#__PURE__*/React.cloneElement(child, {
           className: classNames,
           disabled: child.props.disabled,
-          onClick: function onClick() {
-            return _this2.onChildClicked(child);
+          onClick: function onClick(ev) {
+            return _this2.onChildClicked(ev, child);
           }
         });
       })) : null);

package/extra/plugins/PlotInfoTool.js

@@ -225,7 +225,7 @@ var PlotInfoTool = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "renderError", function () {
       return /*#__PURE__*/React.createElement("div", {
         className: "plot-info-dialog-query-failed"
-      }, _this.state.expandedInfoData.failed === true ? LocaleUtils.tr("plotinfotool.failed") : LocaleUtils.tr(_this.state.expandedInfoData.failed));
+      }, _this.state.expandedInfoData.failed === true ? LocaleUtils.tr("common.dataloadfailed") : LocaleUtils.tr(_this.state.expandedInfoData.failed));
     });
     _defineProperty(_this, "renderInfoData", function () {
       if (_this.props.customInfoComponents[_this.state.expandedInfo]) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2026.07.08",
+    "version": "2026.07.18",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",
@@ -117,7 +117,7 @@
         "@types/three": "^0.180.0",
         "babel-loader": "^10.0.0",
         "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-        "copy-webpack-plugin": "^13.0.1",
+        "copy-webpack-plugin": "^14.0.0",
         "css-loader": "^7.1.3",
         "eslint": "^9.39.2",
         "eslint-plugin-perfectionist": "^5.5.0",
@@ -130,7 +130,7 @@
         "webpack": "^5.105.0",
         "webpack-bundle-analyzer": "^5.2.0",
         "webpack-cli": "^6.0.1",
-        "webpack-dev-server": "^5.2.3"
+        "webpack-dev-server": "^6.0.0"
     },
     "bin": {
         "qwc_build_iconfont": "./scripts/makeIconkit.js",
@@ -138,6 +138,7 @@
         "qwc_update_translations": "./scripts/updateTranslations.js"
     },
     "scripts": {
+        "preinstall": "node -e \"const ua=process.env.npm_config_user_agent||''; if(ua.startsWith('yarn/')){console.error('This project uses npm. Run npm install instead.'); process.exit(1)}\"",
         "prod": "npm run tsupdate && npm run themesconfig && npm run iconfont && webpack --mode production --progress",
         "start": "npm run tsupdate && npm run themesconfig && npm run iconfont && webpack serve --mode development --progress --host 0.0.0.0 --port 8081",
         "iconfont": "node scripts/makeIconkit.js",

package/plugins/BackgroundSwitcher.js

@@ -63,7 +63,11 @@ export var BackgroundSwitcher = /*#__PURE__*/function (_React$Component) {
       }, backgroundLayers.filter(function (entry) {
         return !(entry !== null && entry !== void 0 && entry.omitFromSelect);
       }).map(function (entry) {
-        return Array.isArray(entry) ? _this.renderGroupItem(entry, visibleBgLayer) : _this.renderLayerItem(entry, visibleBgLayer);
+        if (Array.isArray(entry)) {
+          return entry.length > 1 ? _this.renderGroupItem(entry, visibleBgLayer) : _this.renderLayerItem(entry[0], visibleBgLayer);
+        } else {
+          return _this.renderLayerItem(entry, visibleBgLayer);
+        }
       }));
     });
     _defineProperty(_this, "itemTitle", function (item) {
@@ -401,8 +405,8 @@ var selector = function selector(state) {
   var backgroundLayers = Object.values(state.layers.flat.filter(function (layer) {
     return layer.role === LayerRole.BACKGROUND;
   }).reduce(function (res, l) {
-    return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, "_" + (l.group || l.name), l.group ? [].concat(_toConsumableArray(res["_" + l.group] || []), [l]) : l));
-  }, {}));
+    return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, "_" + (l.group || l.name), l.group ? [l].concat(_toConsumableArray(res["_" + l.group] || [])) : l));
+  }, {})).reverse();
   return {
     backgroundLayers: backgroundLayers
   };