qwc2 2025.12.4 → 2025.12.17

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
       }))
     }));
   }
@@ -295,6 +297,7 @@ export default {
       fillColor: opts.measureFillColor,
       headmarker: opts.headmarker,
       tailmarker: opts.tailmarker,
+      markerscale: opts.markerscale,
       strokeDash: []
     };
     return defaultStyle(feature, styleOptions);

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/VectorLayerUtils.js

@@ -19,6 +19,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
  * LICENSE file in the root directory of this source tree.
  */
 
+import cleanCords from '@turf/clean-coords';
 import geojsonBbox from 'geojson-bounding-box';
 import isEmpty from 'lodash.isempty';
 import { getDefaultImageStyle } from 'ol/format/KML';
@@ -74,8 +75,14 @@ var VectorLayerUtils = {
               })
             });
           }
-          return VectorLayerUtils.simplifyFeature(feature);
-        }).flat();
+          try {
+            return VectorLayerUtils.simplifyFeature(feature);
+          } catch (e) {
+            /* eslint-disable-next-line */
+            console.warn("Skipping invalid geometry");
+            return null;
+          }
+        }).filter(Boolean).flat();
         var _iterator2 = _createForOfIteratorHelper(features),
           _step2;
         try {
@@ -88,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)) {
@@ -180,7 +189,7 @@ var VectorLayerUtils = {
         }));
       }).flat();
     } else if (feature.geometry.type === "Polygon") {
-      return simplepolygon(feature).features.map(function (feat, idx, features) {
+      return simplepolygon(cleanCords(feature)).features.map(function (feat, idx, features) {
         if (feat.properties.parent >= 0) {
           features[feat.properties.parent].geometry.coordinates.push(feat.geometry.coordinates[0]);
           return null;