Applying changes from commit 8cb5e26cb78fe02f5b069a7a9e0c66ef2aa71143

SEMICeu · Dec 7, 2023 · 78695e0 · 78695e0
1 parent 82c7dc7
commit 78695e0
Show file tree

Hide file tree

Showing 27 changed files with 1,490 additions and 704 deletions.
diff --git a/DCAT-AP/releases/2.2.0-hvd/context/hvd.jsonld b/DCAT-AP/releases/2.2.0-hvd/context/hvd.jsonld
@@ -120,6 +120,10 @@
           "@id": "http://data.europa.eu/r5r/hvdCategory",
           "@type": "@id"
         },
+        "identifier": {
+          "@container": "@set",
+          "@id": "http://purl.org/dc/terms/identifier"
+        },
         "otherIdentifier": {
           "@container": "@set",
           "@id": "http://www.w3.org/ns/adms#identifier",

diff --git a/DCAT-AP/releases/2.2.0-hvd/context/hvd_en.jsonld b/DCAT-AP/releases/2.2.0-hvd/context/hvd_en.jsonld
@@ -120,6 +120,10 @@
           "@id": "http://data.europa.eu/r5r/hvdCategory",
           "@type": "@id"
         },
+        "identifier": {
+          "@container": "@set",
+          "@id": "http://purl.org/dc/terms/identifier"
+        },
         "otherIdentifier": {
           "@container": "@set",
           "@id": "http://www.w3.org/ns/adms#identifier",

diff --git a/DCAT-AP/releases/2.2.0-hvd/html/examples/example-data_service_service_desk.jsonld b/DCAT-AP/releases/2.2.0-hvd/html/examples/example-data_service_service_desk.jsonld
@@ -11,7 +11,7 @@
   "@graph": [
     {
       "@id": "_:EAMS-APIplatform-contactpoint",
-      "@type": "vcard:Card",
+      "@type": "vcard:Kind",
       "vcard:hasURL": {
         "@id": "https://eams.jira.net/servicedesk"
       }
@@ -52,4 +52,4 @@
       }
     }
   ]
-}
+}
diff --git a/DCAT-AP/releases/2.2.0-hvd/html/examples/example-data_service_service_desk.ttl b/DCAT-AP/releases/2.2.0-hvd/html/examples/example-data_service_service_desk.ttl
@@ -15,5 +15,5 @@ exampleMS:EAMS-APIplatform a dcat:DataService;
    dcat:contactPoint _:EAMS-APIplatform-contactpoint ;
    dcat:servesDataset exampleMS:1T2p3o4B, exampleMS:1W2o3p4T .
 
-_:EAMS-APIplatform-contactpoint a vcard:Card ;
-   vcard:hasURL <https://eams.jira.net/servicedesk> .
+_:EAMS-APIplatform-contactpoint a vcard:Kind;
+   vcard:hasURL <https://eams.jira.net/servicedesk> .
diff --git a/DCAT-AP/releases/2.2.0-hvd/html/examples/example-ms_catalogue.jsonld b/DCAT-AP/releases/2.2.0-hvd/html/examples/example-ms_catalogue.jsonld
@@ -19,7 +19,7 @@
     },
     {
       "@id": "_:EAMS-APIplatform-contactpoint",
-      "@type": "vcard:Card",
+      "@type": "vcard:Kind",
       "vcard:hasURL": {
         "@id": "https://eams.jira.net/servicedesk"
       }
@@ -171,4 +171,4 @@
       }
     }
   ]
-}
+}
diff --git a/DCAT-AP/releases/2.2.0-hvd/html/examples/example-ms_catalogue.ttl b/DCAT-AP/releases/2.2.0-hvd/html/examples/example-ms_catalogue.ttl
@@ -51,11 +51,11 @@ exampleMS:EAMS-APIplatform a dcat:DataService;
    dcat:contactPoint _:EAMS-APIplatform-contactpoint ;
    dcat:servesDataset exampleMS:1T2p3o4B, exampleMS:1W2o3p4T .
 
