update draft with bugfixes

SEMICeu · Apr 26, 2024 · 591fae6 · 591fae6
1 parent be498c7
commit 591fae6
Show file tree

Hide file tree

Showing 8 changed files with 145 additions and 88 deletions.
diff --git a/releases/3.0.0-draft/CHANGELOG.md b/releases/3.0.0-draft/CHANGELOG.md
@@ -118,13 +118,15 @@ In issue [353](https://github.com/SEMICeu/dcat-ap/issues/353) reported the need
 # SHACL
   - issue [245](https://github.com/SEMICeu/dcat-ap/issues/245): replace sh:name with rdfs:label in shacl.
   - issue [48](https://github.com/SEMICeu/dcat-ap/issues/48): provide a shacl file with unique identifiers for each constraint.
+  - issue [361](https://github.com/SEMICeu/dcat-ap/issues/361): bug fixing shacls
 
 # Other issue handling
 
   - issue [209](https://github.com/SEMICeu/dcat-ap/issues/209): provided a new guideline for legal information.
   - issue [223](https://github.com/SEMICeu/dcat-ap/issues/223): closed the issue as the reference to past assessment of Identifiers is included in the DCAT-AP guideline on identifiers.
     The assessment is not uplifted as guideline, but it is now more accessible from the specification. 
     A placeholder issue is not needed anymore.
+
      
 
 # Specification agnostic issues or questions for information/assistance
@@ -153,4 +155,6 @@ These are issues that point out editorial improvements.
   - issue [291](https://github.com/SEMICeu/dcat-ap/issues/391): incorrect conversion from PDF to HMTL: reapply the agreed cardinality for Dataset creator.
   - issue [285](https://github.com/SEMICeu/dcat-ap/issues/285): correct URL to specification.
   - issue [267](https://github.com/SEMICeu/dcat-ap/issues/267): fix malformed table for recommended Controlled Vocabularies.
+  - issue [363](https://github.com/SEMICeu/dcat-ap/issues/363): fix dereferenceable URIs
+  - issue [366](https://github.com/SEMICeu/dcat-ap/issues/366): fix shacl shape bugs
 
diff --git a/releases/3.0.0-draft/context/dcat-ap.jsonld b/releases/3.0.0-draft/context/dcat-ap.jsonld
@@ -179,6 +179,7 @@
       "@id": "http://purl.org/dc/terms/description"
     },
     "DataService.documentation": {
+      "@container": "@set",
       "@id": "http://xmlns.com/foaf/0.1/page",
       "@type": "@id"
     },
@@ -384,7 +385,6 @@
       "@type": "@id"
     },
     "Dataset.version": {
-      "@container": "@set",
       "@id": "http://www.w3.org/ns/dcat#version"
     },
     "Dataset.versionNotes": {

diff --git a/releases/3.0.0-draft/html/shacl/deprecateduris.ttl b/releases/3.0.0-draft/html/shacl/deprecateduris.ttl
@@ -91,3 +91,33 @@
     ];
     sh:targetClass dcat:Dataset .
 
+
+
+<http://data.europa.eu/r5r/codelist_imports>
+  rdf:type owl:Ontology ;
+  owl:imports <https://github.com/SEMICeu/ADMS-AP/raw/master/purl.org/ADMS_SKOS_v1.00.rdf> .
+
+
+:StatusRestrictionADMS
+    a sh:NodeShape ;
+    rdfs:comment "Status restriction" ;
+    rdfs:label "Status restriction" ;
+    sh:property [
+        sh:class skos:ConceptScheme ;
+        sh:hasValue <http://purl.org/adms/status/1.0> ;
+        sh:minCount 1 ;
+        sh:nodeKind sh:IRI ;
+        sh:path skos:inScheme
+    ] .
+
+
+:Distribution_ShapeCV
+    a sh:NodeShape ;
+    sh:property [
+        sh:node :StatusRestrictionADMS ;
+        sh:nodeKind sh:IRI ;
+        sh:path adms:status ;
+	sh:description "The codelist of adms:status has changed from DCAT-AP 2.1 to DCAT-AP 3.0.0" ; 
+        sh:severity sh:Warning 
+    ] ;
+    sh:targetClass dcat:Distribution.
diff --git a/releases/3.0.0-draft/html/shacl/mdr-vocabularies.shape.ttl b/releases/3.0.0-draft/html/shacl/mdr-vocabularies.shape.ttl
@@ -174,16 +174,12 @@
         sh:path skos:inScheme
     ] .
 
-:GeoNamesRestriction
+:GeoNamesRestrictionRegexURI
+    rdfs:comment "Geonames restriction - base itself on URI structure" ;
+    rdfs:label "Geonames restriction" ;
     a sh:NodeShape ;
-    rdfs:comment "Geo names restriction" ;
-    rdfs:label "Geo names restriction" ;
-    sh:property [
-        sh:hasValue <http://sws.geonames.org> ;
-        sh:minCount 1 ;
-        sh:nodeKind sh:IRI ;
-        sh:path skos:inScheme
-    ] .
+    sh:pattern "^https://sws.geonames.org" .
+
 
 :LanguageRestriction
     a sh:NodeShape ;
@@ -231,13 +227,19 @@
         sh:path skos:inScheme
     ] .
 
+:IANARestrictionRegexURI
+    rdfs:comment "IANA restriction - base itself on URL structure" ;
+    rdfs:label "IANA restriction" ;
+    a sh:NodeShape ;
+    sh:pattern "^http.*://www.iana.org/assignments/media-types/" .
+
 :StatusRestriction
     a sh:NodeShape ;
     rdfs:comment "Status restriction" ;
     rdfs:label "Status restriction" ;
     sh:property [
         sh:class skos:ConceptScheme ;
-        sh:hasValue <http://purl.org/adms/status/1.0> ;
+        sh:hasValue <http://publications.europa.eu/resource/authority/distribution-status> ;
         sh:minCount 1 ;
         sh:nodeKind sh:IRI ;
         sh:path skos:inScheme
@@ -247,7 +249,8 @@
     a sh:NodeShape ;
     rdfs:comment "Checksum algorithm restriction" ;
     rdfs:label "Checksum algorithm restriction" ;
-	sh:class <http://spdx.org/rdf/terms#ChecksumAlgorithm>.
+    sh:pattern "^https://spdx.org/rdf/terms" ;
+    sh:class <http://spdx.org/rdf/terms#ChecksumAlgorithm>.
 
 :Checksum_ShapeCV
     a sh:NodeShape ;
@@ -290,7 +293,7 @@
             sh:or (:CountryRestriction
                 :PlaceRestriction
                 :ContinentRestriction
-                :GeoNamesRestriction
+                :GeoNamesRestrictionRegexURI
             )
         ] ;
         sh:nodeKind sh:IRI ;
@@ -333,7 +336,7 @@
             sh:or (:CountryRestriction
                 :PlaceRestriction
                 :ContinentRestriction
-                :GeoNamesRestriction
+                :GeoNamesRestrictionRegexURI
             )
         ] ;
         sh:nodeKind sh:IRI ;
@@ -363,7 +366,9 @@
 
 # ------------------------------------------------------------------------------------------------------------------
 # The constraints for dcat:mediaType, dcat:compressFormat, dcat:packageFormat which are limited to the IANA codelist 
-# cannot be expressed in SHACL unless a copy in RDF for the IANA codelist is being created
+# cannot be expressed in SHACL unless a copy in RDF for the IANA codelist is being created.
+# A less formal check is provided based upon the assumption that the IANIA codelist is hosted on a known URL domain.
+# This check is sensitive to the publication strategy of IANA.
 # ------------------------------------------------------------------------------------------------------------------
 :Distribution_ShapeCV
     a sh:NodeShape ;
@@ -391,6 +396,24 @@
         sh:path dcatap:availability ;
 	sh:description "A non EU managed concept is used to indicate the availability of the distribution. If no corresponding can be found inform the maintainer of the DCAT-AP availability codelist." ; 
         sh:severity sh:Violation
+    ], [
+        sh:node :IANARestrictionRegexURI;
+        sh:nodeKind sh:IRI ;
+        sh:path dcat:mediaType ;
+	sh:description "A mediaType expects a value from IANA. This check uses the URLs from IANA to perform the check as there is no IANA codelist downloadable." ; 
+        sh:severity sh:Warning
+    ], [
+        sh:node :IANARestrictionRegexURI;
+        sh:nodeKind sh:IRI ;
+        sh:path dcat:compressFormat ;
+	sh:description "A compressFormat expects a value from IANA. This check uses the URLs from IANA to perform the check as there is no IANA codelist downloadable." ; 
+        sh:severity sh:Warning
+    ], [
+        sh:node :IANARestrictionRegexURI;
+        sh:nodeKind sh:IRI ;
+        sh:path dcat:packageFormat ;
+	sh:description "A packageFormat expects a value from IANA. This check uses the URLs from IANA to perform the check as there is no IANA codelist downloadable." ; 
+        sh:severity sh:Warning
     ] ;
     sh:targetClass dcat:Distribution.
 

diff --git a/releases/3.0.0-draft/html/shacl/range.ttl b/releases/3.0.0-draft/html/shacl/range.ttl
@@ -390,7 +390,6 @@
     a sh:NodeShape ;
     rdfs:label "PeriodOfTime"@en ;
     sh:property [
-    ], [
         sh:class time:Instant ;
         sh:path time:hasBeginning ;
         sh:severity sh:Violation
@@ -419,7 +418,8 @@
     a sh:NodeShape ;
     rdfs:label "Dataset Series"@en ;
     sh:property [
-       sh:inversePath dcat:inSeries;
+       sh:class dcat:Dataset ;
+       sh:path [ sh:inversePath dcat:inSeries; ];
        sh:severity sh:Warning
     ], [
   	sh:path dcatap:applicableLegislation;

diff --git a/releases/3.0.0-draft/html/shacl/shapes.ttl b/releases/3.0.0-draft/html/shacl/shapes.ttl
@@ -302,7 +302,7 @@
         sh:severity sh:Violation
     ], [
         sh:nodeKind sh:IRI ;
-  	sh:class <http://data.europa.eu/eli/ontology#LegalResource>;
+  	sh:path dcatap:applicableLegislation;
         sh:severity sh:Violation
     ], [
         sh:nodeKind sh:BlankNodeOrIRI ;
@@ -692,7 +692,7 @@
     sh:property [
         sh:minCount 1;
         sh:nodeKind sh:BlankNodeOrIRI;
-        sh:inversePath dcat:inSeries;
+        sh:path [ sh:inversePath dcat:inSeries; ];
         sh:severity sh:Warning
     ], [
   	sh:nodeKind sh:IRI;

diff --git a/releases/3.0.0-draft/html/shacl/shapes_recommended.ttl b/releases/3.0.0-draft/html/shacl/shapes_recommended.ttl
@@ -95,7 +95,6 @@
     a sh:NodeShape ;
     rdfs:label "Catalog Record"@en ;
     sh:property [
-    ], [
         sh:minCount 1 ;
         sh:path dct:conformsTo ;
         sh:severity sh:Warning
@@ -161,29 +160,6 @@
     sh:severity sh:Warning;	
     sh:targetClass dcat:Catalog .
 
-
-
-:CategoryScheme_Shape
-    a sh:NodeShape ;
-    rdfs:label "Category Scheme"@en ;
-    sh:property [
-    ] ;
-    sh:targetClass skos:ConceptScheme .
-
-:Category_Shape
-    a sh:NodeShape ;
-    rdfs:label "Category"@en ;
-    sh:property [
-    ] ;
-    sh:targetClass skos:Concept .
-
-:Checksum_Shape
-    a sh:NodeShape ;
-    rdfs:label "Checksum"@en ;
-    sh:property [
-    ] ;
-    sh:targetClass spdx:Checksum .
-
 :DataService_Shape
     a sh:NodeShape ;
     rdfs:label "Data Service"@en ;
@@ -195,6 +171,26 @@
         sh:minCount 1 ;
         sh:path dcat:endpointDescription ;
         sh:severity sh:Warning
+    ], [
+        sh:minCount 1 ;
+        sh:path dcat:contactPoint ;
+        sh:severity sh:Warning
+    ], [
+        sh:minCount 1 ;
+        sh:path dct:publisher ;
+        sh:severity sh:Warning
+    ], [
+        sh:minCount 1 ;
+        sh:path dcat:theme ;
+        sh:severity sh:Warning
+    ], [
+        sh:minCount 1 ;
+        sh:path dct:conformsTo ;
+        sh:severity sh:Warning
+    ], [
+        sh:minCount 1 ;
+        sh:path dcat:keyword ;
+        sh:severity sh:Warning
     ] ;
     sh:targetClass dcat:DataService .
 
@@ -232,6 +228,20 @@
     ] ;
     sh:targetClass dcat:Dataset .
 
+:DatasetSeries_Shape
+    a sh:NodeShape ;
+    rdfs:label "Dataset"@en ;
+    sh:property [
+        sh:minCount 1 ;
+        sh:path dcat:contactPoint ;
+        sh:severity sh:Warning
+    ], [
+        sh:minCount 1 ;
+        sh:path dct:publisher ;
+        sh:severity sh:Warning
+    ] ;
+    sh:targetClass dcat:DatasetSeries .
+
 :DateOrDateTimeDataType_Shape
     a sh:NodeShape ;
     rdfs:comment "Date time date disjunction shape checks that a datatype property receives a date or a dateTime literal" ;
@@ -259,6 +269,9 @@
         [
             sh:class dcat:DataService
         ]
+        [
+            sh:class dcat:DatasetSeries
+        ]
     ) .
 
 :Distribution_Shape
@@ -283,13 +296,6 @@
     ] ;
     sh:targetClass dcat:Distribution .
 
-:Identifier_Shape
-    a sh:NodeShape ;
-    rdfs:label "Identifier"@en ;
-    sh:property [
-    ] ;
-    sh:targetClass adms:Identifier .
-
 :LicenceDocument_Shape
     a sh:NodeShape ;
     rdfs:label "Licence Document"@en ;
@@ -328,10 +334,4 @@
     ] ;
     sh:targetClass dct:PeriodOfTime .
 
-:Relationship_Shape
-    a sh:NodeShape ;
-    rdfs:label "Relationship"@en ;
-    sh:property [
-    ] ;
-    sh:targetClass dcat:Relationship .