qwc2 2025.10.30 → 2025.11.12

package/static/translations/pt-PT.json

@@ -169,6 +169,14 @@
       "attrtable": "Tabela de Atributos",
       "canceldelete": "Cancelar Eliminação",
       "clearpicture": "Limpar Imagem",
+      "clone_all": "",
+      "clone_copy": "",
+      "clone_defaulted": "",
+      "clone_dontcopy": "",
+      "clone_hidden": "",
+      "clone_none": "",
+      "clone_select_attrs": "",
+      "clone_visible": "",
       "commit": "Confirmar",
       "commitfailed": "Falha ao Confirmar",
       "contraintviolation": "",
@@ -189,6 +197,7 @@
       "reallydelete": "Eliminar",
       "relationcommitfailed": "Falha ao Confirmar Relação",
       "select": "Selecionar",
+      "selectlayer": "",
       "takepicture": "Tirar Fotografia",
       "unsavedchanged": "Alterações Não Guardadas"
     },
@@ -500,6 +509,7 @@
       "bufferlayername": "Nome da Camada de Tampão",
       "bufferselectfeature": "Selecione uma característica para o tampão...",
       "circle": "Círculo",
+      "clone": "",
       "ctrlhint": "",
       "delete": "Excluir",
       "draw": "Desenhar",

package/static/translations/ro-RO.json

@@ -169,6 +169,14 @@
       "attrtable": "Tabel",
       "canceldelete": "Nu șterge",
       "clearpicture": "Elimină imaginea",
+      "clone_all": "",
+      "clone_copy": "",
+      "clone_defaulted": "",
+      "clone_dontcopy": "",
+      "clone_hidden": "",
+      "clone_none": "",
+      "clone_select_attrs": "",
+      "clone_visible": "",
       "commit": "Salvează",
       "commitfailed": "Salvarea a eșuat",
       "contraintviolation": "",
@@ -189,6 +197,7 @@
       "reallydelete": "Șterge",
       "relationcommitfailed": "Salvarea relației a eșuat, vă rugăm să verificați informațiile asociate iconițelor",
       "select": "Selectează",
+      "selectlayer": "",
       "takepicture": "Fotografiază",
       "unsavedchanged": "Modificările nu sunt salvate. Doriți să părăsiți pagina oricum?"
     },
@@ -500,6 +509,7 @@
       "bufferlayername": "Zonă tampon",
       "bufferselectfeature": "Selectați o entitate...",
       "circle": "Cerc",
+      "clone": "",
       "ctrlhint": "",
       "delete": "Elimină",
       "draw": "Desenare",

package/static/translations/ru-RU.json

@@ -169,6 +169,14 @@
       "attrtable": "",
       "canceldelete": "Не удалять",
       "clearpicture": "",
+      "clone_all": "",
+      "clone_copy": "",
+      "clone_defaulted": "",
+      "clone_dontcopy": "",
+      "clone_hidden": "",
+      "clone_none": "",
+      "clone_select_attrs": "",
+      "clone_visible": "",
       "commit": "Подтвердить изменения",
       "commitfailed": "",
       "contraintviolation": "",
@@ -189,6 +197,7 @@
       "reallydelete": "Удалить",
       "relationcommitfailed": "",
       "select": "Выберите...",
+      "selectlayer": "",
       "takepicture": "",
       "unsavedchanged": ""
     },
@@ -500,6 +509,7 @@
       "bufferlayername": "",
       "bufferselectfeature": "",
       "circle": "",
+      "clone": "",
       "ctrlhint": "",
       "delete": "",
       "draw": "",

package/static/translations/sv-SE.json

@@ -169,6 +169,14 @@
       "attrtable": "",
       "canceldelete": "Radera inte",
       "clearpicture": "",
+      "clone_all": "",
+      "clone_copy": "",
+      "clone_defaulted": "",
+      "clone_dontcopy": "",
+      "clone_hidden": "",
+      "clone_none": "",
+      "clone_select_attrs": "",
+      "clone_visible": "",
       "commit": "Skicka",
       "commitfailed": "",
       "contraintviolation": "",
@@ -189,6 +197,7 @@
       "reallydelete": "Verkligen radera",
       "relationcommitfailed": "",
       "select": "Välj",
