Merge pull request #333 from w3c/issue-330-oa

Issue 330 oa
w3c · Mar 10, 2015 · 705d517 · 705d517
2 parents e0599ac + 4f2dad7
commit 705d517
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 10 deletions.
diff --git a/csv2json/tree-ops-ext-standard.json b/csv2json/tree-ops-ext-standard.json
@@ -10,6 +10,15 @@
 		}],
 		"dc:license": "http://opendefinition.org/licenses/cc-by/",
 		"dc:modified": "2010-12-31",
+    "notes": {
+      "@type": "oa:Annotation",
+      "oa:hasTarget": "http://example.org/tree-ops-ext",
+      "oa:hasBody": {
+        "@type": "oa:EmbeddedContent",
+        "rdf:value": "This is a very interesting comment about the table; it's a table!",
+        "dc:format": "text/plain"
+      }
+    },
 		"row": [{
 			"rownum": 1,
 			"url": "http://example.org/tree-ops-ext.csv#row=2",

diff --git a/csv2json/tree-ops-ext.csv-metadata.json b/csv2json/tree-ops-ext.csv-metadata.json
@@ -10,6 +10,15 @@
   }],
   "dc:license": {"@id": "http://opendefinition.org/licenses/cc-by/"},
   "dc:modified": {"@value": "2010-12-31", "@type": "xsd:date"},
