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

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

Updated to new time-related properties

Closes #4

See merge request !7
parents 9699b819 e834ff65

documentation/description.html

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


<p>As it can be observed in <a href="#Figure_3">Figure 3</a>, the modelling of measurements in the SAREF4WATR ontology mostly relies on the measurement model proposed in SAREF.</p>



<p>SAREF allows to define the temporal extent of a measurement by defining the timestamp for it (using the <a href="https://saref.etsi.org/core/hasTimestamp">saref:hasTimestamp</a> property). However, the SAREF4WATR extension also required to be able to define the temporal interval to which a measurement applies, apart from the temporal instant defined by the timestamp. Therefore, the <a href="#s4watr:hasPhenomenonTime">s4watr:hasPhenomenonTime</a> property has been defined in this extension to define the time for which the measurement applies to a feature of interest. The range of this property time has been defined as a time:TemporalEntity, which allows defining temporal intervals or instants.</p>

<p>SAREF allows to define the temporal extent of a measurement by defining the timestamp for it (using the <a href="https://saref.etsi.org/core/hasResultTime">saref:hasResultTime</a> property) and to define the temporal interval to which a measurement applies, apart from the temporal instant defined by the timestamp (using the <a href="#saref:hasPhenomenonTime">saref:hasPhenomenonTime</a> property).</p>

 

<p>Besides, the extension requires to be able to represent those devices that measure a certain feature of interest (and those features of interest that are measured by a device) independently of having measures from which this relationship could be inferred. Because of this, in this extension we have created four new properties to relate <a href="https://saref.etsi.org/core/Device">saref:Device</a> and <a href="https://saref.etsi.org/core/FeatureOfInterest">saref:FeatureOfInterest</a>: <a href="#s4watr:featureIsMeasuredByDevice">s4watr:featureIsMeasuredByDevice</a>, <a href="#s4watr:featureIsControlledByDevice">s4watr:featureIsControlledByDevice</a>, <a href="#s4watr:measuresFeature">s4watr:measuresFeature</a>, and <a href="#s4watr:controlsFeature">s4watr:controlsFeature</a>.</p>

examples/MeterMeasurement.ttl

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ ex:WFMeasurement170206 rdf:type owl:NamedIndividual , 
                                saref:Measurement ;

                       saref:isMeasuredIn om:litre ;

                       saref:relatesToProperty s4watr:FlowVolume ;

                       saref:hasTimestamp "2020-02-06T15:07:12"^^xsd:dateTime ;

                       saref:hasResultTime "2020-02-06T15:07:12"^^xsd:dateTime ;

                       saref:hasValue "127.0"^^xsd:float .
@@ -108,5 +108,5 @@ ex:WFMeasurement643234 rdf:type owl:NamedIndividual , 
                                saref:Measurement ;

                       saref:isMeasuredIn om:degreeCelsius ;

                       saref:relatesToProperty s4watr:ExternalTemperature ;

                       s4watr:hasPhenomenonTime ex:PT838452 ;

                       saref:hasPhenomenonTime ex:PT838452 ;

                       saref:hasValue "24.5"^^xsd:float .

examples/WaterInfrastructure.ttl

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ ex:PMeasurement854306 rdf:type owl:NamedIndividual , 
                      saref:isMeasuredIn om:litrePerHour ;

                      saref:isMeasurementOf ex:PumpRT73467 ;

                      saref:relatesToProperty s4watr:FlowRate ;

                      saref:hasTimestamp "2020-02-06T13:48:22"^^xsd:dateTime ;

                      saref:hasResultTime "2020-02-06T13:48:22"^^xsd:dateTime ;

                      saref:hasValue "8.3"^^xsd:float .

examples/WaterMeasurement.ttl

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ ex:DTSMeasurement106 rdf:type owl:NamedIndividual , 
                              saref:Measurement ;

                     saref:isMeasuredIn om:microgramPerLitre ;

                     saref:relatesToProperty s4watr:Cadmium ;

                     saref:hasTimestamp "2020-02-06T21:01:10"^^xsd:dateTime ;

                     saref:hasResultTime "2020-02-06T21:01:10"^^xsd:dateTime ;

                     saref:hasValue "0.005"^^xsd:float .
@@ -59,7 +59,7 @@ ex:DTSMeasurement107 rdf:type owl:NamedIndividual , 
                              saref:Measurement ;

                     saref:isMeasuredIn om:colonyFormingUnitPerMillilitre ;

                     saref:relatesToProperty s4watr:EscherichiaColi ;

                     saref:hasTimestamp "2020-02-06T21:01:30"^^xsd:dateTime ;

                     saref:hasResultTime "2020-02-06T21:01:30"^^xsd:dateTime ;

                     saref:hasValue "0.42"^^xsd:float .

examples/WaterMeter.ttl

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ ex:WMMeasurement200206 rdf:type saref:Measurement ; 
                       saref:isMeasuredIn om:month ;

                       saref:isMeasurementOf ex:Meter4837QW123 ;

                       saref:relatesToProperty s4watr:BatteryRemainingTime ;

                       saref:hasTimestamp "2020-02-06T15:44:12"^^xsd:dateTime ;

                       saref:hasResultTime "2020-02-06T15:44:12"^^xsd:dateTime ;

                       saref:hasValue "27.0"^^xsd:float .