Skip to content

Commit 5e7a8b8

Browse files
dr-shorthairdr-shorthair
authored
Merge pull request #417 from w3c/416-asset-class
Asset class
2 parents a2398ae + cd3e1cf commit 5e7a8b8

19 files changed

+273
-141
lines changed

‎ssn/chapters/Common.html‎

Lines changed: 100 additions & 50 deletions
Large diffs are not rendered by default.

‎ssn/chapters/IDO-alignment.html‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h4>Class Alignments</h4>
3535
</p>
3636
<ul class="align-on-symbol">
3737
<li>
38-
<span class="lhs"><a>sosa:Actuator</a></span>
38+
<span class="lhs"><a>sosa:Asset</a></span>
3939
<span class="symbol logic">⊑</span>
4040
<span class="rhs">
4141
<span title="An object that occupies space and possesses mass.">lis:PhysicalObject</span>
@@ -69,13 +69,6 @@ <h4>Class Alignments</h4>
6969
<span title="An entity that is not dependent on other entities for existence, and which persists through time.">lis:Object</span>
7070
</span>
7171
</li>
72-
<li>
73-
<span class="lhs"><a>sosa:Platform</a></span>
74-
<span class="symbol logic">⊑</span>
75-
<span class="rhs">
76-
<span title="An object that occupies space and possesses mass.">lis:PhysicalObject</span>
77-
</span>
78-
</li>
7972
<li>
8073
<span class="lhs"><a>sosa:Procedure</a></span>
8174
<span class="symbol logic">⊑</span>
@@ -104,20 +97,6 @@ <h4>Class Alignments</h4>
10497
<span title="An entity that is not dependent on other entities for existence, and which persists through time.">lis:Object</span>
10598
</span>
10699
</li>
107-
<li>
108-
<span class="lhs"><a>sosa:Sampler</a></span>
109-
<span class="symbol logic">⊑</span>
110-
<span class="rhs">
111-
<span title="An object that occupies space and possesses mass.">lis:PhysicalObject</span>
112-
</span>
113-
</li>
114-
<li>
115-
<span class="lhs"><a>sosa:Sensor</a></span>
116-
<span class="symbol logic">⊑</span>
117-
<span class="rhs">
118-
<span title="An object that occupies space and possesses mass.">lis:PhysicalObject</span>
119-
</span>
120-
</li>
121100
<li>
122101
<span class="lhs"><a>sosa:Stimulus</a></span>
123102
<span class="symbol logic">⊑</span>

‎ssn/chapters/Inverse-properties.html‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ <h3>Tabulation of properties and their inverses</h3>
5050
<span class="symbol logic">≡</span>
5151
<span class="rhs"><span class="logic">inverse</span> <a>sosa:propertyFor</a>*</span>
5252
</li>
53+
<li>
54+
<span class="lhs"><a>sosa:hasDeployment</a></span>
55+
<span class="symbol logic">≡</span>
56+
<span class="rhs"><span class="logic">inverse</span> <a>sosa:deployedAsset</a></span>
57+
</li>
5358
<li>
5459
<span class="lhs"><a>sosa:hasFeatureOfInterest</a></span>
5560
<span class="symbol logic">≡</span>
@@ -155,6 +160,11 @@ <h3>Tabulation of properties and their inverses</h3>
155160
<span class="symbol logic">≡</span>
156161
<span class="rhs"><span class="logic">inverse</span> <a>sosa:madeObservation</a></span>
157162
</li>
163+
<li>
164+
<span class="lhs"><a>sosa:madeBySystem</a>*</span>
165+
<span class="symbol logic">≡</span>
166+
<span class="rhs"><span class="logic">inverse</span> <a>sosa:madeExecution</a></span>
167+
</li>
158168
<li>
159169
<span class="lhs"><a>sosa:observedProperty</a></span>
160170
<span class="symbol logic">≡</span>