+  "notes": {
+    "@type": "oa:Annotation",
+    "oa:hasTarget": "http://example.org/tree-ops-ext",
+    "oa:hasBody": {
+      "@type": "oa:EmbeddedContent",
+      "rdf:value": "This is a very interesting comment about the table; it's a table!",
+      "dc:format": {"@value": "text/plain"}
+    }
+  },
   "tableSchema": {
     "columns": [{
       "name": "GID",

diff --git a/csv2rdf/tree-ops-ext-minimal.ttl b/csv2rdf/tree-ops-ext-minimal.ttl
@@ -6,7 +6,7 @@
 	<#on_street> "ADDISON AV" ;
 	<#species> "Celtis australis" ;
 	<#trim_cycle> "Large Tree Routine Prune"@en ;
-	<#dbh> "11"^^xsd:integer ;
+	<#dbh> 11 ;
 	<#inventory_date> "2010-10-18"^^xsd:date ;
 	<#protected> false ;
 	<#kml> "<Point><coordinates>-122.156485,37.440963</coordinates></Point>"^^rdf:XMLLiteral .
@@ -15,7 +15,7 @@
 	<#on_street> "EMERSON ST" ;
 	<#species> "Liquidambar styraciflua" ;
 	<#trim_cycle> "Large Tree Routine Prune"@en ;
-	<#dbh> "11"^^xsd:integer ;
+	<#dbh> 11 ;
 	<#inventory_date> "2010-06-02"^^xsd:date ;
 	<#protected> false ;
 	<#kml> "<Point><coordinates>-122.156749,37.440958</coordinates></Point>"^^rdf:XMLLiteral .
@@ -24,7 +24,7 @@
 	<#on_street> "ADDISON AV" ;
 	<#species> "Robinia pseudoacacia" ;
 	<#trim_cycle> "Large Tree Routine Prune"@en ;
-	<#dbh> "29"^^xsd:integer ;
+	<#dbh> 29 ;
 	<#inventory_date> "2010-06-01"^^xsd:date ;
 	<#comments> "cavity or decay", "trunk decay", "codominant leaders", "included bark", "large leader or limb decay", "previous failure root damage", "root decay", "beware of BEES" ;
 	<#protected> true ;

diff --git a/csv2rdf/tree-ops-ext-standard.ttl b/csv2rdf/tree-ops-ext-standard.ttl
@@ -1,6 +1,7 @@
 @base <http://example.org/tree-ops-ext.csv> .
 @prefix csvw: <http://www.w3.org/ns/csvw#> .
 @prefix dc: <http://purl.org/dc/terms/> .
+@prefix oa: <http://www.w3.org/ns/oa#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rel: <http://www.iana.org/assignments/link-relations/> .
 @prefix schema: <http://schema.org/> .
@@ -19,16 +20,25 @@ _:68fc08e5-56a0-47e2-a784-3a644d8257c4 a csvw:TableGroup ;
 	] ;
 	dc:license <http://opendefinition.org/licenses/cc-by/> ;
 	dc:modified "2010-12-31"^^xsd:date ;
+  csvw:notes [
+    a oa:Annotation ;
+    oa:hasTarget <http://example.org/tree-ops-ext> ;
+    oa:hasBody [
+      a oa:EmbeddedContent ;
+      rdf:value "This is a very interesting comment about the table; it's a table!"@en ;
+      dc:format "text/plain"
+    ]
+  ] ;
 	csvw:row [
-		csvw:rownum "1"^^xsd:integer ;
+		csvw:rownum 1 ;
 		csvw:url <#row=2> ;
 		rel:describes <http://example.org/tree-ops-ext#gid-1>
 	], [
-		csvw:rownum "2"^^xsd:integer ;
+		csvw:rownum 2 ;
 		csvw:url <#row=3> ;
 		rel:describes <http://example.org/tree-ops-ext#gid-2>
 	], [
-		csvw:rownum "3"^^xsd:integer ;
+		csvw:rownum 3 ;
 		csvw:url <#row=4> ;
 		rel:describes <http://example.org/tree-ops-ext#gid-6>
 	] .
@@ -37,7 +47,7 @@ _:68fc08e5-56a0-47e2-a784-3a644d8257c4 a csvw:TableGroup ;
 	<#on_street> "ADDISON AV" ;
 	<#species> "Celtis australis" ;
 	<#trim_cycle> "Large Tree Routine Prune"@en ;
-	<#dbh> "11"^^xsd:integer ;
+	<#dbh> 11 ;
 	<#inventory_date> "2010-10-18"^^xsd:date ;
 	<#protected> false ;
 	<#kml> "<Point><coordinates>-122.156485,37.440963</coordinates></Point>"^^rdf:XMLLiteral .
@@ -46,7 +56,7 @@ _:68fc08e5-56a0-47e2-a784-3a644d8257c4 a csvw:TableGroup ;
 	<#on_street> "EMERSON ST" ;
 	<#species> "Liquidambar styraciflua" ;
 	<#trim_cycle> "Large Tree Routine Prune"@en ;
-	<#dbh> "11"^^xsd:integer ;
+	<#dbh> 11 ;
 	<#inventory_date> "2010-06-02"^^xsd:date ;
 	<#protected> false ;
 	<#kml> "<Point><coordinates>-122.156749,37.440958</coordinates></Point>"^^rdf:XMLLiteral .
@@ -55,7 +65,7 @@ _:68fc08e5-56a0-47e2-a784-3a644d8257c4 a csvw:TableGroup ;
 	<#on_street> "ADDISON AV" ;
 	<#species> "Robinia pseudoacacia" ;
 	<#trim_cycle> "Large Tree Routine Prune"@en ;
-	<#dbh> "29"^^xsd:integer ;
+	<#dbh> 29 ;
 	<#inventory_date> "2010-06-01"^^xsd:date ;
 	<#comments> "cavity or decay", "trunk decay", "codominant leaders", "included bark", "large leader or limb decay", "previous failure root damage", "root decay", "beware of BEES" ;
 	<#protected> true ;

diff --git a/csv2rdf/tree-ops-ext.csv-metadata.json b/csv2rdf/tree-ops-ext.csv-metadata.json
@@ -10,6 +10,15 @@
   }],
   "dc:license": {"@id": "http://opendefinition.org/licenses/cc-by/"},
   "dc:modified": {"@value": "2010-12-31", "@type": "xsd:date"},
+  "notes": {
+    "@type": "oa:Annotation",
+    "oa:hasTarget": "http://example.org/tree-ops-ext",
+    "oa:hasBody": {
+      "@type": "oa:EmbeddedContent",
+      "rdf:value": "This is a very interesting comment about the table; it's a table!",
+      "dc:format": {"@value": "text/plain"}
+    }
+  },
   "tableSchema": {
     "columns": [{
       "name": "GID",