Skip to content

Commit

Permalink
Merge pull request #1 from w3c/gh-pages
Browse files Browse the repository at this point in the history
bringing up to date with DXWG
  • Loading branch information
rawmatt committed May 20, 2020
2 parents ab03a20 + c58b793 commit e6ea142
Show file tree
Hide file tree
Showing 9 changed files with 62 additions and 60 deletions.
8 changes: 4 additions & 4 deletions dcat/examples/spatial-properties.jsonld
Expand Up @@ -64,7 +64,7 @@
"@context" : {
"centroid" : {
"@id" : "http://www.w3.org/ns/dcat#centroid",
"@type" : "http://www.opengis.net/ont/geosparql#asWKT"
"@type" : "http://www.opengis.net/ont/geosparql#wktLiteral"
},
"long" : {
"@id" : "http://www.w3.org/2003/01/geo/wgs84_pos#long",
Expand Down Expand Up @@ -94,11 +94,11 @@
},
"geometry" : {
"@id" : "http://www.w3.org/ns/locn#geometry",
"@type" : "http://www.opengis.net/ont/geosparql#asWKT"
"@type" : "http://www.opengis.net/ont/geosparql#wktLiteral"
},
"bbox" : {
"@id" : "http://www.w3.org/ns/dcat#bbox",
"@type" : "http://www.opengis.net/ont/geosparql#asWKT"
"@type" : "http://www.opengis.net/ont/geosparql#wktLiteral"
},
"geosparql" : "http://www.opengis.net/ont/geosparql#",
"ex" : "https://dcat.example.org/",
Expand All @@ -112,4 +112,4 @@
"dcat" : "http://www.w3.org/ns/dcat#",
"locn" : "http://www.w3.org/ns/locn#"
}
}
}
10 changes: 5 additions & 5 deletions dcat/examples/spatial-properties.ttl
Expand Up @@ -17,21 +17,21 @@ ex:AnneFrank_0
a dcat:Dataset ;
dct:spatial [
a dct:Location ;
locn:geometry "POLYGON (( 4.8842353 52.375108 , 4.884276 52.375153 , 4.8842567 52.375159 , 4.883981 52.375254 , 4.8838502 52.375109 , 4.883819 52.375075 , 4.8841037 52.374979 , 4.884143 52.374965 , 4.8842069 52.375035 , 4.884263 52.375016 , 4.8843200 52.374996 , 4.884255 52.374926 , 4.8843289 52.374901 , 4.884451 52.375034 , 4.8842353 52.375108 ))"^^geosparql:asWKT ;
locn:geometry "POLYGON (( 4.8842353 52.375108 , 4.884276 52.375153 , 4.8842567 52.375159 , 4.883981 52.375254 , 4.8838502 52.375109 , 4.883819 52.375075 , 4.8841037 52.374979 , 4.884143 52.374965 , 4.8842069 52.375035 , 4.884263 52.375016 , 4.8843200 52.374996 , 4.884255 52.374926 , 4.8843289 52.374901 , 4.884451 52.375034 , 4.8842353 52.375108 ))"^^geosparql:wktLiteral ;
] ;
.
ex:AnneFrank_1
a dcat:Dataset ;
dct:spatial [
a dct:Location ;
locn:geometry "<http://www.opengis.net/def/crs/EPSG/0/28992> POLYGON (( 120749.725 487589.422 , 120752.55 487594.375 , 120751.227 487595.129 , 120732.539 487605.788 , 120723.505 487589.745 , 120721.387 487585.939 , 120740.668 487575.07 , 120743.316 487573.589 , 120747.735 487581.337 , 120751.564 487579.154 , 120755.411 487576.96 , 120750.935 487569.172 , 120755.941 487566.288 , 120764.369 487581.066 , 120749.725 487589.422 ))"^^geosparql:asWKT ;
locn:geometry "<http://www.opengis.net/def/crs/EPSG/0/28992> POLYGON (( 120749.725 487589.422 , 120752.55 487594.375 , 120751.227 487595.129 , 120732.539 487605.788 , 120723.505 487589.745 , 120721.387 487585.939 , 120740.668 487575.07 , 120743.316 487573.589 , 120747.735 487581.337 , 120751.564 487579.154 , 120755.411 487576.96 , 120750.935 487569.172 , 120755.941 487566.288 , 120764.369 487581.066 , 120749.725 487589.422 ))"^^geosparql:wktLiteral ;
] ;
.
ex:AnneFrank_2
a dcat:Dataset ;
dct:spatial [
a dct:Location ;
dcat:centroid "POINT(4.88412 52.37509)"^^geosparql:asWKT ;
dcat:centroid "POINT(4.88412 52.37509)"^^geosparql:wktLiteral ;
] ;
.
ex:AnneFrank_3
Expand All @@ -40,7 +40,7 @@ ex:AnneFrank_3
a dct:Location ;
w3cgeo:lat 52.37509 ;
w3cgeo:long 4.88412 ;
dcat:centroid "POINT(4.88412 52.37509)"^^geosparql:asWKT ;
dcat:centroid "POINT(4.88412 52.37509)"^^geosparql:wktLiteral ;
] ;
.
ex:Dutch-postal
Expand All @@ -49,7 +49,7 @@ ex:Dutch-postal
dct:description "INSPIRE addresses derived from the Addresses base registry, available for the Netherlands"@en ;
dct:spatial [
a dct:Location ;
dcat:bbox "POLYGON(( 3.053 47.975 , 7.24 47.975 , 7.24 53.504 , 3.053 53.504 , 3.053 47.975 ))"^^geosparql:asWKT ;
dcat:bbox "POLYGON(( 3.053 47.975 , 7.24 47.975 , 7.24 53.504 , 3.053 53.504 , 3.053 47.975 ))"^^geosparql:wktLiteral ;
] ;
dct:title "Addresses"@en ;
dct:title "Adressen"@nl ;
Expand Down
24 changes: 12 additions & 12 deletions dcat/index.html
Expand Up @@ -246,8 +246,7 @@ <h3>DCAT scope</h3>
</li>
<li>
<a href="#Class:Dataset"><code>dcat:Dataset</code></a> represents a dataset.
A dataset is a collection of data, published or curated by a single agent.
Data comes in many forms including numbers, words, pixels, imagery, sound and other multi-media, and potentially other types, any of which might be collected into a dataset.
A dataset is a collection of data, published or curated by a single agent or identifiable community. The notion of dataset in DCAT is broad and inclusive, with the intention of accommodating resource types arising from all communities. Data comes in many forms including numbers, text, pixels, imagery, sound and other multi-media, and potentially other types, any of which might be collected into a dataset.
</li>
<li>
<a href="#Class:Distribution"><code>dcat:Distribution</code></a> represents an accessible form of a dataset such as a downloadable file.
Expand Down Expand Up @@ -1696,6 +1695,7 @@ <h3>Class: Dataset</h3>
<tr><td class="prop">Sub-class of:</td><td><a href="#Class:Resource"><code>dcat:Resource</code></a></td></tr>
<tr><td class="prop">Usage note:</td><td>This class describes the conceptual dataset. One or more representations might be available, with differing schematic layouts and formats or serializations.</td></tr>
<tr><td class="prop">Usage note:</td><td>This class describes the actual dataset as published by the dataset provider. In cases where a distinction between the actual dataset and its entry in the catalog is necessary (because metadata such as modification date might differ), the <i><a href="#Class:Catalog_Record">catalog record</a></i> class can be used for the latter.</td></tr>
<tr><td class="prop">Usage note:</td><td>The notion of dataset in DCAT is broad and inclusive, with the intention of accommodating resource types arising from all communities. Data comes in many forms including numbers, text, pixels, imagery, sound and other multi-media, and potentially other types, any of which might be collected into a dataset.</td></tr>
</tbody>
</table>

