qwc2 2025.11.18 → 2025.11.19

package/actions/windows.js

@@ -52,12 +52,14 @@ export function showIframeDialog(name, url, options) {
 export function showNotification(name, text) {
   var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : NotificationType.INFO;
   var sticky = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var actions = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
   return {
     type: SHOW_NOTIFICATION,
     name: name,
     text: text,
     notificationType: type,
-    sticky: sticky
+    sticky: sticky,
+    actions: actions
   };
 }
 export function closeWindow(name) {

package/components/AttributeTableWidget.js

@@ -1088,7 +1088,6 @@ _defineProperty(AttributeTableWidget, "defaultState", {
   selectedLayer: "",
   loadedLayer: "",
   curEditConfig: null,
-  curTranslations: null,
   fieldTranslations: null,
   features: [],
   filteredSortedFeatures: [],

package/components/ThemeLayersListWindow.js

@@ -35,7 +35,7 @@ import PropTypes from 'prop-types';
 import { LayerRole, addLayer } from '../actions/layers';
 import { setCurrentTask } from '../actions/task';
 import { setThemeLayersList } from '../actions/theme';
-import { showNotification, closeWindow } from '../actions/windows';
+import { showNotification, closeWindow, NotificationType } from '../actions/windows';
 import LayerUtils from '../utils/LayerUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import ThemeUtils from '../utils/ThemeUtils';
@@ -70,14 +70,23 @@ var ThemeLayersListWindow = /*#__PURE__*/function (_React$Component) {
         var filteredSublayers = [];
         sublayers = sublayers.filter(function (sublayer) {
           if (existingSublayers.includes(sublayer.name)) {
-            filteredSublayers.push(sublayer.title);
+            filteredSublayers.push(sublayer);
             return false;
           }
           return true;
         });
         if (!isEmpty(filteredSublayers)) {
-          var text = LocaleUtils.tr("themelayerslist.existinglayers") + ": " + filteredSublayers.join(",");
-          _this.props.showNotification("existinglayers", text);
+          var text = LocaleUtils.tr("themelayerslist.existinglayers") + ": " + filteredSublayers.map(function (l) {
+            return l.title;
+          }).join(", ");
+          var actions = [{
+            name: LocaleUtils.tr("themelayerslist.addanyway"),
+            onClick: function onClick() {
+              _this.props.addLayer(ThemeUtils.createThemeLayer(_this.props.theme, _this.props.themes, LayerRole.USERLAYER, filteredSublayers));
+              return true;
+            }
+          }];
+          _this.props.showNotification("existinglayers", text, NotificationType.INFO, false, actions);
         }
       }
       if (!isEmpty(sublayers)) {
@@ -108,6 +117,7 @@ var ThemeLayersListWindow = /*#__PURE__*/function (_React$Component) {
       }
     });
     _defineProperty(_this, "onClose", function () {
+      _this.props.closeWindow("existinglayers");
       _this.props.setThemeLayersList(null);
     });
     return _this;

package/components/WindowManager.js

@@ -32,6 +32,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 
 import React from 'react';
 import { connect } from 'react-redux';
+import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 import { closeWindow, closeAllWindows, NotificationType } from '../actions/windows';
 import LocaleUtils from '../utils/LocaleUtils';
@@ -92,7 +93,19 @@ var WindowManager = /*#__PURE__*/function (_React$Component) {
       return /*#__PURE__*/React.createElement("div", {
         className: className,
         key: key
-      }, /*#__PURE__*/React.createElement("div", null, data.text), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Icon, {
+      }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, data.text), !isEmpty(data.actions) ? /*#__PURE__*/React.createElement("div", {
+        className: "windows-notification-actions"
+      }, data.actions.map(function (action, idx) {
+        return /*#__PURE__*/React.createElement("button", {
+          className: "button",
+          key: "action" + idx,
+          onClick: function onClick() {
+            var res = action.onClick();
+            if (res) _this.closeWindow(key);
+          },
+          type: "button"
+        }, action.name);
+      })) : null), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Icon, {
         icon: "remove",
         onClick: function onClick() {
           return _this.closeWindow(key);

package/components/map3d/Map3D.js

@@ -37,10 +37,12 @@ import React, { Suspense } from 'react';
 import ReactDOM from 'react-dom';
 import { connect } from 'react-redux';
 import Instance from '@giro3d/giro3d/core/Instance.js';
-import Coordinates from '@giro3d/giro3d/core/geographic/Coordinates';
+import Coordinates, { crsIsGeographic } from '@giro3d/giro3d/core/geographic/Coordinates';
+import Ellipsoid from '@giro3d/giro3d/core/geographic/Ellipsoid';
 import Extent from '@giro3d/giro3d/core/geographic/Extent.js';
+import CoordinateSystem from '@giro3d/giro3d/core/geographic/coordinate-system/CoordinateSystem';
 import ElevationLayer from '@giro3d/giro3d/core/layer/ElevationLayer.js';
-import FeatureCollection from "@giro3d/giro3d/entities/FeatureCollection.js";
+import DrapedFeatureCollection from '@giro3d/giro3d/entities/DrapedFeatureCollection';
 import Map from '@giro3d/giro3d/entities/Map.js';
 import Tiles3D from "@giro3d/giro3d/entities/Tiles3D.js";
 import Inspector from "@giro3d/giro3d/gui/Inspector.js";
@@ -212,7 +214,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         colorLayers[layer.id] = _objectSpread(_objectSpread({}, layer), {}, {
           visibility: (_prevOptions$visibili = prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.visibility) !== null && _prevOptions$visibili !== void 0 ? _prevOptions$visibili : false,
           opacity: (_prevOptions$opacity = prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.opacity) !== null && _prevOptions$opacity !== void 0 ? _prevOptions$opacity : 255,
-          extrusionHeight: (_prevOptions$extrusio = prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.extrusionHeight) !== null && _prevOptions$extrusio !== void 0 ? _prevOptions$extrusio : ['vector', 'wfs'].includes(layer.type) ? 0 : undefined,
+          extrusionHeight: (_prevOptions$extrusio = prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.extrusionHeight) !== null && _prevOptions$extrusio !== void 0 ? _prevOptions$extrusio : layerCreator.createFeatureSource ? 0 : undefined,
           fields: (_prevOptions$fields = prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.fields) !== null && _prevOptions$fields !== void 0 ? _prevOptions$fields : undefined,
           sublayers: _preserveSublayerOptions(layer, prevOptions)
         });
@@ -250,9 +252,9 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         mapLayer.visible = options.visibility;
         mapLayer.opacity = options.opacity / 255;
         layerBelow = mapLayer;
-        if (options.extrusionHeight !== 0) {
-          _this2.createUpdateExtrudedLayer(mapLayer, options, options.features !== (prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.features));
-        } else if ((prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.extrusionHeight) !== 0) {
+        if (options.extrusionHeight !== undefined && options.extrusionHeight !== 0) {
+          _this2.createUpdateExtrudedLayer(layerCreator, mapLayer, options, options.features !== (prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.features));
+        } else if ((prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.extrusionHeight) !== undefined && (prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.extrusionHeight) !== 0) {
           _this2.removeExtrudedLayer(options.id);
         }
       });
@@ -262,7 +264,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
           layerId = _ref4[0],
           options = _ref4[1];
         if (!(layerId in colorLayers)) {
-          if (options.extrusionHeight !== 0) {
+          if (options.extrusionHeight !== undefined && options.extrusionHeight !== 0) {
             _this2.removeExtrudedLayer(options.id);
           }
           _this2.removeLayer(layerId);
@@ -270,11 +272,9 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       });
       _this2.instance.notifyChange(_this2.map);
     });
-    _defineProperty(_this2, "createUpdateExtrudedLayer", function (mapLayer, options) {
+    _defineProperty(_this2, "createUpdateExtrudedLayer", function (layerCreator, mapLayer, options) {
       var _options$features, _options$features$red;
-      var forceCreate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-      var bounds = options.bbox.bounds;
-      var extent = new Extent(options.bbox.crs, bounds[0], bounds[2], bounds[1], bounds[3]);
+      var forceCreate = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       var objId = options.id + ":extruded";
       var makeColor = function makeColor(c) {
         if (Array.isArray(c)) {
@@ -292,20 +292,9 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
           _this2.instance.remove(obj);
         }
         var layercolor = makeColor((_options$color = options.color) !== null && _options$color !== void 0 ? _options$color : "#FF0000");
-        obj = new FeatureCollection({
-          source: mapLayer.source.source,
-          extent: extent,
-          minLevel: 1,
-          maxLevel: 1,
-          ignoreZ: true,
-          elevation: function elevation(feature) {
-            var _this2$getTerrainHeig;
-            var coordinates = feature.getGeometry().getCoordinates();
-            while (Array.isArray(coordinates[0])) {
-              coordinates = coordinates[0];
-            }
-            return (_this2$getTerrainHeig = _this2.getTerrainHeightFromMap(coordinates)) !== null && _this2$getTerrainHeig !== void 0 ? _this2$getTerrainHeig : 0;
-          },
+        obj = new DrapedFeatureCollection({
+          source: layerCreator.createFeatureSource(mapLayer, options, _this2.state.sceneContext.mapCrs),
+          drapingMode: 'per-feature',
           extrusionOffset: function extrusionOffset(feature) {
             if (typeof obj.userData.extrusionHeight === "string") {
               return parseFloat(feature.getProperties()[obj.userData.extrusionHeight]) || 0;
@@ -325,7 +314,9 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         });
         obj.castShadow = true;
         obj.receiveShadow = true;
-        _this2.instance.add(obj);
+        _this2.instance.add(obj).then(function () {
+          obj.attach(_this2.map);
+        });
         _this2.objectMap[objId] = obj;
       }
       obj.userData.extrusionHeight = options.extrusionHeight;
@@ -339,7 +330,9 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       }, {});
       obj.opacity = mapLayer.opacity;
       obj.visible = mapLayer.visible;
-      obj.updateStyles();
+      if (obj.visible) {
+        obj.updateStyles();
+      }
     });
     _defineProperty(_this2, "removeExtrudedLayer", function (layerId) {
       var objId = layerId + ":extruded";
@@ -602,23 +595,25 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         return;
       }
       var projection = _this2.props.theme.mapCrs;
+      var crs = CoordinateSystem.fromSrid(projection);
 
       // Setup instance
       _this2.instance = new Instance({
         target: _this2.container,
-        crs: projection,
+        crs: crs,
         renderer: {
           clearColor: 0x000000,
           preserveDrawingBuffer: true
         }
       });
       _this2.sceneObjectGroup = new Group();
+      _this2.sceneObjectGroup.name = "sceneObjects";
       _this2.instance.add(_this2.sceneObjectGroup);
 
       // Setup map
       var initialBbox = (_this2$props$theme$ma = (_this2$props$theme$ma2 = _this2.props.theme.map3d) === null || _this2$props$theme$ma2 === void 0 ? void 0 : _this2$props$theme$ma2.extent) !== null && _this2$props$theme$ma !== void 0 ? _this2$props$theme$ma : _this2.props.theme.initialBbox;
       var bounds = CoordinatesUtils.reprojectBbox(initialBbox.bounds, initialBbox.crs, projection);
-      var extent = new Extent(projection, bounds[0], bounds[2], bounds[1], bounds[3]);
+      var extent = new Extent(crs, bounds[0], bounds[2], bounds[1], bounds[3]);
       _this2.map = new Map({
         extent: extent,
         backgroundColor: "white"
@@ -627,7 +622,12 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
 
       // Setup camera
       var center = extent.center();
-      _this2.instance.view.camera.position.set(center.x, center.y, 0.5 * (extent.east - extent.west));
+      if (crsIsGeographic(center.crs)) {
+        var position = Ellipsoid.WGS84.toCartesian(center.latitude, center.longitude, center.altitude);
+        _this2.instance.view.camera.position.set(position.x, position.y, 0.5 * (extent.east - extent.west));
+      } else {
+        _this2.instance.view.camera.position.set(center.x, center.y, 0.5 * (extent.east - extent.west));
+      }
 
       // Skybox
       var cubeTextureLoader = new CubeTextureLoader();
@@ -637,7 +637,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
 
       // Setup elevation
       var demUrl = MiscUtils.resolveAssetsPath((_this2$props$theme$ma3 = (_this2$props$theme$ma4 = _this2.props.theme.map3d) === null || _this2$props$theme$ma4 === void 0 || (_this2$props$theme$ma4 = _this2$props$theme$ma4.dtm) === null || _this2$props$theme$ma4 === void 0 ? void 0 : _this2$props$theme$ma4.url) !== null && _this2$props$theme$ma3 !== void 0 ? _this2$props$theme$ma3 : "");
-      var demCrs = ((_this2$props$theme$ma5 = _this2.props.theme.map3d) === null || _this2$props$theme$ma5 === void 0 || (_this2$props$theme$ma5 = _this2$props$theme$ma5.dtm) === null || _this2$props$theme$ma5 === void 0 ? void 0 : _this2$props$theme$ma5.crs) || "EPSG:3857";
+      var demCrs = CoordinateSystem.fromSrid(((_this2$props$theme$ma5 = _this2.props.theme.map3d) === null || _this2$props$theme$ma5 === void 0 || (_this2$props$theme$ma5 = _this2$props$theme$ma5.dtm) === null || _this2$props$theme$ma5 === void 0 ? void 0 : _this2$props$theme$ma5.crs) || "EPSG:3857");
       if (demUrl) {
         var _this2$props$theme$ma6, _this2$props$theme$ma7;
         var demSource = new GeoTIFFSource({
@@ -740,8 +740,8 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
 
       // Add other objects
       (((_this2$props$theme$ma10 = _this2.props.theme.map3d) === null || _this2$props$theme$ma10 === void 0 ? void 0 : _this2$props$theme$ma10.objects3d) || []).forEach(function (entry) {
-        var _entry$visibility2;
-        importGltf(MiscUtils.resolveAssetsPath(entry.url), entry.name, _this2.state.sceneContext, {
+        var _entry$title2, _entry$visibility2;
+        importGltf(MiscUtils.resolveAssetsPath(entry.url), (_entry$title2 = entry.title) !== null && _entry$title2 !== void 0 ? _entry$title2 : entry.name, _this2.state.sceneContext, {
           visibility: (_entry$visibility2 = entry.visibility) !== null && _entry$visibility2 !== void 0 ? _entry$visibility2 : true
         });
       });
@@ -968,7 +968,8 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
     });
     _defineProperty(_this2, "getTerrainHeightFromMap", function (scenePos) {
       var _elevationResult$samp;
-      var coordinates = new Coordinates(_this2.state.sceneContext.mapCrs, scenePos[0], scenePos[1], 0);
+      var crs = CoordinateSystem.fromSrid(_this2.state.sceneContext.mapCrs);
+      var coordinates = new Coordinates(crs, scenePos[0], scenePos[1], 0);
       var elevationResult = _this2.state.sceneContext.map.getElevation({
         coordinates: coordinates
       });

package/components/map3d/layers/GeoTIFFLayer3D.js

@@ -6,6 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import CoordinateSystem from '@giro3d/giro3d/core/geographic/coordinate-system/CoordinateSystem';
 import ColorLayer from '@giro3d/giro3d/core/layer/ColorLayer';
 import GeoTIFFSource from "@giro3d/giro3d/sources/GeoTIFFSource.js";
 export default {
@@ -14,7 +15,7 @@ export default {
       name: options.name,
       source: new GeoTIFFSource({
         url: options.url,
-        crs: projection
+        crs: CoordinateSystem.fromSrid(projection)
       })
     });
   }

package/components/map3d/layers/VectorLayer3D.js

@@ -12,7 +12,9 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
  * LICENSE file in the root directory of this source tree.
  */
 
+import CoordinateSystem from '@giro3d/giro3d/core/geographic/coordinate-system/CoordinateSystem';
 import ColorLayer from '@giro3d/giro3d/core/layer/ColorLayer';
+import StaticFeatureSource from '@giro3d/giro3d/sources/StaticFeatureSource';
 import VectorSource from "@giro3d/giro3d/sources/VectorSource.js";
 import ol from 'openlayers';
 import FeatureStyles from '../../../utils/FeatureStyles';
@@ -22,6 +24,7 @@ export default {
     return new ColorLayer({
       name: options.name,
       source: new VectorSource({
+        dataProjection: CoordinateSystem.fromSrid(projection),
         data: createFeatures(options, projection),
         format: new ol.format.GeoJSON(),
         style: options.styleFunction || function (feature) {
@@ -54,5 +57,12 @@ export default {
       });
       resolve(_toConsumableArray(fields.values()));
     });
+  },
+  createFeatureSource: function createFeatureSource(layer, options, projection) {
+    var crs = CoordinateSystem.fromSrid(projection);
+    return new StaticFeatureSource({
+      coordinateSystem: crs,
+      features: layer.source.source.getFeatures()
+    });
   }
 };

package/components/map3d/layers/WFSLayer3D.js

@@ -22,7 +22,10 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
  * LICENSE file in the root directory of this source tree.
  */
 
+import Extent from '@giro3d/giro3d/core/geographic/Extent';
+import CoordinateSystem from '@giro3d/giro3d/core/geographic/coordinate-system/CoordinateSystem';
 import ColorLayer from '@giro3d/giro3d/core/layer/ColorLayer';
+import StreamableFeatureSource, { wfsBuilder, tiledLoadingStrategy } from '@giro3d/giro3d/sources/StreamableFeatureSource';
 import VectorSource from "@giro3d/giro3d/sources/VectorSource.js";
 import axios from 'axios';
 import { tile } from "ol/loadingstrategy.js";
@@ -55,7 +58,7 @@ export default {
     return new ColorLayer({
       name: options.name,
       source: new VectorSource({
-        dataProjection: options.projection,
+        dataProjection: CoordinateSystem.fromSrid(projection),
         data: {
           url: url.format(urlParts),
           format: olOpts.format
@@ -110,5 +113,18 @@ export default {
         reject([]);
       });
     });
+  },
+  createFeatureSource: function createFeatureSource(layer, options, projection) {
+    var bounds = CoordinatesUtils.reprojectBbox(options.bbox.bounds, options.bbox.crs, projection);
+    var crs = CoordinateSystem.fromSrid(projection);
+    var maxextent = new Extent(crs, bounds[0], bounds[2], bounds[1], bounds[3]);
+    return new StreamableFeatureSource({
+      queryBuilder: wfsBuilder(options.url, options.name),
+      sourceCoordinateSystem: crs,
+      extent: maxextent,
+      loadingStrategy: tiledLoadingStrategy({
+        tileSize: 5000
+      })
+    });
   }
 };

package/components/style/WindowManager.css

@@ -43,3 +43,9 @@ div.windows-notification-warn {
 div.windows-notification-error {
     background-color: red;
 }
+
+div.windows-notification-actions {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2025.11.18",
+    "version": "2025.11.19",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",
@@ -17,7 +17,7 @@
     ],
     "dependencies": {
         "@furkot/webfonts-generator": "^2.0.2",
-        "@giro3d/giro3d": "^0.43.4",
+        "@sourcepole/qwc-giro3d": "^0.44.0-dev",
         "@kayahr/text-encoding": "^2.0.0",
         "@loaders.gl/core": "^4.3.3",
         "@loaders.gl/shapefile": "^4.3.3",

package/reducers/windows.js

@@ -108,7 +108,8 @@ export default function windows() {
             type: 'notification',
             text: action.text,
             notificationType: action.notificationType,
-            sticky: action.sticky
+            sticky: action.sticky,
+            actions: action.actions
           }))
         });
       }

package/static/translations/bg-BG.json

@@ -650,6 +650,7 @@
       "vertex": "Прилепване към върховете"
     },
     "themelayerslist": {
+      "addanyway": "",
       "addlayer": "Добавяне на слой",
       "addlayerstotheme": "Добавяне на слоеве към текущата карта",
       "addselectedlayers": "Добавяне на избран(и) слой(и)",

package/static/translations/ca-ES.json

@@ -650,6 +650,7 @@
       "vertex": "Ajustar als vèrtexs"
     },
     "themelayerslist": {
+      "addanyway": "",
       "addlayer": "Afegir capa",
       "addlayerstotheme": "Afegir capa al mapa actual",
       "addselectedlayers": "Afegir capa(s) seleccionada(s)",

package/static/translations/cs-CZ.json

@@ -650,6 +650,7 @@
       "vertex": ""
     },
     "themelayerslist": {
+      "addanyway": "",
       "addlayer": "Přidat vrstvu",
       "addlayerstotheme": "Přidat vrstvy do aktuálního tématu",
       "addselectedlayers": "Přidat vybrané vrstvy",

package/static/translations/de-CH.json

@@ -650,6 +650,7 @@
       "vertex": "An Ecken einrasten"
     },
     "themelayerslist": {
+      "addanyway": "Trotzdem hinzufügen",
       "addlayer": "Layer hinzufügen",
       "addlayerstotheme": "Ebenen der Karte hinzufügen",
       "addselectedlayers": "Selektierte Ebenen hinzufügen",

package/static/translations/de-DE.json

@@ -650,6 +650,7 @@
       "vertex": "An Ecken einrasten"
     },
     "themelayerslist": {
+      "addanyway": "Trotzdem hinzufügen",
       "addlayer": "Layer hinzufügen",
       "addlayerstotheme": "Ebenen der Karte hinzufügen",
       "addselectedlayers": "Selektierte Ebenen hinzufügen",

package/static/translations/en-US.json

@@ -650,6 +650,7 @@
       "vertex": "Snap to vertices"
     },
     "themelayerslist": {
+      "addanyway": "Add anyway",
       "addlayer": "Add layer",
       "addlayerstotheme": "Add layers to current map",
       "addselectedlayers": "Add selected layer(s)",

package/static/translations/es-ES.json

@@ -650,6 +650,7 @@
       "vertex": "Ajustar a los vértices"
     },
     "themelayerslist": {
+      "addanyway": "",
       "addlayer": "Agregar capa",
       "addlayerstotheme": "Agregar capas al mapa actual",
       "addselectedlayers": "Agregar capa(s) seleccionada(s)",

package/static/translations/fi-FI.json

@@ -650,6 +650,7 @@
       "vertex": ""
     },
     "themelayerslist": {
+      "addanyway": "",
       "addlayer": "Lisää taso",
       "addlayerstotheme": "Lisää tasoja nykyiseen karttaan",
       "addselectedlayers": "Lisää valitut tasot",

package/static/translations/fr-FR.json

@@ -456,7 +456,7 @@
       "angle": "Angle",
       "featureunsupported": "Entrée numérique non disponible pour cette géométrie",
       "height": "Hauteur",
-      "nofeatureormultiple": "",
+      "nofeatureormultiple": "Aucun ou plusieurs objets actifs",
       "side": "Côté",
       "width": "Largeur",
       "windowtitle": "Entrée numérique"
@@ -650,6 +650,7 @@
       "vertex": "Snapping aux sommets"
     },
     "themelayerslist": {
+      "addanyway": "Ajouter quand même",
       "addlayer": "Ajouter la couche",
       "addlayerstotheme": "Ajouter des couches à la carte",
       "addselectedlayers": "Ajouter les couches sélectionnées",

package/static/translations/hu-HU.json

@@ -650,6 +650,7 @@
       "vertex": ""
     },
     "themelayerslist": {
+      "addanyway": "",
       "addlayer": "",
       "addlayerstotheme": "",
       "addselectedlayers": "",

package/static/translations/it-IT.json

@@ -650,6 +650,7 @@
       "vertex": "Snap ai vertici"
     },
     "themelayerslist": {
+      "addanyway": "Aggiungi comunque",
       "addlayer": "Aggiungi layer",
       "addlayerstotheme": "Aggiungi layer alla mappa corrente",
       "addselectedlayers": "Aggiungi i layer selezionati",

package/static/translations/ja-JP.json

@@ -650,6 +650,7 @@
       "vertex": "頂点にスナップ"
     },
     "themelayerslist": {
+      "addanyway": "",
       "addlayer": "レイヤを追加",
       "addlayerstotheme": "現在の地図にレイヤを追加",
       "addselectedlayers": "選択されたレイヤを追加",

package/static/translations/nl-NL.json

@@ -650,6 +650,7 @@
       "vertex": "Naar hoekpunten snappen"
     },
     "themelayerslist": {
+      "addanyway": "",
       "addlayer": "Laag toevoegen",
       "addlayerstotheme": "Lagen toevoegen aan huidige kaart",
       "addselectedlayers": "Geselecteerde la(a)g(en) toevoegen",

package/static/translations/no-NO.json

@@ -650,6 +650,7 @@
       "vertex": ""
     },
     "themelayerslist": {
+      "addanyway": "",
       "addlayer": "",
       "addlayerstotheme": "",
       "addselectedlayers": "",

package/static/translations/pl-PL.json

@@ -650,6 +650,7 @@
       "vertex": ""
     },
     "themelayerslist": {
+      "addanyway": "",
       "addlayer": "",
       "addlayerstotheme": "",
       "addselectedlayers": "",

package/static/translations/pt-BR.json

@@ -650,6 +650,7 @@
       "vertex": ""
     },
     "themelayerslist": {
+      "addanyway": "",
       "addlayer": "Adicionar camada",
       "addlayerstotheme": "Adicionar camadas ao mapa atual",
       "addselectedlayers": "Adicionar camadas selecionadas",

package/static/translations/pt-PT.json

@@ -650,6 +650,7 @@
       "vertex": "Vértice"
     },
     "themelayerslist": {
+      "addanyway": "",
       "addlayer": "Adicionar Camada",
       "addlayerstotheme": "Adicionar Camadas ao Mapa Atual",
       "addselectedlayers": "Adicionar Camadas Selecionadas",

package/static/translations/ro-RO.json

@@ -650,6 +650,7 @@
       "vertex": ""
     },
     "themelayerslist": {
+      "addanyway": "",
       "addlayer": "Adaugă strat",
       "addlayerstotheme": "Adaugă strat la hartă",
       "addselectedlayers": "Adaugă straturile selectate",

package/static/translations/ru-RU.json

@@ -650,6 +650,7 @@
       "vertex": ""
     },
     "themelayerslist": {
+      "addanyway": "",
       "addlayer": "",
       "addlayerstotheme": "",
       "addselectedlayers": "",

package/static/translations/sv-SE.json

@@ -650,6 +650,7 @@
       "vertex": ""
     },
     "themelayerslist": {
+      "addanyway": "",
       "addlayer": "",
       "addlayerstotheme": "",
       "addselectedlayers": "",

package/static/translations/tr-TR.json

@@ -650,6 +650,7 @@
       "vertex": "Kırık noktalarını yakala"
     },
     "themelayerslist": {
+      "addanyway": "",
       "addlayer": "Katman ekle",
       "addlayerstotheme": "Geçerli haritaya katman ekle",
       "addselectedlayers": "Seçili katmanları ekle",

package/static/translations/tsconfig.json

@@ -559,6 +559,7 @@
     "snapping.loading",
     "snapping.snappingenabled",
     "snapping.vertex",
+    "themelayerslist.addanyway",
     "themelayerslist.addlayer",
     "themelayerslist.addlayerstotheme",
     "themelayerslist.addselectedlayers",

package/static/translations/uk-UA.json

@@ -650,6 +650,7 @@
       "vertex": ""
     },
     "themelayerslist": {
+      "addanyway": "",
       "addlayer": "",
       "addlayerstotheme": "",
       "addselectedlayers": "",

package/utils/ThemeUtils.js

@@ -137,6 +137,7 @@ var ThemeUtils = {
     var sublayerNames = LayerUtils.getSublayerNames({
       sublayers: subLayers !== null && subLayers !== void 0 ? subLayers : theme.sublayers
     });
+    var commonTranslations = StandardApp.store.getState().locale.messagesTree.maptranslations || {};
     var baseParams = urlParts.query;
     var layer = {
       type: "wms",
@@ -175,7 +176,7 @@ var ThemeUtils = {
         LayerUtils.completeExternalLayer(res[cur.internalLayer], LayerUtils.searchSubLayer(theme, 'name', cur.internalLayer));
         return res;
       }, {})),
-      translations: theme.translations,
+      translations: deepmerge(commonTranslations, theme.translations),
       editConfig: theme.editConfig,
       wms_name: theme.wms_name
     };