qwc2 2025.12.15 → 2025.12.18

package/utils/FeatureStyles.js

@@ -174,6 +174,7 @@ var defaultStyle = function defaultStyle(feature, options) {
     }
   }
   if (feature.getGeometry().getType() === "LineString" && opts.headmarker in END_MARKERS) {
+    var _opts$markerscale;
     var _p = feature.getGeometry().getCoordinates()[0];
     var _p2 = feature.getGeometry().getCoordinates()[1];
     var rotation = 0.5 * Math.PI + Math.atan2(_p[0] - _p2[0], _p[1] - _p2[1]);
@@ -184,11 +185,12 @@ var defaultStyle = function defaultStyle(feature, options) {
         anchorYUnits: 'fraction',
         color: opts.strokeColor,
         rotation: END_MARKERS[opts.headmarker].baserotation / 180 * Math.PI + rotation,
-        scale: 0.125 * (1 + opts.strokeWidth) // Also update in VectorLayerUtils.generateMarkerGeometry
+        scale: 0.125 * (1 + opts.strokeWidth) * ((_opts$markerscale = opts.markerscale) !== null && _opts$markerscale !== void 0 ? _opts$markerscale : 1) // Also update in VectorLayerUtils.generateMarkerGeometry
       }))
     }));
   }
   if (feature.getGeometry().getType() === "LineString" && opts.tailmarker in END_MARKERS) {
+    var _opts$markerscale2;
     var l = feature.getGeometry().getCoordinates().length;
     var _p3 = feature.getGeometry().getCoordinates()[l - 1];
     var _p4 = feature.getGeometry().getCoordinates()[l - 2];
@@ -200,7 +202,7 @@ var defaultStyle = function defaultStyle(feature, options) {
         anchorYUnits: 'fraction',
         color: opts.strokeColor,
         rotation: END_MARKERS[opts.tailmarker].baserotation / 180 * Math.PI + _rotation,
-        scale: 0.125 * (1 + opts.strokeWidth) // Also update in VectorLayerUtils.generateMarkerGeometry
+        scale: 0.125 * (1 + opts.strokeWidth) * ((_opts$markerscale2 = opts.markerscale) !== null && _opts$markerscale2 !== void 0 ? _opts$markerscale2 : 1) // Also update in VectorLayerUtils.generateMarkerGeometry
       }))
     }));
   }
@@ -235,25 +237,20 @@ export default {
       })
     })];
   },
-  interaction: function interaction(options, isSnap) {
+  interaction: function interaction(feature, options, isSnap) {
     var opts = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_INTERACTION_STYLE), ConfigUtils.getConfigProp("defaultInteractionStyle")), options);
-    var fillColor = opts.fillColor;
-    var strokeColor = opts.strokeColor;
-    var strokeWidth = opts.strokeWidth;
-    if (isSnap) {
-      fillColor = opts.snapFillColor;
-      strokeColor = opts.snapStrokeColor;
-      strokeWidth = opts.snapStrokeWidth;
-    }
-    return new ol.style.Style({
-      fill: new ol.style.Fill({
-        color: fillColor
-      }),
-      stroke: new ol.style.Stroke({
-        color: strokeColor,
-        width: strokeWidth
-      })
-    });
+    var styleOptions = isSnap ? {
+      strokeColor: opts.snapStrokeColor,
+      strokeWidth: opts.snapStrokeWidth,
+      fillColor: opts.snapFillColor
+    } : {
+      strokeColor: opts.strokeColor,
+      strokeWidth: opts.strokeWidth,
+      fillColor: opts.fillColor
+    };
+    styleOptions.strokeDash = [];
+    styleOptions.circleRadius = 0;
+    return defaultStyle(feature, styleOptions);
   },
   interactionVertex: function interactionVertex(options, isSnap) {
     var opts = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_INTERACTION_STYLE), ConfigUtils.getConfigProp("defaultInteractionStyle")), options);
@@ -295,6 +292,7 @@ export default {
       fillColor: opts.measureFillColor,
       headmarker: opts.headmarker,
       tailmarker: opts.tailmarker,
+      markerscale: opts.markerscale,
       strokeDash: []
     };
     return defaultStyle(feature, styleOptions);

