configure optionaliteit further

Geonovum · Mar 6, 2024 · 02e8ffe · 02e8ffe
1 parent bd54bce
commit 02e8ffe
Show file tree

Hide file tree

Showing 3 changed files with 292 additions and 15 deletions.
diff --git a/shapes/dcat-ap-OPT.ttl b/shapes/dcat-ap-OPT.ttl
@@ -1,3 +1,7 @@
+####################################################################
+# This file is derived from DCAT-AP 3.0.0
+# https://semiceu.github.io/DCAT-AP/releases/3.0.0/#quick-reference
+####################################################################
 @prefix adms: <http://www.w3.org/ns/adms#> .
 @prefix dct: <http://purl.org/dc/terms/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
@@ -200,17 +204,17 @@ dcatapsh:DataServiceShape
   sh:property
     dcatapsh:dcatDataService_dcat-endpointURL ,
     dcatapsh:dcatDataService_dct-title ,
-    # dcatapsh:dcatDataService_dct-conformsTo ,
+    dcatapsh:dcatDataService_dct-conformsTo ,
     dcatapsh:dcatDataService_dcat-contactPoint ,
     dcatapsh:dcatDataService_dcat-endpointDescription ,
-    # dcatapsh:dcatDataService_dcat-keyword ,
-    # dcatapsh:dcatDataService_dct-publisher ,
+    dcatapsh:dcatDataService_dcat-keyword ,
+    dcatapsh:dcatDataService_dct-publisher ,
     dcatapsh:dcatDataService_dcat-servesDataset ,
-    # dcatapsh:dcatDataService_dcat-theme ,
+    dcatapsh:dcatDataService_dcat-theme ,
     dcatapsh:dcatDataService_dct-accessRights ,
     dcatapsh:dcatDataService_dct-description ,
     dcatapsh:dcatDataService_dct-format ,
-    # dcatapsh:dcatDataService_dcat-landingPage ,
+    dcatapsh:dcatDataService_dcat-landingPage ,
     dcatapsh:dcatDataService_dct-license .
 
 dcatapsh:dcatDataService_dcat-endpointURL
@@ -283,7 +287,7 @@ dcatapsh:DatasetShape
     dcatapsh:dcatDataset_dct-temporal ,
     dcatapsh:dcatDataset_dcat-theme ,
     dcatapsh:dcatDataset_dct-accessRights ,
-    # dcatapsh:dcatDataset_dcatap-applicableLegislation ,
+    dcatapsh:dcatDataset_dcatap-applicableLegislation ,
     dcatapsh:dcatDataset_dct-conformsTo ,
     dcatapsh:dcatDataset_dct-creator ,
     dcatapsh:dcatDataset_foaf-page ,
@@ -463,7 +467,7 @@ dcatapsh:DatasetSeriesShape
     dcatapsh:dcatDatasetSeries_dct-spatial ,
     dcatapsh:dcatDatasetSeries_dct-publisher ,
     dcatapsh:dcatDatasetSeries_dct-temporal ,
-    # dcatapsh:dcatDatasetSeries_dcatap-applicableLegislation ,
+    dcatapsh:dcatDatasetSeries_dcatap-applicableLegislation ,
     dcatapsh:dcatDatasetSeries_dct-description ,
     dcatapsh:dcatDatasetSeries_dct-accrualPeriodicity ,
     dcatapsh:dcatDatasetSeries_dct-modified ,
@@ -517,7 +521,7 @@ dcatapsh:DistributionShape
     dcatapsh:dcatDistribution_dct-format ,
     dcatapsh:dcatDistribution_dct-license ,
     dcatapsh:dcatDistribution_dcat-accessService ,
-    # dcatapsh:dcatDistribution_dcatap:applicableLegislation ,
+    dcatapsh:dcatDistribution_dcatap-applicableLegislation ,
     dcatapsh:dcatDistribution_dcatap-availability ,
     dcatapsh:dcatDistribution_dcat-byteSize ,
     dcatapsh:dcatDistribution_spdx-checksum ,
@@ -554,7 +558,7 @@ dcatapsh:dcatDistribution_dcat-accessService
   sh:path dcat:accessService	;
   todo_opt:optionaliteit todo_opt:optioneel	.
 