+      "selectlayer": "",
       "takepicture": "",
       "unsavedchanged": ""
     },
@@ -500,6 +509,7 @@
       "bufferlayername": "Buffert",
       "bufferselectfeature": "Välj ett objekt att buffra",
       "circle": "",
+      "clone": "",
       "ctrlhint": "",
       "delete": "Radera",
       "draw": "Rita",

package/static/translations/tr-TR.json

@@ -169,6 +169,14 @@
       "attrtable": "Tablo",
       "canceldelete": "Silme",
       "clearpicture": "Temizle",
+      "clone_all": "",
+      "clone_copy": "",
+      "clone_defaulted": "",
+      "clone_dontcopy": "",
+      "clone_hidden": "",
+      "clone_none": "",
+      "clone_select_attrs": "",
+      "clone_visible": "",
       "commit": "Onayla",
       "commitfailed": "Kayıt başarısız",
       "contraintviolation": "Kısıtlama ihlali",
@@ -189,6 +197,7 @@
       "reallydelete": "Sil",
       "relationcommitfailed": "Bazı ilişkili kayıtlar güncellenemedi, detay için ipucu ikonunu kontrol ediniz",
       "select": "Seçim",
+      "selectlayer": "",
       "takepicture": "Fotoğraf çek",
       "unsavedchanged": "Kaydedilmemiş değişiklikler mevcut. Yine de sayfadan ayrılmak istiyor musunuz?"
     },
@@ -500,6 +509,7 @@
       "bufferlayername": "Tampon",
       "bufferselectfeature": "Tampon atılacak bir obje seçiniz...",
       "circle": "Daire",
+      "clone": "",
       "ctrlhint": "",
       "delete": "Sil",
       "draw": "Çiz",

package/static/translations/tsconfig.json

@@ -174,6 +174,14 @@
     "editing.attrtable",
     "editing.canceldelete",
     "editing.clearpicture",
+    "editing.clone_all",
+    "editing.clone_copy",
+    "editing.clone_defaulted",
+    "editing.clone_dontcopy",
+    "editing.clone_hidden",
+    "editing.clone_none",
+    "editing.clone_select_attrs",
+    "editing.clone_visible",
     "editing.commit",
     "editing.commitfailed",
     "editing.contraintviolation",
@@ -194,6 +202,7 @@
     "editing.reallydelete",
     "editing.relationcommitfailed",
     "editing.select",
+    "editing.selectlayer",
     "editing.takepicture",
     "editing.unsavedchanged",
     "featureattributes.name",
@@ -429,6 +438,7 @@
     "redlining.bufferlayername",
     "redlining.bufferselectfeature",
     "redlining.circle",
+    "redlining.clone",
     "redlining.ctrlhint",
     "redlining.delete",
     "redlining.draw",

package/static/translations/uk-UA.json

@@ -169,6 +169,14 @@
       "attrtable": "",
       "canceldelete": "Не видаляти",
       "clearpicture": "",
+      "clone_all": "",
+      "clone_copy": "",
+      "clone_defaulted": "",
+      "clone_dontcopy": "",
+      "clone_hidden": "",
+      "clone_none": "",
+      "clone_select_attrs": "",
+      "clone_visible": "",
       "commit": "Підтвердити зміни",
       "commitfailed": "",
       "contraintviolation": "",
@@ -189,6 +197,7 @@
       "reallydelete": "Видалити",
       "relationcommitfailed": "",
       "select": "Виберіть...",
+      "selectlayer": "",
       "takepicture": "",
       "unsavedchanged": ""
     },
@@ -500,6 +509,7 @@
       "bufferlayername": "",
       "bufferselectfeature": "",
       "circle": "",
+      "clone": "",
       "ctrlhint": "",
       "delete": "",
       "draw": "",

package/utils/EditingUtils.js