package/utils/IdentifyUtils.js

@@ -27,6 +27,8 @@ import CoordinatesUtils from '../utils/CoordinatesUtils';
 import LayerUtils from '../utils/LayerUtils';
 import MapUtils from '../utils/MapUtils';
 import VectorLayerUtils from './VectorLayerUtils';
+export var EXCLUDE_PROPS = ['featurereport', 'displayfield', 'layername', 'layertitle', 'layerinfo', 'attribnames', 'clickPos', 'displayname', 'bbox'];
+export var EXCLUDE_ATTRS = ['htmlContent', 'htmlContentInline'];
 function identifyRequestParams(layer, queryLayers, projection, params) {
   var _layer$format;
   var format = 'text/plain';
@@ -184,14 +186,14 @@ var IdentifyUtils = {
       });
     }
   },
-  parseResponse: function parseResponse(response, layer, format, clickPoint, projection, featureInfoReturnsLayerName) {
+  parseResponse: function parseResponse(response, layer, format, clickPoint, projection) {
     var decimals = CoordinatesUtils.getPrecision(projection);
     var posstr = clickPoint ? clickPoint[0].toFixed(decimals) + ", " + clickPoint[1].toFixed(decimals) : "";
     var results = {};
     if (["application/json", "application/geojson", "application/geo+json", "GeoJSON"].includes(format)) {
       results = IdentifyUtils.parseGeoJSONResponse(response, projection, layer);
     } else if (format === "text/xml") {
-      results = IdentifyUtils.parseXmlResponse(response, projection, layer, posstr, featureInfoReturnsLayerName);
+      results = IdentifyUtils.parseXmlResponse(response, projection, layer, posstr);
     } else if (format === "application/vnd.ogc.gml") {
       results = IdentifyUtils.parseGmlResponse(response, projection, layer, posstr);
     } else if (format.startsWith("text/xml;subtype=gml/3.1") || format.startsWith("text/xml;subtype=gml/3.0")) {
@@ -310,8 +312,6 @@ var IdentifyUtils = {
       _doc$firstChild$getEl,
       _this = this;
     var posstr = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-    var featureInfoReturnsLayerName = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-    var mapLayers = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : null;
     var parser = new DOMParser();
     var doc = parser.parseFromString(response, "text/xml");
     var layersEl = [].slice.call(((_doc$firstChild = doc.firstChild) === null || _doc$firstChild === void 0 || (_doc$firstChild$getEl = _doc$firstChild.getElementsByTagName) === null || _doc$firstChild$getEl === void 0 ? void 0 : _doc$firstChild$getEl.call(_doc$firstChild, "Layer")) || []);
@@ -326,18 +326,21 @@ var IdentifyUtils = {
         var displayfield = layerEl.attributes.displayfield ? layerEl.attributes.displayfield.value : null;
         var layername = "";
         var layertitle = "";
-        if (layerEl.attributes.layername) {
+        if (layerEl.attributes.title) {
           var _layer$translations$l, _layer$translations;
+          // QGIS Server 3.36+ / qwc-feature-info-service 2025.12.18+
+          layername = layerEl.attributes.name.value;
+          layertitle = (_layer$translations$l = (_layer$translations = layer.translations) === null || _layer$translations === void 0 || (_layer$translations = _layer$translations.layertree) === null || _layer$translations === void 0 ? void 0 : _layer$translations[layername]) !== null && _layer$translations$l !== void 0 ? _layer$translations$l : layerEl.attributes.title.value;
+        } else if (layerEl.attributes.layername) {
+          var _layer$translations$l2, _layer$translations2;
+          // qwc-feature-info-service < 2025.12.18
           layername = layerEl.attributes.layername.value;
-          layertitle = (_layer$translations$l = (_layer$translations = layer.translations) === null || _layer$translations === void 0 || (_layer$translations = _layer$translations.layertree) === null || _layer$translations === void 0 ? void 0 : _layer$translations[layername]) !== null && _layer$translations$l !== void 0 ? _layer$translations$l : layerEl.attributes.name.value;
-        } else if (featureInfoReturnsLayerName) {
+          layertitle = (_layer$translations$l2 = (_layer$translations2 = layer.translations) === null || _layer$translations2 === void 0 || (_layer$translations2 = _layer$translations2.layertree) === null || _layer$translations2 === void 0 ? void 0 : _layer$translations2[layername]) !== null && _layer$translations$l2 !== void 0 ? _layer$translations$l2 : layerEl.attributes.name.value;
+        } else {
           var _LayerUtils$searchSub, _LayerUtils$searchSub2;
+          // QGIS Server < 3.36
           layername = layerEl.attributes.name.value;
           layertitle = (_LayerUtils$searchSub = (_LayerUtils$searchSub2 = LayerUtils.searchSubLayer(layer, 'name', layername)) === null || _LayerUtils$searchSub2 === void 0 ? void 0 : _LayerUtils$searchSub2.title) !== null && _LayerUtils$searchSub !== void 0 ? _LayerUtils$searchSub : layername;
-        } else {
-          var _LayerUtils$searchSub3, _LayerUtils$searchSub4;
-          layertitle = layerEl.attributes.name.value;
-          layername = (_LayerUtils$searchSub3 = (_LayerUtils$searchSub4 = LayerUtils.searchSubLayer(layer, 'title', layertitle)) === null || _LayerUtils$searchSub4 === void 0 ? void 0 : _LayerUtils$searchSub4.name) !== null && _LayerUtils$searchSub3 !== void 0 ? _LayerUtils$searchSub3 : layertitle;
         }
         var layerinfo = layerEl.attributes.layerinfo ? layerEl.attributes.layerinfo.value : null;
         var features = [].slice.call(layerEl.getElementsByTagName("Feature"));

package/utils/MiscUtils.js

@@ -93,7 +93,8 @@ var MiscUtils = {
   },
   checkKeyActivate: function checkKeyActivate(ev) {
     var onEsc = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-    if (ev.code === "Space" || ev.code === "Enter") {
+    var spaceActivate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+    if (spaceActivate && ev.code === "Space" || ev.code === "Enter") {
       MiscUtils.killEvent(ev);
       ev.currentTarget.click();
     } else if (ev.code === "Escape" && onEsc) {

package/utils/SearchProviders.js

@@ -419,7 +419,7 @@ export var FulltextSearch = /*#__PURE__*/function () {
           resultCount: placeResultCount,
           type: SearchResultType.PLACE,
           items: data.results.filter(function (entry) {
-            return entry.feature;
+            return entry.feature && entry.feature.bbox;
           }).map(function (entry) {
             return {
               id: entry.feature.feature_id,

package/utils/VectorLayerUtils.js

@@ -95,12 +95,14 @@ var VectorLayerUtils = {
             var properties = feature.properties || {};
             var geometry = VectorLayerUtils.reprojectGeometry(feature.geometry, feature.crs || printCrs, printCrs);
             if (feature.geometry.type === "LineString") {
+              var _styleOptions$markers;
+              var markerScale = (_styleOptions$markers = styleOptions.markerscale) !== null && _styleOptions$markers !== void 0 ? _styleOptions$markers : 1;
               // Generate arrow heads
               if (styleOptions.headmarker) {
-                VectorLayerUtils.generateMarkerGeometry(params, styleOptions.headmarker, false, feature, layer, dpi, printScale, printCrs, scaleFactor);
+                VectorLayerUtils.generateMarkerGeometry(params, styleOptions.headmarker, false, feature, layer, dpi, printScale, printCrs, scaleFactor * markerScale);
               }
               if (styleOptions.tailmarker) {
-                VectorLayerUtils.generateMarkerGeometry(params, styleOptions.tailmarker, true, feature, layer, dpi, printScale, printCrs, scaleFactor);
+                VectorLayerUtils.generateMarkerGeometry(params, styleOptions.tailmarker, true, feature, layer, dpi, printScale, printCrs, scaleFactor * markerScale);
               }
             }
             if (feature.geometry.type === "LineString" && !isEmpty(properties.segment_labels)) {