-dcatapsh:dcatDistribution_dcatap:applicableLegislation
+dcatapsh:dcatDistribution_dcatap-applicableLegislation
   sh:path dcatap:applicableLegislation	;
   todo_opt:optionaliteit todo_opt:optioneel	.
 

diff --git a/shapes/dcat-ap-nl-OPT.ttl b/shapes/dcat-ap-nl-OPT.ttl
@@ -107,5 +107,210 @@ dcatapnl:DatasetShape_theme_opt
 #  dcat:Distribution
 ###########################################
 
-# dcatapnl:DistributionShape
-# .
+dcatapnl:DistributionShape
+  sh:property
+    dcatapnl:DistributionShape_accessService_opt,
+    dcatapnl:DistributionShape_applicableLegislation_opt,
+    dcatapnl:DistributionShape_byteSize_opt,
+    dcatapnl:DistributionShape_downloadURL_opt,
+    dcatapnl:DistributionShape_format_opt,
+    dcatapnl:DistributionShape_language_opt,
+    dcatapnl:DistributionShape_license_opt,
+    dcatapnl:DistributionShape_linkedSchemas_opt,
+    dcatapnl:DistributionShape_mediaType_opt,
+    dcatapnl:DistributionShape_rights_opt
+.
+
+dcatapnl:DistributionShape_accessService_opt
+  sh:path dcat:accessService;
+  todo_opt:optionaliteit todo_opt:aanbevolen
+.
+
+dcatapnl:DistributionShape_applicableLegislation_opt
+  sh:path dcatap:applicableLegislation;
+  todo_opt:optionaliteit todo_opt:conditioneel
+.
+
+dcatapnl:DistributionShape_byteSize_opt
+  sh:path dcat:byteSize;
+  todo_opt:optionaliteit todo_opt:conditioneel
+.
+
+dcatapnl:DistributionShape_downloadURL_opt
+  sh:path dcat:downloadURL;
+  todo_opt:optionaliteit todo_opt:aanbevolen
+.
+
+dcatapnl:DistributionShape_format_opt
+  sh:path dct:format;
+  todo_opt:optionaliteit todo_opt:conditioneel
+.
+
+dcatapnl:DistributionShape_language_opt
+  sh:path dct:language;
+  todo_opt:optionaliteit todo_opt:aanbevolen
+.
+
+dcatapnl:DistributionShape_license_opt
+  sh:path dct:license;
+  todo_opt:optionaliteit todo_opt:verplicht
+.
+
+dcatapnl:DistributionShape_linkedSchemas_opt
+  sh:path dct:conformsTo;
+  todo_opt:optionaliteit todo_opt:aanbevolen
+.
+
+dcatapnl:DistributionShape_mediaType_opt
+  sh:path dcat:mediaType;
+  todo_opt:optionaliteit todo_opt:conditioneel
+.
+
+dcatapnl:DistributionShape_rights_opt
+  sh:path dct:rights;
+  todo_opt:optionaliteit todo_opt:conditioneel
+.
+
+
+###########################################
+#  dcat:DataService
+###########################################
+
+dcatapnl:DataServiceShape
+  sh:property
+    dcatapnl:DataServiceShape_accessRights_opt,
+    dcatapnl:DataServiceShape_applicableLegislation_opt,
+    dcatapnl:DataServiceShape_applicationProfile_opt,
+    dcatapnl:DataServiceShape_contactPoint_opt,
+    dcatapnl:DataServiceShape_creator_opt,
+    dcatapnl:DataServiceShape_description_opt,
+    dcatapnl:DataServiceShape_documentation_opt,
+    dcatapnl:DataServiceShape_endpointDescription_opt,
+    dcatapnl:DataServiceShape_hvdCategory_opt,
+    dcatapnl:DataServiceShape_identifier_opt,
+    dcatapnl:DataServiceShape_keyword_opt,
+    dcatapnl:DataServiceShape_language_opt,
+    dcatapnl:DataServiceShape_license_opt,
+    dcatapnl:DataServiceShape_modified_opt,
+    dcatapnl:DataServiceShape_otherIdentifier_opt,
+    dcatapnl:DataServiceShape_publisher_opt,
+    dcatapnl:DataServiceShape_rights_opt,
+    dcatapnl:DataServiceShape_servesDataset_opt,
+    dcatapnl:DataServiceShape_theme_opt,
+    dcatapnl:DataServiceShape_title_opt
+.
+
+dcatapnl:DataServiceShape_accessRights_opt
+  sh:path dct:accessRights;
+  todo_opt:optionaliteit todo_opt:verplicht
+.
+
+dcatapnl:DataServiceShape_applicableLegislation_opt
+  sh:path dcatap:applicableLegislation;
+  todo_opt:optionaliteit todo_opt:conditioneel
+.
+
+dcatapnl:DataServiceShape_applicationProfile_opt
+  sh:path dct:conformsTo;
+  todo_opt:optionaliteit todo_opt:aanbevolen
+.
+
+dcatapnl:DataServiceShape_contactPoint_opt
+  sh:path dcat:contactPoint;
+  todo_opt:optionaliteit todo_opt:verplicht
+.
+
+dcatapnl:DataServiceShape_creator_opt
+  sh:path dct:creator;
+  todo_opt:optionaliteit todo_opt:aanbevolen
+.
+
+dcatapnl:DataServiceShape_description_opt
+  sh:path dct:description;
+  todo_opt:optionaliteit todo_opt:verplicht
+.
+
+dcatapnl:DataServiceShape_documentation_opt
+  sh:path foaf:page;
+  todo_opt:optionaliteit todo_opt:conditioneel
+.
+
+dcatapnl:DataServiceShape_endpointDescription_opt
+  sh:path dcat:endpointDescription;
+  todo_opt:optionaliteit todo_opt:verplicht
+.
+
+dcatapnl:DataServiceShape_hvdCategory_opt
+  sh:path dcatap:hvdCategory;
+  todo_opt:optionaliteit todo_opt:conditioneel
+.
+
+dcatapnl:DataServiceShape_identifier_opt
+  sh:path dct:identifier;
+  todo_opt:optionaliteit todo_opt:verplicht
+.
+
+dcatapnl:DataServiceShape_keyword_opt
+  sh:path dcat:keyword;
+  todo_opt:optionaliteit todo_opt:aanbevolen
+.
+
+dcatapnl:DataServiceShape_language_opt
+  sh:path dct:language;
+  todo_opt:optionaliteit todo_opt:aanbevolen
+.
+
+dcatapnl:DataServiceShape_license_opt
+  sh:path dct:license;
+  todo_opt:optionaliteit todo_opt:verplicht
+.
+
+dcatapnl:DataServiceShape_modified_opt
+  sh:path dct:modified;
+  todo_opt:optionaliteit todo_opt:optioneel
+.
+
+dcatapnl:DataServiceShape_otherIdentifier_opt
+  sh:path adms:identifier;
+  todo_opt:optionaliteit todo_opt:optioneel
+.
+
+dcatapnl:DataServiceShape_publisher_opt
+  sh:path dct:publisher;
+  todo_opt:optionaliteit todo_opt:verplicht
+.
+
+dcatapnl:DataServiceShape_rights_opt
+  sh:path dct:rights;
+  todo_opt:optionaliteit todo_opt:optioneel
+.
+
+dcatapnl:DataServiceShape_servesDataset_opt
+  sh:path dcat:servesDataset;
+  todo_opt:optionaliteit todo_opt:conditioneel
+.
+
+dcatapnl:DataServiceShape_theme_opt
+  sh:path dcat:theme;
+  todo_opt:optionaliteit todo_opt:verplicht
+.
+
+dcatapnl:DataServiceShape_title_opt
+  sh:path dct:title;
+  todo_opt:optionaliteit todo_opt:verplicht
+.
+
+
+###########################################
+#  dcat:DatasetSeries
+###########################################
+
+dcatapnl:DatasetSeriesShape
+  sh:property
+    dcatapnl:DatasetSeriesShape_description_opt
+.
+
+dcatapnl:DatasetSeriesShape_description_opt
+  sh:path dct:description;
+  todo_opt:optionaliteit todo_opt:verplicht
+.