Expand Down Expand Up @@ -2750,7 +2750,7 @@ <h4>Property: geometry</h4>
<tbody>
<tr><td class="prop">Definition:</td><td>Associates any resource with the corresponding geometry. [[LOCN]]</td></tr>
<tr><td class="prop">Range:</td><td><a data-cite="RDF-SCHEMA#ch_literal"><code title="http://www.w3.org/2000/01/rdf-schema#Literal">rdfs:Literal</code></a></td></tr>
<tr><td class="prop">Usage note:</td><td>The range of this property is intentionally generic, with the purpose of allowing different geometry encodings. E.g., the geometry could be encoded as <abbr title="Well-known Text">WKT</abbr> (<a href="http://www.opengis.net/ont/geosparql#asWKT"><code title="http://www.opengis.net/ont/geosparql#asWKT">geosparql:asWKT</code></a> [[GeoSPARQL]]).</td></tr>
<tr><td class="prop">Usage note:</td><td>The range of this property is intentionally generic, with the purpose of allowing different geometry encodings. E.g., the geometry could be encoded as <abbr title="Well-known Text">WKT</abbr> (<a href="http://www.opengis.net/ont/geosparql#wktLiteral"><code title="http://www.opengis.net/ont/geosparql#wktLiteral">geosparql:wktLiteral</code></a> [[GeoSPARQL]]).</td></tr>
</tbody>
</table>

