qwc2 2026.8.13 → 2026.8.14

package/components/BookmarkPanel.js

@@ -105,7 +105,8 @@ var BookmarkPanel = /*#__PURE__*/function (_React$Component) {
           /* eslint-disable-next-line */
           alert(_this.props.translations.savefailed);
           _this.setState({
-            busy: false
+            busy: false,
+            rename: false
           });
         } else {
           _this.props.bookmarkIface.getList(function (bookmarks) {
@@ -158,7 +159,7 @@ var BookmarkPanel = /*#__PURE__*/function (_React$Component) {
       var hasPublicBookmarksCap = ConfigUtils.getConfigProp("capabilities", null, []).includes("public_bookmarks");
       var currentBookmark = this.state.currentBookmark;
       var buttonsDisabled = !currentBookmark || this.state.busy;
-      var updatable = currentBookmark === null || currentBookmark === void 0 ? void 0 : currentBookmark.own;
+      var updatable = (currentBookmark === null || currentBookmark === void 0 ? void 0 : currentBookmark.own) && !this.state.rename;
       return /*#__PURE__*/React.createElement("div", {
         className: "bookmark-body",
         role: "body"

package/components/IdentifyViewer.js

@@ -883,6 +883,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
           fields: Object.values(fields),
           hideIdColumn: true,
           highlightFeatures: _this.setHighlightedFeatures,
+          renderField: _this.renderTableField,
           selectionChanged: function selectionChanged(sel) {
             return _this.setState(function (state) {
               return {
@@ -893,6 +894,9 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         }) : null);
       }));
     });
+    _defineProperty(_this, "renderTableField", function (feature, field) {
+      return _this.attribValue(feature.properties[field.name], field.name, feature.layername, feature);
+    });
     _defineProperty(_this, "tableAction", function (layerid, action) {
       if (action === "Export") {
         var features = isEmpty(_this.state.tableSelection[layerid]) ? _this.state.resultTree[layerid] : Object.values(_this.state.tableSelection[layerid]);

package/components/ImportLayer.js

@@ -1,15 +1,4 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
-function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _regeneratorKeys(e) { var n = Object(e), r = []; for (var t in n) r.unshift(t); return function e() { for (; r.length;) if ((t = r.pop()) in n) return e.value = t, e.done = !1, e; return e.done = !0, e; }; }
-function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
-function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
-function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
-function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -37,17 +26,14 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import React from 'react';
 import { connect } from 'react-redux';
 import axios from 'axios';
-import isEmpty from 'lodash.isempty';
-import Proj4js from 'proj4';
 import PropTypes from 'prop-types';
 import { addLayer, addLayerFeatures } from '../actions/layers';
 import EditableSelect from '../components/widgets/EditableSelect';
 import ConfigUtils from '../utils/ConfigUtils';
-import CoordinatesUtils from '../utils/CoordinatesUtils';
+import FileImportUtils from '../utils/FileImportUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MiscUtils from '../utils/MiscUtils';
 import ServiceLayerUtils from '../utils/ServiceLayerUtils';
-import VectorLayerUtils from '../utils/VectorLayerUtils';
 import FileSelector from './widgets/FileSelector';
 import LayerCatalogWidget from './widgets/LayerCatalogWidget';
 import Spinner from './widgets/Spinner';
@@ -245,385 +231,13 @@ var ImportLayer = /*#__PURE__*/function (_React$Component) {
       _this.setState({
         addingLayer: true
       });
-      var file = _this.state.file;
-      if (file.name.toLowerCase().endsWith(".pdf")) {
-        _this.addGeoPDFLayer(file);
-      } else if (file.name.toLowerCase().endsWith(".zip")) {
-        _this.addSHPLayer(file);
-      } else if (file.name.toLowerCase().endsWith(".kmz")) {
-        _this.addKMZLayer(file);
-      } else {
-        var reader = new FileReader();
-        reader.onload = function (ev) {
-          if (file.name.toLowerCase().endsWith(".kml")) {
-            _this.addKMLLayer(file.name, ev.target.result);
-          } else if (file.name.toLowerCase().endsWith(".geojson") || file.name.toLowerCase().endsWith(".json")) {
-            var data = {};
-            try {
-              data = JSON.parse(ev.target.result);
-              _this.addGeoJSONLayer(file.name, data);
-            } catch (_unused) {
-              /* Pass */
-            }
-          } else if (file.name.toLowerCase().endsWith(".pdf")) {
-            _this.addGeoPDFLayer(file.name, ev.target.result);
-          } else {
-            /* eslint-disable-next-line */
-            alert(LocaleUtils.tr("importlayer.unsupportedfile"));
-          }
-          _this.setState({
-            file: null,
-            addingLayer: false
-          });
-        };
-        reader.readAsText(_this.state.file);
-      }
-    });
-    _defineProperty(_this, "addKMLLayer", function (filename, data) {
-      _this.addGeoJSONLayer(filename, {
-        features: VectorLayerUtils.kmlToGeoJSON(data)
-      });
-    });
-    _defineProperty(_this, "addKMZLayer", /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(file) {
-        var _yield$import, load, _yield$import2, ZipLoader, fileMap, fileName, decoder, _t, _t2;
-        return _regenerator().w(function (_context) {
-          while (1) switch (_context.n) {
-            case 0:
-              _context.n = 1;
-              return import('@loaders.gl/core');
-            case 1:
-              _yield$import = _context.v;
-              load = _yield$import.load;
-              _context.n = 2;
-              return import('@loaders.gl/zip');
-            case 2:
-              _yield$import2 = _context.v;
-              ZipLoader = _yield$import2.ZipLoader;
-              _context.n = 3;
-              return load(file, ZipLoader);
-            case 3:
-              fileMap = _context.v;
-              _t = _regeneratorKeys(fileMap);
-            case 4:
-              if ((_t2 = _t()).done) {
-                _context.n = 6;
-                break;
-              }
-              fileName = _t2.value;
-              if (!(fileName === "doc.kml")) {
-                _context.n = 5;
-                break;
-              }
-              decoder = new TextDecoder();
-              _this.addKMLLayer(file.name, decoder.decode(fileMap[fileName]));
-              return _context.a(3, 6);
-            case 5:
-              _context.n = 4;
-              break;
-            case 6:
-              _this.setState({
-                file: null,
-                addingLayer: false
-              });
-            case 7:
-              return _context.a(2);
-          }
-        }, _callee);
-      }));
-      return function (_x) {
-        return _ref5.apply(this, arguments);
-      };
-    }());
-    _defineProperty(_this, "addGeoJSONLayer", function (filename, data) {
-      if (!data.features && data.type === "Feature") {
-        data = {
-          type: "FeatureCollection",
-          features: [data],
-          crs: data.crs
-        };
-      }
-      if (!isEmpty(data.features)) {
-        var defaultCrs = "EPSG:4326";
-        if (data.crs && data.crs.properties && data.crs.properties.name) {
-          // Extract CRS from FeatureCollection crs
-          defaultCrs = CoordinatesUtils.fromOgcUrnCrs(data.crs.properties.name);
-        }
-        var features = data.features.map(function (feature) {
-          var crs = defaultCrs;
-          if (feature.crs && feature.crs.properties && feature.crs.properties.name) {
-            crs = CoordinatesUtils.fromOgcUrnCrs(feature.crs.properties.name);
-          } else if (typeof feature.crs === "string") {
-            crs = feature.crs;
-          }
-          if (feature.geometry && feature.geometry.coordinates) {
-            feature.geometry.coordinates = feature.geometry.coordinates.map(VectorLayerUtils.convert3dto2d);
-          }
-          return _objectSpread(_objectSpread({}, feature), {}, {
-            crs: crs
-          });
-        });
-        _this.props.addLayerFeatures({
-          name: filename,
-          title: filename.replace(/\.[^/.]+$/, ""),
-          zoomToExtent: true
-        }, features, true);
-      } else {
-        // eslint-disable-next-line
-        alert(LocaleUtils.tr("importlayer.nofeatures"));
-      }
-    });
-    _defineProperty(_this, "addGeoPDFLayer", function (file) {
-      var reader = new FileReader();
-      reader.onload = function (ev) {
-        var pdfText = atob(ev.target.result.slice(28));
-        /* FIXME: This is a very ugly way to extract PDF objects */
-        var GPTS = pdfText.match(/\/GPTS\s+\[([^\]]+)\]/);
-        var LPTS = pdfText.match(/\/LPTS\s+\[([^\]]+)\]/);
-        var Viewport = pdfText.match(/<<([^>]+\/Type\s+\/Viewport[^>]+)>>/);
-        var EPSG = pdfText.match(/\/EPSG\s*(\d+)/);
-        if (!GPTS || !LPTS || !Viewport || !EPSG) {
-          /* eslint-disable-next-line */
-          alert(LocaleUtils.tr("importlayer.notgeopdf"));
-          _this.setState({
-            file: null,
-            addingLayer: false
-          });
-          return;
-        }
-        var pairs = function pairs(res, value, idx, array) {
-          return idx % 2 === 0 ? [].concat(_toConsumableArray(res), [array.slice(idx, idx + 2)]) : res;
-        };
-        var gpts = GPTS[1].split(/\s+/).filter(Boolean).map(Number).reduce(pairs, []).map(function (e) {
-          return e.reverse();
-        }); // lat-lon => lon-lat
-        var lpts = LPTS[1].split(/\s+/).filter(Boolean).map(Number).reduce(pairs, []);
-        var viewport = Viewport[1].match(/\/BBox\s+\[([^\]]+)\]/)[1].split(/\s+/).filter(Boolean).map(Number);
-        var epsg = EPSG[1];
-        var projDef = Proj4js.defs('EPSG:' + epsg);
-        if (!projDef) {
-          /* eslint-disable-next-line */
-          alert(LocaleUtils.tr("importlayer.unknownproj", 'EPSG:' + epsg));
-          _this.setState({
-            file: null,
-            addingLayer: false
-          });
-          return;
-        }
-        // Construct geog CS
-        var geogCs = {
-          projName: 'longlat',
-          ellps: projDef.ellps,
-          datum_params: projDef.datum_params,
-          no_defs: projDef.no_defs
-        };
-
-        // Compute the georeferenced area
-        // Note: this is a simplistic implementation, assuming that the frame is rectangular and not skewed
-        var getCornerIdx = function getCornerIdx(x, y) {
-          return lpts.findIndex(function (entry) {
-            return Math.round(entry[0]) === x && Math.round(entry[1]) === y;
-          });
-        };
-        var idxBL = getCornerIdx(0, 0);
-        var idxTR = getCornerIdx(1, 1);
-        var computeCorner = function computeCorner(idx) {
-          return {
-            pixel: [viewport[0] * (1 - lpts[idx][0]) + viewport[2] * lpts[idx][0], viewport[1] * (1 - lpts[idx][1]) + viewport[3] * lpts[idx][1]],
-            // eslint-disable-next-line
-            coo: Proj4js(geogCs, _this.props.mapCrs, gpts[idx])
-          };
-        };
-        var bl = computeCorner(idxBL);
-        var tr = computeCorner(idxTR);
-        var geoextent = [bl.coo[0], bl.coo[1], tr.coo[0], tr.coo[1]];
-        var imgextent = [bl.pixel[0], bl.pixel[1], tr.pixel[0], tr.pixel[1]];
-        import('pdfjs-dist').then(function (pdfjsLib) {
-          pdfjsLib.GlobalWorkerOptions.workerSrc = new URL('pdfjs-dist/build/pdf.worker.min.mjs', import.meta.url).toString();
-          pdfjsLib.getDocument(ev.target.result).promise.then(function (pdf) {
-            pdf.getPage(1).then(function (page) {
-              var pageViewport = page.getViewport({
-                scale: 1
-              });
-              var canvas = document.createElement('canvas');
-              canvas.width = imgextent[2] - imgextent[0];
-              canvas.height = imgextent[3] - imgextent[1];
-              var context = canvas.getContext('2d');
-              context.translate(-imgextent[0], -(pageViewport.height - imgextent[3]));
-              page.render({
-                canvasContext: context,
-                viewport: pageViewport
-              }).promise.then(function () {
-                _this.props.addLayer({
-                  type: "image",
-                  name: file.name,
-                  title: file.name,
-                  url: canvas.toDataURL(),
-                  projection: _this.props.mapCrs,
-                  imageExtent: geoextent
-                });
-                _this.setState({
-                  file: null,
-                  addingLayer: false
-                });
-              });
-            });
-          });
-        })["catch"](function () {
-          /* eslint-disable-next-line */
-          console.warn("pdfjs import failed");
-          _this.setState({
-            file: null,
-            addingLayer: false
-          });
+      FileImportUtils.importFile(_this.state.file, _this.props.mapCrs, _this.props.addLayer, _this.props.addLayerFeatures)["finally"](function () {
+        _this.setState({
+          file: null,
+          addingLayer: false
         });
-      };
-      reader.readAsDataURL(file);
+      });
     });
