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

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

Updated to use hasResult in observations.

Closes #3

See merge request !10
parents 5705918a 38094222

diagrams/SAREF4WATR examples.drawio

+408 −330

File changed.

Preview size limit exceeded, changes collapsed.

diagrams/SAREF4WATR figures.drawio

+101 −113

File changed.

Preview size limit exceeded, changes collapsed.

documentation/examples.html

+1 −1
Original line number Diff line number Diff line 
<p>The example presented in <a href="#Figure_13">Figure 13</a> depicts a water meter (ex:Meter4837QW123). It can be described by a set of static properties either reused from SAREF (e.g., <a href="https://saref.etsi.org/core/hasModel">saref:hasModel</a>) or from SAREF4WATR (e.g., <a href="https://saref.etsi.org/saref4watr/hasFirmwareVersion">s4watr:hasFirmwareVersion</a>). The spatial extent of the meter is described by its geometry (ex:MeterGeom) that is represented as a point in space following its WKT representation. SAREF4WATR defines different measurable properties of a water meter, among them the battery remaining time (<a href="https://saref.etsi.org/saref4watr/BatteryRemainingTime">s4watr:BatteryRemainingTime</a>) that is the one used in the example. Observations of the meter for this property can be represented (ex:WMObservation200206) using for example the time instant of the observation, its value and the unit of measure.</p>

<p>The example presented in <a href="#Figure_13">Figure 13</a> depicts a water meter (ex:Meter4837QW123). It can be described by a set of static properties either reused from SAREF (e.g., <a href="https://saref.etsi.org/core/hasModel">saref:hasModel</a>) or from SAREF4WATR (e.g., <a href="https://saref.etsi.org/saref4watr/hasFirmwareVersion">s4watr:hasFirmwareVersion</a>). The spatial extent of the meter is described by its geometry (ex:MeterGeom) that is represented as a point in space following its WKT representation. SAREF4WATR defines different measurable properties of a water meter, among them the battery remaining time (<a href="https://saref.etsi.org/saref4watr/BatteryRemainingTime">s4watr:BatteryRemainingTime</a>) that is the one used in the example. Observations of the meter for this property can be represented (ex:WMObservation200206) using for example the time instant of the observation and its value and the unit of measure in a property value.</p>



<figure>

  <a href="diagrams/SAREF4WATR Example water meter.png"><img src="diagrams/SAREF4WATR Example water meter.png" alt="Example of water meter"/></a>

examples/KPI.ttl

+12 −12
Original line number Diff line number Diff line
@@ -99,9 +99,9 @@ ex:DowntownDS rdf:type owl:NamedIndividual , 
ex:MPL2020020723 rdf:type owl:NamedIndividual ,

                          s4city:KeyPerformanceIndicatorAssessment ;

                 s4city:assesses ex:DowntownDS ;

                 s4city:isDerivedFrom ex:PLMeasurement56206 ,

                                      ex:PLMeasurement56207 ,

                                      ex:PLMeasurement56208 ;

                 s4city:isDerivedFrom ex:PLObservation56206 ,

                                      ex:PLObservation56207 ,

                                      ex:PLObservation56208 ;

                 s4city:quantifiesKPI ex:MinimumPressureLevel ;

                 s4city:refersToFeature dbpedia:Madrid ;

                 s4city:refersToTime ex:MPL37222 ;
@@ -145,16 +145,16 @@ ex:OneWeek rdf:type owl:NamedIndividual , 
           time:numericDuration 1 .





###  https://saref.etsi.org/saref4watr/example/PLMeasurement56206

ex:PLMeasurement56206 rdf:type owl:NamedIndividual ,

                               saref:Measurement .

###  https://saref.etsi.org/saref4watr/example/PLObservation56206

ex:PLObservation56206 rdf:type owl:NamedIndividual ,

                               saref:Observation .





###  https://saref.etsi.org/saref4watr/example/PLMeasurement56207

ex:PLMeasurement56207 rdf:type owl:NamedIndividual ,

                               saref:Measurement .

###  https://saref.etsi.org/saref4watr/example/PLObservation56207

ex:PLObservation56207 rdf:type owl:NamedIndividual ,

                               saref:Observation .





###  https://saref.etsi.org/saref4watr/example/PLMeasurement56208

ex:PLMeasurement56208 rdf:type owl:NamedIndividual ,

                               saref:Measurement .
 
