qwc2 2025.10.16 → 2025.10.25

package/static/translations/pt-PT.json

@@ -24,6 +24,7 @@
         "MapExport3D": "",
         "MapFilter": "",
         "MapLight3D": "",
+        "ObjectList": "",
         "Print": "Imprimir",
         "Reports": "",
         "Settings": "Configurações",
@@ -136,7 +137,6 @@
     "draw3d": {
       "clone": "",
       "cone": "",
-      "ctrlhint": "",
       "cuboid": "",
       "cylinder": "",
       "delete": "",
@@ -192,6 +192,12 @@
       "takepicture": "Tirar Fotografia",
       "unsavedchanged": "Alterações Não Guardadas"
     },
+    "featureattributes": {
+      "name": "",
+      "nofeatureormultiple": "",
+      "value": "",
+      "windowtitle": ""
+    },
     "featureform": {
       "feature": "Recurso",
       "noresults": "Sem Resultados",
@@ -244,6 +250,7 @@
     "identify": {
       "aggregatedreport": "",
       "clipboard": "Área de Transferência",
+      "compare": "",
       "comparing": "",
       "download": "",
       "export": "Exportar",
@@ -345,6 +352,10 @@
         "PERMISSION_DENIED": "Posição: permissão negada"
       }
     },
+    "locationrecorder": {
+      "record": "",
+      "stop": ""
+    },
     "map": {
       "loading": "A carregar...",
       "resetrotation": "Redefinir Rotação"
@@ -436,7 +447,7 @@
       "angle": "Ângulo",
       "featureunsupported": "Recurso Não Suportado",
       "height": "Altura",
-      "nofeature": "Nenhum Recurso Selecionado",
+      "nofeatureormultiple": "",
       "side": "Lado",
       "width": "Largura",
       "windowtitle": "Entrada Numérica"
@@ -481,6 +492,7 @@
       "loading": "A carregar..."
     },
     "redlining": {
+      "attributes": "",
       "buffer": "Tampão",
       "buffercompute": "Calcular",
       "bufferdistance": "Distância do Tampão",
@@ -488,6 +500,7 @@
       "bufferlayername": "Nome da Camada de Tampão",
       "bufferselectfeature": "Selecione uma característica para o tampão...",
       "circle": "Círculo",
+      "ctrlhint": "",
       "delete": "Excluir",
       "draw": "Desenhar",
       "edit": "Editar",

package/static/translations/ro-RO.json

@@ -24,6 +24,7 @@
         "MapExport3D": "",
         "MapFilter": "",
         "MapLight3D": "",
+        "ObjectList": "",
         "Print": "Tipărire",
         "Reports": "",
         "Settings": "Setări",
@@ -136,7 +137,6 @@
     "draw3d": {
       "clone": "",
       "cone": "",
-      "ctrlhint": "",
       "cuboid": "",
       "cylinder": "",
       "delete": "",
@@ -192,6 +192,12 @@
       "takepicture": "Fotografiază",
       "unsavedchanged": "Modificările nu sunt salvate. Doriți să părăsiți pagina oricum?"
     },
+    "featureattributes": {
+      "name": "",
+      "nofeatureormultiple": "",
+      "value": "",
+      "windowtitle": ""
+    },
     "featureform": {
       "feature": "Obiect spațial",
       "noresults": "Nu există rezultate",
@@ -244,6 +250,7 @@
     "identify": {
       "aggregatedreport": "",
       "clipboard": "Copiere în clipboard",
+      "compare": "",
       "comparing": "",
       "download": "",
       "export": "Export",
@@ -345,6 +352,10 @@
         "PERMISSION_DENIED": "Poziția: acces refuzat"
       }
     },
+    "locationrecorder": {
+      "record": "",
+      "stop": ""
+    },
     "map": {
       "loading": "Se încarcă...",
       "resetrotation": "Resetează rotația"
@@ -436,7 +447,7 @@
       "angle": "Unghi",
       "featureunsupported": "Valorile numerice nu pot fi introduse pentru acest tip de geometrie",
       "height": "Înălțimea",
-      "nofeature": "Nu există obiecte spațiale active",
+      "nofeatureormultiple": "",
       "side": "Partea",
       "width": "Lățimea",
       "windowtitle": "Valori numerice"
@@ -481,6 +492,7 @@
       "loading": "Formularul se încarcă"
     },
     "redlining": {
+      "attributes": "",
       "buffer": "Zonă tampon",
       "buffercompute": "Calcul",
       "bufferdistance": "Distanța",
@@ -488,6 +500,7 @@
       "bufferlayername": "Zonă tampon",
       "bufferselectfeature": "Selectați o entitate...",
       "circle": "Cerc",
+      "ctrlhint": "",
       "delete": "Elimină",
       "draw": "Desenare",
       "edit": "Modifică",

package/static/translations/ru-RU.json

@@ -24,6 +24,7 @@
         "MapExport3D": "",
         "MapFilter": "",
         "MapLight3D": "",
+        "ObjectList": "",
         "Print": "Печать",
         "Reports": "",
         "Settings": "",
@@ -136,7 +137,6 @@
     "draw3d": {
       "clone": "",
       "cone": "",
-      "ctrlhint": "",
       "cuboid": "",
       "cylinder": "",
       "delete": "",
@@ -192,6 +192,12 @@
       "takepicture": "",
       "unsavedchanged": ""
     },
+    "featureattributes": {
+      "name": "",
+      "nofeatureormultiple": "",
+      "value": "",
+      "windowtitle": ""
+    },
     "featureform": {
       "feature": "",
       "noresults": "",
@@ -244,6 +250,7 @@
     "identify": {
       "aggregatedreport": "",
       "clipboard": "",
+      "compare": "",
       "comparing": "",
       "download": "",
       "export": "Экспорт",
@@ -345,6 +352,10 @@
         "PERMISSION_DENIED": "Геолокация: доступ воспрещен"
       }
     },
+    "locationrecorder": {
+      "record": "",
+      "stop": ""
+    },
     "map": {
       "loading": "Загрузка...",
       "resetrotation": ""
@@ -436,7 +447,7 @@
       "angle": "",
       "featureunsupported": "",
       "height": "",
-      "nofeature": "",
+      "nofeatureormultiple": "",
       "side": "",
       "width": "",
       "windowtitle": ""
@@ -481,6 +492,7 @@
       "loading": ""
     },
     "redlining": {
+      "attributes": "",
       "buffer": "",
       "buffercompute": "",
       "bufferdistance": "",
@@ -488,6 +500,7 @@
       "bufferlayername": "",
       "bufferselectfeature": "",
       "circle": "",
+      "ctrlhint": "",
       "delete": "",
       "draw": "",
       "edit": "",

package/static/translations/sv-SE.json

@@ -24,6 +24,7 @@
         "MapExport3D": "",
         "MapFilter": "",
         "MapLight3D": "",
+        "ObjectList": "",
         "Print": "Skriv ut",
         "Reports": "",
         "Settings": "",
@@ -136,7 +137,6 @@
     "draw3d": {
       "clone": "",
       "cone": "",
-      "ctrlhint": "",
       "cuboid": "",
       "cylinder": "",
       "delete": "",
@@ -192,6 +192,12 @@
       "takepicture": "",
       "unsavedchanged": ""
     },
+    "featureattributes": {
+      "name": "",
+      "nofeatureormultiple": "",
+      "value": "",
+      "windowtitle": ""
+    },
     "featureform": {
       "feature": "",
       "noresults": "",
@@ -244,6 +250,7 @@
     "identify": {
       "aggregatedreport": "",
       "clipboard": "",
+      "compare": "",
       "comparing": "",
       "download": "",
       "export": "Exportera",
@@ -345,6 +352,10 @@
         "PERMISSION_DENIED": "Position: tillåts inte"
       }
     },
+    "locationrecorder": {
+      "record": "",
+      "stop": ""
+    },
     "map": {
       "loading": "Laddar...",
       "resetrotation": ""
@@ -436,7 +447,7 @@
       "angle": "",
       "featureunsupported": "",
       "height": "",
-      "nofeature": "",
+      "nofeatureormultiple": "",
       "side": "",
       "width": "",
       "windowtitle": ""
@@ -481,6 +492,7 @@
       "loading": ""
     },
     "redlining": {
+      "attributes": "",
       "buffer": "Buffert",
       "buffercompute": "Beräkna",
       "bufferdistance": "Avstånd",
@@ -488,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

@@ -24,6 +24,7 @@
         "MapExport3D": "",
         "MapFilter": "Harita Filtresi",
         "MapLight3D": "Tarih Zaman",
+        "ObjectList": "",
         "Print": "Yazdır",
         "Reports": "Raporlar",
         "Settings": "Ayarlar",
@@ -136,7 +137,6 @@
     "draw3d": {
       "clone": "",
       "cone": "Koni",
-      "ctrlhint": "",
       "cuboid": "Kübik",
       "cylinder": "Silindir",
       "delete": "Sil",
@@ -192,6 +192,12 @@
       "takepicture": "Fotoğraf çek",
       "unsavedchanged": "Kaydedilmemiş değişiklikler mevcut. Yine de sayfadan ayrılmak istiyor musunuz?"
     },
+    "featureattributes": {
+      "name": "",
+      "nofeatureormultiple": "",
+      "value": "",
+      "windowtitle": ""
+    },
     "featureform": {
       "feature": "Obje",
       "noresults": "Sonuç yok",
@@ -244,6 +250,7 @@
     "identify": {
       "aggregatedreport": "Toplu rapor",
       "clipboard": "Panoya kopyala",
+      "compare": "",
       "comparing": "",
       "download": "İndir",
       "export": "Dışarıya aktar",
@@ -345,6 +352,10 @@
         "PERMISSION_DENIED": "Konum: izin verilmedi"
       }
     },
+    "locationrecorder": {
+      "record": "",
+      "stop": ""
+    },
     "map": {
       "loading": "Yükleniyor...",
       "resetrotation": "Dönüklüğü sıfırla"
@@ -436,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ş"
@@ -481,6 +492,7 @@
       "loading": "Form yükleniyor..."
     },
     "redlining": {
+      "attributes": "",
       "buffer": "Tampon",
       "buffercompute": "Hesapla",
       "bufferdistance": "Mesafe",
@@ -488,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

@@ -45,6 +45,7 @@
     "appmenu.items.MeasureLineString",
     "appmenu.items.MeasurePolygon",
     "appmenu.items.NewsPopup",
+    "appmenu.items.ObjectList",
     "appmenu.items.Panoramax",
     "appmenu.items.Portal",
     "appmenu.items.PrintScreen3D",
@@ -79,6 +80,7 @@
     "appmenu.items.MapExport3D",
     "appmenu.items.MapFilter",
     "appmenu.items.MapLight3D",
+    "appmenu.items.ObjectList",
     "appmenu.items.Print",
     "appmenu.items.Reports",
     "appmenu.items.Settings",
@@ -144,7 +146,6 @@
     "cyclomedia.title",
     "draw3d.clone",
     "draw3d.cone",
-    "draw3d.ctrlhint",
     "draw3d.cuboid",
     "draw3d.cylinder",
     "draw3d.delete",
@@ -195,6 +196,10 @@
     "editing.select",
     "editing.takepicture",
     "editing.unsavedchanged",
+    "featureattributes.name",
+    "featureattributes.nofeatureormultiple",
+    "featureattributes.value",
+    "featureattributes.windowtitle",
     "featureform.feature",
     "featureform.noresults",
     "featureform.querying",
@@ -234,6 +239,7 @@
     "hideobjects3d.restoreall",
     "identify.aggregatedreport",
     "identify.clipboard",
+    "identify.compare",
     "identify.comparing",
     "identify.download",
     "identify.export",
@@ -312,6 +318,8 @@
     "locate.statustooltip.FOLLOWING",
     "locate.statustooltip.LOCATING",
     "locate.statustooltip.PERMISSION_DENIED",
+    "locationrecorder.record",
+    "locationrecorder.stop",
     "map.loading",
     "map.resetrotation",
     "map3d.lockview",
@@ -380,7 +388,7 @@
     "numericinput.angle",
     "numericinput.featureunsupported",
     "numericinput.height",
-    "numericinput.nofeature",
+    "numericinput.nofeatureormultiple",
     "numericinput.side",
     "numericinput.width",
     "numericinput.windowtitle",
@@ -413,6 +421,7 @@
     "print.submit",
     "print.wait",
     "qtdesignerform.loading",
+    "redlining.attributes",
     "redlining.buffer",
     "redlining.buffercompute",
     "redlining.bufferdistance",
@@ -420,6 +429,7 @@
     "redlining.bufferlayername",
     "redlining.bufferselectfeature",
     "redlining.circle",
+    "redlining.ctrlhint",
     "redlining.delete",
     "redlining.draw",
     "redlining.edit",

package/static/translations/uk-UA.json

@@ -24,6 +24,7 @@
         "MapExport3D": "",
         "MapFilter": "",
         "MapLight3D": "",
+        "ObjectList": "",
         "Print": "Друк",
         "Reports": "",
         "Settings": "",
@@ -136,7 +137,6 @@
     "draw3d": {
       "clone": "",
       "cone": "",
-      "ctrlhint": "",
       "cuboid": "",
       "cylinder": "",
       "delete": "",
@@ -192,6 +192,12 @@
       "takepicture": "",
       "unsavedchanged": ""
     },
+    "featureattributes": {
+      "name": "",
+      "nofeatureormultiple": "",
+      "value": "",
+      "windowtitle": ""
+    },
     "featureform": {
       "feature": "",
       "noresults": "",
@@ -244,6 +250,7 @@
     "identify": {
       "aggregatedreport": "",
       "clipboard": "",
+      "compare": "",
       "comparing": "",
       "download": "",
       "export": "Експорт",
@@ -345,6 +352,10 @@
         "PERMISSION_DENIED": "Геолокація: доступ заборонено"
       }
     },
+    "locationrecorder": {
+      "record": "",
+      "stop": ""
+    },
     "map": {
       "loading": "Завантаження...",
       "resetrotation": ""
@@ -436,7 +447,7 @@
       "angle": "",
       "featureunsupported": "",
       "height": "",
-      "nofeature": "",
+      "nofeatureormultiple": "",
       "side": "",
       "width": "",
       "windowtitle": ""
@@ -481,6 +492,7 @@
       "loading": ""
     },
     "redlining": {
+      "attributes": "",
       "buffer": "",
       "buffercompute": "",
       "bufferdistance": "",
@@ -488,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()
@@ -159,17 +170,19 @@ var EditingInterface = {
    * @param callback Callback invoked with the picked features, taking `{features: [...]}` on success and `null` on failure
    * @param filter An optional feature attribute filter expression
    * @param filterGeom An optional filter geometry
+   * @param fields An optional list of fields to query, if unspecified all fields are queried
    */
   getFeatures: function getFeatures(editConfig, mapCrs, callback) {
     var bbox = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
     var filter = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
     var filterGeom = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : null;
+    var fields = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : null;
     var editServiceUrl = ConfigUtils.getConfigProp("editServiceUrl").replace(/\/$/, '');
     var requestUrl = editServiceUrl + '/' + editConfig.editDataset + '/';
     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",
@@ -177,7 +190,8 @@ var EditingInterface = {
             name: mapCrs
           }
         }
-      })) : undefined
+      }), this.replacer(mapCrs)) : undefined,
+      fields: fields ? fields.join(",") : undefined
     };
     var headers = {
       "Accept-Language": LocaleUtils.lang()
@@ -233,7 +247,7 @@ var EditingInterface = {
             name: mapCrs
           }
         }
