From 4873fc5599409f4fc195e164f821656a5c71ea07 Mon Sep 17 00:00:00 2001
From: phil <phil.blav@hanji.info>
Date: Sun, 28 Apr 2024 01:08:00 +0200
Subject: [PATCH] Fix!update layer export

---
 src/app/map/models.ts                         |  9 +++----
 .../map/tree-layer/tree-layer.component.html  |  2 +-
 src/app/openapi/core/OpenAPI.ts               |  2 +-
 src/app/openapi/schemas.gen.ts                |  4 ++--
 src/app/openapi/services.gen.ts               | 24 +++++++++++++++++++
 src/app/openapi/types.gen.ts                  | 15 ++++++++++++
 6 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/src/app/map/models.ts b/src/app/map/models.ts
index 97391b6..673ffc4 100644
--- a/src/app/map/models.ts
+++ b/src/app/map/models.ts
@@ -33,7 +33,8 @@ export class PrimaryGroupNode extends Node {
     }
 
     downloadGpkg() {
-        window.open('/download/layers/gpkg/' + this.children.map(child => child.store).join(','))
+        const layers = this.children.map(child => child.store).join(',')
+        window.open(`/api/download/geodata/${layers}?format=gpkg`)
     }
 }
 
@@ -74,15 +75,15 @@ export class LayerNode extends Node {
     }
 
     downloadShapefile() {
-        window.open('/download/shapefile/' + this.store)
+        window.open(`/api/download/geodata/${this.store}?format=shapefile`)
     }
 
     downloadGpkg() {
-        window.open('/download/layers/gpkg/' + this.store)
+        window.open(`/api/download/geodata/${this.store}?format=gpkg`)
     }
 
     downloadDXF(reproject: Boolean=false) {
-        window.open('/download/layers/dxf/' + this.store + '?reproject=' + reproject)
+        window.open(`/api/download/geodata/${this.store}?format=dxf&reproject=${reproject}`)
     }
 
     downloadRawData() {
diff --git a/src/app/map/tree-layer/tree-layer.component.html b/src/app/map/tree-layer/tree-layer.component.html
index 1457702..3203f82 100644
--- a/src/app/map/tree-layer/tree-layer.component.html
+++ b/src/app/map/tree-layer/tree-layer.component.html
@@ -59,7 +59,7 @@
         </button>
         <button mat-menu-item (click)="downloadDXF(node)">
             <mat-icon>file_download</mat-icon>
-            <span>Download DXF (EPSG {{ (configService.conf | async).bsData?.geo.proj })</span>
+            <span>Download DXF (EPSG {{ (configService.conf | async).bsData?.geo.srid }})</span>
         </button>
         <button mat-menu-item (click)="downloadDXF(node, true)">
             <mat-icon>file_download</mat-icon>
diff --git a/src/app/openapi/core/OpenAPI.ts b/src/app/openapi/core/OpenAPI.ts
index 1412b70..f5d91d6 100644
--- a/src/app/openapi/core/OpenAPI.ts
+++ b/src/app/openapi/core/OpenAPI.ts
@@ -47,7 +47,7 @@ export const OpenAPI: OpenAPIConfig = {
 	PASSWORD: undefined,
 	TOKEN: undefined,
 	USERNAME: undefined,
-	VERSION: '2023.4.dev63+g52e1d21.d20240408',
+	VERSION: '0.1.dev70+g53c2e35.d20240422',
 	WITH_CREDENTIALS: false,
 	interceptors: {response: new Interceptors(),
 	},
diff --git a/src/app/openapi/schemas.gen.ts b/src/app/openapi/schemas.gen.ts
index 77081ac..e7a6aa4 100644
--- a/src/app/openapi/schemas.gen.ts
+++ b/src/app/openapi/schemas.gen.ts
@@ -515,7 +515,7 @@ export const $BootstrapData = {
         version: {
             type: 'string',
             title: 'Version',
-            default: '2023.4.dev63+g52e1d21.d20240408'
+            default: '0.1.dev70+g53c2e35.d20240422'
         },
         title: {
             type: 'string',
@@ -542,7 +542,7 @@ export const $BootstrapData = {
                 opacity: 0.4,
                 pitch: 0,
                 status: ['E', 'F', 'D'],
-                style: 'No base map',
+                style: 'osm',
                 tagKeys: ['source'],
                 tileServer: {
                     baseDir: '/home/phil/gisaf_misc/map',
diff --git a/src/app/openapi/services.gen.ts b/src/app/openapi/services.gen.ts
index e5662b6..9953689 100644
--- a/src/app/openapi/services.gen.ts
+++ b/src/app/openapi/services.gen.ts
@@ -677,6 +677,30 @@ export class DownloadService {
 });
     }
     
+    /**
+ * Download Geodata
+ * @returns unknown Successful Response
+ * @throws ApiError
+ */
+    public downloadGeodataApiDownloadGeodataStoresGet(data: $OpenApiTs['/api/download/geodata/{stores}']['get']['req']): Observable<$OpenApiTs['/api/download/geodata/{stores}']['get']['res'][200]> {
+        const { stores, format, reproject } = data;
+        return __request(OpenAPI, this.http, {
+    method: 'GET',
+    url: '/api/download/geodata/{stores}',
+    path: {
+        stores
+    },
+    query: {
+        format,
+        reproject
+    },
+    errors: {
+        404: 'Not found',
+        422: 'Validation Error'
+    }
+});
+    }
+    
     /**
  * Execute Action
  * Download the result of an action
diff --git a/src/app/openapi/types.gen.ts b/src/app/openapi/types.gen.ts
index 0a1e1e9..0d76832 100644
--- a/src/app/openapi/types.gen.ts
+++ b/src/app/openapi/types.gen.ts
@@ -962,6 +962,21 @@ export type $OpenApiTs = {
             res: {
                 /**
  * Successful Response
+ */
+                200: unknown;
+            };
+        };
+    };
+    '/api/download/geodata/{stores}': {
+        get: {
+            req: {
+                format?: string;
+                reproject?: boolean;
+                stores: string;
+            };
+            res: {
+                /**
+ * Successful Response
  */
                 200: unknown;
             };