diff --git a/documentation/diagrams/SAREF4EHAW_Model.jpg b/documentation/diagrams/SAREF4EHAW_Model.jpg
index 6a947f78adece4c4ebbd638c7a701ad125a03cde..12b41c1dc768be2a1e34a0cad58ce4bfa061e0a8 100644
Binary files a/documentation/diagrams/SAREF4EHAW_Model.jpg and b/documentation/diagrams/SAREF4EHAW_Model.jpg differ
diff --git a/documentation/diagrams/SAREF4EHAW_Modular-Ontology_Diagrams.pptx b/documentation/diagrams/SAREF4EHAW_Modular-Ontology_Diagrams.pptx
index 9b79328d70a52077b5cf165c59a70a158b59d449..5bd09f1bdee23b30dd091995518f8c0ddaba5edc 100644
Binary files a/documentation/diagrams/SAREF4EHAW_Modular-Ontology_Diagrams.pptx and b/documentation/diagrams/SAREF4EHAW_Modular-Ontology_Diagrams.pptx differ
diff --git a/examples/COVIDCase.ttl b/examples/COVIDCase.ttl
index efda4104b52c819240675c22fb6c79e6f25a491b..6bc89588ab5942c18ce188dbbe9bcda60b77dacd 100644
--- a/examples/COVIDCase.ttl
+++ b/examples/COVIDCase.ttl
@@ -42,7 +42,7 @@
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/AlertForHosp
s4ehawInst:AlertForHosp rdf:type owl:NamedIndividual ,
saref:Service ;
- s4ehaw:supports s4ehaw:SMS .
+ s4ehaw:supports s4ehawInst:SMS .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/Bluetooth
@@ -177,14 +177,14 @@ s4ehawInst:BobSystolicPressure rdf:type owl:NamedIndividual ,
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/BodyTemperature
s4ehawInst:BodyTemperature rdf:type owl:NamedIndividual ,
s4ehaw:Data ;
- s4ehaw:hasMesurement s4ehawInst:BobBodyTemp1 .
+ s4ehaw:hasMeasurement s4ehawInst:BobBodyTemp1 .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/BodyThermometer
s4ehawInst:BodyThermometer rdf:type owl:NamedIndividual ,
s4ehaw:MeasurementFunction ;
s4ehaw:hasData s4ehawInst:BodyTemperature ;
- s4ehaw:uom s4ehaw:DegreeCelsius .
+ s4ehaw:uom s4ehawInst:DegreeCelsius .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/DrKnock
@@ -213,13 +213,13 @@ s4ehawInst:PolymerBattery rdf:type owl:NamedIndividual ,
s4ehawInst:Respiration rdf:type owl:NamedIndividual ,
s4ehaw:MeasurementFunction ;
s4ehaw:hasData s4ehawInst:RespiratoryRate ;
- s4ehaw:uom s4ehaw:Bpm .
+ s4ehaw:uom s4ehawInst:Bpm .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/RespiratoryRate
s4ehawInst:RespiratoryRate rdf:type owl:NamedIndividual ,
s4ehaw:Data ;
- s4ehaw:hasMesurement s4ehawInst:BobRespMeas1 .
+ s4ehaw:hasMeasurement s4ehawInst:BobRespMeas1 .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/SMS
@@ -230,7 +230,7 @@ s4ehawInst:SMS rdf:type owl:NamedIndividual ,
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/SPO2
s4ehawInst:SPO2 rdf:type owl:NamedIndividual ,
s4ehaw:Data ;
- s4ehaw:hasMesurement s4ehawInst:BobSpo2Lev1 .
+ s4ehaw:hasMeasurement s4ehawInst:BobSpo2Lev1 .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/SpireStone
@@ -250,8 +250,8 @@ s4ehawInst:SpireStoneProcessingUnit rdf:type owl:NamedIndividual ,
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/SystolicPressure
s4ehawInst:SystolicPressure rdf:type owl:NamedIndividual ,
s4ehaw:Data ;
- s4ehaw:hasMesurement s4ehawInst:BobSystolicPressure ;
- s4ehaw:uom s4ehaw:MmHG .
+ s4ehaw:hasMeasurement s4ehawInst:BobSystolicPressure ;
+ s4ehaw:uom s4ehawInst:MmHG .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/SystolicPressureSens
@@ -290,26 +290,26 @@ s4ehawInst:WithingsWatchBattery rdf:type owl:NamedIndividual ,
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/Withings_ScanWatch
s4ehawInst:Withings_ScanWatch rdf:type owl:NamedIndividual ,
s4ehaw:DeviceCharacteristic ;
- s4ehaw:hasPowerSource s4ehaw:WithingsWatchBattery ;
+ s4ehaw:hasPowerSource s4ehawInst:WithingsWatchBattery ;
s4ehaw:deviceCharacteristicName "WITHINGS ScanWatch"^^xsd:string .
-### https://saref.etsi.org/saref4ehaw/Bpm
-s4ehaw:Bpm rdf:type owl:NamedIndividual ,
+### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/Bpm
+s4ehawInst:Bpm rdf:type owl:NamedIndividual ,
saref:UnitOfMeasure ;
rdfs:comment "bpm (beats per minute), a unit of measure used in eHealth."@en ;
rdfs:label "bpm"@en .
-### https://saref.etsi.org/saref4ehaw/DegreeCelsius
-s4ehaw:DegreeCelsius rdf:type owl:NamedIndividual ,
+### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/DegreeCelsius
+s4ehawInst:DegreeCelsius rdf:type owl:NamedIndividual ,
saref:UnitOfMeasure ;
rdfs:comment "Degree celsius, a unit of measure often used in eHealth, e.g. for body temperature."@en ;
rdfs:label "Degree celsius"@en .
-### https://saref.etsi.org/saref4ehaw/MmHG
-s4ehaw:MmHG rdf:type owl:NamedIndividual ,
+### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/saref4ehaw/MmHG
+s4ehawInst:MmHG rdf:type owl:NamedIndividual ,
saref:UnitOfMeasure ;
rdfs:comment "mmHG (millimeter of mercury), a manometric unit of pressure used in eHealth for systolic blood pressure."@en ;
rdfs:label "mmHG"@en .
@@ -453,13 +453,13 @@ s4ehaw:MmHG rdf:type owl:NamedIndividual ,
] ;
rdf:rest [ rdf:type <http://www.w3.org/2003/11/swrl#AtomList> ;
rdf:first [ rdf:type <http://www.w3.org/2003/11/swrl#IndividualPropertyAtom> ;
- <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMesurement ;
+ <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMeasurement ;
<http://www.w3.org/2003/11/swrl#argument1> <urn:swrl:var#data1> ;
<http://www.w3.org/2003/11/swrl#argument2> <urn:swrl:var#meas1>
] ;
rdf:rest [ rdf:type <http://www.w3.org/2003/11/swrl#AtomList> ;
rdf:first [ rdf:type <http://www.w3.org/2003/11/swrl#IndividualPropertyAtom> ;
- <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMesurement ;
+ <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMeasurement ;
<http://www.w3.org/2003/11/swrl#argument1> <urn:swrl:var#data> ;
<http://www.w3.org/2003/11/swrl#argument2> <urn:swrl:var#meas>
] ;
@@ -538,7 +538,7 @@ s4ehaw:MmHG rdf:type owl:NamedIndividual ,
] ;
rdf:rest [ rdf:type <http://www.w3.org/2003/11/swrl#AtomList> ;
rdf:first [ rdf:type <http://www.w3.org/2003/11/swrl#IndividualPropertyAtom> ;
- <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMesurement ;
+ <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMeasurement ;
<http://www.w3.org/2003/11/swrl#argument1> <urn:swrl:var#data2> ;
<http://www.w3.org/2003/11/swrl#argument2> <urn:swrl:var#meas2>
] ;
@@ -650,7 +650,7 @@ s4ehaw:MmHG rdf:type owl:NamedIndividual ,
] ;
rdf:rest [ rdf:type <http://www.w3.org/2003/11/swrl#AtomList> ;
rdf:first [ rdf:type <http://www.w3.org/2003/11/swrl#IndividualPropertyAtom> ;
- <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMesurement ;
+ <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMeasurement ;
<http://www.w3.org/2003/11/swrl#argument1> <urn:swrl:var#data> ;
<http://www.w3.org/2003/11/swrl#argument2> <urn:swrl:var#meas>
] ;
@@ -696,7 +696,7 @@ s4ehaw:MmHG rdf:type owl:NamedIndividual ,
] ;
rdf:rest [ rdf:type <http://www.w3.org/2003/11/swrl#AtomList> ;
rdf:first [ rdf:type <http://www.w3.org/2003/11/swrl#IndividualPropertyAtom> ;
- <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMesurement ;
+ <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMeasurement ;
<http://www.w3.org/2003/11/swrl#argument1> <urn:swrl:var#data1> ;
<http://www.w3.org/2003/11/swrl#argument2> <urn:swrl:var#meas1>
] ;
diff --git a/ontology/saref4ehaw.ttl b/ontology/saref4ehaw.ttl
index ced125c37d3c4ecf0ee62728abb81da1a1ddfab7..27b103a2d4473699fe053eb84a4812df9972b2ed 100644
--- a/ontology/saref4ehaw.ttl
+++ b/ontology/saref4ehaw.ttl
@@ -416,7 +416,7 @@ s4envi:hasFrequencyMeasurement rdf:type owl:ObjectProperty ;
### https://saref.etsi.org/saref4ehaw/activityDuration
s4ehaw:activityDuration rdf:type owl:DatatypeProperty ;
rdfs:domain s4ehaw:Activity ;
- rdfs:range xsd:duration ;
+ rdfs:range xsd:float ;
rdfs:comment "The duration of an activity, in second."@en ;
rdfs:label "activity duration"@en .
@@ -682,7 +682,7 @@ s4ehaw:lastName rdf:type owl:DatatypeProperty ;
### https://saref.etsi.org/saref4ehaw/latency
s4ehaw:latency rdf:type owl:DatatypeProperty ;
rdfs:domain s4ehaw:MeasurementFunction ;
- rdfs:range xsd:duration ;
+ rdfs:range xsd:float ;
rdfs:comment "The latency is the time interval between the stimulation and response of a measurement function (in ms)."@en ;
rdfs:label "latency"@en .
@@ -690,8 +690,8 @@ s4ehaw:latency rdf:type owl:DatatypeProperty ;
### https://saref.etsi.org/saref4ehaw/lifetime
s4ehaw:lifetime rdf:type owl:DatatypeProperty ;
rdfs:domain s4ehaw:Ban ;
- rdfs:range xsd:duration ;
- rdfs:comment "The BAN lifetime, e.g. BAN for entertainment purposes should have a lifetime of weeks or few years whereas BAN dedicated for assisted living or anomaly monitoring should last for many years."@en ;
+ rdfs:range xsd:float ;
+ rdfs:comment "The BAN lifetime (in month), e.g. BAN for entertainment purposes should have a lifetime of weeks or few years whereas BAN dedicated for assisted living or anomaly monitoring should last for many years."@en ;
rdfs:label "lifetime"@en .
@@ -1278,10 +1278,10 @@ s4ehaw:AlcoholDrinking rdf:type owl:NamedIndividual ,
### https://saref.etsi.org/saref4ehaw/AssistedLiving
-s4ehaw:assistedLiving rdf:type owl:NamedIndividual ,
+s4ehaw:AssistedLiving rdf:type owl:NamedIndividual ,
s4ehaw:BanApplicationDomain ;
- rdfs:comment "Assisted Living sub-domain for BAN application."@en ;
- rdfs:label "Assisted Living"@en .
+ rdfs:comment "Assisted living sub-domain for BAN application."@en ;
+ rdfs:label "Assisted living"@en .
### https://saref.etsi.org/saref4ehaw/AuralImpairment