Skip to content

Commit c958f0a

Browse files
dr-shorthairdr-shorthair
committed
Make tables for OMS and Sample Relations consistent with the other ModSpec tables
1 parent 91b4f91 commit c958f0a

File tree

2 files changed

+63
-74
lines changed

2 files changed

+63
-74
lines changed

‎ssn/chapters/Modularization.html‎

Lines changed: 47 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -829,71 +829,66 @@ <h5 id="sosa-oms-module">SOSA-OMS</h5>
829829
is a requirement</b>
830830
</p>
831831

832-
<table>
833-
<tr>
834-
<th colspan="2">OGC Requirements class</th>
835-
</tr>
836-
<tr>
837-
<td>SOSA OMS</td>
838-
<td><a href="#sosa-oms-module">https://www.w3.org/TR/vocab-ssn-2023#sosa-oms-module</a></td>
839-
</tr>
840-
<tr>
841-
<th colspan="2">Dependencies</th>
842-
</tr>
832+
<table class="numbered">
833+
<caption>OGC Requirements class:
834+
<br><a href="#sosa-oms-module">https://www.w3.org/TR/vocab-ssn-2023#sosa-oms-module</a>
835+
</caption>
843836
<tr>
844-
<td>SOSA Observation</td>
837+
<td>Dependency</td>
845838
<td><a href="#sosa-observation-module">https://www.w3.org/TR/vocab-ssn-2023#sosa-observation-module</a></td>
846839
</tr>
847840
<tr>
848-
<td>SOSA Sampling</td>
841+
<td>Dependency</td>
849842
<td><a href="#sosa-sampling-module">https://www.w3.org/TR/vocab-ssn-2023#sosa-sampling-module</a></td>
850843
</tr>
851844
<tr>
852-
<th colspan="2">OGC Requirements</th>
853-
</tr>
854-
<tr>
855-
<td>PreparationProcedure</td>
845+
<td>Requirement</td>
856846
<td><a href="#OMSPreparationProcedure">https://www.w3.org/TR/vocab-ssn-2023#OMSPreparationProcedure</a></td>
857847
</tr>
858848
<tr>
859-
<td>PreparationStep</td>
849+
<td>Requirement</td>
860850
<td><a href="#OMSPreparationStep">https://www.w3.org/TR/vocab-ssn-2023#OMSPreparationStep</a></td>
861851
</tr>
862852
<tr>
863-
<td>hasPreparationStep</td>
853+
<td>Requirement</td>
864854
<td><a href="#OMShasPreparationStep">https://www.w3.org/TR/vocab-ssn-2023#OMShasPreparationStep</a></td>
865855
</tr>
866856
<tr>
867-
<td>madeOnPlatform</td>
857+
<td>Requirement</td>
868858
<td><a href="#OMSmadeOnPlatform">https://www.w3.org/TR/vocab-ssn-2023#OMSmadeOnPlatform</a></td>
869859
</tr>
870860
<tr>
871-
<td>metadata</td>
861+
<td>Requirement</td>
862+
<td><a href="#OMSmakesObservationCollection">https://www.w3.org/TR/vocab-ssn-2023#OMSmakesObservationCollection</a>
863+
</td>
864+
</tr>
865+
<tr>
866+
<td>Requirement</td>
872867
<td><a href="#OMSmetadata">https://www.w3.org/TR/vocab-ssn-2023#OMSmetadata</a></td>
873868
</tr>
874869
<tr>
875-
<td>observationType</td>
870+
<td>Requirement</td>
876871
<td><a href="#OMSobservationType">https://www.w3.org/TR/vocab-ssn-2023#OMSobservationType</a></td>
877872
</tr>
878873
<tr>
879-
<td>preparedSample</td>
874+
<td>Requirement</td>
880875
<td><a href="#OMSpreparedSample">https://www.w3.org/TR/vocab-ssn-2023#OMSpreparedSample</a></td>
881876
</tr>
882877
<tr>
883-
<td>processingDetails</td>
878+
<td>Requirement</td>
884879
<td><a href="#OMSprocessingDetails">https://www.w3.org/TR/vocab-ssn-2023#OMSprocessingDetails</a></td>
885880
</tr>
886881
<tr>
887-
<td>relatedSampling</td>
882+
<td>Requirement</td>
888883
<td><a href="#OMSrelatedSampling">https://www.w3.org/TR/vocab-ssn-2023#OMSrelatedSampling</a></td>
889884
</tr>
890885
<tr>
891-
<td>samplePreparationStep</td>
886+
<td>Requirement</td>
892887
<td><a href="#OMSsamplePreparationStep">https://www.w3.org/TR/vocab-ssn-2023#OMSsamplePreparationStep</a>
893888
</td>
894889
</tr>
895890
<tr>
896-
<td>validTime</td>
891+
<td>Requirement</td>
897892
<td><a href="#OMSvalidTime">https://www.w3.org/TR/vocab-ssn-2023#OMSvalidTime</a></td>
898893
</tr>
899894
</table>
@@ -909,29 +904,30 @@ <h5 id="ssn-oms-module">SSN-OMS</h5>
909904
requirement, with reasoning support.
910905
</p>
911906