-    _defineProperty(_this, "addSHPLayer", /*#__PURE__*/function () {
-      var _ref6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(file) {
-        var _yield$import3, _BrowserFileSystem, load, _yield$import4, Proj4Projection, _yield$import5, ShapefileLoader, _yield$import6, ZipLoader, mimeTypes, projections, fileMap, EXTENSIONS, files, fileName, name, ext, fileList, blob, f, list, fileSystem, fetch, filename, data, _t3, _t4, _t5, _t6;
-        return _regenerator().w(function (_context2) {
-          while (1) switch (_context2.p = _context2.n) {
-            case 0:
-              _context2.n = 1;
-              return import('@loaders.gl/core');
-            case 1:
-              _yield$import3 = _context2.v;
-              _BrowserFileSystem = _yield$import3._BrowserFileSystem;
-              load = _yield$import3.load;
-              _context2.n = 2;
-              return import('@math.gl/proj4');
-            case 2:
-              _yield$import4 = _context2.v;
-              Proj4Projection = _yield$import4.Proj4Projection;
-              _context2.n = 3;
-              return import('@loaders.gl/shapefile');
-            case 3:
-              _yield$import5 = _context2.v;
-              ShapefileLoader = _yield$import5.ShapefileLoader;
-              _context2.n = 4;
-              return import('@loaders.gl/zip');
-            case 4:
-              _yield$import6 = _context2.v;
-              ZipLoader = _yield$import6.ZipLoader;
-              // Import SHP layer from ZIP. Zip must contain all the required files : shp, dbf, shx, prj, cpg
-              mimeTypes = ['application/zip', 'application/zip-compressed', 'application/x-zip-compressed'];
-              if (!mimeTypes.includes(file.type)) {
-                _context2.n = 16;
-                break;
-              }
-              projections = ConfigUtils.getConfigProp("projections") || [];
-              if (projections) {
-                Proj4Projection.defineProjectionAliases(projections);
-              }
-              _context2.n = 5;
-              return load(file, ZipLoader);
-            case 5:
-              fileMap = _context2.v;
-              EXTENSIONS = ['shp', 'shx', 'dbf', 'cpg', 'prj'];
-              files = {}; // Iterate through all the files in ZIP to get a list of (SHP + sidecar files) by filename
-              for (fileName in fileMap) {
-                if (Object.hasOwn(fileMap, fileName)) {
-                  name = fileName.split('.')[0];
-                  ext = fileName.split('.').pop();
-                  fileList = files[name] || [];
-                  if (EXTENSIONS.includes(ext)) {
-                    // Create Blob and File from arrayBuffer loaded by ZipLoader
-                    blob = new Blob([fileMap[fileName]]);
-                    fileList.push(new File([blob], fileName));
-                  }
-                  files[name] = fileList;
-                }
-              }
-              // Load each SHP with sidecar files as GeoJSON features
-              _t3 = _regeneratorKeys(files);
-            case 6:
-              if ((_t4 = _t3()).done) {
-                _context2.n = 15;
-                break;
-              }
-              f = _t4.value;
-              if (!Object.hasOwn(files, f)) {
-                _context2.n = 14;
-                break;
-              }
-              list = files[f];
-              fileSystem = new _BrowserFileSystem(list);
-              fetch = fileSystem.fetch.bind(fileSystem.fetch);
-              filename = "".concat(f, ".shp"); // Load SHP and reproject to mapCrs
-              data = null;
-              _context2.p = 7;
-              _context2.n = 8;
-              return load(filename, ShapefileLoader, {
-                fetch: fetch,
-                shapefile: {
-                  shape: 'geojson-table'
-                },
-                gis: {
-                  format: 'geojson',
-                  reproject: true,
-                  _targetCrs: _this.props.mapCrs
-                }
-              });
-            case 8:
-              data = _context2.v;
-              _context2.n = 13;
-              break;
-            case 9:
-              _context2.p = 9;
-              _t5 = _context2.v;
-              _context2.p = 10;
-              _context2.n = 11;
-              return load(filename, ShapefileLoader, {
-                fetch: fetch,
-                shapefile: {
-                  shape: 'geojson-table'
-                },
-                gis: {
-                  format: 'geojson',
-                  reproject: false,
-                  _targetCrs: _this.props.mapCrs
-                }
-              });
-            case 11:
-              data = _context2.v;
-              /* eslint-disable-next-line */
-              alert(LocaleUtils.tr("importlayer.shpreprojectionerror"));
-              _context2.n = 13;
-              break;
-            case 12:
-              _context2.p = 12;
-              _t6 = _context2.v;
-              data = null;
-            case 13:
-              if (data) {
-                data.crs = {
-                  type: "name",
-                  properties: {
-                    name: CoordinatesUtils.toOgcUrnCrs(_this.props.mapCrs)
-                  }
-                };
-                // Add data as GeoJSON layer
-                _this.addGeoJSONLayer(f, data);
-              }
-            case 14:
-              _context2.n = 6;
-              break;
-            case 15:
-              _this.setState({
-                file: null,
-                addingLayer: false
-              });
-            case 16:
-              return _context2.a(2);
-          }
-        }, _callee2, null, [[10, 12], [7, 9]]);
-      }));
-      return function (_x2) {
-        return _ref6.apply(this, arguments);
-      };
-    }());
     return _this;
   }
   _inherits(ImportLayer, _React$Component);

