Update dcat-ap-ch adapters

Author: Hofstetter Benjamin

opendata.swiss/ui/app/components/dataset-detail/model/dcat-ap-ch-v2-dataset-adapter.ts

@@ -215,9 +215,6 @@ export class DcatApChV2DatasetAdapter {
     return this.#dataset.getOdsAccrualPeriodicity;
   }
 
-
-
-
   get propertyTable() {
     const rootNode = this.#dataset.getPropertyTable;
     if (!rootNode) {

opendata.swiss/ui/app/components/dataset-detail/model/dcat-ap-ch-v2-distribution-adapter.ts

@@ -7,13 +7,15 @@ import type { TableEntry } from './table-entry';
 type EnhancedDistribution = Dataset['getDistributions'][number]
 
 
-export class DcatApChV2DistributionAdapter implements EnhancedDistribution {
+export class DcatApChV2DistributionAdapter {
   #distribution: EnhancedDistribution | undefined;
   #dataset: DcatApChV2DatasetAdapter;
 
   constructor(d: EnhancedDistribution, dataset: DcatApChV2DatasetAdapter) {
     this.#distribution = d;
     this.#dataset = dataset;
+
+    console.log('id', this.#distribution?.id);
   }
 
   /**
@@ -93,7 +95,7 @@ export class DcatApChV2DistributionAdapter implements EnhancedDistribution {
 
     // Try to parse the byte size as a number.
     // Piveau returns it as a string with dots as thousands separators which is not valid for Number()
-    const byteSizeNumber = Number(byteSizeValue.replace(/\./g, '')); // Remove dots for thousands separators
+    const byteSizeNumber = Number(byteSizeValue.replace(/\./g, '').replace(/,/g, '').replace(/\s+/g, '')); // Remove spaces for thousands separators
 
     if (isNaN(byteSizeNumber)) {
       return byteSizeValue; // Return the raw value if parsing fails
@@ -115,45 +117,166 @@ export class DcatApChV2DistributionAdapter implements EnhancedDistribution {
     return `${size % 1 === 0 ? size : size.toFixed(2)} ${units[unitIndex]}`;
   }
 
-
-
-  get getPropertyTable() {
-    return this.#distribution?.getPropertyTable || [];
-  }
-
-
+  /**
+   * Get the download URLs of the distribution.
+   *
+   * From dcat-ap-ch:
+   * Property	download URL
+   * Requirement level	Optional
+   * Cardinality	0..n
+   * URI	dcat:downloadURL
+   * Range	rdfs:Resource
+   * Usage Note
+   * - In case of a downloadable file, it is good practice to repeat the mandatory accessURL in this more specific property,
+   *   to indicate to the data user that the distribution has this extra characteristic of being downloadable. The downloadURLs
+   *   MAY thus be the same as the accessURLs but they MAY also differ.
+   */
   get downloadUrls() {
     return this.#distribution?.downloadUrls || [];
   }
 
+  /**
+   * Get the access URLs of the distribution.
+   *
+   * From dcat-ap-ch:
+   * Property	access URL
+   * Requirement level	Mandatory
+   * Cardinality	1..n
+   * URI	dcat:accessURL
+   * Range	rdfs:Resource
+   * Usage Note
+   * - This property contains a URL that gives access to a Distribution of the Dataset. The resource at the access URL may contain
+   *   information about how to get the Dataset.
+   */
   get accessUrls() {
     return this.#distribution?.accessUrls || [];
   }
 
-  get format() {
-    return this.#distribution?.format ?? '';
+  /**
+   * Get the format of the distribution.
+   *
+   * From dcat-ap-ch:
+   * Property	format
+   * Requirement level	Recommended
+   * Cardinality	0..1
+   * URI	dct:format
+   * Range	dct:MediaTypeOrExtent
+   * Usage Note
+   * - This property refers to the file format of the Distribution.CV to be used: [VOCAB-EU-FILE-TYPE]
+   * - CV to be used: [VOCAB-EU-FILE-TYPE]
+   * - If a format is not available:
+   *   a) media type ([IANA-MEDIA-TYPES]) should be used
+   *   b) If necessary, a discussion to evaluate the adoption within the EU should be launched (Contact point: [VOCAB-EU-OP-CONTACT]).
+   */
+  get format(): string {
+    const format = this.#distribution?.format
+    if (format) {
+      return format;
+    }
+    // Fallback: get mediaType from property table
+    const mediaTypeNode = this.#distribution?.getPropertyTable.find(node => node.id === 'mediaType');
+    if (!mediaTypeNode || !mediaTypeNode.data?.length) {
+      return '';
+    }
+    const mediaType = mediaTypeNode?.data[0]?.data ?? '';
+    if (typeof mediaType !== 'string') {
+      return '';
+    }
+    return mediaType;
   }
 
+  /**
+   * Get the license of the distribution if available
+   *
+   * From dcat-ap-ch:
+   * Property	license
+   * Requirement level	Mandatory
+   * Cardinality	1..1
+   * URI	dct:license
+   * Range	dct:LicenseDocument
+   * Usage Note
+   * This property refers to the licence under which the Distribution is made available.
+   * CV to used: [VOCAB-CH-LICENSE]
+   */
   get license() {
-    return this.#distribution?.license;
+    const lic = this.#distribution?.license;
+    const licIri = lic?.resource
+    if (!licIri) {
+      return undefined;
+    }
+    return licIri
   }
 
-  get issued() {
-    return this.#distribution?.issued || '';
+
+  /**
+   * Get the release date of the distribution if available
+   * Property	release date
+   * Requirement level	Optional
+   * Cardinality	0..1
+   * URI	dct:issued
+   * Range	rdfs:Literal (typed as as xsd:date, xsd:dateTime, xsd:gYear or xsd:gYearMonth)
+   * Usage Note
+   * - This property contains the date of formal issuance (e.g., publication) of the Distribution.
+   * - Date of formal issuance (publication) of the distribution
+   * - UsageThe first time issuance of the distribution.
+   *
+   * @returns {Date | undefined} The release date as a Date object, or undefined if not available or invalid.
+   */
+  get releaseDate() {
+    const releaseDateString = this.#distribution?.issued || '';
+    if (!releaseDateString) {
+      return undefined;
+    }
+    const releaseDate = new Date(releaseDateString);
+    return isNaN(releaseDate.getTime()) ? undefined : releaseDate;
   }
 
+  /**
+   * Get the modified date of the distribution if available
+   *
+   * from dcat-ap-ch:
+   *  Property: update/modification date
+   * This property contains the most recent date on which the Distribution was changed or modified.
+   * Property	update/ modification date
+   * Requirement level	Recommended
+   * Cardinality	0..1
+   * URI	dct:modified
+   * Range	rdfs:Literal (typed as as xsd:date, xsd:dateTime, xsd:gYear or xsd:gYearMonth)
+   * Usage Note
+   *
+   * @returns {Date | undefined} The modified date as a Date object, or undefined if not available or invalid.
+   */
   get modified() {
-    return this.#distribution?.modified || '';
+    const modifiedDateString = this.#distribution?.modified || '';
+    if (!modifiedDateString) {
+      return undefined;
+    }
+    const modifiedDate = new Date(modifiedDateString);
+    return isNaN(modifiedDate.getTime()) ? undefined : modifiedDate;
   }
 
+  /**
+   * Get the id of the distribution
+   *
+   * Note: This is not part of dcat-ap-ch, but added by piveau
+   */
   get id() {
     return this.#distribution?.id || '';
   }
 
-  get created() {
-    return this.#distribution?.created;
-  }
-
+  /**
+   * Property	Language
+   * Requirement level	Optional
+   * Cardinality	0..n
+   * URI	dct:language
+   * Range	rdfs:Literal
+   * Usage Note
+   * - This property refers to a language used in the Distribution.
+   * - This property can be repeated if the metadata is provided in multiple languages.
+   * - The property MUST be set if the distribution is language-dependent or if it is given in some of the languages
+   *   German, French, Italian and English but not in all four languages.
+   * - CV to be used: [VOCAB-EU-LANGUAGE]
+   */
   get languages() {
     return this.#distribution?.languages || [];
   }
@@ -170,18 +293,14 @@ export class DcatApChV2DistributionAdapter implements EnhancedDistribution {
 
 
   get propertyTable() {
-    const rootNode = this.#dataset.getPropertyTable;
+    const rootNode = this.#distribution?.getPropertyTable;
     if (!rootNode) {
       return [];
     }
 
-    //   const ignoredNode = ['catalogRecord'];
-    const ignoredNode: string[] = []
+    const ignoredNode = ['byteSize'];
     const nodesToConsider = rootNode.filter(n => n.data).filter(n => !ignoredNode.includes(n.id));
 
-    console.log('flatNodes', nodesToConsider);
-
-
     const table: TableEntry[] = [];
     for (const node of nodesToConsider) {
 

opendata.swiss/ui/app/components/distribution/OdsDownloadList.vue

@@ -0,0 +1,42 @@
+<template>
+  <ul class="download-items">
+    <li v-for="url in props.downloadUrls" :key="url">
+      <OdsDownloadListItem :download-url="url" :name="props.name" :format="props.format" :languages="props.languages" :byte-size="props.byteSize" />
+    </li>
+  </ul>
+
+</template>
+
+
+<script setup lang="ts">
+import { defineProps } from 'vue';
+import OdsDownloadListItem from './OdsDownloadListItem.vue';
+
+
+const props = defineProps({
+  downloadUrls: {
+    type: Array as PropType<string[]>,
+    required: true
+  },
+  format : {
+    type: String,
+    required: false,
+    default: ''
+  },
+  name : {
+    type: String,
+    required: true
+  },
+  languages: {
+    type: Array as PropType<string[]>,
+    required: false,
+    default: () => []
+  },
+  byteSize: {
+    type: String,
+    required: false,
+    default: ''
+  }
+});
+
+</script>

opendata.swiss/ui/app/components/distribution/OdsDownloadListItem.vue

@@ -0,0 +1,62 @@
+<template>
+  <div>
+    <a class="download-item" :href="props.downloadUrl" target="_blank">
+      <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" class="icon icon--xl icon--Download download-item__icon">
+       <path xmlns="http://www.w3.org/2000/svg" d="m19.419 13.698-.375-.649-6.294 3.634v-12.228h-.75v12.228l-6.294-3.634-.375.649 7.044 4.067z" />
+       <path xmlns="http://www.w3.org/2000/svg" d="m6.00576 19.91649h12.76855v.75h-12.76855z"/>
+      </svg>
+      <div>
+       <h2 class="download-item__title">{{ props.name }}</h2>
+       <p class="meta-info download-item__meta-info">
+          <span class="meta-info__item">{{ props.format }}</span>
+          <span class="meta-info__item">{{ props.byteSize }}</span>
+          <span class="meta-info__item">{{ props.languages.join(', ') }}</span>
+        </p>
+      </div>
+    </a>
+  </div>
+</template>
+
+<script setup lang="ts">
+
+import { defineProps } from 'vue';
+
+const props = defineProps({
+  downloadUrl: {
+    type: String,
+    required: true
+  },
+  name: {
+    type: String,
+    required: true
+  },
+  format : {
+    type: String,
+    required: false,
+    default: ''
+  },
+  languages: {
+    type: Array as PropType<string[]>,
+    required: false,
+    default: () => []
+  },
+  byteSize: {
+    type: String,
+    required: false,
+    default: ''
+  }
+});
+</script>
+
+<style scoped lang="scss">
+  a {
+    overflow-x: hidden;
+    word-break: break-all;
+  }
+
+  .download-item__title {
+    text-overflow: hidden;
+    overflow-x: hidden;
+    word-break: break-all;
+  }
+</style>