From 9e1ce5894345d9a05d77d294a62a1c00d5dabcd7 Mon Sep 17 00:00:00 2001 From: Matthieu Benoist Date: Wed, 16 Jun 2021 14:32:38 +0200 Subject: [PATCH 1/3] Complex data corrections for string array --- .../dataset-data-details/dataset-data-details.component.ts | 6 ++++++ src/app/dataset-detail/services/dataset-detail.service.ts | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/app/dataset-detail/components/dataset-data-details/dataset-data-details.component.ts b/src/app/dataset-detail/components/dataset-data-details/dataset-data-details.component.ts index 9420f99b..58e70dcb 100644 --- a/src/app/dataset-detail/components/dataset-data-details/dataset-data-details.component.ts +++ b/src/app/dataset-detail/components/dataset-data-details/dataset-data-details.component.ts @@ -22,6 +22,12 @@ export class DatasetDataDetailsComponent implements OnInit { } catch (err) { } } } + else if (Array.isArray(properties[key])) { + try { + const parsed = JSON.parse(properties[key]); + properties[key] = parsed; + } catch (err) { } + } } this._properties = properties; } diff --git a/src/app/dataset-detail/services/dataset-detail.service.ts b/src/app/dataset-detail/services/dataset-detail.service.ts index 684d5d71..77b82930 100644 --- a/src/app/dataset-detail/services/dataset-detail.service.ts +++ b/src/app/dataset-detail/services/dataset-detail.service.ts @@ -284,7 +284,8 @@ export class DatasetDetailService { var fieldtype = field + '_' + eval(`this._dataset.fields.types.${field}`); newDataPropertiesOrder[field] = data.properties[fieldtype] ? data.properties[fieldtype] : data.properties[field] ? data.properties[field] : data.properties[`${field}_json`] ? - data.properties[`${field}_json`] : ''; + data.properties[`${field}_json`] : data.properties[`${field}_str`] ? + data.properties[`${field}_str`] : ''; }); -- GitLab From 3a0b83f342a0184e3d90a2c771cb05ef2dae324b Mon Sep 17 00:00:00 2001 From: Matthieu Benoist Date: Wed, 16 Jun 2021 15:08:58 +0200 Subject: [PATCH 2/3] Add new rule for the geojson output format for ATMO data --- .../resource-download-item.component.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/app/dataset-detail/components/dataset-downloads/resource-download-item/resource-download-item/resource-download-item.component.ts b/src/app/dataset-detail/components/dataset-downloads/resource-download-item/resource-download-item/resource-download-item.component.ts index 289c3af0..39e3865f 100644 --- a/src/app/dataset-detail/components/dataset-downloads/resource-download-item/resource-download-item/resource-download-item.component.ts +++ b/src/app/dataset-detail/components/dataset-downloads/resource-download-item/resource-download-item/resource-download-item.component.ts @@ -152,6 +152,12 @@ export class ResourceDownloadItemComponent implements OnInit { `${this.format.mapServerType}`; const projectionAndBbox = this.getProjectionAndBbox(this.format); + if (Array.isArray(this.metadata.providers) && this.metadata.providers[0].match(/ATMO/g)) { + if (this.format.mapServerType.match(/application\/json/)) { + outputFormat = `&${this.labelFormat[this.resource.type]}=GEOJSON`; + } + } + const baseParameters = this.resource.parametersUrl ? `?${this.resource.parametersUrl}` : ''; queryableUrl += baseParameters + layer + -- GitLab From 2e983140a9589f3869427ec59d25c9401998f610 Mon Sep 17 00:00:00 2001 From: Matthieu Benoist Date: Wed, 16 Jun 2021 16:50:40 +0200 Subject: [PATCH 3/3] update version number to 2.7.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0c8a36de..cd9805d1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "webapp", - "version": "2.7.3", + "version": "2.7.4", "license": "GNU Affero General Public License v3.0", "scripts": { "ng": "ng", -- GitLab