Commit 40bbc785 authored by Helen Rawsthorne's avatar Helen Rawsthorne
Browse files

Merge branch 'ivanspajic-develop-v1.1.1' into 'develop-v1.1.1' 

Oceanographic Properties with Restrictions for Maritime IoT Devices

See merge request !1
parents 0f182ea1 e8db2f27

documentation/diagrams/Overview.png

−220 KiB (1.75 MiB)
Loading image diff...

documentation/diagrams/Property.png

−833 KiB (141 KiB)
Loading image diff...

documentation/diagrams/overview.drawio

+45 −7
Original line number Diff line number Diff line 
<mxfile host="Electron" modified="2024-07-10T13:01:21.859Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.5.3 Chrome/124.0.6367.207 Electron/30.0.6 Safari/537.36" etag="IlTR9aOgXD2ow5WUhEQC" version="24.5.3" type="device" pages="9">

<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" version="24.8.4" pages="9">

  <diagram id="VPhGmmsqynnscywGstpF" name="SAREF4MARI">

    <mxGraphModel dx="3055" dy="2495" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">

    <mxGraphModel dx="2022" dy="1912" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">

      <root>

        <mxCell id="0" />

        <mxCell id="1" parent="0" />

        <mxCell id="SG2_NnlKsxN5cYcAdMtR-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.75;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;endArrow=block;endFill=0;jumpStyle=arc;" edge="1" parent="1" source="1FtHFo_rNsmZQKpqGKMX-431" target="1FtHFo_rNsmZQKpqGKMX-29">

        <mxCell id="SG2_NnlKsxN5cYcAdMtR-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.75;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;endArrow=block;endFill=0;jumpStyle=arc;" parent="1" source="1FtHFo_rNsmZQKpqGKMX-431" target="1FtHFo_rNsmZQKpqGKMX-29" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="1739" y="-773" as="sourcePoint" />

            <mxPoint x="499" y="-911" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="SG2_NnlKsxN5cYcAdMtR-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;endArrow=block;endFill=0;jumpStyle=arc;" edge="1" parent="1" source="1FtHFo_rNsmZQKpqGKMX-416" target="1FtHFo_rNsmZQKpqGKMX-29">

        <mxCell id="SG2_NnlKsxN5cYcAdMtR-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;endArrow=block;endFill=0;jumpStyle=arc;" parent="1" source="1FtHFo_rNsmZQKpqGKMX-416" target="1FtHFo_rNsmZQKpqGKMX-29" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="619" y="-845" as="sourcePoint" />

            <mxPoint x="584" y="-870" as="targetPoint" />
@@ -2891,15 +2891,15 @@ 
            <mxPoint x="2970" y="-603" as="sourcePoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="2pH5VFnU49YfXjEHHY0h-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;endArrow=block;endFill=0;jumpStyle=arc;" edge="1" parent="1" source="2pH5VFnU49YfXjEHHY0h-2" target="1FtHFo_rNsmZQKpqGKMX-51">

        <mxCell id="2pH5VFnU49YfXjEHHY0h-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;endArrow=block;endFill=0;jumpStyle=arc;" parent="1" source="2pH5VFnU49YfXjEHHY0h-2" target="1FtHFo_rNsmZQKpqGKMX-51" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="-231" y="-962" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="2pH5VFnU49YfXjEHHY0h-2" value="s4mari:MaritimeObjectProperty" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="1">

        <mxCell id="2pH5VFnU49YfXjEHHY0h-2" value="s4mari:MaritimeObjectProperty" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="1" vertex="1">

          <mxGeometry x="-210" y="-910.5200000000001" width="190.5" height="30" as="geometry" />

        </mxCell>

        <mxCell id="SG2_NnlKsxN5cYcAdMtR-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.25;entryY=1;entryDx=0;entryDy=0;endArrow=block;endFill=0;jumpStyle=arc;exitX=0.25;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="1FtHFo_rNsmZQKpqGKMX-408" target="1FtHFo_rNsmZQKpqGKMX-29">

        <mxCell id="SG2_NnlKsxN5cYcAdMtR-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.25;entryY=1;entryDx=0;entryDy=0;endArrow=block;endFill=0;jumpStyle=arc;exitX=0.25;exitY=0;exitDx=0;exitDy=0;" parent="1" source="1FtHFo_rNsmZQKpqGKMX-408" target="1FtHFo_rNsmZQKpqGKMX-29" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="1600" y="410" as="sourcePoint" />

            <mxPoint x="509" y="-901" as="targetPoint" />
