Extend schemas for Dataset and DataService from 2.1.1 to 3.0.0

Agent/examples/example-normalized.json

@@ -19,8 +19,7 @@
       "addressRegion": "Luxembourg",
       "addressCountry": "Luxembourg",
       "postalCode": "2985 ",
-      "postOfficeBoxNumber": "",
-      "areaServed": "European Union"
+      "postOfficeBoxNumber": ""
     }
   },
   "name": {

Agent/examples/example-normalized.json.csv

@@ -1,2 +1,2 @@
-"id_", "type_", "location__type_", "location__value__type_", "location__value__coordinates__0_", "location__value__coordinates__1_", "address__type_", "address__value__streetAddress_", "address__value__addressLocality_", "address__value__addressRegion_", "address__value__addressCountry_", "address__value__postalCode_", "address__value__postOfficeBoxNumber_", "address__value__areaServed_", "name__type_", "name__value__0_", "name__value__1_", "Type__type_", "Type__value_"
-"urn:ngsi-ld:id:ZLHO:07918336", "Agent", "geo:json", "Point", "12.934074", "-149.532943", "StructuredValue", "2 Rue Mercier", "Luxembourg", "Luxembourg", "Luxembourg", "2985 ", "", "European Union", "StructuredValue", "Agent 10", "Agente 10", "Text", "EU Publications office"
+"id_", "type_", "location__type_", "location__value__type_", "location__value__coordinates__0_", "location__value__coordinates__1_", "address__type_", "address__value__streetAddress_", "address__value__addressLocality_", "address__value__addressRegion_", "address__value__addressCountry_", "address__value__postalCode_", "address__value__postOfficeBoxNumber_", "name__type_", "name__value__0_", "name__value__1_", "Type__type_", "Type__value_"
+"urn:ngsi-ld:id:ZLHO:07918336", "Agent", "geo:json", "Point", "12.934074", "-149.532943", "StructuredValue", "2 Rue Mercier", "Luxembourg", "Luxembourg", "Luxembourg", "2985 ", "", "StructuredValue", "Agent 10", "Agente 10", "Text", "EU Publications office"

Agent/examples/example-normalized.jsonld

@@ -9,8 +9,7 @@
             "addressRegion": "Luxembourg",
             "addressCountry": "Luxembourg",
             "postalCode": "2985 ",
-            "postOfficeBoxNumber": "",
-            "areaServed": "European Union"
+            "postOfficeBoxNumber": ""
         }
     },
     "name": {

Agent/examples/example-normalized.jsonld.csv

@@ -1,2 +1,2 @@
-"id_", "type_", "address__type_", "address__value__streetAddress_", "address__value__addressLocality_", "address__value__addressRegion_", "address__value__addressCountry_", "address__value__postalCode_", "address__value__postOfficeBoxNumber_", "address__value__areaServed_", "name__type_", "name__value__0_", "name__value__1_", "Type__type_", "Type__value_", "location__type_", "location__value__type_", "location__value__coordinates__0_", "location__value__coordinates__1_", "@context__0_"
-"urn:ngsi-ld:id:ZLHO:07918336", "Agent", "Property", "2 Rue Mercier", "Luxembourg", "Luxembourg", "Luxembourg", "2985 ", "", "European Union", "Property", "Agent 10", "Agente 10", "Property", "EU Publications office", "GeoProperty", "Point", "12.934074", "-149.532943", "https://raw.githubusercontent.com/smart-data-models/dataModel.DCAT-AP/master/context.jsonld"
+"id_", "type_", "address__type_", "address__value__streetAddress_", "address__value__addressLocality_", "address__value__addressRegion_", "address__value__addressCountry_", "address__value__postalCode_", "address__value__postOfficeBoxNumber_", "name__type_", "name__value__0_", "name__value__1_", "Type__type_", "Type__value_", "location__type_", "location__value__type_", "location__value__coordinates__0_", "location__value__coordinates__1_", "@context__0_"
+"urn:ngsi-ld:id:ZLHO:07918336", "Agent", "Property", "2 Rue Mercier", "Luxembourg", "Luxembourg", "Luxembourg", "2985 ", "", "Property", "Agent 10", "Agente 10", "Property", "EU Publications office", "GeoProperty", "Point", "12.934074", "-149.532943", "https://raw.githubusercontent.com/smart-data-models/dataModel.DCAT-AP/master/context.jsonld"

Agent/examples/example.json

@@ -18,8 +18,7 @@
     "addressRegion": "Luxembourg",
     "addressCountry": "Luxembourg",
     "postalCode": "2985 ",
-    "postOfficeBoxNumber": "",
-    "areaServed": "European Union"
+    "postOfficeBoxNumber": ""
   },
   "Type": "EU Publications office"
 }

