diff --git a/package.json b/package.json index 0c8a36de71633a882bfbe19066ed24ed28205104..cd9805d130d525f5781aad607e7eafdb70fd79c1 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", 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 9420f99b0d0c7103eb69ceca620540e582f7ac81..58e70dcbd01e54ae8533ca5af79f4455f0c90ee7 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/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 289c3af093748265a3cfdc87e805f21849172e75..39e3865f1c20fc1342eade15aeb2dbf6db116c3b 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 + diff --git a/src/app/dataset-detail/services/dataset-detail.service.ts b/src/app/dataset-detail/services/dataset-detail.service.ts index 684d5d713c14adf3b763d3a71988aa5ebb0a92a9..77b82930e5e91818872c6e6a0aa8ff5d47c50b40 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`] : ''; });