qwc2 2026.5.26 → 2026.5.27

package/components/map3d/Map3D.js

@@ -766,9 +766,9 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       var center = extent.center();
       if (center.crs.isGeographic()) {
         var position = Ellipsoid.WGS84.toCartesian(center.latitude, center.longitude, center.altitude);
-        _this2.instance.view.camera.position.set(position.x, position.y, 0.5 * (extent.east - extent.west));
+        _this2.instance.view.camera.position.set(position.x, position.y, 0.5 * (extent.maxX - extent.minX));
       } else {
-        _this2.instance.view.camera.position.set(center.x, center.y, 0.5 * (extent.east - extent.west));
+        _this2.instance.view.camera.position.set(center.x, center.y, 0.5 * (extent.maxX - extent.minX));
       }
 
       // Skybox

package/components/map3d/utils/Tiles3DStyle.js

@@ -98,6 +98,13 @@ var Tiles3DStyle = {
     var featureLabelCache = {};
     var labels = {};
     var idAttr = (_config$idAttr = config.idAttr) !== null && _config$idAttr !== void 0 ? _config$idAttr : "id";
+    if (!["tilesetStyle", "colorAttr", "alphaAttr", "labelAttr", "baseColor"].some(function (k) {
+      var _config$k;
+      return ((_config$k = config[k]) !== null && _config$k !== void 0 ? _config$k : null) !== null;
+    })) {
+      // No styling information is present
+      return;
+    }
     var context = {
       colorExpressions: [],
       featureStyles: (_config$tilesetStyle = config.tilesetStyle) === null || _config$tilesetStyle === void 0 ? void 0 : _config$tilesetStyle.featureStyles,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2026.05.26",
+    "version": "2026.05.27",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",

package/plugins/FeatureSearch.js

@@ -39,12 +39,14 @@ import axios from 'axios';
 import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 import { v4 as uuidv4 } from 'uuid';
+import { LayerRole, changeLayerProperty } from '../actions/layers';
 import Icon from '../components/Icon';
 import IdentifyViewer from '../components/IdentifyViewer';
 import SideBar from '../components/SideBar';
 import InputContainer from '../components/widgets/InputContainer';
 import Spinner from '../components/widgets/Spinner';
 import IdentifyUtils from '../utils/IdentifyUtils';
+import LayerUtils from '../utils/LayerUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import { QgisSearch } from '../utils/SearchProviders';
 import "./style/FeatureSearch.css";
@@ -258,6 +260,17 @@ var FeatureSearch = /*#__PURE__*/function (_React$Component) {
         params: params
       }).then(function (response) {
         var results = IdentifyUtils.parseResponse(response.data, _this.props.theme, 'text/xml', null, _this.props.map.projection);
+        // Enable the layers
+        Object.keys(results).forEach(function (layername) {
+          var path = [];
+          var sublayer = null;
+          var layer = _this.props.layers.find(function (l) {
+            return l.role === LayerRole.THEME && (sublayer = LayerUtils.searchSubLayer(l, 'name', layername, path));
+          });
+          if (layer && sublayer) {
+            _this.props.changeLayerProperty(layer.id, "visibility", true, path, 'both');
+          }
+        });
         if (provider.params.resultTitle) {
           Object.entries(results).forEach(function (_ref6) {
             var _ref7 = _slicedToArray(_ref6, 2),
@@ -448,8 +461,10 @@ var FeatureSearch = /*#__PURE__*/function (_React$Component) {
   }]);
 }(React.Component);
 _defineProperty(FeatureSearch, "propTypes", {
+  changeLayerProperty: PropTypes.func,
   /** Whether to enable the export functionality. Either `true|false` or a list of single allowed formats (builtin formats: `json`, `geojson`, `csv`, `csvzip`, `shapefile`, `xlsx`). If a list is provided, the export formats will be sorted according to that list, and the default format will be the first format of the list. */
   enableExport: PropTypes.oneOfType([PropTypes.bool, PropTypes.array]),
+  layers: PropTypes.array,
   map: PropTypes.object,
   /** The side of the application on which to display the sidebar. */
   side: PropTypes.string,
@@ -461,7 +476,10 @@ _defineProperty(FeatureSearch, "defaultProps", {
 });
 export default connect(function (state) {
   return {
+    layers: state.layers.flat,
     map: state.map,
     theme: state.theme.current
   };
-}, {})(FeatureSearch);
+}, {
+  changeLayerProperty: changeLayerProperty
+})(FeatureSearch);

package/plugins/MapExport.js

@@ -582,7 +582,7 @@ var MapExport = /*#__PURE__*/function (_React$Component) {
   }]);
 }(React.Component);
 _defineProperty(MapExport, "propTypes", {
-  /** Whitelist of allowed export format mimetypes. If empty, supported formats are listed. */
+  /** Whitelist of allowed export format mimetypes. If empty, supported formats are listed. Formats are sorted according to this list, and the first entry becomes the default format. Supported mimetypes are: `image/jpeg`, `image/png`, `image/png; mode=16bit`, `image/png; mode=8bit`, `image/png; mode=1bit`, `image/geotiff`, `image/tiff`, `application/dxf`, `application/pdf`. */
   allowedFormats: PropTypes.arrayOf(PropTypes.string),
   /** List of scales at which to export the map. If empty, scale can be freely specified. If `false`, the map can only be exported at the current scale. */
   allowedScales: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.number), PropTypes.bool]),