-_:EAMS-APIplatform-contactpoint a vcard:Card ;
+_:EAMS-APIplatform-contactpoint a vcard:Kind;
    vcard:hasURL <https://eams.jira.net/servicedesk> .
 
 _:EA-MS a foaf:Agent;
     foaf:name "MS Environmental Agency".
 
 <https://data.exampleMS.gov/resource/FreeAndOpen> a dct:LicenseDocument ;
-   skos:exactMatch <http://publications.europa.eu/resource/authority/licence/CC0>.
+   skos:exactMatch <http://publications.europa.eu/resource/authority/licence/CC0>.
diff --git a/DCAT-AP/releases/2.2.0-hvd/html/examples/example-ms_catalogue_hvd.jsonld b/DCAT-AP/releases/2.2.0-hvd/html/examples/example-ms_catalogue_hvd.jsonld
@@ -19,7 +19,7 @@
     },
     {
       "@id": "_:EAMS-APIplatform-contactpoint",
-      "@type": "vcard:Card",
+      "@type": "vcard:Kind",
       "vcard:hasURL": {
         "@id": "https://eams.jira.net/servicedesk"
       }
@@ -161,4 +161,4 @@
       }
     }
   ]
-}
+}
diff --git a/DCAT-AP/releases/2.2.0-hvd/html/examples/example-ms_catalogue_hvd.ttl b/DCAT-AP/releases/2.2.0-hvd/html/examples/example-ms_catalogue_hvd.ttl
@@ -52,11 +52,11 @@ exampleMS:EAMS-APIplatform a dcat:DataService;
    dcat:contactPoint _:EAMS-APIplatform-contactpoint ;
    dcat:servesDataset exampleMS:1T2p3o4B. 
 
-_:EAMS-APIplatform-contactpoint a vcard:Card ;
+_:EAMS-APIplatform-contactpoint a vcard:Kind;
    vcard:hasURL <https://eams.jira.net/servicedesk> .
 
 _:EA-MS a foaf:Agent;
     foaf:name "MS Environmental Agency".
 
 <https://data.exampleMS.gov/resource/FreeAndOpen> a dct:LicenseDocument ;
-   skos:exactMatch <http://publications.europa.eu/resource/authority/licence/CC0>.
+   skos:exactMatch <http://publications.europa.eu/resource/authority/licence/CC0>.
diff --git a/DCAT-AP/releases/2.2.0-hvd/index.html b/DCAT-AP/releases/2.2.0-hvd/index.html
diff --git a/DCAT-AP/releases/2.2.0-hvd/index_en.html b/DCAT-AP/releases/2.2.0-hvd/index_en.html
diff --git a/DCAT-AP/releases/2.2.0-hvd/shacl/hvd-SHACL.jsonld b/DCAT-AP/releases/2.2.0-hvd/shacl/hvd-SHACL.jsonld
@@ -156,21 +156,6 @@
       "@type": "sh:NodeShape",
       "sh:closed": false,
       "sh:property": [
-        {
-          "@id": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape/7930e9ce7e36c30cae6174390ef005669c59e5ad",
-          "rdfs:seeAlso": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#Kind.contactpage",
-          "sh:description": {
-            "en": "A webpage that either allows to make contact (i.e. a webform) or the information contains how to get into contact. "
-          },
-          "sh:minCount": "1",
-          "sh:name": {
-            "en": "contact page"
-          },
-          "sh:path": "http://www.w3.org/2006/vcard/ns#hasURL",
-          "vl:message": {
-            "en": "Minimally 1 values are expected for contact page"
-          }
-        },
         {
           "@id": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape/8cf3e751730442052d1b2174336d21bb838e4aab",
           "rdfs:seeAlso": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#Kind.email",
@@ -231,21 +216,6 @@
             "en": "The expected value for contact page is a rdfs:Resource (URI or blank node)"
           }
         },
