changed ontology terms for hypermedia controls/web linking

sebastiankb · May 3, 2019 · 8a973e8 · 8a973e8
1 parent 107f9df
commit 8a973e8
Show file tree

Hide file tree

Showing 16 changed files with 435 additions and 430 deletions.
diff --git a/context/json-ld.js b/context/json-ld.js
@@ -37,7 +37,9 @@ function context(obj, id) {
         txt += `_:${scope}${k} <${ld}term> "${k}" .\r\n`;
 
         let iri = fullIRI(v instanceof Object ? v['@id'] : v, ctx);
-        txt+= `_:${scope}${k} <${ld}iri> <${iri}> .\r\n`;
+        if (!iri.startsWith('@')) {
+            txt+= `_:${scope}${k} <${ld}iri> <${iri}> .\r\n`;
+        }
 
         if (v instanceof Object) {
             if (v['@container']) {

diff --git a/context/td-context-1.1.jsonld b/context/td-context-1.1.jsonld
diff --git a/context/web-linking-context.jsonld b/context/web-linking-context.jsonld
@@ -13,30 +13,33 @@
       "@id" : "lnk:Form"
     },
     "op" : {
-      "@id" : "lnk:op"
+      "@id" : "lnk:forOperationType"
     },
     "subprotocol" : {
-      "@id" : "lnk:subprotocol"
+      "@id" : "lnk:forSubProtocol"
     },
     "contentType" : {
-      "@id" : "lnk:contentType",
+      "@id" : "lnk:forContentType",
       "@type": "xsd:string"
     },
     "contentCoding" : {
-      "@id" : "lnk:contentCoding",
+      "@id" : "lnk:forContentCoding",
       "@type": "xsd:string"
     },
     "anchor" : {
-      "@id" : "lnk:anchor"
+      "@id" : "lnk:hasAnchor"
     },
     "href" : {
-      "@id" : "lnk:href"
+      "@id" : "lnk:hasTarget"
     },
     "rel" : {
-      "@id" : "lnk:rel"
+      "@id" : "lnk:hasRelationType"
     },
     "type" : {
-      "@id" : "lnk:type"
+      "@id" : "lnk:hintsAtMediaType"
+    },
+    "response": {
+      "@id": "lnk:returns"
     }
   }
 }
diff --git a/index.html b/index.html
@@ -1634,7 +1634,7 @@ <h2>Web Linking Vocabulary Definitions</h2>
 well-known types necessary to implement the WoT interaction model described in
 [[WOT-ARCHITECTURE]]. Future versions of the standard may extend this list but
 <span class="rfc2119-assertion" id="well-known-operation-types-only">
-operations types SHOULD NOT be arbitrary set by servients
+operations types SHOULD NOT be arbitrarily set by servients
 </span>.
 </p>
 

diff --git a/ontology/jsonschema.html b/ontology/jsonschema.html
@@ -88,28 +88,28 @@ <h2>Introduction</h2>
 <section class="specterm"><h4><a href="#jsonschema-maxitems">jsonschema:maxItems</a></h4><p>IRI: https://www.w3.org/2019/json-schema#maxItems</p><p><strong>a OWL Class</strong></p><em>maxItems</em> - <span>Defines the maximum number of items that have to be in the array.</span><table><tbody></tbody></table></section>
 <section class="specterm"><h4><a href="#jsonschema-required">jsonschema:required</a></h4><p>IRI: https://www.w3.org/2019/json-schema#required</p><p><strong>a OWL Class</strong></p><em>required</em> - <span>Defines which members of the object type are mandatory.</span><table><tbody></tbody></table></section>
 <section class="specterm"><h4><a href="#jsonschema-readonly">jsonschema:readOnly</a></h4><p>IRI: https://www.w3.org/2019/json-schema#readOnly</p><p><strong>a OWL Class</strong></p><em>readOnly</em> - <span>Boolean value that is a hint to indicate whether a property interaction / value is read only (=true) or not (=false)</span><table><tbody></tbody></table></section>
