qwc2 2025.10.16 → 2025.10.25

package/plugins/map/SnappingSupport.js

@@ -29,7 +29,9 @@ 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 classNames from 'classnames';
 import isEmpty from 'lodash.isempty';
 import ol from 'openlayers';
 import PropTypes from 'prop-types';
@@ -37,6 +39,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { LayerRole } from '../../actions/layers';
 import { setSnappingConfig } from '../../actions/map';
 import Icon from '../../components/Icon';
+import { BottomToolPortalContext } from '../../components/PluginsContainer';
 import Spinner from '../../components/widgets/Spinner';
 import IdentifyUtils from '../../utils/IdentifyUtils';
 import LocaleUtils from '../../utils/LocaleUtils';
@@ -313,13 +316,14 @@ var SnappingSupport = /*#__PURE__*/function (_React$Component) {
         return null;
       }
       var disabled = !this.state.havesnaplayers || this.props.mapObj.snapping.active === false;
-      var toolbarClass = disabled ? "snapping-toolbar-inactive" : "";
+      var className = classNames({
+        "snapping-toolbar": true,
+        "snapping-toolbar-inactive": disabled
+      });
       var snapEdge = this.snapToEdge(this.props.mapObj.snapping);
       var snapVertex = this.snapToVertex(this.props.mapObj.snapping);
-      return /*#__PURE__*/React.createElement("div", {
-        className: "snapping-toolbar-container"
-      }, /*#__PURE__*/React.createElement("div", {
-        className: toolbarClass
+      return /*#__PURE__*/ReactDOM.createPortal(/*#__PURE__*/React.createElement("div", {
+        className: className
       }, this.state.reqId !== null ? /*#__PURE__*/React.createElement(Spinner, null) : /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("button", {
         className: "button" + (snapVertex ? " pressed" : ""),
         onClick: function onClick() {
@@ -338,10 +342,11 @@ var SnappingSupport = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "snap_edge",
         size: "large"
-      }))), "\xA0", this.state.reqId ? LocaleUtils.tr("snapping.loading") : LocaleUtils.tr("snapping.snappingenabled")));
+      }))), "\xA0", this.state.reqId ? LocaleUtils.tr("snapping.loading") : LocaleUtils.tr("snapping.snappingenabled")), this.context);
     }
   }]);
 }(React.Component);