Agent/examples/example.json.csv

@@ -1,2 +1,2 @@
-"id_", "type_", "name__0_", "name__1_", "location__type_", "location__coordinates__0_", "location__coordinates__1_", "address__streetAddress_", "address__addressLocality_", "address__addressRegion_", "address__addressCountry_", "address__postalCode_", "address__postOfficeBoxNumber_", "address__areaServed_", "Type_"
-"urn:ngsi-ld:id:ZLHO:07918336", "Agent", "Agent 10", "Agente 10", "Point", "12.934074", "-149.532943", "2 Rue Mercier", "Luxembourg", "Luxembourg", "Luxembourg", "2985 ", "", "European Union", "EU Publications office"
+"id_", "type_", "name__0_", "name__1_", "location__type_", "location__coordinates__0_", "location__coordinates__1_", "address__streetAddress_", "address__addressLocality_", "address__addressRegion_", "address__addressCountry_", "address__postalCode_", "address__postOfficeBoxNumber_", "Type_"
+"urn:ngsi-ld:id:ZLHO:07918336", "Agent", "Agent 10", "Agente 10", "Point", "12.934074", "-149.532943", "2 Rue Mercier", "Luxembourg", "Luxembourg", "Luxembourg", "2985 ", "", "EU Publications office"

Agent/examples/example.jsonld

@@ -7,8 +7,7 @@
     "addressRegion": "Luxembourg",
     "addressCountry": "Luxembourg",
     "postalCode": "2985 ",