package/components/widgets/MenuButton.js

@@ -28,13 +28,15 @@ var MenuButton = /*#__PURE__*/function (_React$Component) {
       popup: false,
       selected: null
     });
-    _defineProperty(_this, "onMenuClicked", function () {
+    _defineProperty(_this, "onMenuClicked", function (ev) {
       if (!_this.props.disabled) {
-        _this.setState(function (state) {
-          return {
-            popup: !state.popup
-          };
-        });
+        if (!_this.state.selected || !ev.currentTarget.querySelector('.menubutton-button-content').contains(ev.target)) {
+          _this.setState(function (state) {
+            return {
+              popup: !state.popup
+            };
+          });
+        }
       }
     });
     _defineProperty(_this, "onButtonClicked", function () {
@@ -44,8 +46,6 @@ var MenuButton = /*#__PURE__*/function (_React$Component) {
         _this.setState({
           popup: false
         });
-      } else {
-        _this.onMenuClicked();
       }
     });
     _defineProperty(_this, "onChildClicked", function (ev, child) {
@@ -111,6 +111,7 @@ var MenuButton = /*#__PURE__*/function (_React$Component) {
         className: classes
       }, /*#__PURE__*/React.createElement("div", {
         className: buttonClassnames,
+        onClick: this.onMenuClicked,
         onKeyDown: MiscUtils.checkKeyActivate,
         ref: function ref(el) {
           _this2.el = el;
@@ -120,8 +121,7 @@ var MenuButton = /*#__PURE__*/function (_React$Component) {
         className: "menubutton-button-content",
         onClick: this.onButtonClicked
       }, buttonContents), /*#__PURE__*/React.createElement("span", {
-        className: "menubotton-button-arrow",
-        onClick: this.onMenuClicked
+        className: "menubotton-button-arrow"
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "chevron-down"
       })), this.props.tooltip ? /*#__PURE__*/React.createElement("span", {

package/icons/public.svg

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
+
+<svg
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 24 24"
+   enable-background="new 0 0 1000 1000"
+   xml:space="preserve"
+   id="svg10"
+   sodipodi:docname="public.svg"
+   width="24"
+   height="24"
+   inkscape:version="1.4.4 (dcaf3e7d9e, 2026-05-05)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
+   id="defs14" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1172"
+   id="namedview12"
+   showgrid="true"
+   inkscape:zoom="15.104"
+   inkscape:cx="17.545021"
+   inkscape:cy="20.292638"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="g8"
+   inkscape:showpageshadow="2"
+   inkscape:pagecheckerboard="0"
+   inkscape:deskcolor="#d1d1d1"><inkscape:grid
+     type="xygrid"
+     id="grid821"
+     originx="0"
+     originy="0"
+     spacingy="1"
+     spacingx="1"
+     units="px" /></sodipodi:namedview>
+<metadata
+   id="metadata2"> Svg Vector Icons : http://www.onlinewebfonts.com/icon <rdf:RDF><cc:Work
+     rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+       rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata>
+<g
+   id="g8"
+   transform="translate(0,-976)"><path
+     id="path4"
+     style="stroke-width:0.00890515"
+     d="m 12,982.4707 c -1.447087,0 -2.6207179,1.17365 -2.6207179,2.62072 0,0.96214 0.518379,1.80295 1.2911829,2.25851 -1.2543529,0.36766 -2.3875996,1.23637 -2.8337839,2.45879 -0.2319085,-0.0991 -0.4710048,-0.18357 -0.7137728,-0.25355 0.9617368,-0.5705 1.6057828,-1.61736 1.6065213,-2.81675 0,-1.80885 -1.4659728,-3.27483 -3.274832,-3.27483 -1.8088591,0 -3.274832,1.46598 -3.274832,3.27483 0,1.20267 0.6490386,2.2537 1.615044,2.82313 C 1.8004602,990.14614 0.04729618,991.7456 9.5281617e-5,993.9763 -0.00546872,994.27795 0.23322998,994.52786 0.53489228,994.53453 H 10.374303 c 0.300549,-0.007 0.540362,-0.25658 0.534796,-0.55823 -0.02179,-1.02952 -0.400043,-1.92529 -0.9971499,-2.64842 h 4.1910169 c -0.604313,0.72313 -0.990281,1.61891 -1.012066,2.64842 -0.0056,0.30163 0.233135,0.55158 0.534797,0.55823 h 9.839411 c 0.300549,-0.0109 0.540363,-0.2566 0.534797,-0.55823 -0.04732,-2.23657 -1.771795,-3.84033 -3.786192,-4.42113 0.961737,-0.57054 1.607914,-1.61741 1.608652,-2.81675 0,-1.80885 -1.468103,-3.27483 -3.276962,-3.27483 -1.808859,0 -3.274832,1.46598 -3.274832,3.27483 0,1.20261 0.649039,2.25368 1.615044,2.82313 -0.242685,0.0711 -0.483027,0.1573 -0.715903,0.25782 -0.438011,-1.23111 -1.562927,-2.10732 -2.833786,-2.4737 0.76939,-0.4564 1.284202,-1.29473 1.284792,-2.25425 0,-1.44707 -1.173631,-2.62072 -2.620718,-2.62072 z" /></g>
+</svg>

package/package.json

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