diff --git a/documentation/description.html b/documentation/description.html index 5f0d71dd8929463a224663a927625a37dad5ba8d..025039d0a718e86afad82fdc9aaf634a91ff1502 100644 --- a/documentation/description.html +++ b/documentation/description.html @@ -20,7 +20,7 @@
As it can be observed in Figure 3, the modelling of measurements in the SAREF4WATR ontology mostly relies on the measurement model proposed in SAREF.
-SAREF allows to define the temporal extent of a measurement by defining the timestamp for it (using the saref:hasTimestamp 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 s4watr:hasPhenomenonTime 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.
+SAREF allows to define the temporal extent of a measurement by defining the timestamp for it (using the saref:hasResultTime property) and to define the temporal interval to which a measurement applies, apart from the temporal instant defined by the timestamp (using the saref:hasPhenomenonTime property).
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 saref:Device and saref:FeatureOfInterest: s4watr:featureIsMeasuredByDevice, s4watr:featureIsControlledByDevice, s4watr:measuresFeature, and s4watr:controlsFeature.
diff --git a/examples/MeterMeasurement.ttl b/examples/MeterMeasurement.ttl index b5720c1546e4d00a8074dd0b9c1c4d2605cd674e..5871ab8c00e2ff22649c366f893b9ca125db83a4 100644 --- a/examples/MeterMeasurement.ttl +++ b/examples/MeterMeasurement.ttl @@ -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 . diff --git a/examples/WaterInfrastructure.ttl b/examples/WaterInfrastructure.ttl index 876b8d43a2d6423a568c82055a2630fa59b7f4b6..ed93dd6649d06b7dc1a840250023d47475d3176e 100644 --- a/examples/WaterInfrastructure.ttl +++ b/examples/WaterInfrastructure.ttl @@ -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 . diff --git a/examples/WaterMeasurement.ttl b/examples/WaterMeasurement.ttl index 2e5bf68671e317ac81713db302d59ad61236c27a..946b9681d5048f338ceae9f71af62b07bb92d58b 100644 --- a/examples/WaterMeasurement.ttl +++ b/examples/WaterMeasurement.ttl @@ -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 . diff --git a/examples/WaterMeter.ttl b/examples/WaterMeter.ttl index b24278f049dac1c11c31ccdab294543aa4ed5d57..7eab1c9bcfd3db80e8bc107f99e06807b0562daf 100644 --- a/examples/WaterMeter.ttl +++ b/examples/WaterMeter.ttl @@ -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 . diff --git a/ontology/saref4watr.ttl b/ontology/saref4watr.ttl index 4423738d8d3a278691dcc182dbd93437a4f9776b..49d2388b2f800aaf37aa44ff71b28d694f95fa1a 100644 --- a/ontology/saref4watr.ttl +++ b/ontology/saref4watr.ttl @@ -200,14 +200,6 @@ s4watr:hasPeriod rdf:type owl:ObjectProperty ; rdfs:label "has period"@en . -### https://saref.etsi.org/saref4watr/hasPhenomenonTime -s4watr:hasPhenomenonTime rdf:type owl:ObjectProperty ; - rdfs:domain saref:Measurement ; - rdfs:range time:TemporalEntity ; - rdfs:label "has phenomenon time"@en ; - rdfs:comment "The time for which the value of a measurement applies to the feature of interest."@en . - - ### https://saref.etsi.org/saref4watr/isDesignedFor s4watr:isDesignedFor rdf:type owl:ObjectProperty ; rdfs:comment "The type of water for which an infrastructure is designed for."@en ; diff --git a/tests/tests.csv b/tests/tests.csv index 79294c515d92e3d248b418621c4d703031cf3d38..6833783d7c35cb7c5657ac82283209df943a95f4 100644 --- a/tests/tests.csv +++ b/tests/tests.csv @@ -42,7 +42,7 @@ WATR-TEST-40;WATR-23;Meter measurements;ExternalTemperature type EnvironmentalPr WATR-TEST-41;WATR-24;Meter measurements;WaterMeter measuresProperty WaterFlowProperty WATR-TEST-42;WATR-24;Meter measurements;FlowTemperature type WaterFlowProperty WATR-TEST-43;WATR-25;Meter measurements;WaterMeter makesMeasurement Measurement -WATR-TEST-44;WATR-26;Meter measurements;Measurement hasTimestamp dateTime +WATR-TEST-44;WATR-26;Meter measurements;Measurement hasResultTime dateTime WATR-TEST-45;WATR-26;Meter measurements;Measurement hasPhenomenonTime TemporalEntity WATR-TEST-46;WATR-27;Infrastructure measurements;Reservoir subClassOf WaterAsset WATR-TEST-47;WATR-27;Infrastructure measurements;Reservoir hasProperty core:Property