qwc2 2025.12.24 → 2026.1.6

package/components/IdentifyViewer.js

@@ -1126,7 +1126,9 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "parsedContent", function (text) {
       text = DOMPurify.sanitize(text, {
-        ADD_ATTR: ['target']
+        ADD_ATTR: ['target'],
+        ADD_TAGS: ["iframe"],
+        FORCE_BODY: true
       }).replace('&#10;', '<br />');
       var options = {
         replace: function replace(node) {

package/components/LinkFeatureForm.js

@@ -23,7 +23,6 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  */
 
 import React from 'react';
-import ReactDOM from 'react-dom';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import { setEditContext } from '../actions/editing';
@@ -32,8 +31,6 @@ import { getFeatureTemplate } from '../utils/EditingUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MapUtils from '../utils/MapUtils';
 import AttributeForm from './AttributeForm';
-import MeasureSwitcher from './MeasureSwitcher';
-import { BottomToolPortalContext } from './PluginsContainer';
 import './style/LinkFeatureForm.css';
 var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
   function LinkFeatureForm() {
@@ -48,12 +45,6 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
       pickedFeatures: null,
       highlightedFeature: null
     });
-    _defineProperty(_this, "changeMeasurementState", function (diff) {
-      var editContext = _this.props.editing.contexts[_this.props.editContextId];
-      _this.props.setEditContext(_this.props.editContextId, {
-        measurements: _objectSpread(_objectSpread({}, editContext.measurements), diff)
-      });
-    });
     _defineProperty(_this, "childPickQuery", function (coordinate) {
       var scale = Math.round(MapUtils.computeForZoom(_this.props.map.scales, _this.props.map.zoom));
       _this.props.iface.getFeature(_this.props.editConfig, coordinate, _this.props.map.projection, scale, 96, function (featureCollection) {
@@ -211,11 +202,9 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
           onClick: this.finish
         }, LocaleUtils.tr("common.cancel"))));
       } else if (editContext.feature) {
-        var _editContext$feature;
         var drawing = editContext.action === 'Draw' && !editContext.feature.geometry && this.props.editConfig.geomType;
-        return [/*#__PURE__*/React.createElement("div", {
-          className: "link-feature-form",
-          key: "LinkFeatureForm"
+        return /*#__PURE__*/React.createElement("div", {
+          className: "link-feature-form"
         }, drawing ? /*#__PURE__*/React.createElement("div", {
           className: "link-feature-form-hint"
         }, /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("linkfeatureform.drawhint"))) : /*#__PURE__*/React.createElement(AttributeForm, {
@@ -231,19 +220,13 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
           className: "button",
           disabled: editContext.changed,
           onClick: this.finish
-        }, drawing ? LocaleUtils.tr("common.cancel") : LocaleUtils.tr("common.close")))), drawing || (_editContext$feature = editContext.feature) !== null && _editContext$feature !== void 0 && _editContext$feature.geometry ? /*#__PURE__*/ReactDOM.createPortal(/*#__PURE__*/React.createElement(MeasureSwitcher, {
-          changeMeasureState: this.changeMeasurementState,
-          geomType: editContext.geomType,
-          iconSize: "large",
-          measureState: editContext.measurements
-        }), this.context) : null];
+        }, drawing ? LocaleUtils.tr("common.cancel") : LocaleUtils.tr("common.close"))));
       } else {
         return null;
       }
     }
   }]);
 }(React.Component);
-_defineProperty(LinkFeatureForm, "contextType", BottomToolPortalContext);
 _defineProperty(LinkFeatureForm, "propTypes", {
   action: PropTypes.string,
   addLayerFeatures: PropTypes.func,

package/components/widgets/TextInput.js

@@ -47,6 +47,15 @@ var TextInput = /*#__PURE__*/function (_React$Component) {
         _this.input.innerHTML = DOMPurify.sanitize(value.replaceAll('\n', _this.props.multiline ? '<br />' : ''));
       }
     });
