Merge branch 'master' into 'develop'

# Conflicts:
#   ontology/saref4wear.ttl

ontology/saref4wear.ttl

@@ -272,8 +272,8 @@ s4wear:isLocatedOn rdf:type owl:ObjectProperty ;
 s4wear:isSensedBy rdf:type owl:ObjectProperty ;
                   rdfs:domain s4wear:Wearer ;
                   rdfs:range s4wear:Wearable ;
-                  rdfs:comment """Defines the relatonship between a wearer and a wearable device.
-The definition of this object property satisfies the requirement WEAR-2.""" ;
+                  rdfs:comment "Defines the relatonship between a wearer and a wearable device.
+The definition of this object property satisfies the requirement WEAR-2." ;
                   rdfs:label "is sensed by"@en .
 
 
@@ -299,7 +299,7 @@ s4wear:sendsInformationTo rdf:type owl:ObjectProperty ;
 ###  https://saref.etsi.org/saref4wear/sendsNotificationsTo
 s4wear:sendsNotificationsTo rdf:type owl:ObjectProperty ;
                             rdfs:subPropertyOf s4syst:connectedTo ;
-                            rdfs:domain saref:Device ;
+                            rdfs:domain s4wear:Wearable ;
                             rdfs:range s4wear:Wearer .
 
 
@@ -351,8 +351,7 @@ s4wear:hasBatteryLife rdf:type owl:DatatypeProperty ;
 
 ###  https://saref.etsi.org/saref4wear/hasCapacity
 s4wear:hasCapacity rdf:type owl:DatatypeProperty ;
-                   rdfs:domain s4city:Facility ,
-                               s4wear:Area ;
+                   rdfs:domain s4city:Facility ;
                    rdfs:range xsd:long .
 
 
@@ -368,10 +367,10 @@ s4wear:hasDataTransmissionRate rdf:type owl:DatatypeProperty ;
                                rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/saref4wear/hasDeep
-s4wear:hasDeep rdf:type owl:DatatypeProperty ;
-               rdfs:domain s4wear:Wearable ;
-               rdfs:range xsd:double .
+###  https://saref.etsi.org/saref4wear/hasWidth
+s4wear:hasWidth rdf:type owl:DatatypeProperty ;
+                rdfs:domain s4wear:Wearable ;
+                rdfs:range xsd:double .
 
 
 ###  https://saref.etsi.org/saref4wear/hasHeight
@@ -410,10 +409,10 @@ s4wear:meansOfTransport rdf:type owl:DatatypeProperty ;
                         rdfs:range xsd:string .
 
 
-###  https://saref.etsi.org/saref4wear/wearerRangeAge
-s4wear:wearerRangeAge rdf:type owl:DatatypeProperty ;
+###  https://saref.etsi.org/saref4wear/wearerAgeRange
+s4wear:wearerAgeRange rdf:type owl:DatatypeProperty ;
                       rdfs:domain s4wear:Wearer ;
-                      rdfs:range xsd:int .
+                      rdfs:range xsd:string .
 
 
 ###  https://saref.etsi.org/saref4wear/wearerStatus
@@ -611,10 +610,6 @@ s4city:Event rdf:type owl:Class ;
              rdfs:subClassOf [ rdf:type owl:Restriction ;
                                owl:onProperty s4city:takesPlaceAtFacility ;
                                owl:allValuesFrom s4city:Facility
-                             ] ,
-                             [ rdf:type owl:Restriction ;
-                               owl:onProperty s4wear:hasSensor ;
-                               owl:allValuesFrom saref:Sensor
                              ] ;
              rdfs:isDefinedBy s4city: ;
              rdfs:label "Event"@en .
@@ -796,8 +791,8 @@ s4wear:User rdf:type owl:Class ;
 ###  https://saref.etsi.org/saref4wear/Wearable
 s4wear:Wearable rdf:type owl:Class ;
                 rdfs:subClassOf saref:Device ;
-                rdfs:comment """A wearable device is a device that is intended to be located near, on or in an organism.
-The definition of this concept satisfies the requirement WEAR-1."""@en ;
+                rdfs:comment "A wearable device is a device that is intended to be located near, on or in an organism.
+The definition of this concept satisfies the requirement WEAR-1."@en ;
                 rdfs:label "Wearable device"@en .
 
 
@@ -808,7 +803,7 @@ s4wear:WearableComponent rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref4wear/Wearer
 s4wear:Wearer rdf:type owl:Class ;
-              rdfs:subClassOf [ owl:intersectionOf ( saref:FeatureOfInterest
+              rdfs:subClassOf [ owl:intersectionOf ( s4wear:LivingOrganism
                                                      [ rdf:type owl:Restriction ;
                                                        owl:onProperty s4wear:isSensedBy ;
                                                        owl:someValuesFrom s4wear:Wearable
@@ -816,8 +811,8 @@ s4wear:Wearer rdf:type owl:Class ;
                                                    ) ;
                                 rdf:type owl:Class
                               ] ;
-              rdfs:comment """A wearer is any living organism that is sensed by a wearable.
-The definition of this concept satisfies the requirement WEAR-2."""@en ;
+              rdfs:comment "A wearer is any living organism that is sensed by a wearable.
+The definition of this concept satisfies the requirement WEAR-2."@en ;
               rdfs:label "Wearer"@en .