+_defineProperty(SnappingSupport, "contextType", BottomToolPortalContext);
 _defineProperty(SnappingSupport, "propTypes", {
   layers: PropTypes.array,
   map: PropTypes.object,

package/plugins/map/style/SnappingSupport.css

@@ -1,21 +1,10 @@
-div.snapping-toolbar-container {
-    position: absolute;
-    bottom: 2.25em;
-    left: 0;
-    right: 0;
-    text-align: center;
-    pointer-events: none;
-    z-index: 3;
-}
-
-div.snapping-toolbar-container > div {
+div.snapping-toolbar {
     display: inline-flex;
     align-items: center;
     line-height: 1.5em;
     position: relative;
-    max-width: 95%;
-    pointer-events: all;
     padding: 0.25em 0.5em;
+    order: 0;
     background-color: var(--container-bg-color);
     box-shadow: 0px -2px 4px rgba(136, 136, 136, 0.5);
     border-bottom: 1px solid rgba(136, 136, 136, 0.5);

package/reducers/locate.js

@@ -16,7 +16,8 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { CHANGE_LOCATE_STATE, CHANGE_LOCATE_POSITION, LOCATE_ERROR } from '../actions/locate';
 var defaultState = {
   state: "DISABLED",
-  position: null
+  position: null,
+  mapPos: null
 };
 export default function locate() {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultState;
@@ -31,7 +32,8 @@ export default function locate() {
     case CHANGE_LOCATE_POSITION:
       {
         return _objectSpread(_objectSpread({}, state), {}, {
-          position: action.position
+          position: action.position,
+          mapPos: action.mapPos
         });
       }
     case LOCATE_ERROR:

package/reducers/redlining.js

@@ -16,6 +16,7 @@ import { CHANGE_REDLINING_STATE, RESET_REDLINING_STATE } from '../actions/redlin
 var defaultState = {
   action: null,
   geomType: null,
+  format: null,
   style: {
     borderColor: [255, 0, 0, 1],
     fillColor: [255, 255, 255, 1],
@@ -31,7 +32,7 @@ var defaultState = {
   drawMultiple: true,
   freehand: false,
   measurements: false,
-  numericInput: false,
+  extraAction: null,
   lenUnit: 'metric',
   areaUnit: 'metric'
 };
@@ -41,9 +42,11 @@ export default function redlining() {
   switch (action.type) {
     case CHANGE_REDLINING_STATE:
       {
-        return _objectSpread(_objectSpread(_objectSpread({}, state), action.data), {}, {
-          style: _objectSpread(_objectSpread({}, state.style), action.data.style)
-        });
+        var newstate = _objectSpread(_objectSpread({}, state), action.data);
+        if (action.data.style) {
+          newstate.style = _objectSpread(_objectSpread({}, state.style), action.data.style);
+        }
+        return newstate;
       }
     case RESET_REDLINING_STATE:
       {

package/scripts/updateTranslations.js

@@ -71,7 +71,7 @@ var _listDir = function listDir(dir, pattern) {
   var results = [];
   var list = fs.readdirSync(dir);
   list.forEach(function (file) {
-    if (file === 'node_modules') {
+    if (file === 'node_modules' || file === 'dist') {
       return;
     }
     var path = dir + '/' + file;

package/static/translations/bg-BG.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/ca-ES.json

@@ -24,6 +24,7 @@
         "MapExport3D": "Exportar mapa",
         "MapFilter": "Filtre de mapa",
         "MapLight3D": "Llum i ombres",
+        "ObjectList": "",
         "Print": "Imprimir",
         "Reports": "Informes",
         "Settings": "Opcions",
@@ -136,7 +137,6 @@
     "draw3d": {
       "clone": "Clonar",
       "cone": "Con",
-      "ctrlhint": "Utilitza Ctrl per a selecció múltiple...",
       "cuboid": "Cuboid",
       "cylinder": "Cilindre",
       "delete": "Eliminar",
@@ -192,6 +192,12 @@
       "takepicture": "Escull imatge",
       "unsavedchanged": "Hi ha canvis sense guardar. Vols sortir de la pàgina sense guardar?"
     },
+    "featureattributes": {
+      "name": "",
+      "nofeatureormultiple": "",
+      "value": "",
+      "windowtitle": ""
+    },
     "featureform": {
       "feature": "Element",
       "noresults": "Sense resultats",
@@ -244,6 +250,7 @@
     "identify": {
       "aggregatedreport": "Informe agregat",
       "clipboard": "Copiar al porta-retalls",
+      "compare": "",
       "comparing": "",
       "download": "Descarregar",
       "export": "Exportar",
@@ -345,6 +352,10 @@
         "PERMISSION_DENIED": "Permis denegat"
       }
     },
+    "locationrecorder": {
+      "record": "",
+      "stop": ""
+    },
     "map": {
       "loading": "Carregant...",
       "resetrotation": "Reiniciar rotació"
@@ -436,7 +447,7 @@
       "angle": "Angle",
       "featureunsupported": "Entrada numèrica no disponible per a aquesta geometria",
       "height": "Alçada",
-      "nofeature": "Sense element actiu",
+      "nofeatureormultiple": "",
       "side": "Costat",
       "width": "Amplada",
       "windowtitle": "Entrada numèrica"
@@ -481,6 +492,7 @@
       "loading": "Carregant formulari..."
     },
     "redlining": {
+      "attributes": "",
       "buffer": "Buffer",
       "buffercompute": "Computar",
       "bufferdistance": "Distància",
@@ -488,6 +500,7 @@
       "bufferlayername": "Capa de buffer",
       "bufferselectfeature": "Seleccioni un element para enmagatzemar en bufer",
       "circle": "Circle",
+      "ctrlhint": "",
       "delete": "Eliminar",
       "draw": "Dibuixar",
       "edit": "Editar",

package/static/translations/cs-CZ.json

@@ -24,6 +24,7 @@
         "MapExport3D": "",
         "MapFilter": "",
         "MapLight3D": "",
+        "ObjectList": "",
         "Print": "Tisk",
         "Reports": "",
         "Settings": "Nastavení",
@@ -136,7 +137,6 @@
     "draw3d": {
       "clone": "",
       "cone": "",
-      "ctrlhint": "",
       "cuboid": "",
       "cylinder": "",
       "delete": "",
@@ -192,6 +192,12 @@
       "takepicture": "",
       "unsavedchanged": ""
     },
+    "featureattributes": {
+      "name": "",
+      "nofeatureormultiple": "",
+      "value": "",
+      "windowtitle": ""
+    },
     "featureform": {
       "feature": "Prvek",
       "noresults": "Žádné výsledky",
@@ -244,6 +250,7 @@
     "identify": {
       "aggregatedreport": "",
       "clipboard": "Zkopírovat do schránky",
+      "compare": "",
       "comparing": "",
       "download": "",
       "export": "Exportovat",
@@ -345,6 +352,10 @@
         "PERMISSION_DENIED": "Poloha: nepovoleno"
       }
     },
+    "locationrecorder": {
+      "record": "",
+      "stop": ""
+    },
     "map": {
       "loading": "Načítání...",
       "resetrotation": "Obnovit orientaci mapy"
@@ -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/de-CH.json

@@ -24,6 +24,7 @@
         "MapExport3D": "Karte exportieren",
         "MapFilter": "Kartenfilter",
         "MapLight3D": "Beleuchtung und Schatten",
+        "ObjectList": "Objektliste",
         "Print": "Drucken",
         "Reports": "Berichte",
         "Settings": "Einstellungen",
@@ -136,7 +137,6 @@
     "draw3d": {
       "clone": "Kopieren",
       "cone": "Kegel",
-      "ctrlhint": "Mehrfachselektion mit Ctrl...",
       "cuboid": "Quader",
       "cylinder": "Zylinder",
       "delete": "Löschen",
@@ -192,6 +192,12 @@
       "takepicture": "Bild schiessen",
       "unsavedchanged": "Es gibt nicht gespeicherte Änderungen. Soll die Seite trotzdem verlassen werden?"
     },
+    "featureattributes": {
+      "name": "Name",
+      "nofeatureormultiple": "Kein oder mehrere Objekte aktiv",
+      "value": "Wert",
+      "windowtitle": "Objektattribute"
+    },
     "featureform": {
       "feature": "Objekt",
       "noresults": "Keine Ergebnisse",
@@ -244,6 +250,7 @@
     "identify": {
       "aggregatedreport": "Aggregierter Bericht",
       "clipboard": "Nach Zwischenablage kopieren",
+      "compare": "Selektierte Objekte vergleichen",
       "comparing": "Vergleich von {0} Objekte",
       "download": "Herunterladen",
       "export": "Exportieren",
@@ -345,6 +352,10 @@
         "PERMISSION_DENIED": "Position: Zugriff verweigert"
       }
     },
+    "locationrecorder": {
+      "record": "Position aufzeichen",
+      "stop": "Aufzeichnung stoppen"
+    },
     "map": {
       "loading": "Karte wird geladen...",
       "resetrotation": "Drehung zurücksetzen"
@@ -436,7 +447,7 @@
       "angle": "Winkel",
       "featureunsupported": "Numerische Eingabe nicht verfügbar für dieses Objekt",
       "height": "Höhe",
-      "nofeature": "Kein Objekt aktiv",
+      "nofeatureormultiple": "Kein oder mehrere Objekte aktiv",
       "side": "Seite",
       "width": "Breite",
       "windowtitle": "Numerische Eingabe"
@@ -481,6 +492,7 @@
       "loading": "Formular wird geladen..."
     },
     "redlining": {
+      "attributes": "Objektattribute",
       "buffer": "Puffern",
       "buffercompute": "Berechnen",
       "bufferdistance": "Distanz",
@@ -488,6 +500,7 @@
       "bufferlayername": "Objektpuffer",
       "bufferselectfeature": "Zu pufferndes Objekt auswählen...",
       "circle": "Kreis",
+      "ctrlhint": "Mehrfachselektion mit Ctrl...",
       "delete": "Löschen",
       "draw": "Zeichnen",
       "edit": "Bearbeiten",

package/static/translations/de-DE.json

@@ -24,6 +24,7 @@
         "MapExport3D": "Karte exportieren",
         "MapFilter": "Kartenfilter",
         "MapLight3D": "Beleuchtung und Schatten",
+        "ObjectList": "Objektliste",
         "Print": "Drucken",
         "Reports": "Berichte",
         "Settings": "Einstellungen",
@@ -136,7 +137,6 @@
     "draw3d": {
       "clone": "Kopieren",
       "cone": "Kegel",
-      "ctrlhint": "Mehrfachselektion mit Ctrl...",
       "cuboid": "Quader",
       "cylinder": "Zylinder",
       "delete": "Löschen",
@@ -192,6 +192,12 @@
       "takepicture": "Bild schießen",
       "unsavedchanged": "Es gibt nicht gespeicherte Änderungen. Soll die Seite trotzdem verlassen werden?"
     },
+    "featureattributes": {
+      "name": "Name",
+      "nofeatureormultiple": "Kein oder mehrere Objekte aktiv",
+      "value": "Wert",
+      "windowtitle": "Objektattribute"
+    },
     "featureform": {
       "feature": "Objekt",
       "noresults": "Keine Ergebnisse",
@@ -244,6 +250,7 @@
     "identify": {
       "aggregatedreport": "Aggregierter Bericht",
       "clipboard": "Nach Zwischenablage kopieren",
+      "compare": "Selektierte Objekte vergleichen",
       "comparing": "Vergleich von {0} Objekte",
       "download": "Herunterladen",
       "export": "Exportieren",
@@ -345,6 +352,10 @@
         "PERMISSION_DENIED": "Position: Zugriff verweigert"
       }
     },
+    "locationrecorder": {
+      "record": "Position aufzeichen",
+      "stop": "Aufzeichnung stoppen"
+    },
     "map": {
       "loading": "Karte wird geladen...",
       "resetrotation": "Drehung zurücksetzen"
@@ -436,7 +447,7 @@
       "angle": "Winkel",
       "featureunsupported": "Numerische Eingabe nicht verfügbar für dieses Objekt",
       "height": "Höhe",
-      "nofeature": "Kein Objekt aktiv",
+      "nofeatureormultiple": "Kein oder mehrere Objekte aktiv",
       "side": "Seite",
       "width": "Breite",
       "windowtitle": "Numerische Eingabe"
@@ -481,6 +492,7 @@
       "loading": "Formular wird geladen..."
     },
     "redlining": {
+      "attributes": "Objektattribute",
       "buffer": "Puffern",
       "buffercompute": "Berechnen",
       "bufferdistance": "Distanz",
@@ -488,6 +500,7 @@
       "bufferlayername": "Objektpuffer",
       "bufferselectfeature": "Zu pufferndes Objekt auswählen...",
       "circle": "Kreis",
+      "ctrlhint": "Mehrfachselektion mit Ctrl...",
       "delete": "Löschen",
       "draw": "Zeichnen",
       "edit": "Bearbeiten",

package/static/translations/en-US.json

@@ -24,6 +24,7 @@
         "MapExport3D": "Export Map",
         "MapFilter": "Map Filter",
         "MapLight3D": "Light and Shadows",
+        "ObjectList": "Object list",
         "Print": "Print",
         "Reports": "Reports",
         "Settings": "Settings",
@@ -136,7 +137,6 @@
     "draw3d": {
       "clone": "Clone",
       "cone": "Cone",
-      "ctrlhint": "Use Ctrl for multiselection...",
       "cuboid": "Cuboid",
       "cylinder": "Cylinder",
       "delete": "Delete",
@@ -192,6 +192,12 @@
       "takepicture": "Take picture",
       "unsavedchanged": "There are unsaved changes. Do you want to leave the page anyway?"
     },
+    "featureattributes": {
+      "name": "Name",
+      "nofeatureormultiple": "No or multiple active features",
+      "value": "Value",
+      "windowtitle": "Feature attributes"
+    },
     "featureform": {
       "feature": "Feature",
       "noresults": "No results",
@@ -244,6 +250,7 @@
     "identify": {
       "aggregatedreport": "Aggregated report",
       "clipboard": "Copy to clipboard",
+      "compare": "Compare selected objects",
       "comparing": "Comparing {0} features",
       "download": "Download",
       "export": "Export",
@@ -345,6 +352,10 @@
         "PERMISSION_DENIED": "Position: permission denied"
       }
     },
+    "locationrecorder": {
+      "record": "Record location",
+      "stop": "Stop recording"
+    },
     "map": {
       "loading": "Loading...",
       "resetrotation": "Reset rotation"
@@ -436,7 +447,7 @@
       "angle": "Angle",
       "featureunsupported": "Numeric input unavailable for this geometry",
       "height": "Height",
-      "nofeature": "No active feature",
+      "nofeatureormultiple": "",
       "side": "Side",
       "width": "Width",
       "windowtitle": "Numeric input"
@@ -481,6 +492,7 @@
       "loading": "Loading form..."
     },
     "redlining": {
+      "attributes": "Feature attributes",
       "buffer": "Buffer",
       "buffercompute": "Compute",
       "bufferdistance": "Distance",
@@ -488,6 +500,7 @@
       "bufferlayername": "Buffer",
       "bufferselectfeature": "Select a feature to buffer...",
       "circle": "Circle",
+      "ctrlhint": "Use Ctrl for multiselection...",
       "delete": "Delete",
       "draw": "Draw",
       "edit": "Edit",

package/static/translations/es-ES.json

@@ -24,6 +24,7 @@
         "MapExport3D": "Exportar mapa",
         "MapFilter": "Filtro de mapa",
         "MapLight3D": "Luz y sombras",
+        "ObjectList": "",
         "Print": "Imprimir",
         "Reports": "Informes",
         "Settings": "Opciones",
@@ -136,7 +137,6 @@
     "draw3d": {
       "clone": "Clonar",
       "cone": "Cono",
-      "ctrlhint": "Usa Ctrl para selección múltiple...",
       "cuboid": "Cuboide",
       "cylinder": "Cilindro",
       "delete": "Eliminar",
@@ -192,6 +192,12 @@
       "takepicture": "Tomar fotografía",
       "unsavedchanged": "Hay cambios sin guardar. Quieres salir de la página sin guardar?"
     },
+    "featureattributes": {
+      "name": "",
+      "nofeatureormultiple": "",
+      "value": "",
+      "windowtitle": ""
+    },
     "featureform": {
       "feature": "Elemento",
       "noresults": "Sin resultados",
@@ -244,6 +250,7 @@
     "identify": {
       "aggregatedreport": "Informe agregado",
       "clipboard": "Copiar al portapapeles",
+      "compare": "",
       "comparing": "",
       "download": "Descargar",
       "export": "Exportar",
@@ -345,6 +352,10 @@
         "PERMISSION_DENIED": "Posición: permiso denegado"
       }
     },
+    "locationrecorder": {
+      "record": "",
+      "stop": ""
+    },
     "map": {
       "loading": "Cargando...",
       "resetrotation": "Reiniciar rotación"
@@ -436,7 +447,7 @@
       "angle": "Ángulo",
       "featureunsupported": "Entrada numérica no disponible para esta geometría",
       "height": "Altura",
-      "nofeature": "Sin elemento activo",
+      "nofeatureormultiple": "",
       "side": "Lado",
       "width": "Ancho",
       "windowtitle": "Entrada numérica"
@@ -481,6 +492,7 @@
       "loading": "Cargando formulario..."
     },
     "redlining": {
+      "attributes": "",
       "buffer": "Bufer",
       "buffercompute": "Computar",
       "bufferdistance": "Distancia",
@@ -488,6 +500,7 @@
       "bufferlayername": "Bufer",
       "bufferselectfeature": "Seleccione un elemento para almacenar en bufer",
       "circle": "Círculo",
+      "ctrlhint": "",
       "delete": "Eliminar",
       "draw": "Dibujar",
       "edit": "Editar",