+    _defineProperty(_this, "storeRef", function (el) {
+      if (el) {
+        _this.input = el;
+        _this.setDefaultValue(_this.state.value, _this.state.valueRev, -1);
+      }
+    });
+    _defineProperty(_this, "setInputContents", function () {
+      _this.input.innerHTML = _this.state.value.replaceAll('\n', _this.props.multiline ? '<br />' : '');
+    });
     _defineProperty(_this, "onCopy", function (ev, cut) {
       ev.preventDefault();
       var selection = window.getSelection();
@@ -243,9 +252,6 @@ var TextInput = /*#__PURE__*/function (_React$Component) {
       }) : null, /*#__PURE__*/React.createElement("pre", {
         className: preClassName,
         contentEditable: !this.props.disabled && !this.props.readOnly,
-        dangerouslySetInnerHTML: {
-          __html: this.state.value.replaceAll('\n', this.props.multiline ? '<br />' : '')
-        },
         onBlur: this.onBlur,
         onChange: this.onChange,
         onCopy: function onCopy(ev) {
@@ -260,9 +266,7 @@ var TextInput = /*#__PURE__*/function (_React$Component) {
         onMouseDown: this.onMouseDown,
         onMouseLeave: this.onMouseLeave,
         onMouseMove: this.onMouseMove,
-        ref: function ref(el) {
-          _this2.input = el;
-        },
+        ref: this.storeRef,
         style: style
       }), !this.state.curValue ? /*#__PURE__*/React.createElement("div", {
         className: "text-input-placeholder"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2025.12.24",
+    "version": "2026.01.06",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",

package/plugins/Editing.js

@@ -33,7 +33,6 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  */
 
 import React from 'react';
-import ReactDOM from 'react-dom';
 import { connect } from 'react-redux';
 import { parseNumber } from '@norbulcz/num-parse';
 import dateParser from 'any-date-parser';
@@ -47,7 +46,6 @@ import { setSnappingConfig } from '../actions/map';
 import { setCurrentTask, setCurrentTaskBlocked } from '../actions/task';
 import AttributeForm from '../components/AttributeForm';
 import Icon from '../components/Icon';
-import MeasureSwitcher from '../components/MeasureSwitcher';
 import PickFeature from '../components/PickFeature';
 import { BottomToolPortalContext } from '../components/PluginsContainer';
 import SideBar from '../components/SideBar';
@@ -643,8 +641,7 @@ var Editing = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this3 = this,
-        _this$props$editConte3;
+      var _this3 = this;
       var minMaxTooltip = this.state.minimized ? LocaleUtils.tr("window.maximize") : LocaleUtils.tr("window.minimize");
       var extraTitlebarContent = /*#__PURE__*/React.createElement(Icon, {
         className: "editing-minimize-maximize",
@@ -678,12 +675,7 @@ var Editing = /*#__PURE__*/function (_React$Component) {
         featureFilter: this.pickFilter,
         featurePicked: this.geomPicked,
         key: "FeaturePicker"
-      }) : null, this.props.editContext.action === "Draw" || (_this$props$editConte3 = this.props.editContext.feature) !== null && _this$props$editConte3 !== void 0 && _this$props$editConte3.geometry ? /*#__PURE__*/ReactDOM.createPortal(/*#__PURE__*/React.createElement(MeasureSwitcher, {
-        changeMeasureState: this.changeMeasurementState,
-        geomType: this.props.editContext.geomType,
-        iconSize: "large",
-        measureState: this.props.editContext.measurements
-      }), this.context) : null];
+      }) : null];
     }
   }]);
 }(React.Component);

package/plugins/ObliqueView.js

