qwc2 2025.11.5 → 2025.11.13

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;
       }
@@ -1464,16 +1466,18 @@ var LayerUtils = {
     return reports;
   },
   computeVisbilityPreset: function computeVisbilityPreset(layer) {
+    var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
     var result = {};
     if (layer.sublayers) {
+      var istoplevel = !!layer.url;
       layer.sublayers.forEach(function (sublayer) {
-        return Object.assign(result, LayerUtils.computeVisbilityPreset(sublayer));
+        return Object.assign(result, LayerUtils.computeVisbilityPreset(sublayer, !istoplevel ? path + layer.name + "/" : ""));
       });
-      if (layer.visibility && !layer.url) {
-        result[layer.name] = "";
+      if (layer.visibility && !istoplevel) {
+        result[path + layer.name] = "";
       }
     } else if (layer.visibility) {
-      result[layer.name] = layer.style;
+      result[path + layer.name] = layer.style;
     }
     return result;
   },

package/utils/LocaleUtils.js

@@ -11,7 +11,6 @@ import axios from 'axios';
 import deepmerge from 'deepmerge';
 import StandardApp from '../components/StandardApp';
 import ConfigUtils from './ConfigUtils';
-var themeTranslationCache = {};
 var LocaleUtils = {
   loadLocale: function loadLocale(lang, fallbackLangData) {
     return new Promise(function (resolve) {
@@ -105,20 +104,6 @@ var LocaleUtils = {
     } else {
       return number.toFixed(decimals);
     }
-  },
-  loadThemeTranslations: function loadThemeTranslations(serviceUrl) {
-    return new Promise(function (resolve) {
-      if (serviceUrl in themeTranslationCache) {
-        resolve(themeTranslationCache[serviceUrl]);
-      } else {
-        axios.get(serviceUrl + "?SERVICE=GetTranslations&LANG=" + LocaleUtils.lang()).then(function (response) {
-          themeTranslationCache[serviceUrl] = response.data;
-          resolve(response.data);
-        })["catch"](function (e) {
-          resolve({});
-        });
-      }
-    });
   }
 };
 export default LocaleUtils;

package/utils/ServiceLayerUtils.js

@@ -34,7 +34,9 @@ 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';
+import StandardApp from '../components/StandardApp';
 function strcmp(a, b) {
   var al = a.toLowerCase();
   var bl = b.toLowerCase();
@@ -298,6 +300,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 +343,9 @@ var ServiceLayerUtils = {
       url: getMapUrl,
       featureInfoUrl: featureInfoUrl,
       legendUrl: legendUrl,
+      editConfigUrl: editConfigUrl,
+      translationsUrl: translationsUrl,
+      wms_name: wmsName,
       version: version,
       infoFormats: infoFormats,
       mapFormats: mapFormats,
@@ -341,7 +360,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 +626,40 @@ 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) {
+                var commonTranslations = StandardApp.store.getState().locale.messagesTree.maptranslations || {};
+                layer = LayerUtils.applyTranslations(layer, deepmerge(commonTranslations, layer.translations));
+              }
+              callback(layerConfig.id, layer);
+            });
           } else {
             // eslint-disable-next-line
             console.warn("Could not find layer " + layerConfig.name);

package/utils/ThemeUtils.js

@@ -19,11 +19,13 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
  * LICENSE file in the root directory of this source tree.
  */
 
+import deepmerge from 'deepmerge';
 import { remove as removeDiacritics } from 'diacritics';
 import isEmpty from 'lodash.isempty';
 import url from 'url';
 import { v4 as uuidv4 } from 'uuid';
 import { LayerRole } from '../actions/layers';
+import StandardApp from '../components/StandardApp';
 import { SearchResultType } from '../utils/SearchProviders';
 import ConfigUtils from './ConfigUtils';
 import LayerUtils from './LayerUtils';
@@ -173,7 +175,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
@@ -332,11 +336,12 @@ var ThemeUtils = {
     }).filter(Boolean);
   },
   applyTranslations: function applyTranslations(group) {
+    var commonTranslations = StandardApp.store.getState().locale.messagesTree.maptranslations || {};
     return _objectSpread(_objectSpread({}, group), {}, {
       subdirs: group.subdirs ? group.subdirs.map(ThemeUtils.applyTranslations) : null,
       items: group.items ? group.items.map(function (item) {
         var _item$translations$th, _item$translations;
-        return _objectSpread(_objectSpread({}, LayerUtils.applyTranslations(item, item.translations)), {}, {
+        return _objectSpread(_objectSpread({}, LayerUtils.applyTranslations(item, deepmerge(commonTranslations, item.translations))), {}, {
           title: (_item$translations$th = (_item$translations = item.translations) === null || _item$translations === void 0 || (_item$translations = _item$translations.theme) === null || _item$translations === void 0 ? void 0 : _item$translations.title) !== null && _item$translations$th !== void 0 ? _item$translations$th : item.title
         });
       }) : null