diff --git a/diagrams/SAREF4WATR examples.drawio b/diagrams/SAREF4WATR examples.drawio index 68cd4310d88d021e9ab1c36a3616657e59ae50fa..6f0e0cdfeb255c249bdbad92abe79e83fcfd9576 100644 --- a/diagrams/SAREF4WATR examples.drawio +++ b/diagrams/SAREF4WATR examples.drawio @@ -1,4 +1,4 @@ - + @@ -85,7 +85,7 @@ - + @@ -308,21 +308,21 @@ - + - + - + - + diff --git a/diagrams/SAREF4WATR figures.drawio b/diagrams/SAREF4WATR figures.drawio index f5039e315c8a6361c931dafa2a5db6886f3e58cf..4decc35e6604d62af29ab1173d420636ed0a4c8d 100644 --- a/diagrams/SAREF4WATR figures.drawio +++ b/diagrams/SAREF4WATR figures.drawio @@ -1,4 +1,4 @@ - + @@ -758,7 +758,7 @@ - + diff --git a/documentation/description.html b/documentation/description.html index eadc17532a50589fc2f197b5f292d5b77cc836da..61481bf0ba3c46be977de28fc347df001a2ef0b8 100644 --- a/documentation/description.html +++ b/documentation/description.html @@ -34,7 +34,7 @@

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

-

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

+

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

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

diff --git a/examples/WaterMeter.ttl b/examples/WaterMeter.ttl index d7f2ebeba9aae46619fe7b618709c604bf3115ac..cb4b21b6fb2f14d86fd30249f19777c9defbf659 100644 --- a/examples/WaterMeter.ttl +++ b/examples/WaterMeter.ttl @@ -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" . diff --git a/ontology/saref4watr.ttl b/ontology/saref4watr.ttl index 5c9ea0848aea72778ffcadeb612d6e885943cc42..71f98dc6e48f2e170ee1f32551ccb6d7b6a510d9 100644 --- a/ontology/saref4watr.ttl +++ b/ontology/saref4watr.ttl @@ -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 ;