From 911477c373b340ff3be89d6dc485a66a0de877ee Mon Sep 17 00:00:00 2001 From: volterra79 Date: Tue, 9 Jan 2024 11:40:15 +0100 Subject: [PATCH 01/28] Add pdf download format management --- src/app/constant.js | 6 +++++- src/app/core/layers/layer.js | 1 + src/app/core/layers/mixins/download.js | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/app/constant.js b/src/app/constant.js index cf2a9692a..0dede78e3 100644 --- a/src/app/constant.js +++ b/src/app/constant.js @@ -56,7 +56,11 @@ export const DOWNLOAD_FORMATS = { download_raster: { format: 'geotiff', url: 'geotiff' - } + }, + download_pdf: { + format: 'pdf', + url: 'pdf' + }, }; /** diff --git a/src/app/core/layers/layer.js b/src/app/core/layers/layer.js index b54934d79..64a84f50c 100644 --- a/src/app/core/layers/layer.js +++ b/src/app/core/layers/layer.js @@ -65,6 +65,7 @@ function Layer(config={}, options={}) { this.config.urls.xls = `${vectorUrl}xls/${suffixUrl}`; this.config.urls.gpx = `${vectorUrl}gpx/${suffixUrl}`; this.config.urls.gpkg = `${vectorUrl}gpkg/${suffixUrl}`; + this.config.urls.pdf = `${vectorUrl}pdf/${suffixUrl}`; //@since 3.10.0 this.config.urls.geotiff = `${rasterUrl}geotiff/${suffixUrl}`; this.config.urls.editing = `${vectorUrl}editing/${suffixUrl}`; this.config.urls.commit = `${vectorUrl}commit/${suffixUrl}`; diff --git a/src/app/core/layers/mixins/download.js b/src/app/core/layers/mixins/download.js index 51edb2a1d..f7c2df961 100644 --- a/src/app/core/layers/mixins/download.js +++ b/src/app/core/layers/mixins/download.js @@ -24,6 +24,7 @@ export default { case 'gpx': return this.getGpx({data, options}); case 'gpkg': return this.getGpkg({data, options}); case 'geotiff': return this.getGeoTIFF({ data, options }); + case 'pdf': return this.getGeoTIFF({ data, options }); } }, @@ -110,6 +111,20 @@ export default { httpMethod: "POST" }) }, + /** + * @since 3.10.0 + * Get csv layer format + * @param data + * @returns {Promise | Promise} + */ + getPdf({ data = {} } = {}) { + data.filtertoken = this.getFilterToken(); + return XHR.fileDownload({ + url: this.getUrl('pdf'), + data, + httpMethod: "POST" + }) + }, /** * Check if it has a format to download From 6e7a2bab2b20c109a780c78788d2dd76c192f004 Mon Sep 17 00:00:00 2001 From: Raruto Date: Tue, 16 Jan 2024 14:44:54 +0100 Subject: [PATCH 02/28] jsdoc --- src/app/core/layers/mixins/download.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/core/layers/mixins/download.js b/src/app/core/layers/mixins/download.js index f7c2df961..e45a1b015 100644 --- a/src/app/core/layers/mixins/download.js +++ b/src/app/core/layers/mixins/download.js @@ -112,10 +112,13 @@ export default { }) }, /** - * @since 3.10.0 * Get csv layer format + * * @param data + * * @returns {Promise | Promise} + * + * @since 3.10.0 */ getPdf({ data = {} } = {}) { data.filtertoken = this.getFilterToken(); From 0ac49efe225aaa9cac5addef41f20a73615b46b0 Mon Sep 17 00:00:00 2001 From: Francesco Boccacci Date: Tue, 16 Jan 2024 14:47:28 +0100 Subject: [PATCH 03/28] Update src/app/core/layers/mixins/download.js Fix wrong method Co-authored-by: Raruto --- src/app/core/layers/mixins/download.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/layers/mixins/download.js b/src/app/core/layers/mixins/download.js index e45a1b015..c5a6890ff 100644 --- a/src/app/core/layers/mixins/download.js +++ b/src/app/core/layers/mixins/download.js @@ -24,7 +24,7 @@ export default { case 'gpx': return this.getGpx({data, options}); case 'gpkg': return this.getGpkg({data, options}); case 'geotiff': return this.getGeoTIFF({ data, options }); - case 'pdf': return this.getGeoTIFF({ data, options }); + case 'pdf': return this.getPdf({ data, options }); } }, From 74a4b5c4784d1a4429ab3be9b57bd1aa27ce8a54 Mon Sep 17 00:00:00 2001 From: volterra79 Date: Mon, 29 Jan 2024 09:43:00 +0100 Subject: [PATCH 04/28] Clean code --- src/app/gui/queryresults/vue/queryresults.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/gui/queryresults/vue/queryresults.js b/src/app/gui/queryresults/vue/queryresults.js index a246181d7..6d52a7b1f 100644 --- a/src/app/gui/queryresults/vue/queryresults.js +++ b/src/app/gui/queryresults/vue/queryresults.js @@ -1,7 +1,7 @@ import * as vueComponentOptions from 'components/QueryResults.vue'; -const { base, inherit } = require('utils'); -const Component = require('gui/component/component'); +const { base, inherit } = require('utils'); +const Component = require('gui/component/component'); const QueryResultsService = require('gui/queryresults/queryresultsservice'); const InternalComponent = Vue.extend(vueComponentOptions); @@ -19,11 +19,15 @@ function QueryResultsComponent(options={}) { }; this.getElement = function() { - if (this.internalComponent) return this.internalComponent.$el; + if (this.internalComponent) { + return this.internalComponent.$el; + } }; this._service.onafter('setLayersData', async () => { - !this.internalComponent && this.setInternalComponent(); + if (!this.internalComponent) { + this.setInternalComponent(); + } await this.internalComponent.$nextTick(); }); From b530a38589cda4057017a03cdab22f1682b7421c Mon Sep 17 00:00:00 2001 From: volterra79 Date: Mon, 29 Jan 2024 10:36:14 +0100 Subject: [PATCH 05/28] Clean code --- src/components/QueryResults.vue | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/components/QueryResults.vue b/src/components/QueryResults.vue index b977052a9..9a482c475 100644 --- a/src/components/QueryResults.vue +++ b/src/components/QueryResults.vue @@ -60,19 +60,19 @@ - + Date: Mon, 29 Jan 2024 10:51:37 +0100 Subject: [PATCH 06/28] Add getLayerDownloads to filter download formats enable of layer level --- src/components/QueryResults.vue | 49 +++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/src/components/QueryResults.vue b/src/components/QueryResults.vue index 9a482c475..42bc1e770 100644 --- a/src/components/QueryResults.vue +++ b/src/components/QueryResults.vue @@ -45,7 +45,7 @@ -