###  https://saref.etsi.org/saref4watr/example/PLObservation56208

ex:PLObservation56208 rdf:type owl:NamedIndividual ,

                               saref:Observation .

examples/MeterMeasurement.ttl

+31 −21
Original line number Diff line number Diff line 
@prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .

@prefix ex: <https://saref.etsi.org/saref4watr/v2.1.1/example/MeterMeasurement/> .

@prefix ex: <https://saref.etsi.org/saref4watr/v2.1.1/example/MeterObservation/> .

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

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

@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@@ -13,11 +13,11 @@ 
@prefix dctype: <http://purl.org/dc/dcmitype/> .

@prefix dcterms: <http://purl.org/dc/terms/> .



<https://saref.etsi.org/saref4watr/v2.1.1/example/MeterMeasurement#> a dctype:Dataset ;

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

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

  dcterms:conformsTo <https://saref.etsi.org/saref4watr/v2.1.1/> ;

  dcterms:title "Example MeterMeasurement"@en ;

  dcterms:description "Example MeterMeasurement"@en .

  dcterms:title "Example Meter Observation"@en ;

  dcterms:description "Example Meter Observation"@en .

  



#################################################################
@@ -57,22 +57,22 @@ om:litre rdf:type owl:NamedIndividual , 
###  https://saref.etsi.org/saref4watr/ExternalTemperature

s4watr:ExternalTemperature rdf:type owl:NamedIndividual ,

                                    s4watr:WaterFlowProperty ;

                           saref:relatesToMeasurement ex:WFMeasurement643234 ;

                           saref:isObservedBy ex:WFObservation643234 ;

                           rdfs:label "External temperature"@en .





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

s4watr:FlowVolume rdf:type owl:NamedIndividual ,

                           s4watr:WaterFlowProperty ;

                  saref:relatesToMeasurement ex:WFMeasurement170206 ;

                  saref:isObservedBy ex:WFObservation170206 ;

                  rdfs:label "Flow volume"@en .





###  https://saref.etsi.org/saref4watr/example/Meter4837QW123

ex:Meter4837QW123 rdf:type owl:NamedIndividual ,

                           s4watr:WaterMeter ;

                  saref:makesMeasurement ex:WFMeasurement170206 ,

                                         ex:WFMeasurement643234 .

                  saref:madeExecution ex:WFObservation170206 ,

                                      ex:WFObservation643234 .





###  https://saref.etsi.org/saref4watr/example/PT838452
@@ -94,19 +94,29 @@ ex:PT838452E rdf:type owl:NamedIndividual , 
             time:inXSDDateTimeStamp "2020-02-06T14:59:59Z"^^xsd:dateTimeStamp .





###  https://saref.etsi.org/saref4watr/example/WFMeasurement170206

ex:WFMeasurement170206 rdf:type owl:NamedIndividual ,

                                saref:Measurement ;

                       saref:isMeasuredIn om:litre ;

                       saref:relatesToProperty s4watr:FlowVolume ;

###  https://saref.etsi.org/saref4watr/example/WFObservation170206

ex:WFObservation170206 rdf:type owl:NamedIndividual ,

                                saref:Observation ;

                       saref:observes s4watr:FlowVolume ;

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

                       saref:hasResult ex:127Litres .





###  http://saref.etsi.org/saref4watr/example/127Litres

ex:127Litres rdf:type saref:PropertyValue ;

             saref:isMeasuredIn om:litre ;

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





###  https://saref.etsi.org/saref4watr/example/WFMeasurement643234

ex:WFMeasurement643234 rdf:type owl:NamedIndividual ,

                                saref:Measurement ;

                       saref:isMeasuredIn om:degreeCelsius ;

                       saref:relatesToProperty s4watr:ExternalTemperature ;

###  https://saref.etsi.org/saref4watr/example/WFObservation643234

ex:WFObservation643234 rdf:type owl:NamedIndividual ,

                                saref:Observation ;

                       saref:observes s4watr:ExternalTemperature ;

                       saref:hasPhenomenonTime ex:PT838452 ;

                       saref:hasResult ex:245DC .





###  http://saref.etsi.org/saref4watr/example/245DC

ex:245DC rdf:type saref:PropertyValue ;

         saref:isMeasuredIn om:degreeCelsius ;

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