Extend schemas for Dataset and DataService from 2.1.1 to 3.0.0

Catalogue/ADOPTERS.yaml

@@ -1,10 +1,10 @@
 description: This is a compilation list of the current adopters of the data model CatalogueDCAT-AP of the Subject dataModel.DCAT-AP.  All fields are non mandatory. More info at https://smart-data-models.github.io/data-models/templates/dataModel/CURRENT_ADOPTERS.yaml
 currentAdopters:
 -
- adopter: 
- description: 
- mail: 
- organization: 
- project: 
- comments: 
- startDate: 
+ adopter: Waterverse Project
+ description:
+ mail:
+ organization:
+ project:  https://waterverse.eu/
+ comments: Adoption of DCAT-AP to define metadata information of Datasets including FAIR and Meloda5 principles
+ startDate: 2024-10-01

DataService/ADOPTERS.yaml

@@ -16,3 +16,11 @@ currentAdopters:
  project: https://salted-project.eu/
  comments: 
  startDate:
+-
+ adopter: Waterverse Project
+ description:
+ mail:
+ organization:
+ project:  https://waterverse.eu/
+ comments: Adoption of DCAT-AP to define metadata information of Datasets including FAIR and Meloda5 principles
+ startDate: 2024-10-01

DataService/examples/example-normalized.json

@@ -1,21 +1,9 @@
 {
   "id": "urn:ngsi-ld:DataService:id:JBDJ:56257192",
   "type": "DataService",
-  "description": {
-    "type": "StructuredValue",
-    "value": [
-      "Data service for the solar system open data portal."
-    ]
-  },
-  "location": {
-    "type": "geo:json",
-    "value": {
-      "type": "Point",
-      "coordinates": [
-        72.564509,
-        11.125289
-      ]
-    }
+  "accessRights": {
+    "type": "Text",
+    "value": "No restrictions to access the data but APi requests limit, 5000 requests per hour"
   },
   "address": {
     "type": "StructuredValue",
@@ -28,44 +16,157 @@
       "postOfficeBoxNumber": ""
     }
   },
+  "applicableLegislation": {
+    "type": "StructuredValue",
+    "value": [
+      "Regulation 883/2004",
+      "Regulation 465/2012"
+    ]
+  },
   "areaServed": {
     "type": "Text",
-    "value": "European union and beyond"
+    "value": "European Union and beyond"
   },
-  "endPointURL": {
+  "conformsTo": {
     "type": "StructuredValue",
     "value": [
-      "urn:ngsi-ld:DataServiceDCAT-AP:items:AFGI:79071729",
-      "urn:ngsi-ld:DataServiceDCAT-AP:items:JAZP:97999812"
+      "OGC WFS API"
     ]
   },
-  "title": {
+  "contactPoint": {
     "type": "StructuredValue",
     "value": [
-      "Data service of the european open data portal",
-      "Data service del portal europeo de datos abiertos"
+      {
+        "type": "Text",
+        "email": "[email protected]"
+      },
+      {
+        "type": "Text",
+        "email": "[email protected]"
+      }
     ]
   },
-  "endPointDescription": {
+  "description": {
+    "type": "StructuredValue",
+    "value": {
+      "en": "Data service of the european open data portal",
+      "de": "Datendienst des Europäischen Portals für offene Daten",
+      "es": "Data service del portal europeo de datos abiertos",
+      "fr": "Service de données du portail européen de données ouvertes",
+      "it": "Servizio dati del Portale europeo dei dati aperti",
+      "ja": "欧州オープンデータ・ポータルのデータサービス",
+      "ko": "유럽 오픈 데이터 포털의 데이터 서비스",
+      "zh": "欧洲开放数据门户的数据服务",
+      "el": "Υπηρεσία δεδομένων της Ευρωπαϊκής Πύλης Ανοικτών Δεδομένων",
+      "nl": "Dataservice van het Europese open dataportaal",
+      "fi": "Euroopan avoimen datan portaalin tietopalvelu"
+    }
+  },
+  "endpointDescription": {
     "type": "StructuredValue",
     "value": [
       "SPARQL end point without authentication",
       "API compliant with CKAN specification"
     ]
   },
-  "servesDataset": {
+  "endpointURL": {
     "type": "StructuredValue",
     "value": [
-      "EU geographic map",
-      "EU physical map"
+      "urn:ngsi-ld:DataServiceDCAT-AP:items:AFGI:79071729",
+      "urn:ngsi-ld:DataServiceDCAT-AP:items:JAZP:97999812"
     ]
   },
-  "accessRights": {
-    "type": "Text",
-    "value": "No restrictions to access the data but APi requests limit, 5000 requests per hour"
+  "format": {
+    "type": "StructuredValue",
+    "value": [
+      "CSV",
+      "JSON"
+    ]
+  },
+  "keyword": {
+    "type": "StructuredValue",
+    "value": [
+      "Data Service",
+      "CKAN"
+    ]
+  },
+  "landingPage": {
+    "type": "StructuredValue",
+    "value": [
+      "https://dataservice.data",
+      "https://otherservice.data"
+    ]
+  },
+  "lastUpdated": {
+    "type": "StructuredValue",
+    "value": {
+      "@type": "DateTime",
+      "@value": "2021-07-01T10:27:59Z"
+    }
   },
   "license": {
     "type": "Text",
-    "value": "EUPL."
+    "value": "GPL-1.0"
+  },
+  "operationSpace": {
+    "type": "geo:json",
+    "value": {
+      "type": "Point",
+      "coordinates": [
+        72.564509,
+        11.125289
+      ]
+    }
+  },
+  "page": {
+    "type": "StructuredValue",
+    "value": [
+      "http://foo.org/how-to"
+    ]
+  },
+  "provenance": {
+    "type": "StructuredValue",
+    "value": [
+      "1",
+      "2"
+    ]
+  },
+  "publisher": {
+    "type": "Text",
+    "value": "Comunidad de madrid"
+  },
+  "servesDataset": {
+    "type": "StructuredValue",
+    "object": [
+      "urn:ngsi-ld:Dataset:id:HUZY:41266715",
+      "urn:ngsi-ld:Dataset:id:HUZY:41266716"
+    ]
+  },
+  "theme": {
+    "type": "StructuredValue",
+    "value": [
+      "Economy",
+      "Tourism"
+    ]
+  },
+  "title": {
+    "type": "StructuredValue",
+    "value": {
+      "en": "Data service of the european open data portal",
+      "de": "Datendienst des Europäischen Portals für offene Daten",
+      "es": "Data service del portal europeo de datos abiertos",
+      "fr": "Service de données du portail européen de données ouvertes",
+      "it": "Servizio dati del Portale europeo dei dati aperti",
+      "ja": "欧州オープンデータ・ポータルのデータサービス",
+      "ko": "유럽 오픈 데이터 포털의 데이터 서비스",
+      "zh": "欧洲开放数据门户的数据服务",
+      "el": "Υπηρεσία δεδομένων της Ευρωπαϊκής Πύλης Ανοικτών Δεδομένων",
+      "nl": "Dataservice van het Europese open dataportaal",
+      "fi": "Euroopan avoimen datan portaalin tietopalvelu"
+    }
+  },
+  "validationSchema": {
+    "type": "Text",
+    "value": "https://smart-data-models.github.io/dataModel.DCAT-AP/DataService/schema.json"
   }
-}
+}