-<section class="specterm"><h4><a href="#jsonschema-oneof">jsonschema:oneOf</a></h4><p>IRI: https://www.w3.org/2019/json-schema#oneOf</p><p><strong>a OWL Class</strong></p><em>oneOf</em> - <span>Used to ensure that the data is valid against one of the specified schemas in the array.</span><table><tbody></tbody></table></section></section></section><section><h2>Term Mapping</h2><table><thead><tr><th>JSON String</th><th>Ontology Term</th></tr></thead><tbody><tr><td>string</td><td><a href="#jsonschema-stringschema">jsonschema:StringSchema</a></td></tr>
-<tr><td>null</td><td><a href="#jsonschema-nullschema">jsonschema:NullSchema</a></td></tr>
-<tr><td>properties</td><td><a href="#jsonschema-properties">jsonschema:properties</a></td></tr>
+<section class="specterm"><h4><a href="#jsonschema-oneof">jsonschema:oneOf</a></h4><p>IRI: https://www.w3.org/2019/json-schema#oneOf</p><p><strong>a OWL Class</strong></p><em>oneOf</em> - <span>Used to ensure that the data is valid against one of the specified schemas in the array.</span><table><tbody></tbody></table></section></section></section><section><h2>Term Mapping</h2><table><thead><tr><th>JSON String</th><th>Ontology Term</th></tr></thead><tbody><tr><td>DataSchema</td><td><a href="#jsonschema-dataschema">jsonschema:DataSchema</a></td></tr>
 <tr><td>object</td><td><a href="#jsonschema-objectschema">jsonschema:ObjectSchema</a></td></tr>
-<tr><td>maximum</td><td><a href="#jsonschema-maximum">jsonschema:maximum</a></td></tr>
-<tr><td>readOnly</td><td><a href="#jsonschema-readonly">jsonschema:readOnly</a></td></tr>
+<tr><td>array</td><td><a href="#jsonschema-arrayschema">jsonschema:ArraySchema</a></td></tr>
 <tr><td>writeOnly</td><td><a href="#jsonschema-writeonly">jsonschema:writeOnly</a></td></tr>
-<tr><td>unit</td><td><a href="#jsonschema-unit">jsonschema:unit</a></td></tr>
-<tr><td>number</td><td><a href="#jsonschema-numberschema">jsonschema:NumberSchema</a></td></tr>
-<tr><td>enum</td><td><a href="#jsonschema-enum">jsonschema:enum</a></td></tr>
-<tr><td>oneOf</td><td><a href="#jsonschema-oneof">jsonschema:oneOf</a></td></tr>
+<tr><td>jsonschema</td><td><a href="#jsonschema-">jsonschema:</a></td></tr>
+<tr><td>items</td><td><a href="#jsonschema-items">jsonschema:items</a></td></tr>
+<tr><td>minimum</td><td><a href="#jsonschema-minimum">jsonschema:minimum</a></td></tr>
+<tr><td>minItems</td><td><a href="#jsonschema-minitems">jsonschema:minItems</a></td></tr>
 <tr><td>integer</td><td><a href="#jsonschema-integerschema">jsonschema:IntegerSchema</a></td></tr>
+<tr><td>number</td><td><a href="#jsonschema-numberschema">jsonschema:NumberSchema</a></td></tr>
 <tr><td>maxItems</td><td><a href="#jsonschema-maxitems">jsonschema:maxItems</a></td></tr>
+<tr><td>boolean</td><td><a href="#jsonschema-booleanschema">jsonschema:BooleanSchema</a></td></tr>
 <tr><td>required</td><td><a href="#jsonschema-required">jsonschema:required</a></td></tr>
-<tr><td>minItems</td><td><a href="#jsonschema-minitems">jsonschema:minItems</a></td></tr>
-<tr><td>minimum</td><td><a href="#jsonschema-minimum">jsonschema:minimum</a></td></tr>
-<tr><td>jsonschema</td><td><a href="#jsonschema-">jsonschema:</a></td></tr>
+<tr><td>readOnly</td><td><a href="#jsonschema-readonly">jsonschema:readOnly</a></td></tr>
 <tr><td>const</td><td><a href="#jsonschema-const">jsonschema:const</a></td></tr>
-<tr><td>array</td><td><a href="#jsonschema-arrayschema">jsonschema:ArraySchema</a></td></tr>
-<tr><td>DataSchema</td><td><a href="#jsonschema-dataschema">jsonschema:DataSchema</a></td></tr>
-<tr><td>boolean</td><td><a href="#jsonschema-booleanschema">jsonschema:BooleanSchema</a></td></tr>
-<tr><td>items</td><td><a href="#jsonschema-items">jsonschema:items</a></td></tr></tbody></table></section>
+<tr><td>null</td><td><a href="#jsonschema-nullschema">jsonschema:NullSchema</a></td></tr>
+<tr><td>maximum</td><td><a href="#jsonschema-maximum">jsonschema:maximum</a></td></tr>
+<tr><td>unit</td><td><a href="#jsonschema-unit">jsonschema:unit</a></td></tr>
+<tr><td>string</td><td><a href="#jsonschema-stringschema">jsonschema:StringSchema</a></td></tr>
+<tr><td>oneOf</td><td><a href="#jsonschema-oneof">jsonschema:oneOf</a></td></tr>
+<tr><td>enum</td><td><a href="#jsonschema-enum">jsonschema:enum</a></td></tr>
+<tr><td>properties</td><td><a href="#jsonschema-properties">jsonschema:properties</a></td></tr></tbody></table></section>
 
 </body>