qwc2 2025.10.24 → 2025.10.29

package/static/translations/ru-RU.json

@@ -137,7 +137,6 @@
     "draw3d": {
       "clone": "",
       "cone": "",
-      "ctrlhint": "",
       "cuboid": "",
       "cylinder": "",
       "delete": "",
@@ -195,7 +194,7 @@
     },
     "featureattributes": {
       "name": "",
-      "nofeature": "",
+      "nofeatureormultiple": "",
       "value": "",
       "windowtitle": ""
     },
@@ -448,7 +447,7 @@
       "angle": "",
       "featureunsupported": "",
       "height": "",
-      "nofeature": "",
+      "nofeatureormultiple": "",
       "side": "",
       "width": "",
       "windowtitle": ""
@@ -501,6 +500,7 @@
       "bufferlayername": "",
       "bufferselectfeature": "",
       "circle": "",
+      "ctrlhint": "",
       "delete": "",
       "draw": "",
       "edit": "",

package/static/translations/sv-SE.json

@@ -137,7 +137,6 @@
     "draw3d": {
       "clone": "",
       "cone": "",
-      "ctrlhint": "",
       "cuboid": "",
       "cylinder": "",
       "delete": "",
@@ -195,7 +194,7 @@
     },
     "featureattributes": {
       "name": "",
-      "nofeature": "",
+      "nofeatureormultiple": "",
       "value": "",
       "windowtitle": ""
     },
@@ -448,7 +447,7 @@
       "angle": "",
       "featureunsupported": "",
       "height": "",
-      "nofeature": "",
+      "nofeatureormultiple": "",
       "side": "",
       "width": "",
       "windowtitle": ""
@@ -501,6 +500,7 @@
       "bufferlayername": "Buffert",
       "bufferselectfeature": "Välj ett objekt att buffra",
       "circle": "",
+      "ctrlhint": "",
       "delete": "Radera",
       "draw": "Rita",
       "edit": "Redigera",

package/static/translations/tr-TR.json

@@ -137,7 +137,6 @@
     "draw3d": {
       "clone": "",
       "cone": "Koni",
-      "ctrlhint": "",
       "cuboid": "Kübik",
       "cylinder": "Silindir",
       "delete": "Sil",
@@ -195,7 +194,7 @@
     },
     "featureattributes": {
       "name": "",
-      "nofeature": "",
+      "nofeatureormultiple": "",
       "value": "",
       "windowtitle": ""
     },
@@ -448,7 +447,7 @@
       "angle": "Açı",
       "featureunsupported": "Sayısal değer bu geometri için kullanılamaz",
       "height": "Yükseklik",
-      "nofeature": "Aktif obje yok",
+      "nofeatureormultiple": "",
       "side": "Taraf",
       "width": "Genişlik",
       "windowtitle": "Sayısal giriş"
@@ -501,6 +500,7 @@
       "bufferlayername": "Tampon",
       "bufferselectfeature": "Tampon atılacak bir obje seçiniz...",
       "circle": "Daire",
+      "ctrlhint": "",
       "delete": "Sil",
       "draw": "Çiz",
       "edit": "Düzenle",

package/static/translations/tsconfig.json

@@ -146,7 +146,6 @@
     "cyclomedia.title",
     "draw3d.clone",
     "draw3d.cone",
-    "draw3d.ctrlhint",
     "draw3d.cuboid",
     "draw3d.cylinder",
     "draw3d.delete",
@@ -198,7 +197,7 @@
     "editing.takepicture",
     "editing.unsavedchanged",
     "featureattributes.name",
-    "featureattributes.nofeature",
+    "featureattributes.nofeatureormultiple",
     "featureattributes.value",
     "featureattributes.windowtitle",
     "featureform.feature",
@@ -389,7 +388,7 @@
     "numericinput.angle",
     "numericinput.featureunsupported",
     "numericinput.height",
-    "numericinput.nofeature",
+    "numericinput.nofeatureormultiple",
     "numericinput.side",
     "numericinput.width",
     "numericinput.windowtitle",
@@ -430,6 +429,7 @@
     "redlining.bufferlayername",
     "redlining.bufferselectfeature",
     "redlining.circle",
+    "redlining.ctrlhint",
     "redlining.delete",
     "redlining.draw",
     "redlining.edit",

package/static/translations/uk-UA.json