Expand All @@ -2776,7 +2776,7 @@ <h4>Property: bounding box</h4>
<tbody>
<tr><td class="prop">Definition:</td><td>The geographic bounding box of a resource.</td></tr>
<tr><td class="prop">Range:</td><td><a data-cite="RDF-SCHEMA#ch_literal"><code title="http://www.w3.org/2000/01/rdf-schema#Literal">rdfs:Literal</code></a></td></tr>
<tr><td class="prop">Usage note:</td><td>The range of this property is intentionally generic, with the purpose of allowing different geometry encodings. E.g., the geometry could be encoded as <abbr title="Well-known Text">WKT</abbr> (<a href="http://www.opengis.net/ont/geosparql#asWKT"><code title="http://www.opengis.net/ont/geosparql#asWKT">geosparql:asWKT</code></a> [[GeoSPARQL]]).</td></tr>
<tr><td class="prop">Usage note:</td><td>The range of this property is intentionally generic, with the purpose of allowing different geometry encodings. E.g., the geometry could be encoded as <abbr title="Well-known Text">WKT</abbr> (<a href="http://www.opengis.net/ont/geosparql#wktLiteral"><code title="http://www.opengis.net/ont/geosparql#wktLiteral">geosparql:wktLiteral</code></a> [[GeoSPARQL]]).</td></tr>
</tbody>
</table>

Expand All @@ -2802,7 +2802,7 @@ <h4>Property: centroid</h4>
<tbody>
<tr><td class="prop">Definition:</td><td>The geographic center (centroid) of a resource.</td></tr>
<tr><td class="prop">Range:</td><td><a data-cite="RDF-SCHEMA#ch_literal"><code title="http://www.w3.org/2000/01/rdf-schema#Literal">rdfs:Literal</code></a></td></tr>
<tr><td class="prop">Usage note:</td><td>The range of this property is intentionally generic, with the purpose of allowing different geometry encodings. E.g., the geometry could be encoded as <abbr title="Well-known Text">WKT</abbr> (<a href="http://www.opengis.net/ont/geosparql#asWKT"><code title="http://www.opengis.net/ont/geosparql#asWKT">geosparql:asWKT</code></a> [[GeoSPARQL]]).</td></tr>
<tr><td class="prop">Usage note:</td><td>The range of this property is intentionally generic, with the purpose of allowing different geometry encodings. E.g., the geometry could be encoded as <abbr title="Well-known Text">WKT</abbr> (<a href="http://www.opengis.net/ont/geosparql#wktLiteral"><code title="http://www.opengis.net/ont/geosparql#wktLiteral">geosparql:wktLiteral</code></a> [[GeoSPARQL]]).</td></tr>
</tbody>
</table>