912-
<table>
913-
<tr>
914-
<th colspan="2">OGC Requirements class</th>
915-
</tr>
907+
<table class="numbered">
908+
<caption>OGC Requirements class:
909+
<br><a href="#ssn-oms-module">https://www.w3.org/TR/vocab-ssn-2023#ssn-oms-module</a>
910+
</caption>
916911
<tr>
917-
<td>SSN OMS</td>
918-
<td><a href="#ssn-oms-module">https://www.w3.org/TR/vocab-ssn-2023#ssn-oms-module</a></td>
912+
<td>Dependency</td>
913+
<td><a href="#sosa-oms-module">https://www.w3.org/TR/vocab-ssn-2023#sosa-oms-module</a></td>
919914
</tr>
920915
<tr>
921-
<th colspan="2">Dependencies</th>
916+
<td>Dependency</td>
917+
<td><a href="#ssn-observation-module">https://www.w3.org/TR/vocab-ssn-2023#ssn-observation-module</a></td>
922918
</tr>
923919
<tr>
924-
<td>SOSA OMS</td>
925-
<td><a href="#sosa-oms-module">https://www.w3.org/TR/vocab-ssn-2023#sosa-oms-module</a></td>
920+
<td>Dependency</td>
921+
<td><a href="#ssn-sampling-module">https://www.w3.org/TR/vocab-ssn-2023#ssn-sampling-module</a></td>
926922
</tr>
927-
928923
<tr>
929-
<td>SSN Observation</td>
930-
<td><a href="#ssn-observation-module">https://www.w3.org/TR/vocab-ssn-2023#ssn-observation-module</a></td>
924+
<td>Requirement</td>
925+
<td><a href="#SSN-OMSmadeOnPlatform">https://www.w3.org/TR/vocab-ssn-2023#SSN-OMSmadeOnPlatform</a></td>
931926
</tr>
932927
<tr>
933-
<td>SSN Sampling</td>
934-
<td><a href="#ssn-sampling-module">https://www.w3.org/TR/vocab-ssn-2023#ssn-sampling-module</a></td>
928+
<td>Requirement</td>
929+
<td><a href="#SSN-OMSmakesObservationCollection">https://www.w3.org/TR/vocab-ssn-2023#SSN-OMSmakesObservationCollection</a>
930+
</td>
935931
</tr>
936932
</table>
937933

@@ -945,47 +941,36 @@ <h4 id="sample-relations-module">Sample Relations</h4>
945941
The <i>Sample Relations module</i> is documented in section <a href="#Sample-Relations"></a>.
946942
</p>
947943

