From 32eb791440b59786ffa18488ec53d096c445fb00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Garc=C3=ADa=20Castro?= Date: Fri, 31 May 2024 17:22:09 +0200 Subject: [PATCH] Updated to use hasResult in observations. --- diagrams/SAREF4WATR examples.drawio | 738 +++++++++++++++------------- diagrams/SAREF4WATR figures.drawio | 214 ++++---- documentation/examples.html | 2 +- examples/KPI.ttl | 24 +- examples/MeterMeasurement.ttl | 50 +- examples/WaterInfrastructure.ttl | 23 +- examples/WaterMeasurement.ttl | 50 +- examples/WaterMeter.ttl | 21 +- 8 files changed, 609 insertions(+), 513 deletions(-) diff --git a/diagrams/SAREF4WATR examples.drawio b/diagrams/SAREF4WATR examples.drawio index 19b94f5..68cd431 100644 --- a/diagrams/SAREF4WATR examples.drawio +++ b/diagrams/SAREF4WATR examples.drawio @@ -1,6 +1,6 @@ - + - + @@ -165,11 +165,11 @@ - + - + @@ -177,9 +177,9 @@ - + - + @@ -188,9 +188,9 @@ - + - + @@ -210,7 +210,7 @@ - + @@ -221,12 +221,12 @@ - + - + @@ -237,19 +237,19 @@ - + - + - + - - + + @@ -258,7 +258,7 @@ - + @@ -266,7 +266,7 @@ - + @@ -274,19 +274,19 @@ - + - - + + - + - + @@ -294,25 +294,42 @@ - + - - + + - + - + + + + + + + + + + + + + + + + + + - + @@ -322,9 +339,9 @@ - + - + @@ -333,9 +350,9 @@ - + - + @@ -343,35 +360,32 @@ - - + + - + - + - + - + - + - + - - - - + @@ -379,171 +393,92 @@ - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - + - - + + - + - + - - - - + - - + + - - + + - - + + - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - - - - - + + - + - + - + - - + + @@ -552,15 +487,15 @@ - + - + - - + + @@ -569,18 +504,18 @@ - + - + - + - - + + @@ -590,8 +525,8 @@ - - + + @@ -599,11 +534,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -828,233 +863,259 @@ - + - - + + - + - + - - + + - + - + - - + + - - + + - + - + - + - + - + - - + + - - - - - + + - - + + - - + + - + - + - + + + + - + - - - - - - + + - - - + + + - - + + + + + - + + + + + + + + + + + + + + + - - + + - - + + - + - + - - + + - - + + - + - - + + + + + + - + - + - + + + + - - + + - - - + + + - - + + + + + + + + - - + + + + - - + + - - + + - + - - + + - - + + - + - + - - + + + + + - + - - - - - - + + - + - + - - + + - + - - - - - - + + - + - + - - + + - - + + - + - - + + - - + + - - - + + + + + + - + @@ -1071,7 +1132,7 @@ - + @@ -1260,21 +1321,18 @@ - + - - - - + - + @@ -1283,9 +1341,9 @@ - + - + @@ -1294,9 +1352,9 @@ - + - + @@ -1305,12 +1363,12 @@ - + - + @@ -1319,7 +1377,7 @@ - + @@ -1327,56 +1385,76 @@ - + + + + + + + - - + + - + - + - - + + - + - - + + - + - + - - + + - - + + + + + - - + + + + - + + + + + + + - - + + - + - + + + + - + @@ -1611,22 +1689,22 @@ - + - + - + - + - + - + diff --git a/diagrams/SAREF4WATR figures.drawio b/diagrams/SAREF4WATR figures.drawio index c7da971..f5039e3 100644 --- a/diagrams/SAREF4WATR figures.drawio +++ b/diagrams/SAREF4WATR figures.drawio @@ -1,6 +1,6 @@ - + - + @@ -57,7 +57,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -113,9 +113,9 @@ - + - + @@ -124,9 +124,9 @@ - + - + @@ -135,9 +135,9 @@ - + - + @@ -146,9 +146,9 @@ - + - + @@ -157,7 +157,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -197,7 +197,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -224,25 +224,6 @@ - - - - - - - - - - - - - - - - - - - @@ -290,8 +271,8 @@ - - + + @@ -380,7 +361,7 @@ - + @@ -493,7 +474,7 @@ - + @@ -501,7 +482,7 @@ - + @@ -550,9 +531,9 @@ - + - + @@ -565,16 +546,19 @@ - + - + + + + - - + + @@ -584,11 +568,11 @@ - + - + @@ -599,31 +583,21 @@ - - - - - - - - - - - + - + @@ -632,9 +606,9 @@ - + - + @@ -643,7 +617,7 @@ - + @@ -654,7 +628,7 @@ - + @@ -683,7 +657,7 @@ - + @@ -694,79 +668,93 @@ - + - + - + - - + + - - - - - - + - - + + - + - + - + - + - + - - + + - - - - - - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -900,7 +888,7 @@ - + @@ -916,7 +904,7 @@ - + @@ -1014,7 +1002,7 @@ - + @@ -1120,12 +1108,12 @@ - + - - + + @@ -1163,8 +1151,8 @@ - - + + @@ -1628,7 +1616,7 @@ - + @@ -1782,18 +1770,18 @@ - - + + - + - + - + @@ -2153,7 +2141,7 @@ - + @@ -2214,7 +2202,7 @@ - + diff --git a/documentation/examples.html b/documentation/examples.html index 0fe2720..63d849b 100644 --- a/documentation/examples.html +++ b/documentation/examples.html @@ -1,4 +1,4 @@ -