Expand Down Expand Up @@ -3181,7 +3181,7 @@ <h3>Spatial properties</h3>
4.8843200 52.374996 , 4.884255 52.374926 ,
4.8843289 52.374901 , 4.884451 52.375034 ,
4.8842353 52.375108
))"""^^geosparql:asWKT ;
))"""^^geosparql:wktLiteral ;
] .
</pre>
<figure id="fig-spatial-coverage-geometry">
Expand All @@ -3205,7 +3205,7 @@ <h3>Spatial properties</h3>
120755.411 487576.96 , 120750.935 487569.172 ,
120755.941 487566.288 , 120764.369 487581.066 ,
120749.725 487589.422
))"""^^geosparql:asWKT ;
))"""^^geosparql:wktLiteral ;
] .
</pre>
</aside>
Expand All @@ -3216,7 +3216,7 @@ <h3>Spatial properties</h3>
&lt;AnneFrank_2&gt; a dcat:Dataset ;
dct:spatial [
a dct:Location ;
dcat:centroid "POINT(4.88412 52.37509)"^^geosparql:asWKT ;
dcat:centroid "POINT(4.88412 52.37509)"^^geosparql:wktLiteral ;
] .
</pre>
<figure id="fig-spatial-coverage-centroid">
Expand All @@ -3225,14 +3225,14 @@ <h3>Spatial properties</h3>
</figure>
<div class="note">
<p>This point location could be expressed using the [[W3C-BASIC-GEO]] vocabulary.
If it is required to provide the <code>w3cgeo:Point</code> formulation, then it should be in addition to, not in place of, a <code>dcat:centroid</code> containing a <abbr title="Well-known Text">WKT</abbr> literal (<a href="http://www.opengis.net/ont/geosparql#asWKT"><code title="http://www.opengis.net/ont/geosparql#asWKT">geosparql:asWKT</code></a> [[GeoSPARQL]]).
If it is required to provide the <code>w3cgeo:Point</code> formulation, then it should be in addition to, not in place of, a <code>dcat:centroid</code> containing a <abbr title="Well-known Text">WKT</abbr> literal (<a href="http://www.opengis.net/ont/geosparql#wktLiteral"><code title="http://www.opengis.net/ont/geosparql#wktLiteral">geosparql:wktLiteral</code></a> [[GeoSPARQL]]).
This ensures interoperability with other DCAT dataset descriptions.
For example:
<pre class="nohighlight turtle">
&lt;AnneFrank_3&gt; a dcat:Dataset ;
dct:spatial [
a dct:Location , w3cgeo:Point ;
dcat:centroid "POINT(4.88412 52.37509)"^^geosparql:asWKT ;
dcat:centroid "POINT(4.88412 52.37509)"^^geosparql:wktLiteral ;
w3cgeo:lat "52.37509"^^xsd:decimal ;
w3cgeo:long "4.88412"^^xsd:decimal ;
] .
Expand All @@ -3257,7 +3257,7 @@ <h3>Spatial properties</h3>
3.053 47.975 , 7.24 47.975 ,
7.24 53.504 , 3.053 53.504 ,
3.053 47.975
))"""^^geosparql:asWKT ;
))"""^^geosparql:wktLiteral ;
] .
</pre>
<figure id="fig-spatial-coverage-bbox">
Expand Down Expand Up @@ -3858,7 +3858,7 @@ <h2>Acknowledgments</h2>

<p>The editors gratefully acknowledge the contributions made to this document by <a href="https://www.w3.org/2000/09/dbwg/details?group=99375&public=1">all members of the working group</a>, especially Annette Greiner, Antoine Isaac, Armin Haller, Dan Brickley, Ine de Visser, Jaroslav Pullmann, Lars G. Svensson, Linda van den Brink, Makx Dekkers, Nicholas Car, Rob Atkinson, Tom Baker.</p>