package/plugins/Print.js

@@ -132,7 +132,7 @@ var Print = /*#__PURE__*/function (_React$Component) {
         atlasFeatures: []
       });
     });
-    _defineProperty(_this, "renderBody", function () {
+    _defineProperty(_this, "renderBody", function (themeLayer) {
       var _this$state$extents$a, _this$props$theme$pri2, _this$state$layout$la, _this$state$layout;
       if (!_this.state.layout) {
         return /*#__PURE__*/React.createElement("div", {
@@ -255,7 +255,7 @@ var Print = /*#__PURE__*/function (_React$Component) {
         return /*#__PURE__*/React.createElement("option", {
           key: item.name,
           value: item.name
-        }, _this.translateLayoutName(item));
+        }, _this.translateLayoutName(themeLayer, item));
       })))), _this.props.formats.length > 1 ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("common.format")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("select", {
         disabled: _this.state.printSeriesEnabled,
         name: "FORMAT",
@@ -801,9 +801,9 @@ var Print = /*#__PURE__*/function (_React$Component) {
         });
       });
     });
-    _defineProperty(_this, "translateLayoutName", function (item) {
-      var _ref1, _ref10, _this$props$theme$tra, _this$props$theme$tra2, _this$props$theme$tra3;
-      return (_ref1 = (_ref10 = (_this$props$theme$tra = (_this$props$theme$tra2 = _this.props.theme.translations) === null || _this$props$theme$tra2 === void 0 || (_this$props$theme$tra2 = _this$props$theme$tra2.layouts) === null || _this$props$theme$tra2 === void 0 ? void 0 : _this$props$theme$tra2[item.title]) !== null && _this$props$theme$tra !== void 0 ? _this$props$theme$tra : (_this$props$theme$tra3 = _this.props.theme.translations) === null || _this$props$theme$tra3 === void 0 || (_this$props$theme$tra3 = _this$props$theme$tra3.layouts) === null || _this$props$theme$tra3 === void 0 ? void 0 : _this$props$theme$tra3[item.name]) !== null && _ref10 !== void 0 ? _ref10 : item.title) !== null && _ref1 !== void 0 ? _ref1 : item.name;
+    _defineProperty(_this, "translateLayoutName", function (themeLayer, item) {
+      var _ref1, _ref10, _themeLayer$translati, _themeLayer$translati2, _themeLayer$translati3;
+      return (_ref1 = (_ref10 = (_themeLayer$translati = (_themeLayer$translati2 = themeLayer.translations) === null || _themeLayer$translati2 === void 0 || (_themeLayer$translati2 = _themeLayer$translati2.layouts) === null || _themeLayer$translati2 === void 0 ? void 0 : _themeLayer$translati2[item.title]) !== null && _themeLayer$translati !== void 0 ? _themeLayer$translati : (_themeLayer$translati3 = themeLayer.translations) === null || _themeLayer$translati3 === void 0 || (_themeLayer$translati3 = _themeLayer$translati3.layouts) === null || _themeLayer$translati3 === void 0 ? void 0 : _themeLayer$translati3[item.name]) !== null && _ref10 !== void 0 ? _ref10 : item.title) !== null && _ref1 !== void 0 ? _ref1 : item.name;
     });
     _this.printForm = null;
     _this.state.grid = props.gridInitiallyEnabled;
@@ -892,7 +892,7 @@ var Print = /*#__PURE__*/function (_React$Component) {
         width: "20em"
       }, function () {
         return {
-          body: _this3.state.minimized ? null : _this3.renderBody(),
+          body: _this3.state.minimized ? null : _this3.renderBody(themeLayer),
           extra: [_this3.renderPrintSelection()]
         };
       }), this.renderPrintOutputWindow(), this.props.active && this.state.layout && this.state.layout.atlasCoverageLayer && !this.state.printSeriesEnabled ? /*#__PURE__*/React.createElement(PickFeature, {

package/plugins/Redlining.js

@@ -417,7 +417,7 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
         className: "redlining-control"
       }, /*#__PURE__*/React.createElement("span", null, sizeLabel, ":\xA0"), /*#__PURE__*/React.createElement(NumberInput, {
         max: 99,
-        min: 1,
+        min: 0,
         mobile: true,
         onChange: function onChange(nr) {
           return _this.updateRedliningStyle({

package/plugins/redlining/RedliningFeatureLabelSupport.js

@@ -103,9 +103,10 @@ var RedliningFeatureLabelSupport = /*#__PURE__*/function (_React$Component) {
         role: LayerRole.USERLAYER
       };
       var featureId = "label::".concat(cur.map, "::").concat(cur.layer, "::").concat(cur.feature.id);
-      var expression = cur.profiles.find(function (profile) {
-        return profile.name === _this.state.currentProfile;
-      }).expression;
+      var profile = cur.profiles.find(function (entry) {
+        return entry.name === _this.state.currentProfile;
+      });
+      var expression = profile.expression;
       if (!expression) {
         _this.props.removeLayerFeatures(layer, [featureId]);
         return;
@@ -126,12 +127,17 @@ var RedliningFeatureLabelSupport = /*#__PURE__*/function (_React$Component) {
         return f.id === featureId;
       });
       if (feature) {
+        var _profile$size;
         feature = _objectSpread(_objectSpread({}, feature), {}, {
           properties: {
             label: text
-          }
+          },
+          styleOptions: _objectSpread(_objectSpread({}, feature.styleOptions), {}, {
+            strokeWidth: ((_profile$size = profile.size) !== null && _profile$size !== void 0 ? _profile$size : null) !== null ? 1 + 0.5 * profile.size : feature.styleOptions.stokeWidth
+          })
         });
       } else {
+        var _profile$size2;
         feature = {
           id: featureId,
           type: "Feature",
@@ -145,7 +151,7 @@ var RedliningFeatureLabelSupport = /*#__PURE__*/function (_React$Component) {
           shape: "Text",
           styleName: "textlabel",
           styleOptions: {
-            strokeWidth: 2,
+            strokeWidth: 1 + 0.5 * ((_profile$size2 = profile.size) !== null && _profile$size2 !== void 0 ? _profile$size2 : 1),
             fillColor: [255, 255, 255, 1],
             textFillColor: [0, 0, 0, 1],
             strokeColor: [0, 0, 0, 1],

package/reducers/locale.js

@@ -17,6 +17,7 @@ import deepmerge from 'deepmerge';
 import { flatten } from 'flat';
 import { CHANGE_LOCALE, ADD_TRANSLATIONS } from '../actions/locale';
 var defaultState = {
+  messagesTree: {},
   messages: {},
   fallbackMessages: {},
   current: null
@@ -39,7 +40,7 @@ export default function locale() {
         var _action$translations$, _action$translations;
         var newMessages = (_action$translations$ = (_action$translations = action.translations) === null || _action$translations === void 0 ? void 0 : _action$translations[state.current]) !== null && _action$translations$ !== void 0 ? _action$translations$ : {};
         return _objectSpread(_objectSpread({}, state), {}, {
-          messagesTree: deepmerge(state.messages, newMessages),
+          messagesTree: deepmerge(state.messagesTree, newMessages),
           messages: _objectSpread(_objectSpread({}, state.messages), flatten(newMessages))
         });
       }

package/scripts/themesConfig.js

@@ -671,6 +671,7 @@ function genThemes(themesConfig) {
       defaultSearchProviders: config.defaultSearchProviders,
       defaultMapTips: config.defaultMapTips,
       defaultBackgroundLayers: config.defaultBackgroundLayers || [],
+      defaultLabelProfiles: config.defaultLabelProfiles,
       externalLayers: config.themes.externalLayers || [],
       pluginData: config.themes.pluginData,
       themeInfoLinks: config.themes.themeInfoLinks,

package/scripts/themesConfig.py

@@ -628,6 +628,7 @@ def genThemes(themesConfig):
             "defaultSearchProviders": config["defaultSearchProviders"] if "defaultSearchProviders" in config else None,
             "defaultBackgroundLayers": config["defaultBackgroundLayers"] if "defaultBackgroundLayers" in config else [],
             "defaultMapTips": config["defaultMapTips"] if "defaultMapTips" in config else None,
+            "defaultLabelProfiles": config["defaultLabelProfiles"] if "defaultLabelProfiles" in config else None,
             "pluginData": config["themes"]["pluginData"] if "pluginData" in config["themes"] else [],
             "themeInfoLinks": config["themes"]["themeInfoLinks"] if "themeInfoLinks" in config["themes"] else [],
             "externalLayers": config["themes"]["externalLayers"] if "externalLayers" in config["themes"] else [],

package/utils/FeatureStyles.js

@@ -19,6 +19,7 @@ import ConfigUtils from './ConfigUtils';
 import arrowhead from './img/arrowhead.svg';
 import markerIcon from './img/marker-icon.png';
 import measurehead from './img/measurehead.svg';
+import MiscUtils from './MiscUtils';
 import ResourceRegistry from './ResourceRegistry';
 ResourceRegistry.addResource('arrowhead', arrowhead);
 ResourceRegistry.addResource('measurehead', measurehead);
@@ -466,15 +467,15 @@ export default {
     return [new ol.style.Style({
       text: new ol.style.Text({
         font: '10pt sans-serif',
-        padding: [6, 10, 6, 10],
+        padding: [3, 5, 3, 5],
         text: feature.getProperties().label || "",
         rotation: feature.getProperties().rotation || 0,
         scale: options.strokeWidth,
         fill: new ol.style.Fill({
-          color: '#000'
+          color: options.strokeColor
         }),
         stroke: new ol.style.Stroke({
-          color: '#FFF',
+          color: MiscUtils.isBrightColor(options.strokeColor) ? '#333' : '#FFF',
           width: 2
         }),
         backgroundFill: new ol.style.Fill({

package/utils/MiscUtils.js

@@ -185,11 +185,21 @@ var MiscUtils = {
   capitalizeFirst: function capitalizeFirst(text) {
     return text.slice(0, 1).toUpperCase() + text.slice(1);
   },
-  isBrightColor: function isBrightColor(hex) {
-    var color = +("0x" + hex.slice(1).replace(hex.length < 5 && /./g, '$&$&'));
-    var r = color >> 16;
-    var g = color >> 8 & 255;
-    var b = color & 255;
+  isBrightColor: function isBrightColor(color) {
+    var r;
+    var g;
+    var b;
+    if (Array.isArray(color)) {
+      var _color = _slicedToArray(color, 3);
+      r = _color[0];
+      g = _color[1];
+      b = _color[2];
+    } else {
+      var intcolor = +("0x" + color.slice(1).replace(color.length < 5 && /./g, '$&$&'));
+      r = intcolor >> 16;
+      g = intcolor >> 8 & 255;
+      b = intcolor & 255;
+    }
     var hsp = Math.sqrt(0.299 * (r * r) + 0.587 * (g * g) + 0.114 * (b * b));
     return hsp > 127.5;
   },

package/utils/ThemeUtils.js

@@ -184,7 +184,7 @@ var ThemeUtils = {
       editConfig: theme.editConfig,
       editConfigUrl: theme.editConfigUrl,
       filter: theme.filter,
-      labelProfiles: theme.labelProfiles,
+      labelProfiles: _objectSpread(_objectSpread({}, themes.defaultLabelProfiles), theme.labelProfiles),
       wms_name: theme.wms_name
     };
     if (layer.editConfigUrl) {