@@ -41,7 +41,7 @@ export var FeatureCache = /*#__PURE__*/_createClass(function FeatureCache() {
 _FeatureCache = FeatureCache;
 _defineProperty(FeatureCache, "store", {});
 _defineProperty(FeatureCache, "requestPromises", {});
-_defineProperty(FeatureCache, "get", function (editIface, layerName, mapCrs, filterExpr) {
+_defineProperty(FeatureCache, "get", function (editIface, layerName, editConfig, mapCrs, filterExpr) {
   var key = layerName + uuidv5(JSON.stringify(filterExpr !== null && filterExpr !== void 0 ? filterExpr : null), UUID_NS);
   if (key in _FeatureCache.store) {
     return new Promise(function (resolve) {
@@ -51,8 +51,6 @@ _defineProperty(FeatureCache, "get", function (editIface, layerName, mapCrs, fil
     return _FeatureCache.requestPromises[key];
   } else {
     _FeatureCache.requestPromises[key] = new Promise(function (resolve) {
-      var _StandardApp$store$ge, _StandardApp$store$ge2;
-      var editConfig = (_StandardApp$store$ge = (_StandardApp$store$ge2 = StandardApp.store.getState().theme.current.editConfig) === null || _StandardApp$store$ge2 === void 0 ? void 0 : _StandardApp$store$ge2[layerName]) !== null && _StandardApp$store$ge !== void 0 ? _StandardApp$store$ge : {};
       editIface.getFeatures(editConfig, mapCrs, function (result) {
         if (key in _FeatureCache.requestPromises) {
           if (((result === null || result === void 0 ? void 0 : result.features) || []).length === 1) {
@@ -72,13 +70,13 @@ _defineProperty(FeatureCache, "get", function (editIface, layerName, mapCrs, fil
     return _FeatureCache.requestPromises[key];
   }
 });
-_defineProperty(FeatureCache, "getSync", function (editIface, layerName, mapCrs, filterExpr) {
-  var promises = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
+_defineProperty(FeatureCache, "getSync", function (editIface, layerName, editConfig, mapCrs, filterExpr) {
+  var promises = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : [];
   var key = layerName + uuidv5(JSON.stringify(filterExpr !== null && filterExpr !== void 0 ? filterExpr : null), UUID_NS);
   if (key in _FeatureCache.store) {
     return _FeatureCache.store[key];
   } else {
-    promises.push(_FeatureCache.get(editIface, layerName, mapCrs, filterExpr));
+    promises.push(_FeatureCache.get(editIface, layerName, editConfig, mapCrs, filterExpr));
     return null;
   }
 });
@@ -169,10 +167,12 @@ export function parseExpression(expr, feature, editConfig, editIface, mapPrefix,
   var reevaluate = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
   var parser = new nearley.Parser(nearley.Grammar.fromCompiled(grammar));
   var promises = [];
+  var mapEditConfigs = StandardApp.store.getState().layers.editConfigs[mapPrefix];
   window.qwc2ExpressionParserContext = {
     feature: feature,
     getFeature: function getFeature(layerName, attr, value) {
-      return FeatureCache.getSync(editIface, layerName, mapCrs, [[attr, '=', value]], promises);
+      var _mapEditConfigs$layer;
+      return FeatureCache.getSync(editIface, layerName, (_mapEditConfigs$layer = mapEditConfigs[layerName]) !== null && _mapEditConfigs$layer !== void 0 ? _mapEditConfigs$layer : {}, mapCrs, [[attr, '=', value]], promises);
     },
     representValue: function representValue(attr) {
       return _representValue(attr, editConfig, editIface, promises);
@@ -212,6 +212,7 @@ export function parseExpression(expr, feature, editConfig, editIface, mapPrefix,
 }
 export function parseExpressionsAsync(fieldExpressions, feature, editConfig, editIface, mapPrefix, mapCrs, asFilter) {
   var promises = [];
+  var mapEditConfigs = StandardApp.store.getState().layers.editConfigs[mapPrefix];
   return new Promise(function (resolve) {
     var newfeature = _objectSpread(_objectSpread({}, feature), {}, {
       properties: _objectSpread({}, feature.properties)
@@ -219,7 +220,8 @@ export function parseExpressionsAsync(fieldExpressions, feature, editConfig, edi
     window.qwc2ExpressionParserContext = {
       feature: newfeature,
       getFeature: function getFeature(layerName, attr, value) {
-        return FeatureCache.getSync(editIface, layerName, mapCrs, [[attr, '=', value]], promises);
+        var _mapEditConfigs$layer2;
+        return FeatureCache.getSync(editIface, layerName, (_mapEditConfigs$layer2 = mapEditConfigs[layerName]) !== null && _mapEditConfigs$layer2 !== void 0 ? _mapEditConfigs$layer2 : {}, mapCrs, [[attr, '=', value]], promises);
       },
       representValue: function representValue(attr) {
         return _representValue(attr, editConfig, editIface, promises);
@@ -333,24 +335,24 @@ export function computeExpressionFields(editConfig, feature, editIface, mapCrs,
   } catch (e) {
     /* eslint-disable-next-line */
     console.warn("Failed to sort expressions, they probably contain cyclic dependencies");
-    fieldExpressions = Object.entries(fieldExpressions).map(function (res, _ref4) {
+    fieldExpressions = Object.entries(fieldExpressions).map(function (_ref4) {
       var _ref5 = _slicedToArray(_ref4, 2),
         field = _ref5[0],
         expression = _ref5[1];
-      return [].concat(_toConsumableArray(res), [{
+      return {
         field: field,
         expression: expression
-      }]);
+      };
     }, {});
   }
   // Evaluate expressions
   FeatureCache.clear();
-  var mapPrefix = (editConfig.editDataset.match(/^[^.]+\./) || [""])[0];
+  var mapPrefix = editConfig.editDataset.split(".")[0];
   parseExpressionsAsync(fieldExpressions, feature, editConfig, editIface, mapPrefix, mapCrs).then(function (result) {
     // Adjust values based on field type
     editConfig.fields.forEach(function (field) {
       var _field$constraints2;
-      if (!((_field$constraints2 = field.constraints) !== null && _field$constraints2 !== void 0 && _field$constraints2.hidden)) {
+      if ((_field$constraints2 = field.constraints) !== null && _field$constraints2 !== void 0 && _field$constraints2.hidden) {
         // Remove hidden fields from result
         delete result[field.id];
       } else if (field.id in result && field.type === "date") {

package/utils/ElevationInterface.js

@@ -86,5 +86,4 @@ var ElevationInterface = {
 export function getElevationInterface() {
   var _window$QWC2Elevation;
   return (_window$QWC2Elevation = window.QWC2ElevationInterface) !== null && _window$QWC2Elevation !== void 0 ? _window$QWC2Elevation : ElevationInterface;
-}
-;
+}

package/utils/LayerUtils.js

@@ -864,14 +864,16 @@ var LayerUtils = {
     }
     return null;
   },
-  searchLayer: function searchLayer(layers, layerUrl, layerName) {
+  searchLayer: function searchLayer(layers, attr, value, subattr, subval) {
     var match = null;
     layers.find(function (layer) {
       var sublayer = null;
-      if (layer.url === layerUrl && (sublayer = LayerUtils.searchSubLayer(layer, 'name', layerName))) {
+      var path = [];
+      if (layer[attr] === value && (sublayer = LayerUtils.searchSubLayer(layer, subattr, subval, path))) {
         match = {
           layer: layer,
-          sublayer: sublayer
+          sublayer: sublayer,
+          path: path
         };
         return true;
       }

package/utils/MapUtils.js

@@ -40,15 +40,6 @@ var MapUtils = {
   dpi2dpm: function dpi2dpm(dpi) {
     return (dpi || DEFAULT_SCREEN_DPI) * (100 / 2.54);
   },
-  /**
-   * @param dpi {number} screen resolution in dots per inch.
-   * @param projection {string} map projection.
-   * @return {number} dots per map unit.
-   */
-  dpi2dpu: function dpi2dpu(dpi, projection) {
-    var units = CoordinatesUtils.getUnits(projection);
-    return METERS_PER_UNIT[units] * MapUtils.dpi2dpm(dpi);
-  },
   /**
    * Get a list of scales for each zoom level of the Google Mercator.
    * @param minZoom {number} min zoom level.
@@ -75,9 +66,9 @@ var MapUtils = {
    */
   getResolutionsForScales: function getResolutionsForScales(scales, projection) {
     var dpi = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : DEFAULT_SCREEN_DPI;
-    var dpu = MapUtils.dpi2dpu(dpi, projection);
+    var units = CoordinatesUtils.getUnits(projection);
     var resolutions = scales.map(function (scale) {
-      return scale / dpu;
+      return scale * 0.0254 / (dpi * METERS_PER_UNIT[units]);
     });
     return resolutions;
   },

package/utils/ServiceLayerUtils.js

@@ -34,6 +34,7 @@ import { LayerRole } from '../actions/layers';
 import ConfigUtils from './ConfigUtils';
 import CoordinatesUtils from './CoordinatesUtils';
 import LayerUtils from './LayerUtils';
+import LocaleUtils from './LocaleUtils';
 import MiscUtils from './MiscUtils';
 function strcmp(a, b) {
   var al = a.toLowerCase();
@@ -298,6 +299,20 @@ var ServiceLayerUtils = {
     } catch (e) {
       /* pass */
     }
+    var editConfigUrl = null;
+    var wmsName = null;
+    try {
+      editConfigUrl = layer.EditConfig.OnlineResource.href;
+      wmsName = layer.EditConfig.wms_name;
+    } catch (e) {
+      /* pass */
+    }
+    var translationsUrl = null;
+    try {
+      translationsUrl = layer.Traslations.OnlineResource.href;
+    } catch (e) {
+      /* pass */
+    }
     var dimensions = [];
     MiscUtils.ensureArray(layer.Dimension).forEach(function (dim) {
       var _dim$fieldName, _dim$endFieldName;
@@ -327,6 +342,9 @@ var ServiceLayerUtils = {
       url: getMapUrl,
       featureInfoUrl: featureInfoUrl,
       legendUrl: legendUrl,
+      editConfigUrl: editConfigUrl,
+      translationsUrl: translationsUrl,
+      wms_name: wmsName,
       version: version,
       infoFormats: infoFormats,
       mapFormats: mapFormats,
@@ -341,7 +359,8 @@ var ServiceLayerUtils = {
       maxScale: layer.MinScaleDenominator !== undefined ? Number(layer.MaxScaleDenominator) : undefined,
       dimensions: dimensions,
       styles: styles,
-      style: style
+      style: style,
+      serverType: translationsUrl ? 'qgis' : null // If there is a translationsUrl, assume it is the qwc-ogc-service
     };
   },
   getWFSLayers: function getWFSLayers(capabilities, calledServiceUrl, mapCrs) {
@@ -606,7 +625,39 @@ var ServiceLayerUtils = {
                 LAYERS: layerConfig.name
               };
             }
-            callback(layerConfig.id, layer);
+            var metadataRequests = [new Promise(function (resolve, reject) {
+              if (layer.editConfigUrl) {
+                axios.get(layer.editConfigUrl).then(function (response) {
+                  layer.editConfig = response.data;
+                  delete layer.editConfigUrl;
+                  resolve();
+                })["catch"](function (e) {
+                  delete layer.editConfigUrl;
+                  resolve();
+                });
+              } else {
+                resolve();
+              }
+            }), new Promise(function (resolve, reject) {
+              if (layer.translationsUrl) {
+                axios.get(layer.translationsUrl.replace('{lang}', LocaleUtils.lang())).then(function (response) {
+                  layer.translations = response.data;
+                  delete layer.translationsUrl;
+                  resolve();
+                })["catch"](function (e) {
+                  delete layer.translationsUrl;
+                  resolve();
+                });
+              } else {
+                resolve();
+              }
+            })];
+            Promise.all(metadataRequests).then(function () {
+              if (layer.translations) {
+                layer = LayerUtils.applyTranslations(layer, layer.translations);
+              }
+              callback(layerConfig.id, layer);
+            });
           } else {
             // eslint-disable-next-line
             console.warn("Could not find layer " + layerConfig.name);

package/utils/ThemeUtils.js

@@ -173,7 +173,9 @@ var ThemeUtils = {
         LayerUtils.completeExternalLayer(res[cur.internalLayer], LayerUtils.searchSubLayer(theme, 'name', cur.internalLayer));
         return res;
       }, {})),
-      translations: theme.translations
+      translations: theme.translations,
+      editConfig: theme.editConfig,
+      wms_name: theme.wms_name
     };
     layer = LayerUtils.recomputeLayerBBox(layer);
     // Drawing order only makes sense if layer reordering is disabled