qwc2 2025.12.2 → 2025.12.4

package/actions/windows.js

@@ -22,6 +22,7 @@ import ReducerIndex from '../reducers/index';
 import windowsReducer from '../reducers/windows';
 import ConfigUtils from '../utils/ConfigUtils';
 import CoordinatesUtils from '../utils/CoordinatesUtils';
+import LocaleUtils from '../utils/LocaleUtils';
 import MapUtils from '../utils/MapUtils';
 import { UrlParams } from '../utils/PermaLinkUtils';
 ReducerIndex.register("windows", windowsReducer);
@@ -153,6 +154,7 @@ export function openExternalUrl(url) {
     url = url.replace('$y$', y);
     url = url.replace('$crs$', proj);
     url = url.replace('$user$', ConfigUtils.getConfigProp("username") || "");
+    url = url.replace('$lang$', LocaleUtils.lang());
     if (target.startsWith(":iframedialog")) {
       var targetParts = target.split(":");
       var options = targetParts.slice(2).reduce(function (res, cur) {

package/components/Icon.js

@@ -40,8 +40,15 @@ var Icon = /*#__PURE__*/function (_React$Component) {
         icon_disabled: this.props.disabled,
         icon_clickable: !!this.props.onClick || !!this.props.onMouseDown || !!this.props.onPointerDown
       }, "icon-" + this.props.icon, true), "icon_" + this.props.size, !!this.props.size), this.props.className, !!this.props.className));