‎ssn/chapters/PROV-alignment.html‎

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,54 @@ <h4>Class Alignments</h4>
6565
The notation used in this section is described in <a href="#Alignment-notation"></a>.
6666
</p>
6767
<p>
68-
1. Execution (acts of Observation, Actuation and Sampling) is a kind of Activity, thus:
68+
1. Execution (acts of Observation, Actuation and Sampling) and Deployment are kinds of Activity, thus:
6969
</p>
7070
<ul class="align-on-symbol">
7171
<li>
7272
<span class="lhs"><a>sosa:Execution</a></span>
7373
<span class="symbol logic">⊑</span>
7474
<span class="rhs"><a href="http://www.w3.org/ns/prov#Activity">prov:Activity</a></span>
7575
</li>
76+
<li>
77+
<span class="lhs"><a>sosa:Actuation</a></span>
78+
<span class="symbol logic">⊑</span>
79+
<span class="rhs"><a href="http://www.w3.org/ns/prov#Activity">prov:Activity</a></span>
80+
</li>
81+
<li>
82+
<span class="lhs"><a>sosa:Observation</a></span>
83+
<span class="symbol logic">⊑</span>
84+
<span class="rhs"><a href="http://www.w3.org/ns/prov#Activity">prov:Activity</a></span>
85+
</li>
86+
<li>
87+
<span class="lhs"><a>sosa:Sampling</a></span>
88+
<span class="symbol logic">⊑</span>
89+
<span class="rhs"><a href="http://www.w3.org/ns/prov#Activity">prov:Activity</a></span>
90+
</li>
91+
<li>
92+
<span class="lhs"><a>sosa:Deployment</a></span>
93+
<span class="symbol logic">⊑</span>
94+
<span class="rhs"><a href="http://www.w3.org/ns/prov#Activity">prov:Activity</a></span>
95+
</li>
7696
</ul>
7797
<p>
78-
2. Systems (Sensors, Actuators and Samplers) are entities that are responsible for the corresponding activities,
98+
2. Assets, including Systems (Sensors, Actuators and Samplers) and Platforms are entities that are responsible for the corresponding activities,
7999
thus:
80100
</p>
81101
<ul class="align-on-symbol">
102+
<li>
103+
<span class="lhs"><a>sosa:Asset</a></span>
104+
<span class="symbol logic">⊑</span>
105+
<span class="rhs"><a href="http://www.w3.org/ns/prov#Agent">prov:Agent</a> <span class="logic">or</span> <a href="http://www.w3.org/ns/prov#Entity">prov:Entity</a></span>
106+
</li>
82107
<li>
83108
<span class="lhs"><a>sosa:System</a></span>
84109
<span class="symbol logic">⊑</span>
85-
<span class="rhs"><a href="http://www.w3.org/ns/prov#Agent">prov:Agent</a> , <a href="http://www.w3.org/ns/prov#Entity">prov:Entity</a></span>
110+
<span class="rhs"><a href="http://www.w3.org/ns/prov#Agent">prov:Agent</a> <span class="logic">or</span> <a href="http://www.w3.org/ns/prov#Entity">prov:Entity</a></span>
111+
</li>
112+
<li>
113+
<span class="lhs"><a>sosa:Platform</a></span>
114+
<span class="symbol logic">⊑</span>
115+
<span class="rhs"><a href="http://www.w3.org/ns/prov#Entity">prov:Entity</a></span>
86116
</li>
87117
</ul>
88118
<p>
@@ -115,11 +145,6 @@ <h4>Class Alignments</h4>
115145
<span class="symbol logic">⊑</span>
116146
<span class="rhs"><a href="http://www.w3.org/ns/prov#Entity">prov:Entity</a></span>
117147
</li>
118-
<li>
119-
<span class="lhs"><a>sosa:Platform</a></span>
120-
<span class="symbol logic">⊑</span>
121-
<span class="rhs"><a href="http://www.w3.org/ns/prov#Entity">prov:Entity</a></span>
122-
</li>
123148
</ul>
124149
</section>
125150

‎ssn/chapters/RDF-implementation.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ <h4>Index of classes and properties</h4>
133133
<a>sosa:Actuation</a>,
134134
<a>sosa:ActuationCollection</a>*,
135135
<a>sosa:Actuator</a>,
136+
<a>sosa:Asset</a>*,
136137
<a>sosa:Deployment</a>,
137138
<a>sosa:Execution</a>*,
138139
<a>sosa:ExecutionCollection</a>*,

‎ssn/chapters/SAREF-alignment.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,11 @@ <h4>Alignment of SOSA-common to SAREF</h4>
189189
<span class="symbol logic">≡</span>
190190
<span class="rhs"><a href="https://saref.etsi.org/core/hasStartTime">saref:hasStartTime</a></span>
191191
</li>
192+
<li>
193+
<span class="lhs"><a>sosa:Asset</a></span>
194+
<span class="symbol logic">⊑</span>
195+
<span class="rhs"><a href="https://saref.etsi.org/saref4syst/System">s4syst:System</a></span>
196+
</li>
192197
<li>
193198
<span class="lhs"><a>sosa:Platform</a></span>
194199
<span class="symbol logic">⊑</span>

‎ssn/config.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ var respecConfig = {
4040
{
4141
src: "images/OGC-0.png",
4242
alt: "OGC",
43-
height: "70",
44-
width: "62",
43+
height: "128",
44+
width: "114",
4545
url: "https://www.ogc.org/"
4646
}
4747
],

‎ssn/images/SSN-core-modules.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎ssn/images/SSN-extension-modules.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎ssn/images/System.svg‎

Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)