948-
<table>
949-
<tr>
950-
<th colspan="2">OGC Requirements class</th>
951-
</tr>
952-
<tr>
953-
<td>Sample Relations</td>
954-
<td><a href="#sample-relations-module">https://www.w3.org/TR/vocab-ssn-2023#sample-relations-module</a>
955-
</td>
956-
</tr>
957-
<tr>
958-
<th colspan="2">Dependencies</th>
959-
</tr>
944+
<table class="numbered">
945+
<caption>OGC Requirements class:
946+
<br><a href="#sample-relations-module">https://www.w3.org/TR/vocab-ssn-2023#sample-relations-module</a>
947+
</caption>
960948
<tr>
961-
<td>SOSA Sampling</td>
949+
<td>Dependency</td>
962950
<td><a href="#sosa-sampling-module">https://www.w3.org/TR/vocab-ssn-2023#sosa-sampling-module</a></td>
963951
</tr>
964952
<tr>
965-
<th colspan="2">OGC Requirements</th>
966-
</tr>
967-
<tr>
968-
<td>RelationshipNature</td>
953+
<td>Requirement</td>
969954
<td><a href="#SAMRRelationshipNature">https://www.w3.org/TR/vocab-ssn-2023#SAMRRelationshipNature</a>
970955
</td>
971956
</tr>
972957
<tr>
973-
<td>SampleRelationship</td>
958+
<td>Requirement</td>
974959
<td><a href="#SAMRSampleRelationship">https://www.w3.org/TR/vocab-ssn-2023#SAMRSampleRelationship</a>
975960
</td>
976961
</tr>
977962
<tr>
978-
<td>hasSampleRelationship</td>
963+
<td>Requirement</td>
979964
<td><a href="#SAMRhasSampleRelationship">https://www.w3.org/TR/vocab-ssn-2023#SAMRhasSampleRelationship</a>
980965
</td>
981966
</tr>
982967
<tr>
983-
<td>natureOfRelationship</td>
968+
<td>Requirement</td>
984969
<td><a href="#SAMRnatureOfRelationship">https://www.w3.org/TR/vocab-ssn-2023#SAMRnatureOfRelationship</a>
985970
</td>
986971
</tr>
987972
<tr>
988-
<td>relatedSample</td>
973+
<td>Requirement</td>
989974
<td><a href="#SAMRrelatedSample">https://www.w3.org/TR/vocab-ssn-2023#SAMRrelatedSample</a></td>
990975
</tr>
991976
</table>

‎ssn/chapters/OMS.html‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,14 @@ <h5><dfn>sosa-oms:madeOnPlatform</dfn></h5>
262262
<dd>
263263
<a>sosa-oms:makesObservationCollection</a>
264264
</dd>
265-
<dt class="ssn">Super property of chain</dt>
266-
<dd class="ssn">
267-
<a>sosa:hasFeatureOfInterest</a> <b>o</b>
268-
<a>sosa:isResultOfMadeBySampler</a> <b>o</b>
269-
<a>sosa:isHostedBy</a>
270-
</dd>
265+
<div class="ssn" id="SSN-OMSmadeOnPlatform">
266+
<dt>Super property of chain</dt>
267+
<dd>
268+
<a>sosa:hasFeatureOfInterest</a> <b>o</b>
269+
<a>sosa:isResultOfMadeBySampler</a> <b>o</b>
270+
<a>sosa:isHostedBy</a>
271+
</dd>
272+
</div>
271273
<dt>is Defined By</dt>
272274
<dd>
273275
<a href="http://www.w3.org/ns/sosa/oms/">http://www.w3.org/ns/sosa/oms/</a>
@@ -319,12 +321,14 @@ <h5><dfn>sosa-oms:makesObservationCollection</dfn></h5>
319321
<dd>
320322
<a>sosa-oms:madeOnPlatform</a>
321323
</dd>
322-
<dt class="ssn">Super property of chain</dt>
323-
<dd class="ssn">
324-
<a>sosa:hosts</a> <b>o</b>
325-
<a>sosa:madeSamplingHasResult</a> <b>o</b>
326-
<a>sosa:isFeatureOfInterestOf</a>
327-
</dd>
324+
<div class="ssn" id="SSN-OMSmakesObservationCollection">
325+
<dt>Super property of chain</dt>
326+
<dd>
327+
<a>sosa:hosts</a> <b>o</b>
328+
<a>sosa:madeSamplingHasResult</a> <b>o</b>
329+
<a>sosa:isFeatureOfInterestOf</a>
330+
</dd>
331+
</div>
328332
<dt>is Defined By</dt>
329333
<dd>
330334
<a href="http://www.w3.org/ns/sosa/oms/">http://www.w3.org/ns/sosa/oms/</a>

0 commit comments

Comments
 (0)