-      })) : undefined
+      }), this.replacer(mapCrs)) : undefined
     };
     var headers = {
       "Accept-Language": LocaleUtils.lang()

package/utils/EditingUtils.js

@@ -32,6 +32,7 @@ import { v5 as uuidv5 } from 'uuid';
 import StandardApp from '../components/StandardApp';
 import ConfigUtils from './ConfigUtils';
 import LocaleUtils from './LocaleUtils';
+import MiscUtils from './MiscUtils';
 import grammar from './expr_grammar/grammar';
 var UUID_NS = '5ae5531d-8e21-4456-b45d-77e9840a5bb7';
 export var FeatureCache = /*#__PURE__*/_createClass(function FeatureCache() {
@@ -176,6 +177,7 @@ export function parseExpression(expr, feature, editConfig, editIface, mapPrefix,
     representValue: function representValue(attr) {
       return _representValue(attr, editConfig, editIface, promises);
     },
+    formatDate: MiscUtils.formatDate,
     asFilter: asFilter,
     username: ConfigUtils.getConfigProp("username"),
     layer: editConfig.layerName,
@@ -267,7 +269,7 @@ export function getFeatureTemplate(editConfig, feature, editIface, mapPrefix, ma
   }
   // Apply default values
   var defaultFieldExpressions = editConfig.fields.reduce(function (res, field) {
-    if (field.defaultValue) {
+    if (field.defaultValue && !(field.id in feature.properties)) {
       return [].concat(_toConsumableArray(res), [{
         field: field.id,
         expression: field.defaultValue.replace(/^expr:/, '')

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;