@@ -2909,6 +2909,44 @@ 
            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="4ssgpzwcUSAD8wTdgtnd-1" value="&lt;u&gt;s4mari:Heading&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;dashed=1;" vertex="1" parent="1">

          <mxGeometry x="-210" y="490" width="229.75" height="30" as="geometry" />

        </mxCell>

        <mxCell id="4ssgpzwcUSAD8wTdgtnd-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=classic;endFill=1;dashed=1;jumpStyle=arc;" edge="1" parent="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="-210" y="505" as="sourcePoint" />

            <mxPoint x="-230" y="-920" as="targetPoint" />

            <Array as="points">

              <mxPoint x="-230" y="505" />

            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="4ssgpzwcUSAD8wTdgtnd-3" value="&lt;u&gt;s4mari:Pitch&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;dashed=1;" vertex="1" parent="1">

          <mxGeometry x="-210" y="529.86" width="229.75" height="30" as="geometry" />

        </mxCell>

        <mxCell id="4ssgpzwcUSAD8wTdgtnd-4" value="&lt;u&gt;s4mari:Roll&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;dashed=1;" vertex="1" parent="1">

          <mxGeometry x="-210" y="570" width="229.75" height="30" as="geometry" />

        </mxCell>

        <mxCell id="4ssgpzwcUSAD8wTdgtnd-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=classic;endFill=1;dashed=1;jumpStyle=arc;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="4ssgpzwcUSAD8wTdgtnd-3">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="-280" y="540.62" as="sourcePoint" />

            <mxPoint x="-230" y="-920" as="targetPoint" />

            <Array as="points">

              <mxPoint x="-230" y="545" />

              <mxPoint x="-230" y="-884" />

            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="4ssgpzwcUSAD8wTdgtnd-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=classic;endFill=1;dashed=1;jumpStyle=arc;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="4ssgpzwcUSAD8wTdgtnd-4">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="-250.75" y="570" as="sourcePoint" />

            <mxPoint x="-230" y="-920" as="targetPoint" />

            <Array as="points">

              <mxPoint x="-230" y="585" />

              <mxPoint x="-230" y="-895" />

            </Array>

          </mxGeometry>

        </mxCell>

      </root>

    </mxGraphModel>

  </diagram>

examples/example1.ttl

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
@prefix dcterms: <http://purl.org/dc/terms/> .

@prefix dctype: <http://purl.org/dc/dcmitype/> .

@prefix ex: <https://saref.etsi.org/saref4mari/v1.1.1/example/example1/> .

@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .

@prefix geosp: <http://www.opengis.net/ont/geosparql#> .

@prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .

@prefix owl: <http://www.w3.org/2002/07/owl#> .

@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .

@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .

@prefix s4mari: <https://saref.etsi.org/saref4mari/> .

@prefix saref: <https://saref.etsi.org/core/> .

@prefix sosa: <http://www.w3.org/ns/sosa/> .

@prefix ssn: <http://www.w3.org/ns/ssn/> .

@prefix time: <http://www.w3.org/2006/time#> .

@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .



<https://saref.etsi.org/saref4mari/v1.1.1/example/example1#> a dctype:Dataset ;

  dcterms:license <https://forge.etsi.org/etsi-software-license> ;

  dcterms:conformsTo <https://saref.etsi.org/core/v3.2.1/> ;

  dcterms:conformsTo <https://saref.etsi.org/saref4mari/v1.1.1/> ;

  dcterms:title "SAREF4MARI example number 1."@en ;

  dcterms:description "SAREF4MARI example number 1."@en .

examples/s4mari-sensor-example.ttl

0 → 100644
+68 −0
Original line number Diff line number Diff line 
@prefix dcterms: <http://purl.org/dc/terms/> .