-        {
-          "@id": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape/abe13467d83c0301d2d6c2d77bd37218b9f6b62b",
-          "rdfs:seeAlso": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#Kind.email",
-          "sh:description": {
-            "en": "A email address via which contact can be made.\r\n"
-          },
-          "sh:minCount": "1",
-          "sh:name": {
-            "en": "email"
-          },
-          "sh:path": "http://www.w3.org/2006/vcard/ns#hasEmail",
-          "vl:message": {
-            "en": "Minimally 1 values are expected for email"
-          }
-        },
         {
           "@id": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape/af064e842c8e058505005f10ba6025ee57ad168b",
           "rdfs:seeAlso": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#Kind.contactpage",
@@ -607,21 +577,6 @@
             "en": "The range of HVD category must be of type <http://www.w3.org/2004/02/skos/core#Concept>."
           }
         },
-        {
-          "@id": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataServiceShape/396231de4783bdfd25c32e935e43dec4585563ce",
-          "rdfs:seeAlso": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataService.licence",
-          "sh:description": {
-            "en": "A licence under which the Data service is made available."
-          },
-          "sh:minCount": "1",
-          "sh:name": {
-            "en": "licence"
-          },
-          "sh:path": "http://purl.org/dc/terms/license",
-          "vl:message": {
-            "en": "Minimally 1 values are expected for licence"
-          }
-        },
         {
           "@id": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataServiceShape/3bde2663aaca96d953765ac2e525ef64710bf4d6",
           "rdfs:seeAlso": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataService.endpointURL",
@@ -672,7 +627,7 @@
           "rdfs:seeAlso": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataService.documentation",
           "sh:class": "http://xmlns.com/foaf/0.1/Document",
           "sh:description": {
-            "en": "A web page that provides details the quality of service the Data Service provides and/or additional information."
+            "en": "A page that provides additional information about the Data Service."
           },
           "sh:name": {
             "en": "documentation"
@@ -746,7 +701,7 @@
           "@id": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataServiceShape/8521ebd386ec388c4cf09933c419e3fe7668f29d",
           "rdfs:seeAlso": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataService.documentation",
           "sh:description": {
-            "en": "A web page that provides details the quality of service the Data Service provides and/or additional information."
+            "en": "A page that provides additional information about the Data Service."
           },
           "sh:minCount": "1",
           "sh:name": {
@@ -776,7 +731,7 @@
           "@id": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataServiceShape/998ce689a5bcc3e2764ff84a05255e34d91e8102",
           "rdfs:seeAlso": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataService.documentation",
           "sh:description": {
-            "en": "A web page that provides details the quality of service the Data Service provides and/or additional information."
+            "en": "A page that provides additional information about the Data Service."
           },
           "sh:name": {
             "en": "documentation"
@@ -1200,6 +1155,21 @@
             "en": "The range of other identifier must be of type <http://www.w3.org/ns/adms#identifier>."
           }
         },
+        {
+          "@id": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DatasetShape/aadbd67a77a624f073be2076627fb9dc883cbe48",
+          "rdfs:seeAlso": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#Dataset.identifier",
+          "sh:description": {
+            "en": "The main identifier for the Dataset, e.g. the URI or other unique identifier in the context of the Catalogue."
+          },
+          "sh:name": {
+            "en": "identifier"
+          },
+          "sh:nodeKind": "sh:Literal",
+          "sh:path": "http://purl.org/dc/terms/identifier",
+          "vl:message": {
+            "en": "The expected value for identifier is a Literal"
+          }
+        },
         {
           "@id": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DatasetShape/b3ec0655204c62a2531244aaeab12f1a2c5e5b5d",
           "rdfs:seeAlso": "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#Dataset.publisher",

diff --git a/DCAT-AP/releases/2.2.0-hvd/shacl/hvd-SHACL.ttl b/DCAT-AP/releases/2.2.0-hvd/shacl/hvd-SHACL.ttl
@@ -187,7 +187,6 @@
   shacl:property <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataServiceShape/0a6f3bb11ed4ea12f852c78996b89c9a54ffc0fb>,
     <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataServiceShape/1a61f733fafb015548fe0e21203d559c9cb4d228>,
     <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataServiceShape/1aeb85e10acb27fafc68a1bc04adb4860ecbea59>,
-    <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataServiceShape/396231de4783bdfd25c32e935e43dec4585563ce>,
     <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataServiceShape/3bde2663aaca96d953765ac2e525ef64710bf4d6>,
     <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataServiceShape/60675e8175395481680e343172eea5fcd3f82cd4>,
     <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataServiceShape/63240e11f1eb66f636413d1dbb134f0ff9066a7c>,
@@ -235,13 +234,6 @@
   shacl:path <http://data.europa.eu/r5r/hvdCategory>;
   <https://purl.eu/ns/shacl#message> "The range of HVD category must be of type <http://www.w3.org/2004/02/skos/core#Concept>."@en .
 
-<https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataServiceShape/396231de4783bdfd25c32e935e43dec4585563ce> rdfs:seeAlso "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataService.licence";
-  shacl:description "A licence under which the Data service is made available."@en;
-  shacl:minCount 1;
-  shacl:name "licence"@en;
-  shacl:path dc:license;
-  <https://purl.eu/ns/shacl#message> "Minimally 1 values are expected for licence"@en .
-
 <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataServiceShape/3bde2663aaca96d953765ac2e525ef64710bf4d6> rdfs:seeAlso "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataService.endpointURL";
   shacl:description "The root location or primary endpoint of the service (an IRI)."@en;
   shacl:name "endpoint URL"@en;
@@ -265,7 +257,7 @@
 
 <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataServiceShape/68388ec47b77212d80036e8a02e9956f5ba0e0f5> rdfs:seeAlso "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataService.documentation";
   shacl:class foaf:Document;
-  shacl:description "A web page that provides details the quality of service the Data Service provides and/or additional information."@en;
+  shacl:description "A page that provides additional information about the Data Service."@en;
   shacl:name "documentation"@en;
   shacl:path foaf:Page;
   <https://purl.eu/ns/shacl#message> "The range of documentation must be of type <http://xmlns.com/foaf/0.1/Document>."@en .
@@ -299,7 +291,7 @@
   <https://purl.eu/ns/shacl#message> "Minimally 1 values are expected for endpoint URL"@en .
 
 <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataServiceShape/8521ebd386ec388c4cf09933c419e3fe7668f29d> rdfs:seeAlso "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataService.documentation";
-  shacl:description "A web page that provides details the quality of service the Data Service provides and/or additional information."@en;
+  shacl:description "A page that provides additional information about the Data Service."@en;
   shacl:minCount 1;
   shacl:name "documentation"@en;
   shacl:path foaf:Page;
@@ -313,7 +305,7 @@
   <https://purl.eu/ns/shacl#message> "The range of rights must be of type <http://purl.org/dc/terms/RightsStatement>."@en .
 
 <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataServiceShape/998ce689a5bcc3e2764ff84a05255e34d91e8102> rdfs:seeAlso "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DataService.documentation";
-  shacl:description "A web page that provides details the quality of service the Data Service provides and/or additional information."@en;
+  shacl:description "A page that provides additional information about the Data Service."@en;
   shacl:name "documentation"@en;
   shacl:nodeKind shacl:BlankNodeOrIRI;
   shacl:path foaf:Page;
@@ -426,6 +418,7 @@
     <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DatasetShape/9adf9f5890592909cf3e67021ae7ab4f895a7745>,
     <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DatasetShape/9f9f581dcae4fbd1653141d8b35ba7f86b4cf740>,
     <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DatasetShape/9fe7c5889615d19dd4849fb66a5664fc016aa598>,
+    <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DatasetShape/aadbd67a77a624f073be2076627fb9dc883cbe48>,
     <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DatasetShape/b3ec0655204c62a2531244aaeab12f1a2c5e5b5d>,
     <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DatasetShape/c84f7330b9538a899ebb875c44dc23c9882e74ac>,
     <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DatasetShape/d36065836a29f463546e269c25db7b95b879b3fb>,
@@ -530,6 +523,13 @@
   shacl:path <http://www.w3.org/ns/adms#identifier>;
   <https://purl.eu/ns/shacl#message> "The range of other identifier must be of type <http://www.w3.org/ns/adms#identifier>."@en .
 
+<https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DatasetShape/aadbd67a77a624f073be2076627fb9dc883cbe48> rdfs:seeAlso "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#Dataset.identifier";
+  shacl:description "The main identifier for the Dataset, e.g. the URI or other unique identifier in the context of the Catalogue."@en;
+  shacl:name "identifier"@en;
+  shacl:nodeKind shacl:Literal;
+  shacl:path dc:identifier;
+  <https://purl.eu/ns/shacl#message> "The expected value for identifier is a Literal"@en .
+
 <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#DatasetShape/b3ec0655204c62a2531244aaeab12f1a2c5e5b5d> rdfs:seeAlso "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#Dataset.publisher";
   shacl:class foaf:Agent;
   shacl:description "An entity (organisation) responsible for making the Dataset available."@en;
@@ -684,23 +684,14 @@
 
 <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape> a shacl:NodeShape;
   shacl:closed false;
-  shacl:property <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape/7930e9ce7e36c30cae6174390ef005669c59e5ad>,
-    <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape/8cf3e751730442052d1b2174336d21bb838e4aab>,
+  shacl:property <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape/8cf3e751730442052d1b2174336d21bb838e4aab>,
     <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape/95cf5318d1604f72f1c5d4d22a360ce268437bf0>,
     <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape/9b6ccc41bb0ced6f6b8f28a86e120bd9d73b32fb>,
     <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape/a736c4b01ea7557518c0c146f3e311947ce00ccc>,
-    <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape/abe13467d83c0301d2d6c2d77bd37218b9f6b62b>,
     <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape/af064e842c8e058505005f10ba6025ee57ad168b>,
     <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape/df2e16526cd0f7cc796d3bb27ac1861737a35d91>;
   shacl:targetClass vcard:Kind .
 
-<https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape/7930e9ce7e36c30cae6174390ef005669c59e5ad> rdfs:seeAlso "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#Kind.contactpage";
-  shacl:description "A webpage that either allows to make contact (i.e. a webform) or the information contains how to get into contact. "@en;
-  shacl:minCount 1;
-  shacl:name "contact page"@en;
-  shacl:path vcard:hasURL;
-  <https://purl.eu/ns/shacl#message> "Minimally 1 values are expected for contact page"@en .
-
 <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape/8cf3e751730442052d1b2174336d21bb838e4aab> rdfs:seeAlso "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#Kind.email";
   shacl:class rdfs:Resource;
   shacl:description """A email address via which contact can be made.
@@ -731,14 +722,6 @@
   shacl:path vcard:hasURL;
   <https://purl.eu/ns/shacl#message> "The expected value for contact page is a rdfs:Resource (URI or blank node)"@en .
 
-<https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape/abe13467d83c0301d2d6c2d77bd37218b9f6b62b> rdfs:seeAlso "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#Kind.email";
-  shacl:description """A email address via which contact can be made.
-"""@en;
-  shacl:minCount 1;
-  shacl:name "email"@en;
-  shacl:path vcard:hasEmail;
-  <https://purl.eu/ns/shacl#message> "Minimally 1 values are expected for email"@en .
-
 <https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#KindShape/af064e842c8e058505005f10ba6025ee57ad168b> rdfs:seeAlso "https://semiceu.github.io//DCAT-AP/releases/2.2.0-hvd#Kind.contactpage";
   shacl:description "A webpage that either allows to make contact (i.e. a webform) or the information contains how to get into contact. "@en;
   shacl:maxCount 1;