<p>The editors would also like to thank the following for comments received: Addison Phillips, Andreas Kuckartz, Anna Odgaard Ingram, Armando Stellato, Bert van Nuffelen, Chris Little, Chris Sweeney, Chris Wood, Clemens Portele, Daniel Pop, Dave Reynolds, Guillaume Duffes, Ian Davis, Jakob Voß, Jakub Klímek, James Passmore, Leigh Dodds, Luca Trani, Marco Brattinga, Matthias Palmér, Melanie Barlow, Nancy Fallgren, Nuno Freire, Øystein Åsnes, Pano Maria, Peter Parslow, Renato Iannella, Ruth Duerr, Siri Jodha S. Khalsa, Stephane Fellah, Stephen Richard, Stijn Goedertier, Tom Kralidis, Vladimir Alexiev, Wouter Beek, Yves Coene.</p>
<p>The editors would also like to thank the following for comments received: Addison Phillips, Andreas Kuckartz, Anna Odgaard Ingram, Armando Stellato, Bert van Nuffelen, Chris Little, Chris Sweeney, Chris Wood, Clemens Portele, Daniel Pop, Dave Reynolds, Guillaume Duffes, Ian Davis, Jakob Voß, Jakub Klímek, James Passmore, Leigh Dodds, Luca Trani, Marco Brattinga, Matthew Rawlings, Matthias Palmér, Melanie Barlow, Nancy Fallgren, Nuno Freire, Øystein Åsnes, Pano Maria, Peter Parslow, Renato Iannella, Ruth Duerr, Shuji Kamitsuna, Siri Jodha S. Khalsa, Stephane Fellah, Stephen Richard, Stijn Goedertier, Tom Kralidis, Vladimir Alexiev, Wouter Beek, Yves Coene.</p>

<p>The editors also gratefully acknowledge the chairs of this Working Group: Karen Coyle, Caroline Burle and Peter Winstanley &mdash; and staff contacts Phil Archer and Dave Raggett.</p>