@prefix dctype: <http://purl.org/dc/dcmitype/> .

@prefix ex: <https://saref.etsi.org/saref4mari/v1.1.1/example/s4mari-sensor-example/> .

@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .

@prefix geosp: <http://www.opengis.net/ont/geosparql#> .

@prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .

@prefix owl: <http://www.w3.org/2002/07/owl#> .

@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .

@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .

@prefix s4mari: <https://saref.etsi.org/saref4mari/> .

@prefix saref: <https://saref.etsi.org/core/> .

@prefix sosa: <http://www.w3.org/ns/sosa/> .

@prefix ssn: <http://www.w3.org/ns/ssn/> .

@prefix time: <http://www.w3.org/2006/time#> .

@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

@base <https://saref.etsi.org/saref4mari/> .



<https://saref.etsi.org/saref4mari/v1.1.1/example/s4mari-sensor-example#> a dctype:Dataset ;

                                                             dcterms:license <https://forge.etsi.org/etsi-software-license> ;

                                                             dcterms:conformsTo <https://saref.etsi.org/core/v3.2.1/> ;

                                                             dcterms:conformsTo <https://saref.etsi.org/saref4mari/v1.1.1/> ;

                                                             dcterms:title "SAREF4MARI sensor example."@en ;

                                                             dcterms:description "SAREF4MARI sensor example."@en ;

                                                             rdf:type owl:Ontology ;

                                                             owl:versionIRI <http://www.semanticweb.org/ispa/ontologies/2024/10/s4mari-sensor-example/1.0.0> ;

                                                             owl:imports <https://saref.etsi.org/saref4mari/v1.1.1/> .

                                                            





# Represents a sensor on a mooring rig off-shore from Austevoll, Norway.

###  http://www.semanticweb.org/ispa/ontologies/2024/10/s4mari-sensor-example#Austevoll_Temperature_Sensor_1063

ex:Austevoll_Temperature_Sensor_1063 rdf:type owl:NamedIndividual ,

                                            <https://saref.etsi.org/core/Sensor> ,

                                            [ rdf:type owl:Restriction ;

                                              owl:onProperty <https://saref.etsi.org/core/madeExecution> ;

                                              owl:hasValue ex:Temperature_Measurement_20241128

                                            ] .





# Represents an observation made by the Austevoll sensor at a specific time.

###  http://www.semanticweb.org/ispa/ontologies/2024/10/s4mari-sensor-example#Temperature_Measurement_20241128

ex:Temperature_Measurement_20241128 rdf:type owl:NamedIndividual ,

                                           <https://saref.etsi.org/core/Observation> ,

                                           [ rdf:type owl:Restriction ;

                                             owl:onProperty <https://saref.etsi.org/core/hasResult> ;

                                             owl:hasValue ex:Water_Temperature_20241128

                                           ] ,

                                           [ rdf:type owl:Restriction ;

                                             owl:onProperty <https://saref.etsi.org/core/hasResultTime> ;

                                             owl:hasValue "2024-11-28T12:00:00Z"^^xsd:dateTime

                                           ] .



# Represents a specific observation result as part of the observation made by the Austevoll sensor.

# This result indicates a specific value and a specific unit it is measured in.

###  http://www.semanticweb.org/ispa/ontologies/2024/10/s4mari-sensor-example#Water_Temperature_20241128

ex:Water_Temperature_20241128 rdf:type owl:NamedIndividual ,

                                     [ rdf:type owl:Class ;

                                       owl:oneOf ( <https://saref.etsi.org/saref4mari/WaterTemperature>

                                                 )

                                     ] ,

                                     [ rdf:type owl:Restriction ;

                                       owl:onProperty <https://saref.etsi.org/core/isMeasuredIn> ;

                                       owl:hasValue <http://qudt.org/vocab/quantitykind/CelsiusTemperature>

                                     ] ,

                                     [ rdf:type owl:Restriction ;

                                       owl:onProperty <https://saref.etsi.org/core/hasValue> ;

                                       owl:hasValue "3.455"^^xsd:double

                                     ] .
 
 No newline at end of file