@@ -137,7 +137,6 @@
     "draw3d": {
       "clone": "",
       "cone": "",
-      "ctrlhint": "",
       "cuboid": "",
       "cylinder": "",
       "delete": "",
@@ -195,7 +194,7 @@
     },
     "featureattributes": {
       "name": "",
-      "nofeature": "",
+      "nofeatureormultiple": "",
       "value": "",
       "windowtitle": ""
     },
@@ -448,7 +447,7 @@
       "angle": "",
       "featureunsupported": "",
       "height": "",
-      "nofeature": "",
+      "nofeatureormultiple": "",
       "side": "",
       "width": "",
       "windowtitle": ""
@@ -501,6 +500,7 @@
       "bufferlayername": "",
       "bufferselectfeature": "",
       "circle": "",
+      "ctrlhint": "",
       "delete": "",
       "draw": "",
       "edit": "",

package/utils/EditingInterface.js

@@ -56,6 +56,17 @@ var EditingInterface = {
     }
     return message;
   },
+  replacer: function replacer(mapCrs) {
+    if (mapCrs === "EPSG:4326") {
+      return function (key, val) {
+        return val.toFixed ? Number(val.toFixed(5)) : val;
+      };
+    } else {
+      return function (key, val) {
+        return val.toFixed ? Number(val.toFixed(2)) : val;
+      };
+    }
+  },
   /**
    * Gets features at the specified map position.
    *
@@ -88,7 +99,7 @@ var EditingInterface = {
             name: mapCrs
           }
         }
-      })) : undefined
+      }), this.replacer(mapCrs)) : undefined
     };
     var headers = {
       "Accept-Language": LocaleUtils.lang()
@@ -171,7 +182,7 @@ var EditingInterface = {
     var params = {
       crs: mapCrs,
       bbox: bbox ? bbox.join(",") : undefined,
-      filter: filter ? JSON.stringify(filter) : undefined,
+      filter: filter ? JSON.stringify(filter, this.replacer(mapCrs)) : undefined,
       filter_geom: filterGeom ? JSON.stringify(_objectSpread(_objectSpread({}, filterGeom), {}, {
         crs: {
           type: "name",
@@ -179,7 +190,7 @@ var EditingInterface = {
             name: mapCrs
           }
         }
-      })) : undefined,
+      }), this.replacer(mapCrs)) : undefined,
       fields: fields ? fields.join(",") : undefined
     };
     var headers = {
@@ -236,7 +247,7 @@ var EditingInterface = {
             name: mapCrs
           }
         }
-      })) : undefined
+      }), this.replacer(mapCrs)) : undefined
     };
     var headers = {
       "Accept-Language": LocaleUtils.lang()

package/utils/LayerUtils.js

@@ -520,13 +520,18 @@ var LayerUtils = {
           return layers;
         }
         // Avoid splitting sibling groups when reordering
-        var siblinggrouppath = exploded[idx + delta].path.length > level ? exploded[idx + delta].path.slice(0, level) : null;
-        if (siblinggrouppath !== null) {
-          var dir = delta > 0 ? 1 : -1;
-          while (idx + delta + dir >= 0 && idx + delta + dir < exploded.length && LayerUtils.pathEqualOrBelow(siblinggrouppath, exploded[idx + delta + dir].path)) {
-            delta += dir;
-          }
+        var group = sublayerpath.slice(0, -1).reduce(function (sublayer, i) {
+          return sublayer.sublayers[i];
+        }, movelayer);
+        // Compute move offset
+        var dir = delta > 0 ? 1 : -1;
+        var oldIndex = sublayerpath[sublayerpath.length - 1];
+        var newIndex = oldIndex + delta;
+        var offset = 0;
+        for (var i = oldIndex + dir; dir * i <= dir * newIndex; i += dir) {
+          offset += LayerUtils.layerTreeCount(group.sublayers[i]) * dir;
         }
+        delta = offset;
       }
       // Reorder layer
       if (delta < 0) {
@@ -766,6 +771,11 @@ var LayerUtils = {
       }
     }
   },
+  layerTreeCount: function layerTreeCount(layer) {
+    return isEmpty(layer.sublayers) ? 1 : layer.sublayers.reduce(function (sum, sublayer) {
+      return sum + LayerUtils.layerTreeCount(sublayer);
+    }, 0);
+  },
   getSublayerNames: function getSublayerNames(layer) {
     var _this2 = this;
     var toplevel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;