The example presented in Figure 13 depicts a water meter (ex:Meter4837QW123). It can be described by a set of static properties either reused from SAREF (e.g., saref:hasModel) or from SAREF4WATR (e.g., s4watr:hasFirmwareVersion). 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 (s4watr:BatteryRemainingTime) 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.

+

The example presented in Figure 13 depicts a water meter (ex:Meter4837QW123). It can be described by a set of static properties either reused from SAREF (e.g., saref:hasModel) or from SAREF4WATR (e.g., s4watr:hasFirmwareVersion). 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 (s4watr:BatteryRemainingTime) 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.

Example of water meter diff --git a/examples/KPI.ttl b/examples/KPI.ttl index c91c897..dea53f6 100644 --- a/examples/KPI.ttl +++ b/examples/KPI.ttl @@ -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 . diff --git a/examples/MeterMeasurement.ttl b/examples/MeterMeasurement.ttl index 5871ab8..d142946 100644 --- a/examples/MeterMeasurement.ttl +++ b/examples/MeterMeasurement.ttl @@ -1,5 +1,5 @@ @prefix om: . -@prefix ex: . +@prefix ex: . @prefix owl: . @prefix rdf: . @prefix xsd: . @@ -13,11 +13,11 @@ @prefix dctype: . @prefix dcterms: . - a dctype:Dataset ; + a dctype:Dataset ; dcterms:license ; dcterms:conformsTo ; - 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:hasValue "127.0"^^xsd:float . + saref:hasResult ex:127Litres . -### https://saref.etsi.org/saref4watr/example/WFMeasurement643234 -ex:WFMeasurement643234 rdf:type owl:NamedIndividual , - saref:Measurement ; - saref:isMeasuredIn om:degreeCelsius ; - saref:relatesToProperty s4watr:ExternalTemperature ; +### 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/WFObservation643234 +ex:WFObservation643234 rdf:type owl:NamedIndividual , + saref:Observation ; + saref:observes s4watr:ExternalTemperature ; saref:hasPhenomenonTime ex:PT838452 ; - saref:hasValue "24.5"^^xsd:float . + 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 . diff --git a/examples/WaterInfrastructure.ttl b/examples/WaterInfrastructure.ttl index 79acd19..6d0b88f 100644 --- a/examples/WaterInfrastructure.ttl +++ b/examples/WaterInfrastructure.ttl @@ -55,7 +55,7 @@ s4watr:DrinkingWater rdf:type owl:NamedIndividual , ### https://saref.etsi.org/saref4watr/FlowRate s4watr:FlowRate rdf:type owl:NamedIndividual , s4watr:WaterFlowProperty ; - saref:relatesToMeasurement ex:PMeasurement854306 ; + saref:isObservedBy ex:PObservation854306 ; rdfs:label "Flow rate"@en . @@ -88,14 +88,19 @@ ex:MeterGeom rdf:type owl:NamedIndividual , geo:asWKT "POINT (-3.705346 40.417351)"^^geo:wktLiteral . -### https://saref.etsi.org/saref4watr/example/PMeasurement854306 -ex:PMeasurement854306 rdf:type owl:NamedIndividual , - saref:Measurement ; - saref:isMeasuredIn om:litrePerHour ; - saref:isMeasurementOf ex:PumpRT73467 ; - saref:relatesToProperty s4watr:FlowRate ; +### https://saref.etsi.org/saref4watr/example/PObservation854306 +ex:PObservation854306 rdf:type owl:NamedIndividual , + saref:Observation ; + saref:observes ex:PumpRT73467 ; + saref:observes s4watr:FlowRate ; saref:hasResultTime "2020-02-06T13:48:22"^^xsd:dateTime ; - saref:hasValue "8.3"^^xsd:float . + saref:hasResult ex:83LPH . + + +### http://saref.etsi.org/saref4watr/example/83LPH +ex:83LPH rdf:type saref:PropertyValue ; + saref:isMeasuredIn om:litrePerHour ; + saref:hasValue "8.3"^^xsd:float . ### https://saref.etsi.org/saref4watr/example/PumpGeom @@ -107,7 +112,7 @@ ex:PumpGeom rdf:type owl:NamedIndividual , ex:PumpRT73467 rdf:type owl:NamedIndividual , s4watr:Pump ; geo:hasGeometry ex:PumpGeom ; - saref:hasMeasurement ex:PMeasurement854306 ; + saref:isObservedBy ex:PObservation854306 ; geo:asWKT "POINT (-3.703384 40.418560)"^^geo:wktLiteral . diff --git a/examples/WaterMeasurement.ttl b/examples/WaterMeasurement.ttl index 946b968..d344e11 100644 --- a/examples/WaterMeasurement.ttl +++ b/examples/WaterMeasurement.ttl @@ -1,4 +1,4 @@ -@prefix ex: . +@prefix ex: . @prefix om: . @prefix owl: . @prefix rdf: . @@ -9,11 +9,11 @@ @prefix saref: . @prefix s4watr: . - a dctype:Dataset ; + a dctype:Dataset ; dcterms:license ; dcterms:conformsTo ; - dcterms:title "Example WaterMeasurement"@en ; - dcterms:description "Example WaterMeasurement"@en . + dcterms:title "Example Water Observation"@en ; + dcterms:description "Example Water Observation"@en . ################################################################# @@ -33,38 +33,48 @@ om:microgramPerLitre rdf:type owl:NamedIndividual , ### https://saref.etsi.org/saref4watr/Cadmium s4watr:Cadmium rdf:type owl:NamedIndividual , s4watr:ChemicalProperty ; - saref:relatesToMeasurement ex:DTSMeasurement106 ; + saref:isObservedBy ex:DTSObservation106 ; rdfs:label "Cadmium"@en . ### https://saref.etsi.org/saref4watr/EscherichiaColi s4watr:EscherichiaColi rdf:type owl:NamedIndividual , s4watr:BacterialProperty ; - saref:relatesToMeasurement ex:DTSMeasurement107 ; + saref:isObservedBy ex:DTSObservation107 ; rdfs:label "E. coli"@en , "Escherichia coli"@en . -### https://saref.etsi.org/saref4watr/example/DTSMeasurement106 -ex:DTSMeasurement106 rdf:type owl:NamedIndividual , - saref:Measurement ; - saref:isMeasuredIn om:microgramPerLitre ; - saref:relatesToProperty s4watr:Cadmium ; +### https://saref.etsi.org/saref4watr/example/DTSObservation106 +ex:DTSObservation106 rdf:type owl:NamedIndividual , + saref:Observation ; + saref:observes s4watr:Cadmium ; saref:hasResultTime "2020-02-06T21:01:10"^^xsd:dateTime ; - saref:hasValue "0.005"^^xsd:float . + saref:hasResult ex:0005MGPL . -### https://saref.etsi.org/saref4watr/example/DTSMeasurement107 -ex:DTSMeasurement107 rdf:type owl:NamedIndividual , - saref:Measurement ; - saref:isMeasuredIn om:colonyFormingUnitPerMillilitre ; - saref:relatesToProperty s4watr:EscherichiaColi ; +### http://saref.etsi.org/saref4watr/example/0005MGPL +ex:0005MGPL rdf:type saref:PropertyValue ; + saref:isMeasuredIn om:microgramPerLitre ; + saref:hasValue "0.005"^^xsd:float . + + +### https://saref.etsi.org/saref4watr/example/DTSObservation107 +ex:DTSObservation107 rdf:type owl:NamedIndividual , + saref:Observation ; + saref:observes s4watr:EscherichiaColi ; saref:hasResultTime "2020-02-06T21:01:30"^^xsd:dateTime ; - saref:hasValue "0.42"^^xsd:float . + saref:hasResult ex:042CFUPM . + + +### http://saref.etsi.org/saref4watr/example/042CFUPM +ex:042CFUPM rdf:type saref:PropertyValue ; + saref:isMeasuredIn om:colonyFormingUnitPerMillilitre ; + saref:hasValue "0.42"^^xsd:float . ### https://saref.etsi.org/saref4watr/example/DTSample335632 ex:DTSample335632 rdf:type owl:NamedIndividual , s4watr:Water ; - saref:hasMeasurement ex:DTSMeasurement106 , - ex:DTSMeasurement107 . + saref:isObservedBy ex:DTSObservation106 , + ex:DTSObservation107 . diff --git a/examples/WaterMeter.ttl b/examples/WaterMeter.ttl index 7eab1c9..fdb410b 100644 --- a/examples/WaterMeter.ttl +++ b/examples/WaterMeter.ttl @@ -42,7 +42,7 @@ geo:asWKT rdf:type owl:DatatypeProperty . ### http://saref.etsi.org/saref4watr/example/Meter4837QW123 ex:Meter4837QW123 rdf:type s4watr:WaterMeter ; geo:hasGeometry ex:MeterGeom ; - saref:hasMeasurement ex:WMMeasurement200206 ; + saref:isObservedBy ex:WMObservation200206 ; saref:hasProperty s4watr:BatteryRemainingTime ; saref:hasManufacturer "Turion" ; saref:hasModel "Meterall" ; @@ -59,13 +59,18 @@ ex:MeterGeom rdf:type sf:Point ; geo:asWKT "POINT (-3.705346 40.417351)"^^geo:wktLiteral . -### http://saref.etsi.org/saref4watr/example/WMMeasurement200206 -ex:WMMeasurement200206 rdf:type saref:Measurement ; - saref:isMeasuredIn om:month ; - saref:isMeasurementOf ex:Meter4837QW123 ; - saref:relatesToProperty s4watr:BatteryRemainingTime ; +### http://saref.etsi.org/saref4watr/example/WMObservation200206 +ex:WMObservation200206 rdf:type saref:Observation ; + saref:observes ex:Meter4837QW123 ; + saref:observes s4watr:BatteryRemainingTime ; saref:hasResultTime "2020-02-06T15:44:12"^^xsd:dateTime ; - saref:hasValue "27.0"^^xsd:float . + saref:hasResult ex:27Months . + + +### http://saref.etsi.org/saref4watr/example/27Months +ex:27Months rdf:type saref:PropertyValue ; + saref:isMeasuredIn om:month ; + saref:hasValue "27.0"^^xsd:float . ### http://www.ontology-of-units-of-measure.org/resource/om-2/month @@ -75,5 +80,5 @@ om:month rdf:type saref:UnitOfMeasure . ### https://saref.etsi.org/saref4watr#BatteryRemainingTime s4watr:BatteryRemainingTime rdf:type s4watr:WaterMeterProperty ; saref:isPropertyOf ex:Meter4837QW123 ; - saref:relatesToMeasurement ex:WMMeasurement200206 ; + saref:isObservedBy ex:WMObservation200206 ; rdfs:label "Battery remaining time"@en . -- GitLab