@@ -46,26 +46,7 @@ import './style/ObliqueView.css';
 /**
  * Display oblique satellite imagery.
  *
- * Requires `obliqueImageryServiceUrl` in `config.json` to point to a `qwc-oblique-imagery-service`.
- *
- * You can configure oblique imagery datasets in the `obliqueDatasets` entry in a QWC theme configuration as follows:
- * ```
- * {
- *   ...
- *   "obliqueDatasets": [{
- *     {
- *       "name": "<dataset_name>",
- *       "default": <false|true>,
- *       "backgroundLayer": "<background_layer_name>",
- *       "backgroundOpacity": <0-255>,
- *       "title": "<dataset_title>",
- *       "titleMsgId": "<dataset_title_msgid>"
- *     },
- *     ...
- *   ]
- * }
- * ```
- * where `dataset_name` is the the name of a dataset configured in the `qwc-oblique-imagery-service`.
+ * See [Oblique View](../../topics/ObliqueView).
  */
 var ObliqueView = /*#__PURE__*/function (_React$Component) {
   function ObliqueView(props) {
@@ -287,11 +268,11 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
         this.props.setViewMode(ViewMode._Oblique);
       }
       if (this.props.viewMode === ViewMode._Oblique && this.props.theme && (this.props.theme !== prevProps.theme || prevProps.viewMode !== ViewMode._Oblique)) {
-        var _datasets$find$name, _datasets$find, _datasets$;
+        var _datasets$find$datase, _datasets$find, _datasets$;
         var datasets = this.props.theme.obliqueDatasets || [];
-        var defaultDataset = (_datasets$find$name = (_datasets$find = datasets.find(function (entry) {
+        var defaultDataset = (_datasets$find$datase = (_datasets$find = datasets.find(function (entry) {
           return entry["default"];
-        })) === null || _datasets$find === void 0 ? void 0 : _datasets$find.name) !== null && _datasets$find$name !== void 0 ? _datasets$find$name : (_datasets$ = datasets[0]) === null || _datasets$ === void 0 ? void 0 : _datasets$.name;
+        })) === null || _datasets$find === void 0 ? void 0 : _datasets$find.dataset) !== null && _datasets$find$datase !== void 0 ? _datasets$find$datase : (_datasets$ = datasets[0]) === null || _datasets$ === void 0 ? void 0 : _datasets$.dataset;
         this.setState({
           selectedDataset: defaultDataset,
           datasetConfig: null,
@@ -353,7 +334,7 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
         active: this.state.viewsLocked
       }];
       var obliqueConfig = (_this$props$theme = this.props.theme) === null || _this$props$theme === void 0 || (_this$props$theme = _this$props$theme.obliqueDatasets) === null || _this$props$theme === void 0 || (_this$props$theme$fin = _this$props$theme.find) === null || _this$props$theme$fin === void 0 ? void 0 : _this$props$theme$fin.call(_this$props$theme, function (entry) {
-        return entry.name === _this2.state.selectedDataset;
+        return entry.dataset === _this2.state.selectedDataset;
       });
       var basemap = (_this$props$themes = this.props.themes) === null || _this$props$themes === void 0 || (_this$props$themes = _this$props$themes.backgroundLayers) === null || _this$props$themes === void 0 || (_this$props$themes$fi = _this$props$themes.find) === null || _this$props$themes$fi === void 0 ? void 0 : _this$props$themes$fi.call(_this$props$themes, function (entry) {
         return entry.name === (obliqueConfig === null || obliqueConfig === void 0 ? void 0 : obliqueConfig.backgroundLayer);
@@ -467,9 +448,9 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
       }, (((_this$props$theme2 = this.props.theme) === null || _this$props$theme2 === void 0 ? void 0 : _this$props$theme2.obliqueDatasets) || []).map(function (entry) {
         var _entry$title;
         return /*#__PURE__*/React.createElement("option", {
-          key: entry.name,
-          value: entry.name
-        }, LocaleUtils.trWithFallback(entry.titleMsgId, (_entry$title = entry.title) !== null && _entry$title !== void 0 ? _entry$title : entry.name));
+          key: entry.dataset,
+          value: entry.dataset
+        }, LocaleUtils.trWithFallback(entry.titleMsgId, (_entry$title = entry.title) !== null && _entry$title !== void 0 ? _entry$title : entry.dataset));
       })), /*#__PURE__*/React.createElement("span", {
         className: "obliqueview-bottombar-spacer"
       }), this.renderScaleChooser(), /*#__PURE__*/React.createElement("span", {

package/plugins/map/EditingSupport.js

@@ -29,11 +29,14 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  */
 
 import React from 'react';
+import ReactDOM from 'react-dom';
 import { connect } from 'react-redux';
 import ol from 'openlayers';
 import PropTypes from 'prop-types';
 import { setEditContext } from '../../actions/editing';
 import LocationRecorder from '../../components/LocationRecorder';
+import MeasureSwitcher from '../../components/MeasureSwitcher';
+import { BottomToolPortalContext } from '../../components/PluginsContainer';
 import FeatureStyles from "../../utils/FeatureStyles";
 import MeasureUtils from '../../utils/MeasureUtils';
 
@@ -46,7 +49,19 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
     _classCallCheck(this, EditingSupport);
     _this = _callSuper(this, EditingSupport, [props]);
     _defineProperty(_this, "state", {
-      showRecordLocation: false
+      showRecordLocation: false,
+      measurements: {
+        showmeasurements: false,
+        lenUnit: 'metric',
+        areaUnit: 'metric'
+      }
+    });
+    _defineProperty(_this, "changeMeasurementState", function (diff) {
+      _this.setState(function (state) {
+        return {
+          measurements: _objectSpread(_objectSpread({}, state.measurements), diff)
+        };
+      });
     });
     _defineProperty(_this, "editStyle", function (feature) {
       var geometryFunction = function geometryFunction(f) {
@@ -69,23 +84,25 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
         geometryFunction: geometryFunction
       }, _this.props.editContext.vertexStyle))].flat();
     });