-    "postOfficeBoxNumber": "",
-    "areaServed": "European Union"
+    "postOfficeBoxNumber": ""
   },
   "name": [
     "Agent 10",

Agent/examples/example.jsonld.csv

@@ -1,2 +1,2 @@
-"id_", "type_", "address__streetAddress_", "address__addressLocality_", "address__addressRegion_", "address__addressCountry_", "address__postalCode_", "address__postOfficeBoxNumber_", "address__areaServed_", "name__0_", "name__1_", "Type_", "location__type_", "location__coordinates__0_", "location__coordinates__1_", "@context__0_"
-"urn:ngsi-ld:id:ZLHO:07918336", "Agent", "2 Rue Mercier", "Luxembourg", "Luxembourg", "Luxembourg", "2985 ", "", "European Union", "Agent 10", "Agente 10", "EU Publications office", "Point", "12.934074", "-149.532943", "https://raw.githubusercontent.com/smart-data-models/dataModel.DCAT-AP/master/context.jsonld"
+"id_", "type_", "address__streetAddress_", "address__addressLocality_", "address__addressRegion_", "address__addressCountry_", "address__postalCode_", "address__postOfficeBoxNumber_", "name__0_", "name__1_", "Type_", "location__type_", "location__coordinates__0_", "location__coordinates__1_", "@context__0_"
+"urn:ngsi-ld:id:ZLHO:07918336", "Agent", "2 Rue Mercier", "Luxembourg", "Luxembourg", "Luxembourg", "2985 ", "", "Agent 10", "Agente 10", "EU Publications office", "Point", "12.934074", "-149.532943", "https://raw.githubusercontent.com/smart-data-models/dataModel.DCAT-AP/master/context.jsonld"

Agent/schema.json

@@ -1,10 +1,12 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$schemaVersion": "1.0.1",
-  "modelTags": "",
+  "modelTags": "INTERSTAT, WATERVERSE",
   "$id": "https://smart-data-models.github.io/dataModel.DCAT-AP/Agent/schema.json",
   "title": "Agent DCAT-AP 2.1.1 schema",
-  "description": "Agent Schema meeting DCAT-AP 2.1.1 specification",
+  "description": "Agent Schema definition based on DCAT-AP 2.1.1 specification",
+  "derivedFrom": "https://github.com/SEMICeu/DCAT-AP/blob/master/releases/2.1.1/dcat-ap_2.1.1.pdf",
+  "license": "https://creativecommons.org/licenses/by/4.0",
   "type": "object",
   "allOf": [
     {

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

Catalogue/examples/example-normalized.json

@@ -25,8 +25,7 @@
       "addressRegion": "Luxembourg",
       "addressCountry": "Luxembourg",
       "postalCode": "2985 ",
-      "postOfficeBoxNumber": "",
-      "areaServed": "European Union"
+      "postOfficeBoxNumber": ""
     }
   },
   "dataset": {

Catalogue/examples/example-normalized.json.csv

@@ -1,2 +1,2 @@
-"id_", "type_", "description__type_", "description__value__0_", "location__type_", "location__value__type_", "location__value__coordinates__0_", "location__value__coordinates__1_", "address__type_", "address__value__streetAddress_", "address__value__addressLocality_", "address__value__addressRegion_", "address__value__addressCountry_", "address__value__postalCode_", "address__value__postOfficeBoxNumber_", "address__value__areaServed_", "dataset__type_", "dataset__value__0_", "publisher__type_", "publisher__value_", "title__type_", "title__value__0_", "title__value__1_", "homepage__type_", "homepage__value_", "language__type_", "language__value__0_", "language__value__1_", "license__type_", "license__value_", "issued__type_", "issued__value_", "spatial__type_", "spatial__value__0__type_", "spatial__value__0__coordinates__0_", "spatial__value__0__coordinates__1_", "themeTaxonomy__type_", "themeTaxonomy__value__0_", "themeTaxonomy__value__1_", "modified__type_", "modified__value_", "hasPart__type_", "hasPart__value__0_", "isPartOf__type_", "isPartOf__value_", "record__type_", "record__value__0_", "record__value__1_", "rights__type_", "rights__value_", "catalog__type_", "catalog__value__0_", "catalog__value__1_", "creator__type_", "creator__value__0_"
-"urn:ngsi-ld:Catalogue:id:LMVP:18269678", "Catalogue", "StructuredValue", "Interesting art recently book girl yard represent book. Garden style wish blood your ground size.", "geo:json", "Point", "-83.400987", "0.152532", "StructuredValue", "2 Rue Mercier", "Luxembourg", "Luxembourg", "Luxembourg", "2985 ", "", "European Union", "StructuredValue", "urn:ngsi-ld:Catalogue:dataset:ZBCW:95668818", "Text", "spanish open data portal", "StructuredValue", "Hair commercial free civil. Figure American film despite few. Box watch cold act mean thank music people. Third fill us.", "Technology life low standard second.", "Text", "urn:ngsi-ld:Catalogue:homepage:ZFAW:13633782", "StructuredValue", "Town size computer way. Since challenge phone state listen south low.", "Eight once single. Build every kid.", "Text", "Improve social simply court week debate bad. Structure ago cup head point. Above much can own course.", "DateTime", "2004-08-22T22:32:47Z", "StructuredValue", "Point", "57.234944", "52.840273", "StructuredValue", "Tourism", "Economy", "DateTime", "1982-09-02T03:16:28Z", "StructuredValue", "urn:ngsi-ld:Catalogue:hasPart:GVZM:66676591", "Text", "urn:ngsi-ld:Catalogue:isPartOf:NXBZ:88517287", "StructuredValue", "urn:ngsi-ld:Catalogue:items:HLGA:73285516", "urn:ngsi-ld:Catalogue:items:IHOB:85266800", "Text", "Open source", "StructuredValue", "urn:ngsi-ld:Catalogue:items:LZMQ:44249979", "urn:ngsi-ld:Catalogue:items:PECX:02526105", "StructuredValue", "Role fact sport shoulder blue direction probably order."
+"id_", "type_", "description__type_", "description__value__0_", "location__type_", "location__value__type_", "location__value__coordinates__0_", "location__value__coordinates__1_", "address__type_", "address__value__streetAddress_", "address__value__addressLocality_", "address__value__addressRegion_", "address__value__addressCountry_", "address__value__postalCode_", "address__value__postOfficeBoxNumber_", "dataset__type_", "dataset__value__0_", "publisher__type_", "publisher__value_", "title__type_", "title__value__0_", "title__value__1_", "homepage__type_", "homepage__value_", "language__type_", "language__value__0_", "language__value__1_", "license__type_", "license__value_", "issued__type_", "issued__value_", "spatial__type_", "spatial__value__0__type_", "spatial__value__0__coordinates__0_", "spatial__value__0__coordinates__1_", "themeTaxonomy__type_", "themeTaxonomy__value__0_", "themeTaxonomy__value__1_", "modified__type_", "modified__value_", "hasPart__type_", "hasPart__value__0_", "isPartOf__type_", "isPartOf__value_", "record__type_", "record__value__0_", "record__value__1_", "rights__type_", "rights__value_", "catalog__type_", "catalog__value__0_", "catalog__value__1_", "creator__type_", "creator__value__0_"
+"urn:ngsi-ld:Catalogue:id:LMVP:18269678", "Catalogue", "StructuredValue", "Interesting art recently book girl yard represent book. Garden style wish blood your ground size.", "geo:json", "Point", "-83.400987", "0.152532", "StructuredValue", "2 Rue Mercier", "Luxembourg", "Luxembourg", "Luxembourg", "2985 ", "", "StructuredValue", "urn:ngsi-ld:Catalogue:dataset:ZBCW:95668818", "Text", "spanish open data portal", "StructuredValue", "Hair commercial free civil. Figure American film despite few. Box watch cold act mean thank music people. Third fill us.", "Technology life low standard second.", "Text", "urn:ngsi-ld:Catalogue:homepage:ZFAW:13633782", "StructuredValue", "Town size computer way. Since challenge phone state listen south low.", "Eight once single. Build every kid.", "Text", "Improve social simply court week debate bad. Structure ago cup head point. Above much can own course.", "DateTime", "2004-08-22T22:32:47Z", "StructuredValue", "Point", "57.234944", "52.840273", "StructuredValue", "Tourism", "Economy", "DateTime", "1982-09-02T03:16:28Z", "StructuredValue", "urn:ngsi-ld:Catalogue:hasPart:GVZM:66676591", "Text", "urn:ngsi-ld:Catalogue:isPartOf:NXBZ:88517287", "StructuredValue", "urn:ngsi-ld:Catalogue:items:HLGA:73285516", "urn:ngsi-ld:Catalogue:items:IHOB:85266800", "Text", "Open source", "StructuredValue", "urn:ngsi-ld:Catalogue:items:LZMQ:44249979", "urn:ngsi-ld:Catalogue:items:PECX:02526105", "StructuredValue", "Role fact sport shoulder blue direction probably order."

Catalogue/examples/example-normalized.jsonld

@@ -9,13 +9,12 @@
       "addressRegion": "Luxembourg",
       "addressCountry": "Luxembourg",
       "postalCode": "2985 ",
-      "postOfficeBoxNumber": "",
-      "areaServed": "European Union"
+      "postOfficeBoxNumber": ""
     }
   },
   "catalog": {
     "type": "Relationship",
-    "value": [
+    "object": [
       "urn:ngsi-ld:Catalogue:items:LZMQ:44249979",
       "urn:ngsi-ld:Catalogue:items:PECX:02526105"
     ]
@@ -84,7 +83,7 @@
   },
   "record": {
     "type": "Relationship",
-    "value": [
+    "object": [
       "Catalogue.items.HLGA.73285516",
       "Catalogue.items.IHOB.85266800"
     ]

Catalogue/examples/example-normalized.jsonld.csv

@@ -1,2 +1,2 @@
-"id_", "type_", "address__type_", "address__value__streetAddress_", "address__value__addressLocality_", "address__value__addressRegion_", "address__value__addressCountry_", "address__value__postalCode_", "address__value__postOfficeBoxNumber_", "address__value__areaServed_", "catalog__type_", "catalog__value__0_", "catalog__value__1_", "creator__type_", "creator__object__0_", "dataset__type_", "dataset__object__0_", "description__type_", "description__value__0_", "hasPart__type_", "hasPart__object__0_", "homepage__type_", "homepage__value_", "isPartOf__type_", "isPartOf__object_", "language__type_", "language__value__0_", "language__value__1_", "license__type_", "license__value_", "location__type_", "location__value__type_", "location__value__coordinates__0_", "location__value__coordinates__1_", "modified__type_", "modified__value__@type_", "modified__value__@value_", "publisher__type_", "publisher__value_", "record__type_", "record__value__0_", "record__value__1_", "issued__type_", "issued__value__@type_", "issued__value__@value_", "rights__type_", "rights__value_", "spatial__type_", "spatial__value__type_", "spatial__value__coordinates__0_", "spatial__value__coordinates__1_", "themeTaxonomy__type_", "themeTaxonomy__value__0_", "themeTaxonomy__value__1_", "title__type_", "title__value__0_", "title__value__1_", "@context__0_"
-"urn:ngsi-ld:Catalogue:id:LMVP:18269678", "Catalogue", "Property", "2 Rue Mercier", "Luxembourg", "Luxembourg", "Luxembourg", "2985 ", "", "European Union", "Relationship", "urn:ngsi-ld:Catalogue:items:LZMQ:44249979", "urn:ngsi-ld:Catalogue:items:PECX:02526105", "Relationship", "", "Relationship", "urn:ngsi-ld:Catalogue:dataset:ZBCW:95668818", "Property", "", "Relationship", "urn:ngsi-ld:Catalogue:hasPart:GVZM:66676591", "Property", "Catalogue:homepage:ZFAW:13633782", "Relationship", "urn:ngsi-ld:Catalogue:isPartOf:NXBZ:88517287", "Property", "ES", "DE", "Property", "Creative Commons 3.0 International", "GeoProperty", "Point", "-83.400987", "0.152532", "Property", "DateTime", "1982-09-02T03:16:28Z", "Property", "Spain open data portal", "Relationship", "Catalogue.items.HLGA.73285516", "Catalogue.items.IHOB.85266800", "Property", "DateTime", "2004-08-22T22:32:47Z", "Property", "", "GeoProperty", "Point", "57.234944", "52.840273", "Property", "Tourism", "Economy", "Property", "New catalogue", "Nuevo catalogo", "https://raw.githubusercontent.com/smart-data-models/dataModel.DCAT-AP/master/context.jsonld"
+"id_", "type_", "address__type_", "address__value__streetAddress_", "address__value__addressLocality_", "address__value__addressRegion_", "address__value__addressCountry_", "address__value__postalCode_", "address__value__postOfficeBoxNumber_", "catalog__type_", "catalog__value__0_", "catalog__value__1_", "creator__type_", "creator__object__0_", "dataset__type_", "dataset__object__0_", "description__type_", "description__value__0_", "hasPart__type_", "hasPart__object__0_", "homepage__type_", "homepage__value_", "isPartOf__type_", "isPartOf__object_", "language__type_", "language__value__0_", "language__value__1_", "license__type_", "license__value_", "location__type_", "location__value__type_", "location__value__coordinates__0_", "location__value__coordinates__1_", "modified__type_", "modified__value__@type_", "modified__value__@value_", "publisher__type_", "publisher__value_", "record__type_", "record__value__0_", "record__value__1_", "issued__type_", "issued__value__@type_", "issued__value__@value_", "rights__type_", "rights__value_", "spatial__type_", "spatial__value__type_", "spatial__value__coordinates__0_", "spatial__value__coordinates__1_", "themeTaxonomy__type_", "themeTaxonomy__value__0_", "themeTaxonomy__value__1_", "title__type_", "title__value__0_", "title__value__1_", "@context__0_"
+"urn:ngsi-ld:Catalogue:id:LMVP:18269678", "Catalogue", "Property", "2 Rue Mercier", "Luxembourg", "Luxembourg", "Luxembourg", "2985 ", "", "Relationship", "urn:ngsi-ld:Catalogue:items:LZMQ:44249979", "urn:ngsi-ld:Catalogue:items:PECX:02526105", "Relationship", "", "Relationship", "urn:ngsi-ld:Catalogue:dataset:ZBCW:95668818", "Property", "", "Relationship", "urn:ngsi-ld:Catalogue:hasPart:GVZM:66676591", "Property", "Catalogue:homepage:ZFAW:13633782", "Relationship", "urn:ngsi-ld:Catalogue:isPartOf:NXBZ:88517287", "Property", "ES", "DE", "Property", "Creative Commons 3.0 International", "GeoProperty", "Point", "-83.400987", "0.152532", "Property", "DateTime", "1982-09-02T03:16:28Z", "Property", "Spain open data portal", "Relationship", "Catalogue.items.HLGA.73285516", "Catalogue.items.IHOB.85266800", "Property", "DateTime", "2004-08-22T22:32:47Z", "Property", "", "GeoProperty", "Point", "57.234944", "52.840273", "Property", "Tourism", "Economy", "Property", "New catalogue", "Nuevo catalogo", "https://raw.githubusercontent.com/smart-data-models/dataModel.DCAT-AP/master/context.jsonld"

Catalogue/examples/example.json

@@ -17,8 +17,7 @@
     "addressRegion": "Luxembourg",
     "addressCountry": "Luxembourg",
     "postalCode": "2985 ",
-    "postOfficeBoxNumber": "",
-    "areaServed": "European Union"
+    "postOfficeBoxNumber": ""
   },
   "dataset": [
     "urn:ngsi-ld:Catalogue:dataset:ZBCW:95668818"