From bb7d8eb378a55f2c025775b2ec7a79a23abe3cdd Mon Sep 17 00:00:00 2001 From: frankporras Date: Tue, 3 Sep 2024 16:13:27 +0200 Subject: [PATCH] - Coverage section reformatted - Keywords section converted in linked elements --- src/models/dataset.ts | 62 ++++++++++++++++--- .../dataset-detail.component.ts | 8 +++ .../dataset-detail.component.vue | 25 +++++++- 3 files changed, 83 insertions(+), 12 deletions(-) diff --git a/src/models/dataset.ts b/src/models/dataset.ts index 16e5271..9e38775 100644 --- a/src/models/dataset.ts +++ b/src/models/dataset.ts @@ -235,17 +235,31 @@ export class DbDataset { const yMax = this.coverage.y_max; // const elevationAbsolut = this.coverage.elevation_absolut; + // let geoLocation = + // "- SOUTH-BOUND LATITUDE: " + + // yMin + + // "\n" + + // "- WEST-BOUND LONGITUDE: " + + // xMin + + // "\n" + + // "- NORTH-BOUND LATITUDE: " + + // yMax + + // "\n" + + // "- EAST-BOUND LONGITUDE: " + + // xMax; + let geoLocation = - "* SOUTH-BOUND LATITUDE: " + + // "- SOUTH-BOUND LATITUDE: " + + "- South-bound Latitude: " + yMin + "\n" + - "* WEST-BOUND LONGITUDE: " + + "- West-bound Longitude: " + xMin + "\n" + - "* NORTH-BOUND LATITUDE: " + + "- North-bound Latitude: " + yMax + "\n" + - "* EAST-BOUND LONGITUDE: " + + "- East-bound Longitude: " + xMax; // geoLocation += elevationAbsolut != null ? ` * ELEVATION ABSOLUT: ${elevationAbsolut}\n` : ""; @@ -254,31 +268,59 @@ export class DbDataset { let elevation = ""; if (this.coverage.elevation_max != null && this.coverage.elevation_min != null) { - elevation += "\n* ELEVATION MIN: " + this.coverage.elevation_min + " *\nELEVATION MAX: " + this.coverage.elevation_max; + // elevation += "\n- ELEVATION MIN: " + this.coverage.elevation_min + " \n- ELEVATION MAX: " + this.coverage.elevation_max; + elevation += "\n- Elevation Min.: " + this.coverage.elevation_min + " m\n- Elevation Max.: " + this.coverage.elevation_max + " m"; } if (this.coverage.elevation_absolut != null) { - elevation += "\n* ELEVATION ABSOLUT: " + this.coverage.elevation_absolut; + elevation += "\n- Elevation Absolut: " + this.coverage.elevation_absolut + " m"; } if (elevation != "") geoLocation += elevation; let depth = ""; if (this.coverage.depth_max != null && this.coverage.depth_min != null) { - depth += "\n* DEPTH MIN: " + this.coverage.depth_min + "\n* DEPTH MAX: " + this.coverage.depth_max; + depth += "\n- Depth Min.: " + this.coverage.depth_min + " m\n- Depth Max.: " + this.coverage.depth_max + " m"; } if (this.coverage.elevation_absolut != null) { - depth += "\n* DEPTH ABSOLUT: " + this.coverage.depth_absolut; + depth += "\n- Depth Absolut: " + this.coverage.depth_absolut + " m"; } if (depth != "") geoLocation += depth; let time = ""; if (this.coverage.time_max != null && this.coverage.time_min != null) { - time += "\n* TIME MIN: " + this.coverage.time_min + "\n* TIME MAX: " + this.coverage.time_max; + time += "\n* Time Min.: " + this.coverage.time_min + "\n* Time Max.: " + this.coverage.time_max; } if (this.coverage.time_absolut != null) { - time += "\n* TIME ABSOLUT: " + this.coverage.time_absolut; + time += "\n* Time Absolut: " + this.coverage.time_absolut; } if (time != "") geoLocation += time; + // let elevation = ""; + // if (this.coverage.elevation_max != null && this.coverage.elevation_min != null) { + // elevation += "\n* ELEVATION MIN: " + this.coverage.elevation_min + " \n* ELEVATION MAX: " + this.coverage.elevation_max; + // } + // if (this.coverage.elevation_absolut != null) { + // elevation += "\n* ELEVATION ABSOLUT: " + this.coverage.elevation_absolut; + // } + // if (elevation != "") geoLocation += elevation; + + // let depth = ""; + // if (this.coverage.depth_max != null && this.coverage.depth_min != null) { + // depth += "\n* DEPTH MIN: " + this.coverage.depth_min + "\n* DEPTH MAX: " + this.coverage.depth_max; + // } + // if (this.coverage.elevation_absolut != null) { + // depth += "\n* DEPTH ABSOLUT: " + this.coverage.depth_absolut; + // } + // if (depth != "") geoLocation += depth; + + // let time = ""; + // if (this.coverage.time_max != null && this.coverage.time_min != null) { + // time += "\n* TIME MIN: " + this.coverage.time_min + "\n* TIME MAX: " + this.coverage.time_max; + // } + // if (this.coverage.time_absolut != null) { + // time += "\n* TIME ABSOLUT: " + this.coverage.time_absolut; + // } + // if (time != "") geoLocation += time; + return geoLocation; } else { return ""; diff --git a/src/views/dataset-detail.component/dataset-detail.component.ts b/src/views/dataset-detail.component/dataset-detail.component.ts index 9b35e58..0a04e1a 100644 --- a/src/views/dataset-detail.component/dataset-detail.component.ts +++ b/src/views/dataset-detail.component/dataset-detail.component.ts @@ -156,6 +156,14 @@ export default class DatasetDetailComponent extends Vue { // return moment(date).format("YYYY"); } + public getLanguage(language: string): string { + if (language === "de") { + return "Deutsch" + } else { + return "English" + } + } + public getCitation(): string { let citation = this.dataset.authors .map((u) => { diff --git a/src/views/dataset-detail.component/dataset-detail.component.vue b/src/views/dataset-detail.component/dataset-detail.component.vue index 0a94183..9818861 100644 --- a/src/views/dataset-detail.component/dataset-detail.component.vue +++ b/src/views/dataset-detail.component/dataset-detail.component.vue @@ -195,7 +195,7 @@

-

-
+ +
+
+

Schlüsselwörter/Keywords

+

+ + + {{ subject.value }} + + + , + +

+

-

+
+ + +

Erstellungsjahr/Year

@@ -224,7 +245,7 @@

Sprache/Language

- {{ dataset.language }} + {{ getLanguage(dataset.language) }}