Expand Down
8 changes: 4 additions & 4 deletions dcat/rdf/dcat-external.jsonld
Expand Up @@ -1653,16 +1653,16 @@
} ],
"http://www.w3.org/2004/02/skos/core#scopeNote" : [ {
"@language" : "es",
"@value" : " el contexto de DCAT 2.0, el rango de esta propiedad es intencionalmente genérico con el propósito de permitir distintas codificaciones de la geometría. Por ejemplo, la geometría puede codificarse como WKT (geosparql:asWKT [GeoSPARQL])."
"@value" : " el contexto de DCAT 2.0, el rango de esta propiedad es intencionalmente genérico con el propósito de permitir distintas codificaciones de la geometría. Por ejemplo, la geometría puede codificarse como WKT (geosparql:wktLiteral [GeoSPARQL])."
}, {
"@language" : "en",
"@value" : "In the context of DCAT 2.0, the range of this property is intentionally generic, with the purpose of allowing different geometry encodings. E.g., the geometry could be encoded as WKT (geosparql:asWKT [GeoSPARQL])."
"@value" : "In the context of DCAT 2.0, the range of this property is intentionally generic, with the purpose of allowing different geometry encodings. E.g., the geometry could be encoded as WKT (geosparql:wktLiteral [GeoSPARQL])."
}, {
"@language" : "it",
"@value" : "Nel contesto del DCAT 2.0, il range di questa proprietà è volutamente generico, con lo scopo di consentire diverse codifiche geometriche. Ad esempio, la geometria potrebbe essere codificata come WKT (geosparql:asWKT [GeoSPARQL])."
"@value" : "Nel contesto del DCAT 2.0, il range di questa proprietà è volutamente generico, con lo scopo di consentire diverse codifiche geometriche. Ad esempio, la geometria potrebbe essere codificata come WKT (geosparql:wktLiteral [GeoSPARQL])."
}, {
"@language" : "cs",
"@value" : "V kontextu DCAT 2.0, obor hodnot této vlastnosti je úmyslně obecný, aby umožnil různé kódování geometrií. Geometrie by kupříkladu mohla být kódována jako WKT (geosparql:asWKT [GeoSPARQL])."
"@value" : "V kontextu DCAT 2.0, obor hodnot této vlastnosti je úmyslně obecný, aby umožnil různé kódování geometrií. Geometrie by kupříkladu mohla být kódována jako WKT (geosparql:wktLiteral [GeoSPARQL])."
} ]
}, {
"@id" : "http://www.w3.org/ns/odrl/2/hasPolicy",
Expand Down
8 changes: 4 additions & 4 deletions dcat/rdf/dcat-external.rdf
Expand Up @@ -344,10 +344,10 @@
<skos:definition xml:lang="it">Associa qualsiasi risorsa alla geometria corrispondente.</skos:definition>
<skos:definition xml:lang="en">Associates any resource with the corresponding geometry.</skos:definition>
<skos:definition xml:lang="cs">Přiřazuje geometrii jakémukoliv zdroji.</skos:definition>
<skos:scopeNote xml:lang="es"> el contexto de DCAT 2.0, el rango de esta propiedad es intencionalmente genérico con el propósito de permitir distintas codificaciones de la geometría. Por ejemplo, la geometría puede codificarse como WKT (geosparql:asWKT [GeoSPARQL]).</skos:scopeNote>
<skos:scopeNote xml:lang="en">In the context of DCAT 2.0, the range of this property is intentionally generic, with the purpose of allowing different geometry encodings. E.g., the geometry could be encoded as WKT (geosparql:asWKT [GeoSPARQL]).</skos:scopeNote>
<skos:scopeNote xml:lang="it">Nel contesto del DCAT 2.0, il range di questa proprietà è volutamente generico, con lo scopo di consentire diverse codifiche geometriche. Ad esempio, la geometria potrebbe essere codificata come WKT (geosparql:asWKT [GeoSPARQL]).</skos:scopeNote>
<skos:scopeNote xml:lang="cs">V kontextu DCAT 2.0, obor hodnot této vlastnosti je úmyslně obecný, aby umožnil různé kódování geometrií. Geometrie by kupříkladu mohla být kódována jako WKT (geosparql:asWKT [GeoSPARQL]).</skos:scopeNote>
<skos:scopeNote xml:lang="es"> el contexto de DCAT 2.0, el rango de esta propiedad es intencionalmente genérico con el propósito de permitir distintas codificaciones de la geometría. Por ejemplo, la geometría puede codificarse como WKT (geosparql:wktLiteral [GeoSPARQL]).</skos:scopeNote>
<skos:scopeNote xml:lang="en">In the context of DCAT 2.0, the range of this property is intentionally generic, with the purpose of allowing different geometry encodings. E.g., the geometry could be encoded as WKT (geosparql:wktLiteral [GeoSPARQL]).</skos:scopeNote>
<skos:scopeNote xml:lang="it">Nel contesto del DCAT 2.0, il range di questa proprietà è volutamente generico, con lo scopo di consentire diverse codifiche geometriche. Ad esempio, la geometria potrebbe essere codificata come WKT (geosparql:wktLiteral [GeoSPARQL]).</skos:scopeNote>
<skos:scopeNote xml:lang="cs">V kontextu DCAT 2.0, obor hodnot této vlastnosti je úmyslně obecný, aby umožnil různé kódování geometrií. Geometrie by kupříkladu mohla být kódována jako WKT (geosparql:wktLiteral [GeoSPARQL]).</skos:scopeNote>
</owl:ObjectProperty>


Expand Down

0 comments on commit e6ea142

Please sign in to comment.