Commit d1032702 authored by Raul Garcia-Castro's avatar Raul Garcia-Castro
Browse files

Merge branch 'issue-12' into 'develop-v2.1.1' 

Updated the use of datatype properties for identifiers

Closes #12

See merge request !12
parents 71c76aa5 2023f19f

diagrams/SAREF4WATR examples.drawio

+6 −6
Original line number Diff line number Diff line 
<mxfile host="Electron" modified="2024-05-31T14:52:12.203Z" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.4.8 Chrome/124.0.6367.207 Electron/30.0.6 Safari/537.36" etag="pAXW6tMSazpqTLJ2HvzG" version="24.4.8" type="device" pages="6">

<mxfile host="Electron" modified="2024-06-07T15:16:28.448Z" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.5.1 Chrome/124.0.6367.207 Electron/30.0.6 Safari/537.36" etag="bJ5sMadHI0lRp9qzVBmQ" version="24.5.1" type="device" pages="6">

  <diagram name="Water Meter" id="7StWjrC59b7MtaYeR-BC">

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

      <root>
@@ -85,7 +85,7 @@ 
            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="UoIeGqhHTO__Xtlh26Lv-40" value="s4watr:hasVersion" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="UoIeGqhHTO__Xtlh26Lv-39" vertex="1" connectable="0">

        <mxCell id="UoIeGqhHTO__Xtlh26Lv-40" value="saref:hasVersion" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="UoIeGqhHTO__Xtlh26Lv-39" vertex="1" connectable="0">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="15" y="-16" as="offset" />

          </mxGeometry>
@@ -308,21 +308,21 @@ 
        <mxCell id="06MvrXrdmsQjl4xO1CiC-11" value="om:month" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="UoIeGqhHTO__Xtlh26Lv-1" vertex="1">

          <mxGeometry x="-530" y="-301" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="uxshAsQ-pq_VCYGoTzUm-0" value="saref:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="UoIeGqhHTO__Xtlh26Lv-1">

        <mxCell id="uxshAsQ-pq_VCYGoTzUm-0" value="saref:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="UoIeGqhHTO__Xtlh26Lv-1" vertex="1">

          <mxGeometry x="-776" y="-359" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="uxshAsQ-pq_VCYGoTzUm-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="UoIeGqhHTO__Xtlh26Lv-1" target="uxshAsQ-pq_VCYGoTzUm-3" source="6SMQOBCAEm36FLkuKaD9-27">

        <mxCell id="uxshAsQ-pq_VCYGoTzUm-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="UoIeGqhHTO__Xtlh26Lv-1" source="6SMQOBCAEm36FLkuKaD9-27" target="uxshAsQ-pq_VCYGoTzUm-3" edge="1">

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

            <mxPoint x="-907" y="-576" as="sourcePoint" />

            <mxPoint x="-820" y="-369" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="uxshAsQ-pq_VCYGoTzUm-2" value="saref:hasResult" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" vertex="1" connectable="0" parent="uxshAsQ-pq_VCYGoTzUm-1">

        <mxCell id="uxshAsQ-pq_VCYGoTzUm-2" value="saref:hasResult" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="uxshAsQ-pq_VCYGoTzUm-1" vertex="1" connectable="0">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="51" y="9" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="uxshAsQ-pq_VCYGoTzUm-3" value="ex:27Months" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" vertex="1" parent="UoIeGqhHTO__Xtlh26Lv-1">

        <mxCell id="uxshAsQ-pq_VCYGoTzUm-3" value="ex:27Months" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="UoIeGqhHTO__Xtlh26Lv-1" vertex="1">

          <mxGeometry x="-776" y="-334" width="130" height="25" as="geometry" />

        </mxCell>

      </root>

diagrams/SAREF4WATR figures.drawio

+2 −2
Original line number Diff line number Diff line 
<mxfile host="Electron" modified="2024-05-31T14:26:02.540Z" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.4.8 Chrome/124.0.6367.207 Electron/30.0.6 Safari/537.36" etag="TmokvuZSKo4HLNlo_7qK" version="24.4.8" type="device" pages="11">

