qwc2 2025.12.19 → 2025.12.24

package/utils/LayerUtils.js

@@ -643,18 +643,18 @@ var LayerUtils = {
         // Reduced layer with one single sublayer per level, up to leaf
         var redLayer = _objectSpread({}, layer);
         var group = redLayer;
-        var _iterator10 = _createForOfIteratorHelper(path),
-          _step10;
+        var _iterator0 = _createForOfIteratorHelper(path),
+          _step0;
         try {
-          for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-            var jdx = _step10.value;
+          for (_iterator0.s(); !(_step0 = _iterator0.n()).done;) {
+            var jdx = _step0.value;
             group.sublayers = [_objectSpread({}, group.sublayers[jdx])];
             group = group.sublayers[0];
           }
         } catch (err) {
-          _iterator10.e(err);
+          _iterator0.e(err);
         } finally {
-          _iterator10.f();
+          _iterator0.f();
         }
         exploded.push({
           layer: redLayer,
@@ -669,11 +669,11 @@ var LayerUtils = {
     var usedIds = new Set();
 
     // Merge all possible items of an exploded layer array
-    var _iterator11 = _createForOfIteratorHelper(exploded),
-      _step11;
+    var _iterator1 = _createForOfIteratorHelper(exploded),
+      _step1;
     try {
-      for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-        var entry = _step11.value;
+      for (_iterator1.s(); !(_step1 = _iterator1.n()).done;) {
+        var entry = _step1.value;
         var _layer2 = entry.layer;
 
         // Attempt to merge with previous if possible
@@ -702,9 +702,9 @@ var LayerUtils = {
       }
       // Ensure mutually exclusive groups have exactly one visible layer
     } catch (err) {
-      _iterator11.e(err);
+      _iterator1.e(err);
     } finally {
-      _iterator11.f();
+      _iterator1.f();
     }
     for (var _i = 0, _newlayers = newlayers; _i < _newlayers.length; _i++) {
       var layer = _newlayers[_i];
@@ -744,30 +744,30 @@ var LayerUtils = {
         var visibleSublayer = tristateSublayer || group.sublayers.find(function (sublayer) {
           return sublayer.visibility === true;
         }) || group.sublayers[0];
-        var _iterator12 = _createForOfIteratorHelper(group.sublayers),
-          _step12;
+        var _iterator10 = _createForOfIteratorHelper(group.sublayers),
+          _step10;
         try {
-          for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-            var sublayer = _step12.value;
+          for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+            var sublayer = _step10.value;
             sublayer.visibility = sublayer === visibleSublayer;
           }
         } catch (err) {
-          _iterator12.e(err);
+          _iterator10.e(err);
         } finally {
-          _iterator12.f();
+          _iterator10.f();
         }
       }
-      var _iterator13 = _createForOfIteratorHelper(group.sublayers),
-        _step13;
+      var _iterator11 = _createForOfIteratorHelper(group.sublayers),
+        _step11;
       try {
-        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-          var _sublayer = _step13.value;
+        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+          var _sublayer = _step11.value;
           LayerUtils.ensureMutuallyExclusive(_sublayer);
         }
       } catch (err) {
-        _iterator13.e(err);
+        _iterator11.e(err);
       } finally {
-        _iterator13.f();
+        _iterator11.f();
       }
     }
   },
@@ -812,11 +812,11 @@ var LayerUtils = {
     var path = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
     if (layer.sublayers) {
       var idx = 0;
-      var _iterator14 = _createForOfIteratorHelper(layer.sublayers),
-        _step14;
+      var _iterator12 = _createForOfIteratorHelper(layer.sublayers),
+        _step12;
       try {
-        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-          var sublayer = _step14.value;
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+          var sublayer = _step12.value;
           var match = sublayer[attr] === value ? sublayer : LayerUtils.searchSubLayer(sublayer, attr, value, path);
           if (match) {
             path.unshift(idx);
@@ -825,9 +825,9 @@ var LayerUtils = {
           idx += 1;
         }
       } catch (err) {
-        _iterator14.e(err);
+        _iterator12.e(err);
       } finally {
-        _iterator14.f();
+        _iterator12.f();
       }
     } else {
       if (layer[attr] === value) {
@@ -840,11 +840,11 @@ var LayerUtils = {
     var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     if (layer.sublayers) {
       var idx = 0;
-      var _iterator15 = _createForOfIteratorHelper(layer.sublayers),
-        _step15;
+      var _iterator13 = _createForOfIteratorHelper(layer.sublayers),
+        _step13;
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-          var sublayer = _step15.value;
+        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+          var sublayer = _step13.value;
           var match = func(sublayer) ? sublayer : LayerUtils.matchSubLayer(sublayer, func, path);
           if (match) {
             path.unshift(idx);
@@ -853,9 +853,9 @@ var LayerUtils = {
           idx += 1;
         }
       } catch (err) {
-        _iterator15.e(err);
+        _iterator13.e(err);
       } finally {
-        _iterator15.f();
+        _iterator13.f();
       }
     } else {
       if (func(layer)) {
@@ -884,11 +884,11 @@ var LayerUtils = {
   sublayerVisible: function sublayerVisible(layer, sublayerpath) {
     var visible = layer.visibility !== false;
     var sublayer = layer;
-    var _iterator16 = _createForOfIteratorHelper(sublayerpath),
-      _step16;
+    var _iterator14 = _createForOfIteratorHelper(sublayerpath),
+      _step14;
     try {
-      for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-        var index = _step16.value;
+      for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+        var index = _step14.value;
         sublayer = sublayer.sublayers[index];
         visible &= sublayer.visibility !== false;
         if (!visible) {
@@ -896,9 +896,9 @@ var LayerUtils = {
         }
       }
     } catch (err) {
-      _iterator16.e(err);
+      _iterator14.e(err);
     } finally {
-      _iterator16.f();
+      _iterator14.f();
     }
     return true;
   },
@@ -932,8 +932,7 @@ var LayerUtils = {
   computeLayerQueryable: function computeLayerQueryable(layer) {
     var queryable = 0;
     layer.sublayers.map(function (sublayer) {
-      var _sublayer$omitFromQue;
-      var sublayerqueryable = (_sublayer$omitFromQue = !sublayer.omitFromQueryLayers) !== null && _sublayer$omitFromQue !== void 0 ? _sublayer$omitFromQue : true;
+      var sublayerqueryable = !sublayer.omitFromQueryLayers;
       if (sublayer.sublayers && sublayerqueryable) {
         queryable += LayerUtils.computeLayerQueryable(sublayer);
       } else {
@@ -962,30 +961,30 @@ var LayerUtils = {
   },
   collectGroupLayers: function collectGroupLayers(layer, parentGroups, groupLayers) {
     if (!isEmpty(layer.sublayers)) {
-      var _iterator17 = _createForOfIteratorHelper(layer.sublayers),
-        _step17;
+      var _iterator15 = _createForOfIteratorHelper(layer.sublayers),
+        _step15;
       try {
-        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
-          var sublayer = _step17.value;
+        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+          var sublayer = _step15.value;
           LayerUtils.collectGroupLayers(sublayer, parentGroups.concat(layer.name), groupLayers);
         }
       } catch (err) {
-        _iterator17.e(err);
+        _iterator15.e(err);
       } finally {
-        _iterator17.f();
+        _iterator15.f();
       }
     } else {
-      var _iterator18 = _createForOfIteratorHelper(parentGroups),
-        _step18;
+      var _iterator16 = _createForOfIteratorHelper(parentGroups),
+        _step16;
       try {
-        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-          var group = _step18.value;
+        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+          var group = _step16.value;
           groupLayers[group] = (groupLayers[group] || []).concat(layer.name);
         }
       } catch (err) {
-        _iterator18.e(err);
+        _iterator16.e(err);
       } finally {
-        _iterator18.f();
+        _iterator16.f();
       }
     }
   },
@@ -993,11 +992,11 @@ var LayerUtils = {
     var groupLayers = {};
     LayerUtils.collectGroupLayers(layer, [], groupLayers);
     var newLayerConfigs = [];
-    var _iterator19 = _createForOfIteratorHelper(layerConfigs),
-      _step19;
+    var _iterator17 = _createForOfIteratorHelper(layerConfigs),
+      _step17;
     try {
       var _loop4 = function _loop4() {
-        var layerConfig = _step19.value;
+        var layerConfig = _step17.value;
         if (layerConfig.name in groupLayers) {
           newLayerConfigs.push.apply(newLayerConfigs, _toConsumableArray(groupLayers[layerConfig.name].map(function (name) {
             return _objectSpread(_objectSpread({}, layerConfig), {}, {
@@ -1008,13 +1007,13 @@ var LayerUtils = {
           newLayerConfigs.push(layerConfig);
         }
       };
-      for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+      for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
         _loop4();
       }
     } catch (err) {
-      _iterator19.e(err);
+      _iterator17.e(err);
     } finally {
-      _iterator19.f();
+      _iterator17.f();
     }
     return newLayerConfigs;
   },
@@ -1218,11 +1217,11 @@ var LayerUtils = {
       FILTER_GEOM: ''
     };
     var counterRef = [0];
-    var _iterator20 = _createForOfIteratorHelper(layers),
-      _step20;
+    var _iterator18 = _createForOfIteratorHelper(layers),
+      _step18;
     try {
-      for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
-        var _layer3 = _step20.value;
+      for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+        var _layer3 = _step18.value;
         if (_layer3.role === LayerRole.THEME && _layer3.params.LAYERS) {
           var _layer3$params$FILTER, _layer3$params$FILTER2;
           params.LAYERS.push(_layer3.params.LAYERS);
@@ -1238,9 +1237,9 @@ var LayerUtils = {
         }
       }
     } catch (err) {
-      _iterator20.e(err);
+      _iterator18.e(err);
     } finally {
-      _iterator20.f();
+      _iterator18.f();
     }
     var backgroundLayer = layers.find(function (layer) {
       return layer.role === LayerRole.BACKGROUND && layer.visibility === true;
@@ -1433,17 +1432,17 @@ var LayerUtils = {
     var reports = {};
     var _collectLayerReports = function collectLayerReports(toplayer, layer) {
       if (layer.sublayers) {
-        var _iterator21 = _createForOfIteratorHelper(layer.sublayers),
-          _step21;
+        var _iterator19 = _createForOfIteratorHelper(layer.sublayers),
+          _step19;
         try {
-          for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
-            var sublayer = _step21.value;
+          for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+            var sublayer = _step19.value;
             reports = _objectSpread(_objectSpread({}, reports), _collectLayerReports(toplayer, sublayer));
           }
         } catch (err) {
-          _iterator21.e(err);
+          _iterator19.e(err);
         } finally {
-          _iterator21.f();
+          _iterator19.f();
         }
       } else if (layer.featureReport) {
         var key = toplayer.url + "#" + layer.name;

package/utils/MiscUtils.js

@@ -12,13 +12,13 @@ function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Can
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 /**
  * Copyright 2018-2024 Sourcepole AG
  * All rights reserved.
@@ -178,6 +178,13 @@ var MiscUtils = {
     }
     return [el];
   },
+  objectOmit: function objectOmit(obj, excludeKeys) {
+    return Object.fromEntries(Object.entries(obj).filter(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 1),
+        key = _ref2[0];
+      return !excludeKeys.includes(key);
+    }));
+  },
   capitalizeFirst: function capitalizeFirst(text) {
     return text.slice(0, 1).toUpperCase() + text.slice(1);
   },