@igo2/geo 21.0.0-next.11 → 21.0.0-next.12

package/fesm2022/igo2-geo.mjs

@@ -15314,9 +15314,9 @@ function detectFileEPSG(options) {
                 const text = reader.result;
                 const lines = text.split('\n');
                 for (let line = 0; line <= nbLines; line++) {
-                    const epsg = lines[line].match(/EPSG:\d{0,6}/gm);
+                    const epsg = lines[line].match(/EPSG:{1,2}\d{1,6}/gm);
                     if (epsg !== null && epsg.length) {
-                        resolve(epsg[0]);
+                        resolve(epsg[0].replace(/::/g, ':'));
                         break;
                     }
                     else {
@@ -29243,9 +29243,9 @@ class ExportService {
     httpClient = inject(HttpClient);
     tableDataService = inject(TableDataService);
     static ogreFormats = {
-        GML: 'gml',
-        GPX: 'gpx',
-        KML: 'kml',
+        GML: 'GML',
+        GPX: 'GPX',
+        KML: 'KML',
         Shapefile: 'ESRI Shapefile',
         CSV: 'CSV',
         /** @deprecated use CSV */
@@ -29330,7 +29330,7 @@ class ExportService {
                     }
                     return;
                 }
-                this.exportWithOgre(olFeatures, options, title, projectionIn, projectionOut).subscribe({
+                this.exportWithOgre(olFeatures, options, title, projectionIn, projectionOut)?.subscribe({
                     complete: () => observer.complete(),
                     error: (error) => observer.error(error)
                 });
@@ -29424,47 +29424,63 @@ class ExportService {
         }
     }
     exportWithOgre(olFeatures, { format, csvSeparator = undefined }, title, projectionIn, projectionOut) {
-        const featuresText = new olformat.GeoJSON().writeFeatures(olFeatures, {
+        if (!format) {
+            return;
+        }
+        const features = new olformat.GeoJSON().writeFeaturesObject(olFeatures, {
             dataProjection: projectionOut,
             featureProjection: projectionIn
         });
-        const sizeError = this.checkOgrePayloadSize(featuresText);
+        const sizeError = this.checkOgrePayloadSize(JSON.stringify(features));
         if (sizeError)
             return sizeError;
         const url = `${this.ogreUrl}/convertJson`;
-        const formData = new FormData();
-        formData.append('json', featuresText);
-        let outputName = format === 'Shapefile'
-            ? `${title}.zip`
-            : `${title}.${format.toLowerCase()}`;
+        let outputName = title;
         let ogreFormat = ExportService.ogreFormats[format];
+        let params = new HttpParams();
         if (isCsvExport(format)) {
-            outputName = `${title}.csv`;
+            outputName = title;
             if (format === 'CSVcomma' || format === 'CSVsemicolon') {
                 ogreFormat = 'CSV';
             }
-            formData.append('lco', `SEPARATOR=${csvSeparator}`);
-            if (format === 'CSVsemicolon') {
-                formData.append('lco', `SEPARATOR=${csvSeparator}`);
-            }
+            params = params.append('lco', `SEPARATOR=${csvSeparator}`);
         }
-        formData.append('outputName', this.formatFilename(outputName));
-        formData.append('format', ogreFormat);
-        formData.append('forceUTF8', 'true');
+        params = params
+            .set('name', this.formatFilename(outputName))
+            .set('format', ogreFormat)
+            .set('forceUTF8', 'true');
         return this.httpClient
-            .post(url, formData, {
-            responseType: 'blob'
+            .post(url, features, {
+            params,
+            responseType: 'blob',
+            observe: 'response'
         })
-            .pipe(tap((value) => {
-            downloadBlob(value, outputName);
+            .pipe(tap((response) => {
+            if (!response.body) {
+                return;
+            }
+            const filename = this.getFileName(response.headers, outputName, format);
+            downloadBlob(response.body, filename);
         }));
     }
+    getFileName(headers, outputName, format) {
+        const contentDisposition = headers.get('content-disposition');
+        const filenameMatch = contentDisposition?.match(/filename="?([^";\n]+)"?/);
+        if (filenameMatch?.[1]) {
+            return filenameMatch[1];
+        }
+        let extension = format.toLowerCase();
+        if (format === 'Shapefile') {
+            extension = 'zip';
+        }
+        return `${outputName}.${extension}`;
+    }
     formatFilename(name) {
         return name
             .replaceAll(' ', '_')
             .normalize('NFD')
             .replace(/[\u0300-\u036f]/g, '')
-            .replace(/’/g, "'");
+            .replace(/[^a-zA-Z0-9_-]/g, '');
     }
     nothingToExport(olFeatures, format) {
         if (olFeatures.length === 0) {
@@ -29598,12 +29614,12 @@ class ExportService {
         return geomTypes;
     }
     /**
-     * Checks if the given payload exceeds the OGRE maximum allowed size (2MB).
+     * Checks if the given payload exceeds the OGRE maximum allowed size (50MB).
      * @param payload The GeoJSON payload as a string.
      * @returns An Observable that throws an error if the payload is too large, or undefined if the size is acceptable.
      */
     checkOgrePayloadSize(payload) {
-        const OGRE_MAX_SIZE = 2 * 1024 * 1024; // 2MB
+        const OGRE_MAX_SIZE = 50 * 1024 * 1024; // 50MB
         const byteLength = new TextEncoder().encode(payload).length;
         if (byteLength > OGRE_MAX_SIZE) {
             const error = new Error();
@@ -30387,10 +30403,10 @@ class ImportExportComponent {
             }
             if (!isCSV || !data.combineLayers) {
                 geomTypes.forEach((geomType) => {
-                    if (geomType.type) {
-                        fileName += geomType.type;
-                    }
-                    this.handleExport(geomType.features, data, fileName);
+                    const formattedFilename = geomType.type
+                        ? `${fileName}_${geomType.type}`
+                        : fileName;
+                    this.handleExport(geomType.features, data, formattedFilename);
                 });
             }
             this.loading$.next(false);