<mxfile host="Electron" modified="2024-06-07T15:16:09.768Z" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.5.1 Chrome/124.0.6367.207 Electron/30.0.6 Safari/537.36" etag="o9RiEjb8IF-EDk6GGdNi" version="24.5.1" type="device" pages="11">

  <diagram id="q2cKUIsIDjwAVqodLtUJ" name="Overview">

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

      <root>
@@ -758,7 +758,7 @@ 
      <root>

        <mxCell id="frWgI9l_6pccOB3PLj2l-0" />

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

        <mxCell id="Wkc5KGymtmhRckLb19tq-1" value="s4watr:hasFabricationNumber::rdfs:Literal&lt;br&gt;s4watr:hasFirmwareVersion::rdfs:Literal&lt;br&gt;s4watr:hasHardwareVersion::rdfs:Literal&lt;br&gt;s4watr:hasVersion::rdfs:Literal&lt;br&gt;s4watr:operatesAtRadioFrequency::&lt;br&gt;s4watr:requiresPower::" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;dashed=1;fontSize=13;verticalAlign=middle;align=left;spacingLeft=2;" parent="frWgI9l_6pccOB3PLj2l-1" vertex="1">

        <mxCell id="Wkc5KGymtmhRckLb19tq-1" value="s4watr:hasFabricationNumber::rdfs:Literal&lt;br&gt;s4watr:hasFirmwareVersion::rdfs:Literal&lt;br&gt;s4watr:hasHardwareVersion::rdfs:Literal&lt;br&gt;saref:hasVersion::rdfs:Literal&lt;br&gt;s4watr:operatesAtRadioFrequency::&lt;br&gt;s4watr:requiresPower::" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;dashed=1;fontSize=13;verticalAlign=middle;align=left;spacingLeft=2;" parent="frWgI9l_6pccOB3PLj2l-1" vertex="1">

          <mxGeometry x="305.5" y="-276" width="255" height="101" as="geometry" />

        </mxCell>

        <mxCell id="k6Jm76lxCt4op6gv81An-0" value="saref:Device" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=top;" parent="frWgI9l_6pccOB3PLj2l-1" vertex="1">

documentation/description.html

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 


<p><a href="#Figure_4">Figure 4</a> provides an overview of how to represent a water meter using the <a href="#s4watr:WaterMeter">s4watr:WaterMeter</a> class. The representation of water meters and their properties has been extracted from the European M-Bus standard (EN 13757).</p>



<p>A water meter may be defined by the properties inherited from SAREF (e.g., <a href="https://saref.etsi.org/core/hasManufacturer">saref:hasManufacturer</a> or <a href="https://saref.etsi.org/core/hasModel">saref:hasModel</a>) and also by a set of properties defined in SAREF4WATR to indicate: its fabrication number (<a href="#s4watr:hasFabricationNumber">s4watr:hasFabricationNumber</a>), its firmware version (<a href="#s4watr:hasFirmwareVersion">s4watr:hasFirmwareVersion</a>), its hardware version (<a href="#s4watr:hasHardwareVersion">s4watr:hasHardwareVersion</a>), its version (<a href="#s4watr:hasVersion">s4watr:hasVersion</a>), the radio frequency in which it operates (<a href="#s4watr:operatesAtRadioFrequency">s4watr:operatesAtRadioFrequency</a>), and its required power (<a href="#s4watr:requiresPower">s4watr:requiresPower</a>).</p>