-    _defineProperty(_this, "createLayer", function () {
-      var source = new ol.source.Vector();
-      _this.layer = new ol.layer.Vector({
-        source: source,
-        zIndex: 1000000,
-        style: _this.editStyle
-      });
-      _this.props.map.addLayer(_this.layer);
+    _defineProperty(_this, "setCurrentLayer", function () {
+      if (!(_this.props.editContext.id in _this.layers)) {
+        _this.layers[_this.props.editContext.id] = new ol.layer.Vector({
+          source: new ol.source.Vector(),
+          zIndex: 1000000,
+          style: _this.editStyle
+        });
+        _this.props.map.addLayer(_this.layers[_this.props.editContext.id]);
+      }
+      _this.currentLayer = _this.layers[_this.props.editContext.id];
     });
     _defineProperty(_this, "addDrawInteraction", function () {
       _this.reset();
-      _this.createLayer();
+      _this.setCurrentLayer();
       var geomType = _this.props.editContext.geomType.replace(/Z$/, '');
       var drawInteraction = new ol.interaction.Draw({
         stopClick: true,
         type: geomType,
-        source: _this.layer.getSource(),
+        source: _this.currentLayer.getSource(),
         condition: function condition(event) {
           return event.originalEvent.buttons === 1;
         },
@@ -111,12 +128,12 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "addEditInteraction", function () {
       _this.reset();
-      _this.createLayer();
+      _this.setCurrentLayer();
       var format = new ol.format.GeoJSON();
       _this.currentFeature = format.readFeature(_this.props.editContext.feature);
       _this.currentFeature.on('change', _this.updateMeasurements);
       _this.updateMeasurements();
-      _this.layer.getSource().addFeature(_this.currentFeature);
+      _this.currentLayer.getSource().addFeature(_this.currentFeature);
       var modifyInteraction = new ol.interaction.Modify({
         features: new ol.Collection([_this.currentFeature]),
         condition: function condition(event) {
@@ -139,18 +156,18 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
       _this.interaction = modifyInteraction;
     });
     _defineProperty(_this, "updateMeasurements", function () {
-      var _this$props$editConte;
+      var _this$state$measureme;
       if (!_this.currentFeature) {
         return;
-      } else if (!((_this$props$editConte = _this.props.editContext.measurements) !== null && _this$props$editConte !== void 0 && _this$props$editConte.showmeasurements)) {
+      } else if (!((_this$state$measureme = _this.state.measurements) !== null && _this$state$measureme !== void 0 && _this$state$measureme.showmeasurements)) {
         _this.currentFeature.set('measurements', undefined);
         _this.currentFeature.set('segment_labels', undefined);
         _this.currentFeature.set('label', undefined);
       } else {
         var settings = {
           displayCrs: _this.props.displayCrs,
-          lenUnit: _this.props.editContext.measurements.lenUnit,
-          areaUnit: _this.props.editContext.measurements.areaUnit
+          lenUnit: _this.state.measurements.lenUnit,
+          areaUnit: _this.state.measurements.areaUnit
         };
         MeasureUtils.updateFeatureMeasurements(_this.currentFeature, _this.props.editContext.geomType, _this.props.mapCrs, settings);
       }
@@ -186,67 +203,100 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
         _this.currentFeature.un('change', _this.updateMeasurements);
       }
       _this.currentFeature = null;
-      if (_this.layer) {
-        _this.props.map.removeLayer(_this.layer);
+      if (_this.layers[_this.props.editContext.id]) {
+        _this.layers[_this.props.editContext.id].getSource().clear();
       }
-      _this.layer = null;
+    });
+    _defineProperty(_this, "cleanupLayers", function (prevContexts) {
+      var currentContexts = new Set(Object.keys(_this.props.editContexts));
+      var removedContexts = Object.keys(prevContexts).filter(function (item) {
+        return !currentContexts.has(item);
+      });
+      removedContexts.forEach(function (id) {
+        if (_this.layers[id]) {
+          _this.props.map.removeLayer(_this.layers[id]);
+          delete _this.layers[id];
+        }
+      });
     });
     _this.interaction = null;
-    _this.layer = null;
+    _this.layers = {};
+    _this.currentLayer = null;
     _this.currentFeature = null;
     return _this;
   }
   _inherits(EditingSupport, _React$Component);
   return _createClass(EditingSupport, [{
     key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
-      if (this.props.editContext === prevProps.editContext) {
+    value: function componentDidUpdate(prevProps, prevState) {
+      var curContext = this.props.editContext;
+      var prevContext = prevProps.editContext;
+      if (curContext === prevContext) {
         // pass
-      } else if (this.props.editContext.measurements !== prevProps.editContext.measurements) {
-        this.updateMeasurements();
-      } else if (this.props.editContext.action === 'Pick' && this.props.editContext.feature) {
+      } else if (curContext.action === 'Pick' && curContext.feature) {
         // If a feature without geometry was picked, enter draw mode, otherwise enter edit mode
-        if (!this.props.editContext.feature.geometry && this.props.editContext.geomType) {
+        if (!curContext.feature.geometry && curContext.geomType) {
           this.addDrawInteraction();
         } else {
           this.addEditInteraction();
         }
-      } else if (this.props.editContext.action === 'Draw' && this.props.editContext.geomType) {
+      } else if (curContext.action === 'Draw' && curContext.geomType) {
         // Usually, draw mode starts without a feature, but draw also can start with a pre-set geometry
-        if (!(this.props.editContext.feature || {}).geometry || prevProps.editContext.geomType !== this.props.editContext.geomType) {
+        if (!(curContext.feature || {}).geometry || prevContext.id === curContext.id && prevContext.geomType !== curContext.geomType) {
           this.addDrawInteraction();
-        } else if ((this.props.editContext.feature || {}).geometry) {
+        } else if ((curContext.feature || {}).geometry) {
           this.addEditInteraction();
         }
       } else {
         this.reset();
       }
+      if (this.state.measurements !== prevState.measurements) {
+        this.updateMeasurements();
+      }
+      if (this.props.editContexts !== prevProps.editContexts) {
+        this.cleanupLayers(prevProps.editContexts);
+      }
     }
   }, {
     key: "render",
     value: function render() {
+      var _this$props$editConte;
+      var locationRecorder = null;
+      var measureSwitcher = null;
       if (this.state.showRecordLocation && this.props.editContext.geomType) {
         var geomType = this.props.editContext.geomType.replace(/Z$/, '');
-        return /*#__PURE__*/React.createElement(LocationRecorder, {
+        locationRecorder = /*#__PURE__*/React.createElement(LocationRecorder, {
           drawInteraction: this.interaction,
           geomType: geomType,
           key: "LocationRecorder",
           map: this.props.map
         });
       }
-      return null;
+      if (this.props.editContext.action === "Draw" || (_this$props$editConte = this.props.editContext.feature) !== null && _this$props$editConte !== void 0 && _this$props$editConte.geometry) {
+        measureSwitcher = /*#__PURE__*/ReactDOM.createPortal(/*#__PURE__*/React.createElement(MeasureSwitcher, {
+          changeMeasureState: this.changeMeasurementState,
+          geomType: this.props.editContext.geomType,
+          iconSize: "large",
+          key: "MeasureSwitcher",
+          measureState: this.state.measurements
+        }), this.context);
+      }
+      return [measureSwitcher, locationRecorder];
     }
   }]);
 }(React.Component);
+_defineProperty(EditingSupport, "contextType", BottomToolPortalContext);
 _defineProperty(EditingSupport, "propTypes", {
   displayCrs: PropTypes.string,
   editContext: PropTypes.object,
+  editContexts: PropTypes.object,
   map: PropTypes.object,
   mapCrs: PropTypes.string,
   setEditContext: PropTypes.func
 });
 export default connect(function (state) {
   return {
+    editContexts: state.editing.contexts,
     editContext: state.editing.contexts[state.editing.currentContext] || {},
     displayCrs: state.map.displayCrs,
     mapCrs: state.map.projection

package/reducers/editing.js

@@ -44,20 +44,15 @@ export default function editing() {
   switch (action.type) {
     case SET_EDIT_CONTEXT:
       {
-        var _action$editConfig, _state$contexts$actio, _editConfig$permissio2;
-        var editConfig = (_action$editConfig = action.editConfig) !== null && _action$editConfig !== void 0 ? _action$editConfig : (_state$contexts$actio = state.contexts[action.contextId]) === null || _state$contexts$actio === void 0 ? void 0 : _state$contexts$actio.editConfig;
+        var _action$editContext$e, _action$editContext, _state$contexts$actio, _editConfig$permissio2;
+        var editConfig = (_action$editContext$e = (_action$editContext = action.editContext) === null || _action$editContext === void 0 ? void 0 : _action$editContext.editConfig) !== null && _action$editContext$e !== void 0 ? _action$editContext$e : (_state$contexts$actio = state.contexts[action.contextId]) === null || _state$contexts$actio === void 0 ? void 0 : _state$contexts$actio.editConfig;
         return {
           contexts: _objectSpread(_objectSpread({}, state.contexts), {}, _defineProperty({}, action.contextId, _objectSpread(_objectSpread(_objectSpread({
             action: null,
             feature: null,
             changed: false,
             mapPrefix: null,
-            editConfig: null,
-            measurements: {
-              showmeasurements: false,
-              lenUnit: 'metric',
-              areaUnit: 'metric'
-            }
+            editConfig: null
           }, state.contexts[action.contextId]), action.editContext), {}, {
             geomNonZeroZ: checkNonZeroZ(state.contexts[action.contextId], action.editContext),
             geomReadOnly: checkGeomReadOnly(editConfig),

package/scripts/themesConfig.js

@@ -528,9 +528,6 @@ function getTheme(config, configItem, result, resultItem, proxy) {
         resultItem.print = printTemplates;
       }
       resultItem.drawingOrder = drawingOrder;
-      if (configItem.extraDxfParameters) {
-        resultItem.extraDxfParameters = configItem.extraDxfParameters;
-      }
       if (configItem.extraPrintParameters) {
         resultItem.extraPrintParameters = configItem.extraPrintParameters;
       }

package/scripts/themesConfig.py

@@ -496,8 +496,6 @@ def getTheme(config, configItem, result, resultItem):
         if printTemplates:
             resultItem["print"] = printTemplates
         resultItem["drawingOrder"] = drawingOrder
-        if "extraDxfParameters" in configItem:
-            resultItem["extraDxfParameters"] = configItem["extraDxfParameters"]
         if "extraPrintParameters" in configItem:
             resultItem["extraPrintParameters"] = configItem["extraPrintParameters"]
         extraLegenParams = configItem["extraLegendParameters"] if "extraLegendParameters" in configItem else ""

package/utils/LayerUtils.js

@@ -1464,37 +1464,37 @@ var LayerUtils = {
     });
     return reports;
   },
-  computeVisbilityPreset: function computeVisbilityPreset(layer) {
-    var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
+  computeVisibilityPreset: function computeVisibilityPreset(layers) {
     var result = {};
-    if (layer.sublayers) {
-      var istoplevel = !!layer.url;
-      layer.sublayers.forEach(function (sublayer) {
-        return Object.assign(result, LayerUtils.computeVisbilityPreset(sublayer, !istoplevel ? path + layer.name + "/" : ""));
-      });
-      if (layer.visibility && !istoplevel) {
-        result[path + layer.name] = "";
+    var _collectLayerVisibilities = function collectLayerVisibilities(layer, path) {
+      if (layer.sublayers) {
+        var istoplevel = !!layer.url;
+        layer.sublayers.forEach(function (sublayer) {
+          return _collectLayerVisibilities(sublayer, !istoplevel ? path + layer.name + "/" : "");
+        });
+        if (layer.visibility && !istoplevel) {
+          result[path + layer.name] = "";
+        }
+      } else if (layer.visibility) {
+        result[path + layer.name] = layer.style;
       }
-    } else if (layer.visibility) {
-      result[path + layer.name] = layer.style;
-    }
-    return result;
+    };
+    layers.forEach(function (layer) {
+      if (layer.role === LayerRole.THEME) {
+        _collectLayerVisibilities(layer);
+      }
+    });
   },
   getActiveVisibilityPreset: function getActiveVisibilityPreset(layers, presets) {
     if (isEmpty(presets)) {
       return null;
     }
-    var result = {};
-    layers.forEach(function (layer) {
-      if (layer.role === LayerRole.THEME) {
-        Object.assign(result, LayerUtils.computeVisbilityPreset(layer));
-      }
-    });
+    var currentPreset = LayerUtils.computeVisibilityPreset(layers);
     for (var _i4 = 0, _Object$entries = Object.entries(presets); _i4 < _Object$entries.length; _i4++) {
       var _Object$entries$_i = _slicedToArray(_Object$entries[_i4], 2),
         name = _Object$entries$_i[0],
         preset = _Object$entries$_i[1];
-      if (isEqual(preset, result)) {
+      if (isEqual(preset, currentPreset)) {
         return name;
       }
     }

package/utils/PermaLinkUtils.js

@@ -296,7 +296,7 @@ export function resolveBookmark(bookmarkKey, callback) {
     var data = response.data;
     callback(_objectSpread({}, data.query || {}), data.state || {}, !!data.query);
   })["catch"](function () {
-    callback(bookmarkKey, {}, false);
+    callback({}, {}, false);
   });
 }
 export function getUserBookmarks(user, callback) {
@@ -428,4 +428,55 @@ export function removeBookmark(bkey, callback) {
       return callback(false);
     });
   }
+}
+export function resolveVisibilityPreset(vpKey, callback) {
+  axios.get(ConfigUtils.getConfigProp("permalinkServiceUrl").replace(/\/$/, '') + "/visibility_presets/" + vpKey).then(function (response) {
+    callback(response.data);
+  })["catch"](function () {
+    callback(null);
+  });
+}
+export function getVisibilityPresets(callback) {
+  var _ConfigUtils$getConfi, _ConfigUtils$getConfi2;
+  var permalinkServiceUrl = (_ConfigUtils$getConfi = ConfigUtils.getConfigProp("permalinkServiceUrl")) === null || _ConfigUtils$getConfi === void 0 || (_ConfigUtils$getConfi2 = _ConfigUtils$getConfi.replace) === null || _ConfigUtils$getConfi2 === void 0 ? void 0 : _ConfigUtils$getConfi2.call(_ConfigUtils$getConfi, /\/$/, '');
+  axios.get(permalinkServiceUrl + "/visibility_presets/").then(function (response) {
+    callback(response.data || []);
+  })["catch"](function () {
+    callback([]);
+  });
+}
+export function storeVisibilityPreset(description, callback) {
+  var _ConfigUtils$getConfi3, _ConfigUtils$getConfi4;
+  var permalinkServiceUrl = (_ConfigUtils$getConfi3 = ConfigUtils.getConfigProp("permalinkServiceUrl")) === null || _ConfigUtils$getConfi3 === void 0 || (_ConfigUtils$getConfi4 = _ConfigUtils$getConfi3.replace) === null || _ConfigUtils$getConfi4 === void 0 ? void 0 : _ConfigUtils$getConfi4.call(_ConfigUtils$getConfi3, /\/$/, '');
+  if (!permalinkServiceUrl) {
+    callback(false);
+    return;
+  }
+  var state = StandardApp.store.getState();
+  var preset = LayerUtils.computeVisibilityPreset(state.layers.flat);
+  axios.post(permalinkServiceUrl + "/visibility_presets/?description=" + description, preset).then(function () {
+    return callback(true);
+  })["catch"](function () {
+    return callback(false);
+  });
+}
+export function updateVisibilityPreset(key, description, callback) {
+  var _ConfigUtils$getConfi5, _ConfigUtils$getConfi6;
+  var permalinkServiceUrl = (_ConfigUtils$getConfi5 = ConfigUtils.getConfigProp("permalinkServiceUrl")) === null || _ConfigUtils$getConfi5 === void 0 || (_ConfigUtils$getConfi6 = _ConfigUtils$getConfi5.replace) === null || _ConfigUtils$getConfi6 === void 0 ? void 0 : _ConfigUtils$getConfi6.call(_ConfigUtils$getConfi5, /\/$/, '');
+  var state = StandardApp.store.getState();
+  var preset = LayerUtils.computeVisibilityPreset(state.layers.flat);
+  axios.put(permalinkServiceUrl + "/visibility_presets/" + key + "?description=" + description, preset).then(function () {
+    return callback(true);
+  })["catch"](function () {
+    return callback(false);
+  });
+}
+export function removeVisibilityPreset(key, callback) {
+  var _ConfigUtils$getConfi7, _ConfigUtils$getConfi8;
+  var permalinkServiceUrl = (_ConfigUtils$getConfi7 = ConfigUtils.getConfigProp("permalinkServiceUrl")) === null || _ConfigUtils$getConfi7 === void 0 || (_ConfigUtils$getConfi8 = _ConfigUtils$getConfi7.replace) === null || _ConfigUtils$getConfi8 === void 0 ? void 0 : _ConfigUtils$getConfi8.call(_ConfigUtils$getConfi7, /\/$/, '');
+  axios["delete"](permalinkServiceUrl + "/visibility_presets/" + key).then(function () {
+    return callback(true);
+  })["catch"](function () {
+    return callback(false);
+  });
 }

package/utils/ThemeUtils.js

@@ -176,7 +176,7 @@ var ThemeUtils = {
         LayerUtils.completeExternalLayer(res[cur.internalLayer], LayerUtils.searchSubLayer(theme, 'name', cur.internalLayer));
         return res;
       }, {})),
-      translations: deepmerge(commonTranslations, theme.translations),
+      translations: deepmerge(commonTranslations, theme.translations || {}),
       editConfig: theme.editConfig,
       wms_name: theme.wms_name
     };