qwc2 2025.10.29 → 2025.10.30

package/components/ImportLayer.js

@@ -483,7 +483,7 @@ var ImportLayer = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "addSHPLayer", /*#__PURE__*/function () {
       var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(file) {
-        var _yield$import3, _BrowserFileSystem, load, _yield$import4, ShapefileLoader, _yield$import5, ZipLoader, fileMap, EXTENSIONS, files, fileName, name, ext, fileList, blob, f, list, fileSystem, fetch, filename, data;
+        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;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -494,22 +494,33 @@ var ImportLayer = /*#__PURE__*/function (_React$Component) {
               _BrowserFileSystem = _yield$import3._BrowserFileSystem;
               load = _yield$import3.load;
               _context2.next = 7;
-              return import('@loaders.gl/shapefile');
+              return import('@math.gl/proj4');
             case 7:
               _yield$import4 = _context2.sent;
-              ShapefileLoader = _yield$import4.ShapefileLoader;
+              Proj4Projection = _yield$import4.Proj4Projection;
               _context2.next = 11;
-              return import('@loaders.gl/zip');
+              return import('@loaders.gl/shapefile');
             case 11:
               _yield$import5 = _context2.sent;
-              ZipLoader = _yield$import5.ZipLoader;
-              if (!(file.type === "application/zip")) {
-                _context2.next = 51;
+              ShapefileLoader = _yield$import5.ShapefileLoader;
+              _context2.next = 15;
+              return import('@loaders.gl/zip');
+            case 15:
+              _yield$import6 = _context2.sent;
+              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.next = 58;
                 break;
               }
-              _context2.next = 16;
+              projections = ConfigUtils.getConfigProp("projections") || [];
+              if (projections) {
+                Proj4Projection.defineProjectionAliases(projections);
+              }
+              _context2.next = 23;
               return load(file, ZipLoader);
-            case 16:
+            case 23:
               fileMap = _context2.sent;
               EXTENSIONS = ['shp', 'shx', 'dbf', 'cpg', 'prj'];
               files = {}; // Iterate through all the files in ZIP to get a list of (SHP + sidecar files) by filename
@@ -528,14 +539,14 @@ var ImportLayer = /*#__PURE__*/function (_React$Component) {
               }
               // Load each SHP with sidecar files as GeoJSON features
               _context2.t0 = _regeneratorRuntime().keys(files);
-            case 21:
+            case 28:
               if ((_context2.t1 = _context2.t0()).done) {
-                _context2.next = 50;
+                _context2.next = 57;
                 break;
               }
               f = _context2.t1.value;
               if (!Object.hasOwn(files, f)) {
-                _context2.next = 48;
+                _context2.next = 55;
                 break;
               }
               list = files[f];
@@ -543,8 +554,8 @@ var ImportLayer = /*#__PURE__*/function (_React$Component) {
               fetch = fileSystem.fetch.bind(fileSystem.fetch);
               filename = "".concat(f, ".shp"); // Load SHP and reproject to mapCrs
               data = null;
-              _context2.prev = 29;
-              _context2.next = 32;
+              _context2.prev = 36;
+              _context2.next = 39;
               return load(filename, ShapefileLoader, {
                 fetch: fetch,
                 shapefile: {
@@ -556,15 +567,15 @@ var ImportLayer = /*#__PURE__*/function (_React$Component) {
                   _targetCrs: _this.props.mapCrs
                 }
               });
-            case 32:
+            case 39:
               data = _context2.sent;
-              _context2.next = 47;
+              _context2.next = 54;
               break;
-            case 35:
-              _context2.prev = 35;
-              _context2.t2 = _context2["catch"](29);
-              _context2.prev = 37;
-              _context2.next = 40;
+            case 42:
+              _context2.prev = 42;
+              _context2.t2 = _context2["catch"](36);
+              _context2.prev = 44;
+              _context2.next = 47;
               return load(filename, ShapefileLoader, {
                 fetch: fetch,
                 shapefile: {
@@ -576,17 +587,17 @@ var ImportLayer = /*#__PURE__*/function (_React$Component) {
                   _targetCrs: _this.props.mapCrs
                 }
               });
-            case 40:
+            case 47:
               data = _context2.sent;
               /* eslint-disable-next-line */
               alert(LocaleUtils.tr("importlayer.shpreprojectionerror"));
-              _context2.next = 47;
+              _context2.next = 54;
               break;
-            case 44:
-              _context2.prev = 44;
-              _context2.t3 = _context2["catch"](37);
+            case 51:
+              _context2.prev = 51;
+              _context2.t3 = _context2["catch"](44);
               data = null;
-            case 47:
+            case 54:
               if (data) {
                 data.crs = {
                   type: "name",
@@ -597,19 +608,19 @@ var ImportLayer = /*#__PURE__*/function (_React$Component) {
                 // Add data as GeoJSON layer
                 _this.addGeoJSONLayer(f, data);
               }
-            case 48:
-              _context2.next = 21;
+            case 55:
+              _context2.next = 28;
               break;
-            case 50:
+            case 57:
               _this.setState({
                 file: null,
                 addingLayer: false
               });
-            case 51:
+            case 58:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, null, [[29, 35], [37, 44]]);
+        }, _callee2, null, [[36, 42], [44, 51]]);
       }));
       return function (_x2) {
         return _ref6.apply(this, arguments);

package/package.json

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

package/plugins/map/RedliningSupport.js

@@ -196,7 +196,7 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
           areaUnit: _this.props.redlining.areaUnit
         };
         MeasureUtils.updateFeatureMeasurements(feature, feature.get('shape'), _this.props.mapCrs, settings);
-      } else {
+      } else if (feature.get('measurements')) {
         feature.set('measurements', undefined);
         feature.set('segment_labels', undefined);
         feature.set('label', '');