<p>A water meter may be defined by the properties inherited from SAREF (e.g., <a href="https://saref.etsi.org/core/hasManufacturer">saref:hasManufacturer</a> or <a href="https://saref.etsi.org/core/hasModel">saref:hasModel</a>) and also by a set of properties defined in SAREF4WATR to indicate: its fabrication number (<a href="#s4watr:hasFabricationNumber">s4watr:hasFabricationNumber</a>), its firmware version (<a href="#s4watr:hasFirmwareVersion">s4watr:hasFirmwareVersion</a>), its hardware version (<a href="#s4watr:hasHardwareVersion">s4watr:hasHardwareVersion</a>), its version (<a href="https://saref.etsi.org/core/hasVersion">saref:hasVersion</a>), the radio frequency in which it operates (<a href="#s4watr:operatesAtRadioFrequency">s4watr:operatesAtRadioFrequency</a>), and its required power (<a href="#s4watr:requiresPower">s4watr:requiresPower</a>).</p>



<p>Observations may be taken from the water meter themselves. To enable the representation of such observations, water meters are defined as features of interest (<a href="https://saref.etsi.org/core/FeatureOfInterest">saref:FeatureOfInterest</a>) and a non-exhaustive list of properties has been defined based on the M-Bus standard to allow measuring: on time (<a href="#s4watr:MeterOnTime">s4watr:MeterOnTime</a>), operating time (<a href="#s4watr:MeterOperatingTime">s4watr:MeterOperatingTime</a>), battery operating time (<a href="#s4watr:BatteryOperatingTime">s4watr:BatteryOperatingTime</a>), battery last change (<a href="#s4watr:BatteryLastChange">s4watr:BatteryLastChange</a>), and battery remaining time (<a href="#s4watr:BatteryRemainingTime">s4watr:BatteryRemainingTime</a>).</p>

examples/WaterMeter.ttl

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ ex:Meter4837QW123 rdf:type s4watr:WaterMeter ; 
                  s4watr:hasFabricationNumber "4837QW" ;

                  s4watr:hasFirmwareVersion "123.7" ;

                  s4watr:hasHardwareVersion "23.5b" ;

                  s4watr:hasVersion "1.2" ;

                  saref:hasVersion "1.2" ;

                  s4watr:operatesAtRadioFrequency "2.4 GHz" ;

                  s4watr:requiresPower "24 volts" .

ontology/saref4watr.ttl

+3 −7
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ s4watr:hasStartTimestamp rdf:type owl:DatatypeProperty ; 


###  https://saref.etsi.org/saref4watr/hasFabricationNumber

s4watr:hasFabricationNumber rdf:type owl:DatatypeProperty ;

                            rdfs:subPropertyOf saref:hasIdentifier ;

                            rdfs:range rdfs:Literal ;

                            rdfs:comment "The fabrication number of a device."@en ;

                            rdfs:label "has fabrication number"@en .
@@ -246,6 +247,7 @@ s4watr:hasFabricationNumber rdf:type owl:DatatypeProperty ; 


###  https://saref.etsi.org/saref4watr/hasFirmwareVersion

s4watr:hasFirmwareVersion rdf:type owl:DatatypeProperty ;

                          rdfs:subPropertyOf saref:hasVersion ;

                          rdfs:range rdfs:Literal ;

                          rdfs:comment "The firmware version of a device."@en ;

                          rdfs:label "has firmware version"@en .
@@ -253,18 +255,12 @@ s4watr:hasFirmwareVersion rdf:type owl:DatatypeProperty ; 


###  https://saref.etsi.org/saref4watr/hasHardwareVersion

s4watr:hasHardwareVersion rdf:type owl:DatatypeProperty ;

                          rdfs:subPropertyOf saref:hasVersion ;

                          rdfs:range rdfs:Literal ;

                          rdfs:comment "The hardware version of a device."@en ;

                          rdfs:label "has hardware version"@en .





###  https://saref.etsi.org/saref4watr/hasVersion

s4watr:hasVersion rdf:type owl:DatatypeProperty ;

                  rdfs:range rdfs:Literal ;

                  rdfs:comment "The version of a device."@en ;

                  rdfs:label "has version"@en .





###  https://saref.etsi.org/saref4watr/operatesAtRadioFrequency

s4watr:operatesAtRadioFrequency rdf:type owl:DatatypeProperty ;

                                rdfs:comment "The radio frequency at which a device operates."@en ;