-      var tabIndex = this.props.onClick ? 0 : undefined;
-      var onKeyDown = tabIndex !== undefined ? MiscUtils.checkKeyActivate : null;
+      var tabIndex = undefined;
+      var onKeyDown = null;
+      if (this.props.onClick) {
+        tabIndex = 0;
+        onKeyDown = MiscUtils.checkKeyActivate;
+      } else if (this.props.onPointerDown) {
+        tabIndex = 0;
+        onKeyDown = MiscUtils.checkKeyActivatePointerDown;
+      }
       if (this.props.icon.startsWith(":/")) {
         var assetsPath = ConfigUtils.getAssetsPath();
         var src = assetsPath + this.props.icon.substr(1);

package/components/IdentifyViewer.js

@@ -1100,7 +1100,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       return htmlReactParser(text, options);
     });
     _defineProperty(_this, "attributeLinkClicked", function (ev) {
-      _this.props.openExternalUrl(ev.currentTarget.href, ev.target.target, {
+      _this.props.openExternalUrl(ev.currentTarget.href, ev.currentTarget.target, {
         docked: _this.props.iframeDialogsInitiallyDocked
       });
       ev.preventDefault();

package/components/map3d/MapControls3D.js

@@ -348,28 +348,26 @@ var MapControls3D = /*#__PURE__*/function (_React$Component) {
         style: {
           order: 998
         }
-      }, /*#__PURE__*/React.createElement("div", {
+      }, /*#__PURE__*/React.createElement(Icon, {
+        icon: "plus",
         onPointerDown: function onPointerDown(ev) {
           return _this2.zoom(ev, +1);
         }
-      }, /*#__PURE__*/React.createElement(Icon, {
-        icon: "plus"
-      })), /*#__PURE__*/React.createElement("div", {
+      }), /*#__PURE__*/React.createElement(Icon, {
+        icon: "minus",
         onPointerDown: function onPointerDown(ev) {
           return _this2.zoom(ev, -1);
         }
-      }, /*#__PURE__*/React.createElement(Icon, {
-        icon: "minus"
-      }))) : null, this.context), /*#__PURE__*/ReactDOM.createPortal(/*#__PURE__*/React.createElement("div", {
+      })) : null, this.context), /*#__PURE__*/ReactDOM.createPortal(/*#__PURE__*/React.createElement("div", {
         className: firstPersonButtonClasses,
         "data-slot": 0,
         key: "MapControlsFirstPerson",
-        onClick: this.toggleFirstPersonControls,
         style: {
           order: 997
         }
       }, /*#__PURE__*/React.createElement(Icon, {
-        icon: "person"
+        icon: "person",
+        onClick: this.toggleFirstPersonControls
       })), this.context), this.props.controlsPosition !== 'bottom' ? /*#__PURE__*/ReactDOM.createPortal(/*#__PURE__*/React.createElement("div", {
         className: "map3d-nav-spacer",
         key: "MapControlsSpacer",

package/components/map3d/style/MapControls3D.css

@@ -39,7 +39,7 @@ div.map3d-nav-zoom {
     margin: 0 1em 0.5em 1em;
 }
 
-div.map3d-nav-zoom > div {
+div.map3d-nav-zoom > span {
     height: 2em;
     width: 1.5em;
     display: flex;
@@ -47,7 +47,7 @@ div.map3d-nav-zoom > div {
     justify-content: center;
 }
 
-div.map3d-nav-zoom > div:first-child {
+div.map3d-nav-zoom > span:first-child {
     border-bottom: 1px solid var(--map-button-text-color);
 }
 
@@ -74,6 +74,11 @@ div.map3d-firstperson-button-active {
     color: var(--map-button-bg-color);
 }
 
+div.map3d-firstperson-button > span {
+    width: 2em;
+    height: 2em;
+}
+
 div.map3d-nav-spacer {
     display: inline-block;
     width: 1em;

package/package.json

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

package/plugins/MapTip.js

@@ -177,7 +177,7 @@ var MapTip = /*#__PURE__*/function (_React$Component) {
       return htmlReactParser(text, options);
     });
     _defineProperty(_this, "attributeLinkClicked", function (ev) {
-      _this.props.openExternalUrl(ev.currentTarget.href, ev.target.target, {
+      _this.props.openExternalUrl(ev.currentTarget.href, ev.currentTarget.target, {
         docked: _this.props.iframeDialogsInitiallyDocked
       });
       ev.preventDefault();

package/scripts/themesConfig.js

@@ -640,6 +640,7 @@ function getGroupThemes(config, configGroup, result, resultGroup, proxy, groupCo
         var groupEntry = {
           id: 'g' + ++groupCounter,
           title: group.title,
+          titleMsgId: group.titleMsgId,
           items: [],
           subdirs: []
         };

package/scripts/themesConfig.py

@@ -588,6 +588,7 @@ def getGroupThemes(config, configGroup, result, resultGroup, groupCounter):
             groupEntry = {
                 "id": "g%d" % groupCounter,
                 "title": group["title"],
+                "titleMsgId": group["titleMsgId"],
                 "items": [],
                 "subdirs": []
             }

package/utils/CoordinatesUtils.js

@@ -167,6 +167,8 @@ var CoordinatesUtils = {
     if (commonEsriWktLookup[epsgCode]) {
       return commonEsriWktLookup[epsgCode];
     }
+
+    /* eslint-disable-next-line */
     console.warn("No ESRI WKT definition found for ".concat(epsgCode, ". Shapefile export may not include projection information. Consider adding an 'esriWkt' property to the projection in config.json."));
     return null;
   },

package/utils/EditingInterface.js

@@ -25,6 +25,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import axios from 'axios';
 import isEmpty from 'lodash.isempty';
 import ConfigUtils from './ConfigUtils';
+import CoordinatesUtils from './CoordinatesUtils';
 import { computeExpressionFields } from './EditingUtils';
 import LocaleUtils from './LocaleUtils';
 var EditingInterface = {
@@ -86,8 +87,16 @@ var EditingInterface = {
     var requestUrl = editServiceUrl + '/' + editConfig.editDataset + '/';
 
     // 10px tolerance
-    var tol = 10.0 / dpi * 0.0254 * mapScale;
-    var bbox = mapPos[0] - tol + "," + (mapPos[1] - tol) + "," + (mapPos[0] + tol) + "," + (mapPos[1] + tol);
+    var bbox = null;
+    var metersPerPixel = 1 / dpi * 0.0254 * mapScale;
+    if (CoordinatesUtils.getUnits(mapCrs) === 'degrees') {
+      var tolLat = 10 * metersPerPixel / 111320.0; // meters per degree latitude
+      var tolLon = 10 * metersPerPixel / (111320.0 * Math.cos(mapPos[1] * Math.PI / 180));
+      bbox = [mapPos[0] - tolLon, mapPos[1] - tolLat, mapPos[0] + tolLon, mapPos[1] + tolLat].join(",");
+    } else {
+      var tol = 10 * metersPerPixel;
+      bbox = mapPos[0] - tol + "," + (mapPos[1] - tol) + "," + (mapPos[0] + tol) + "," + (mapPos[1] + tol);
+    }
     var params = {
       bbox: bbox,
       crs: mapCrs,

package/utils/MiscUtils.js

@@ -101,6 +101,29 @@ var MiscUtils = {
       onEsc();
     }
   },
+  checkKeyActivatePointerDown: function checkKeyActivatePointerDown(ev) {
+    if (ev.code === "Space" || ev.code === "Enter") {
+      MiscUtils.killEvent(ev);
+      ev.currentTarget.dispatchEvent(new PointerEvent("pointerdown", {
+        bubbles: true,
+        cancelable: true,
+        pointerId: 1,
+        pointerType: "mouse",
+        view: ev.view
+      }));
+      ev.currentTarget.addEventListener("keyup", function (ev2) {
+        ev2.currentTarget.dispatchEvent(new PointerEvent("pointerup", {
+          bubbles: true,
+          cancelable: true,
+          pointerId: 1,
+          pointerType: "mouse",
+          view: ev2.view
+        }));
+      }, {
+        once: true
+      });
+    }
+  },
   blendColors: function blendColors(color1, color2, ratio) {
     color1 = [parseInt(color1[1] + color1[2], 16), parseInt(color1[3] + color1[4], 16), parseInt(color1[5] + color1[6], 16)];
     color2 = [parseInt(color2[1] + color2[2], 16), parseInt(color2[3] + color2[4], 16), parseInt(color2[5] + color2[6], 16)];