Merge pull request #825 from w3c/dcat-issue432-simon

Remove DataDistributionService

dcat/examples/csiro-stratchart.ttl

@@ -78,7 +78,7 @@ dap:d33937
       dct:conformsTo <https://www.w3.org/TR/rdf-schema/> ;
       rdfs:comment "RDF representation of the data" ;
       dcat:accessService [
-          a dcat:DataDistributionService ;
+          a dcat:DataService ;
           dct:conformsTo <https://www.w3.org/TR/sparql11-query/> ;
           dct:title "International Chronostratigraphic Chart hosted at Research Vocabularies Australia" ;
           rdfs:comment "Service that supports queries to obtain RDF representations of subsets of the data" ;

dcat/examples/dataset-004.ttl

@@ -31,15 +31,15 @@
   dcat:mediaType <https://www.iana.org/assignments/media-types/image/png> ;
 .
 :figure-service-006
-  rdf:type dcat:DataDistributionService ;
+  rdf:type dcat:DataService ;
   dct:conformsTo <http://example.org/apidef/figure/v1.0> ;
   dct:type <https://inspire.ec.europa.eu/metadata-codelist/SpatialDataServiceType/view> ;
   dcat:endpointDescription <http://example.org/api/figure-006/params> ;
   dcat:endpointURL <http://example.org/api/figure-006> ;
   dcat:servesDataset :dataset-004 ;
 .
 :table-service-005
-  rdf:type dcat:DataDistributionService ;
+  rdf:type dcat:DataService ;
   dct:conformsTo <http://example.org/apidef/table/v2.2> ;
   dct:type <https://inspire.ec.europa.eu/metadata-codelist/SpatialDataServiceType/download> ;
   dcat:endpointDescription <http://example.org/api/table-005/capability> ;

dcat/examples/ga-courts.ttl

@@ -91,7 +91,7 @@ ga-courts:jc
   dcat:theme <http://www.abs.gov.au/ausstats/abs@.nsf/0/0CE8FFFE4879D23ACA2574180004AFE5> ;
 .
 ga-courts:jc-esri
-  rdf:type dcat:DataDistributionService ;
+  rdf:type dcat:DataService ;
   dct:accessRights <http://creativecommons.org/licenses/by/4.0/legalcode> ;
   dct:conformsTo <https://developers.arcgis.com/rest/> ;
   dct:created "2016-01-01"^^xsd:date ;
@@ -122,7 +122,7 @@ ga-courts:jc-esri
   dcat:theme <http://www.abs.gov.au/ausstats/abs@.nsf/0/0CE8FFFE4879D23ACA2574180004AFE5> ;
 .
 ga-courts:jc-wfs
-  rdf:type dcat:DataDistributionService ;
+  rdf:type dcat:DataService ;
   dct:accessRights <http://creativecommons.org/licenses/by/4.0/legalcode> ;
   dct:conformsTo <http://www.opengis.net/def/serviceType/ogc/wfs/2.0.0> ;
   dct:conformsTo <http://www.opengis.net/def/serviceType/ogc/wfs/1.1.0> ;
@@ -154,7 +154,7 @@ ga-courts:jc-wfs
   dcat:theme <http://www.abs.gov.au/ausstats/abs@.nsf/0/0CE8FFFE4879D23ACA2574180004AFE5> ;
 .
 ga-courts:jc-wms
-  rdf:type dcat:DataDistributionService ;
+  rdf:type dcat:DataService ;
   dct:accessRights <http://creativecommons.org/licenses/by/4.0/legalcode> ;
   dct:conformsTo <http://www.opengis.net/def/serviceType/ogc/wms/1.3> ;
   dct:created "2016-01-01"^^xsd:date ;

dcat/examples/threddsABC.ttl

@@ -34,7 +34,7 @@ threddsABC:CatalogRecord_D1
 threddsABC:CatalogRecord_DDS1
   rdf:type dcat:CatalogRecord ;
   dcterms:issued "2018-09-10" ;
-  foaf:primaryTopic threddsABC:DataDistributionService_1 ;
+  foaf:primaryTopic threddsABC:DataService_1 ;
 .
 threddsABC:CatalogRecord_DS1
   rdf:type dcat:CatalogRecord ;
@@ -51,12 +51,12 @@ threddsABC:Catalog_1
   dcat:record threddsABC:CatalogRecord_D1 ;
   dcat:record threddsABC:CatalogRecord_DDS1 ;
   dcat:record threddsABC:CatalogRecord_DS1 ;
-  dcat:service threddsABC:DataDistributionService_1 ;
+  dcat:service threddsABC:DataService_1 ;
   dcat:service threddsABC:DiscoveryService_1 ;
   dcat:themeTaxonomy <http://official.example.org/classification-scheme-A/> ;
 .
-threddsABC:DataDistributionService_1
-  rdf:type dcat:DataDistributionService ;
+threddsABC:DataService_1
+  rdf:type dcat:DataService ;
   dc:title "TDS 1" ;
   dcterms:conformsTo <http://unidata.org/tds/5.4> ;
   dcat:endpointURL <http://organization.example.org/data/service/tds1> ;
@@ -73,7 +73,7 @@ threddsABC:Dataset_1
       rdf:type dcat:Distribution ;
       dcterms:conformsTo <http://organization.example.org/schema/yu876> ;
       dcterms:license <https://creativecommons.org/licenses/by/4.0/> ;
-      dcat:accessService threddsABC:DataDistributionService_1 ;
+      dcat:accessService threddsABC:DataService_1 ;
       dcat:byteSize 39871230887 ;
       dcat:downloadURL <http://data.example.org/dataset/distro/d1.csv> ;
       dcat:mediaType <https://www.iana.org/assignments/media-types/text/csv> ;

dcat/rdf/dcat.ttl

@@ -259,16 +259,7 @@ dcat:CatalogRecord
 					  Να σημειωθεί πως η οντολογία W3C PROV επιτρέπει την περιγραφή επιπλέον πληροφοριών ιστορικού όπως λεπτομέρειες για τη διαδικασία και τον δράστη που εμπλέκονται σε μία συγκεκριμένη αλλαγή εντός του συνόλου δεδομένων."""@el ;
   skos:scopeNote "このクラスはオプションで、すべてのカタログがそれを用いるとは限りません。これは、データセットに関するメタデータとカタログ内のデータセットのエントリーに関するメタデータとで区別が行われるカタログのために存在しています。例えば、データセットの公開日プロパティーは、公開機関が情報を最初に利用可能とした日付を示しますが、カタログ・レコードの公開日は、データセットがカタログに追加された日付です。両方の日付が異っていたり、後者だけが分かっている場合は、カタログ・レコードに対してのみ公開日を指定すべきです。W3CのPROVオントロジー[prov-o]を用いれば、データセットに対する特定の変更に関連するプロセスやエージェントの詳細などの、さらに詳しい来歴情報の記述が可能となることに注意してください。"@ja ;
 .
-dcat:DataDistributionService
-  rdf:type owl:Class ;
-  rdfs:comment "A site or end-point that provides access to distributions of existing datasets or subsets of datasets" ;
-  rdfs:label "Data distribution service" ;
-  rdfs:subClassOf dcat:DataService ;
-  skos:changeNote "New class in this revision of DCAT" ;
-  skos:editorialNote "Status: Class accepted by DCAT revision team, but details of definition and constraints not yet resolved." ;
-  skos:scopeNote "A DataDistributionService is usually bound to one or more specified Datasets, as indicated by the dcat:servesDataset property" ;
-  skos:scopeNote "A data discovery service supports discovery of data, usually by providing access to a Catalog. In that context the data discovery service can be understood as a DataDistributionService in which least one dcat:Catalog appears as the object of its dcat:servesDataset property" ;
-.
+
 dcat:DataService
   rdf:type owl:Class ;
   rdfs:comment "A site or end-point providing operations related to the discovery of, access to, or processing functions on, data or related resources" ;
@@ -282,9 +273,10 @@ dcat:DataService
     ] ;
   skos:changeNote "New class in this revision of DCAT" ;
   skos:editorialNote "Status: Class accepted by DCAT revision team, but details of definition and constraints not yet resolved." ;
-  skos:scopeNote "The class dcat:DataService is an extension point for the description of any kind of data service. Currently only one subclass is defined - DataDistributionService - but additional subclasses may be defined in a DCAT application profile or other DCAT application for catalogs of other kinds of services" ;
   skos:scopeNote "The kind of service can be indicated using the dct:type property. Its value may be taken from a controlled vocabulary such as the INSPIRE spatial data service type vocabulary" ;
+  skos:scopeNote "If a dcat:DataService is bound to one or more specified Datasets, they are indicated by the dcat:servesDataset property.";
 .
+
 dcat:Dataset
   rdf:type rdfs:Class ;
   rdf:type owl:Class ;
@@ -412,7 +404,7 @@ dcat:accessService
   rdf:type owl:ObjectProperty ;
   rdfs:comment "A site or end-point that gives access to the distribution of the dataset" ;
   rdfs:label "data access service" ;
-  rdfs:range dcat:DataDistributionService ;
+  rdfs:range dcat:DataService ;
   skos:changeNote "New property in this revision of DCAT" ;
   skos:editorialNote "Status: Property accepted by DCAT revision team, but details of definition and constraints not yet resolved." ;
 .
@@ -811,8 +803,8 @@ dcat:record
 .
 dcat:servesDataset
   rdf:type owl:ObjectProperty ;
-  rdfs:comment "A collection of data that this DataDistributionService can distribute" ;
-  rdfs:domain dcat:DataDistributionService ;
+  rdfs:comment "A collection of data that this DataService can distribute" ;
+  rdfs:domain dcat:DataService ;
   rdfs:label "serves dataset" ;
   rdfs:range dcat:Dataset ;
   skos:changeNote "New property in this revision of DCAT" ;

dcat/rdf/dcat2014.ttl

@@ -23,7 +23,7 @@ dcat:Download
   rdfs:label "Descarga (Obsoleto)"@es ;
   rdfs:subClassOf dcat:Distribution ;
   owl:deprecated "true"^^xsd:boolean ;
-  skos:changeNote "Use dcat:DataDistributionService instead" ;
+  skos:changeNote "Use dcat:DataService instead" ;
 .
 dcat:Feed
   rdf:type rdfs:Class ;
@@ -34,7 +34,7 @@ dcat:Feed
   rdfs:label "Feed (Deprecated)" ;
   rdfs:subClassOf dcat:Distribution ;
   owl:deprecated "true"^^xsd:boolean ;
-  skos:changeNote "Use dcat:DataDistributionService instead" ;
+  skos:changeNote "Use dcat:DataService instead" ;
 .
 dcat:WebService
   rdf:type rdfs:Class ;