diff --git a/ontology/saref4wear.ttl b/ontology/saref4wear.ttl
index 78a500ebd340254c34bc4ea645869d7c144be5fc..ea243367e5812150bfb2fb41407a323060265e8f 100644
--- a/ontology/saref4wear.ttl
+++ b/ontology/saref4wear.ttl
@@ -9,7 +9,6 @@
@prefix vann: .
@prefix voaf: .
@prefix saref: .
-@prefix wgs84: .
@prefix s4city: .
@prefix s4syst: .
@prefix s4wear: .
@@ -20,6 +19,7 @@
rdf:type owl:Ontology ;
owl:versionIRI ;
+ owl:imports ;
dcterms:created "2019-01-01"^^xsd:date ;
dcterms:creator ,
;
@@ -133,13 +133,6 @@ geo:sfWithin rdf:type owl:ObjectProperty ;
rdfs:label "sfWithin"@en .
-### http://www.w3.org/2003/01/geo/wgs84_pos#location
-wgs84:location rdf:type owl:ObjectProperty ;
- rdfs:comment "The relation between something and the point, or other geometrical thing in space, where it is. For example, the relationship between a radio tower and a Point with a given lat and long. Or a relationship between a park and its outline as a closed arc of points, or a road and its location as a arc (a sequence of points). Clearly in practice there will be limit to the accuracy of any such statement, but one would expect an accuracy appropriate for the size of the object and uses such as mapping."@en ;
- rdfs:isDefinedBy wgs84: ;
- rdfs:label "location" .
-
-
### http://www.w3.org/ns/ssn/systems/hasSystemCapability
ssn-system:hasSystemCapability rdf:type owl:ObjectProperty ;
rdfs:comment "Relation from a System to a SystemCapability describing the capabilities of the System under certain Conditions."@en ;
@@ -169,7 +162,7 @@ saref:hasCommand rdf:type owl:ObjectProperty ;
### https://saref.etsi.org/core/hasFunction
saref:hasFunction rdf:type owl:ObjectProperty ;
- rdfs:domain s4wear:Wearable ;
+ rdfs:domain s4wear:WearableDevice ;
rdfs:range saref:Function ;
rdfs:comment "A relationship identifying the function of a device."@en ;
rdfs:label "has function"@en .
@@ -257,7 +250,7 @@ s4syst:connectedTo rdf:type owl:ObjectProperty ;
### https://saref.etsi.org/saref4wear/controlsFeature
s4wear:controlsFeature rdf:type owl:ObjectProperty ;
- rdfs:domain saref:Device ;
+ rdfs:domain s4wear:WearableDevice ;
rdfs:range saref:FeatureOfInterest ;
rdfs:comment "A relationship specifying the features of interest that are controlled by a device."@en ;
rdfs:label "controls feature"@en .
@@ -266,7 +259,7 @@ s4wear:controlsFeature rdf:type owl:ObjectProperty ;
### https://saref.etsi.org/saref4wear/featureIsControlledByDevice
s4wear:featureIsControlledByDevice rdf:type owl:ObjectProperty ;
rdfs:domain saref:FeatureOfInterest ;
- rdfs:range saref:Device ;
+ rdfs:range s4wear:WearableDevice ;
rdfs:comment "A relationship specifying the devices that control a feature of interest."@en ;
rdfs:label "feature is controlled by device"@en .
@@ -274,14 +267,14 @@ s4wear:featureIsControlledByDevice rdf:type owl:ObjectProperty ;
### https://saref.etsi.org/saref4wear/featureIsMeasuredByDevice
s4wear:featureIsMeasuredByDevice rdf:type owl:ObjectProperty ;
rdfs:domain saref:FeatureOfInterest ;
- rdfs:range saref:Device ;
+ rdfs:range s4wear:WearableDevice ;
rdfs:comment "A relationship specifying the devices that measure a feature of interest."@en ;
rdfs:label "feature is measured by device"@en .
### https://saref.etsi.org/saref4wear/followsPolicy
s4wear:followsPolicy rdf:type owl:ObjectProperty ;
- rdfs:domain s4wear:Wearable ;
+ rdfs:domain s4wear:WearableDevice ;
rdfs:range s4wear:Policy ;
rdfs:comment "A relationship specifying the policy followed by a wearable device."@en ;
rdfs:label "follows policy"@en .
@@ -303,14 +296,6 @@ s4wear:hasPowerSupply rdf:type owl:ObjectProperty ;
rdfs:label "has power supply"@en .
-### https://saref.etsi.org/saref4wear/hasSensor
-s4wear:hasSensor rdf:type owl:ObjectProperty ;
- rdfs:domain saref:Device ;
- rdfs:range saref:Sensor ;
- rdfs:comment "A relationship specifying a sensor integrated into a device."@en ;
- rdfs:label "has sensor"@en .
-
-
### https://saref.etsi.org/saref4wear/installs
s4wear:installs rdf:type owl:ObjectProperty ;
rdfs:domain s4city:Facility ;
@@ -337,7 +322,7 @@ s4wear:isDetectedBy rdf:type owl:ObjectProperty ;
### https://saref.etsi.org/saref4wear/isLocated
s4wear:isLocated rdf:type owl:ObjectProperty ;
- rdfs:domain s4wear:Wearable ;
+ rdfs:domain s4wear:WearableDevice ;
rdfs:range s4wear:Wearer ;
rdfs:comment "A relationship specifying the location of a wearer with respect to a wearable."@en ;
rdfs:label "is located"@en .
@@ -381,7 +366,7 @@ s4wear:isTriggeredBy rdf:type owl:ObjectProperty ;
### https://saref.etsi.org/saref4wear/measuresFeature
s4wear:measuresFeature rdf:type owl:ObjectProperty ;
- rdfs:domain saref:Device ;
+ rdfs:domain s4wear:WearableDevice ;
rdfs:range saref:FeatureOfInterest ;
rdfs:comment "A relationship specifying the features of interest that are measured by a device."@en ;
rdfs:label "measures feature"@en .
@@ -398,8 +383,8 @@ s4wear:monitors rdf:type owl:ObjectProperty ;
### https://saref.etsi.org/saref4wear/sendsInformationTo
s4wear:sendsInformationTo rdf:type owl:ObjectProperty ;
rdfs:subPropertyOf s4syst:connectedTo ;
- rdfs:domain s4wear:Wearable ;
- rdfs:range s4wear:Wearable ;
+ rdfs:domain s4wear:WearableDevice ;
+ rdfs:range s4wear:WearableDevice ;
rdfs:comment "A relationship specifying the sending information operation between two wearables."@en ;
rdfs:label "sends information to"@en .
@@ -407,7 +392,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 s4wear:Wearable ;
+ rdfs:domain s4wear:WearableDevice ;
rdfs:range s4wear:Wearer ;
rdfs:comment "A relationship specifying the sending notification operation between two wearables."@en ;
rdfs:label "sends notifications to"@en .
@@ -455,7 +440,7 @@ s4wear:hasCapacity rdf:type owl:DatatypeProperty ;
### https://saref.etsi.org/saref4wear/hasDataTransmissionRate
s4wear:hasDataTransmissionRate rdf:type owl:DatatypeProperty ;
- rdfs:domain s4wear:Wearable ;
+ rdfs:domain s4wear:WearableDevice ;
rdfs:range xsd:double ;
rdfs:comment "A relationship defining the data transmission rate of a wearable."@en ;
rdfs:label "has data transmission rate"@en .
@@ -463,7 +448,7 @@ s4wear:hasDataTransmissionRate rdf:type owl:DatatypeProperty ;
### https://saref.etsi.org/saref4wear/hasHeight
s4wear:hasHeight rdf:type owl:DatatypeProperty ;
- rdfs:domain s4wear:Wearable ;
+ rdfs:domain s4wear:WearableDevice ;
rdfs:range xsd:double ;
rdfs:comment "A relationship defining the height dimension of a wearable."@en ;
rdfs:label "has height"@en .
@@ -471,7 +456,7 @@ s4wear:hasHeight rdf:type owl:DatatypeProperty ;
### https://saref.etsi.org/saref4wear/hasLength
s4wear:hasLength rdf:type owl:DatatypeProperty ;
- rdfs:domain s4wear:Wearable ;
+ rdfs:domain s4wear:WearableDevice ;
rdfs:range xsd:double ;
rdfs:comment "A relationship defining the length dimension of a wearable."@en ;
rdfs:label "has length"@en .
@@ -479,7 +464,7 @@ s4wear:hasLength rdf:type owl:DatatypeProperty ;
### https://saref.etsi.org/saref4wear/hasStorage
s4wear:hasStorage rdf:type owl:DatatypeProperty ;
- rdfs:domain s4wear:Wearable ;
+ rdfs:domain s4wear:WearableDevice ;
rdfs:range xsd:double ;
rdfs:comment "A relationship defining the storage capacity of a wearable."@en ;
rdfs:label "has storage"@en .
@@ -487,7 +472,7 @@ s4wear:hasStorage rdf:type owl:DatatypeProperty ;
### https://saref.etsi.org/saref4wear/hasWeight
s4wear:hasWeight rdf:type owl:DatatypeProperty ;
- rdfs:domain s4wear:Wearable ;
+ rdfs:domain s4wear:WearableDevice ;
rdfs:range xsd:double ;
rdfs:comment "A relationship defining the weight of a wearable device."@en ;
rdfs:label "has weight"@en .
@@ -495,7 +480,7 @@ s4wear:hasWeight rdf:type owl:DatatypeProperty ;
### https://saref.etsi.org/saref4wear/hasWidth
s4wear:hasWidth rdf:type owl:DatatypeProperty ;
- rdfs:domain s4wear:Wearable ;
+ rdfs:domain s4wear:WearableDevice ;
rdfs:range xsd:double ;
rdfs:comment "A relationship defining the width dimention of a wearable."@en ;
rdfs:label "has width"@en .
@@ -563,6 +548,14 @@ geo:Geometry rdf:type owl:Class ;
rdfs:label "Geometry"@en .
+### http://www.opengis.net/ont/geosparql#Point
+geo:Point rdf:type owl:Class ;
+ rdfs:subClassOf geo:Geometry ;
+ rdfs:comment "A point, typically described using a coordinate system relative to Earth."@en ;
+ rdfs:isDefinedBy ;
+ rdfs:label "Point"@en .
+
+
### http://www.opengis.net/ont/geosparql#SpatialObject
geo:SpatialObject rdf:type owl:Class ;
rdfs:comment "The class spatial-object represents everything that can have a spatial representation. It is superclass of feature and geometry."@en ;
@@ -570,14 +563,6 @@ geo:SpatialObject rdf:type owl:Class ;
rdfs:label "Spatial object"@en .
-### http://www.w3.org/2003/01/geo/wgs84_pos#Point
-wgs84:Point rdf:type owl:Class ;
- rdfs:subClassOf geo:Geometry ;
- rdfs:comment "A point, typically described using a coordinate system relative to Earth, such as WGS84."@en ;
- rdfs:isDefinedBy wgs84: ;
- rdfs:label "Point"@en .
-
-
### http://www.w3.org/ns/ssn/systems/SystemCapability
ssn-system:SystemCapability rdf:type owl:Class ;
rdfs:comment """Describes normal measurement, actuation, sampling properties such as accuracy, range, precision, etc. of a System under some specified Conditions such as a temperature range.
@@ -827,7 +812,7 @@ s4wear:FabricWearable rdf:type owl:Class ;
### https://saref.etsi.org/saref4wear/InBodyWearable
s4wear:InBodyWearable rdf:type owl:Class ;
- rdfs:subClassOf [ owl:intersectionOf ( s4wear:Wearable
+ rdfs:subClassOf [ owl:intersectionOf ( s4wear:WearableDevice
[ rdf:type owl:Restriction ;
owl:onProperty s4wear:isLocatedIn ;
owl:someValuesFrom s4wear:Wearer
@@ -869,7 +854,7 @@ s4wear:NavigatingFunction rdf:type owl:Class ;
### https://saref.etsi.org/saref4wear/NearBodyWearable
s4wear:NearBodyWearable rdf:type owl:Class ;
- rdfs:subClassOf [ owl:intersectionOf ( s4wear:Wearable
+ rdfs:subClassOf [ owl:intersectionOf ( s4wear:WearableDevice
[ rdf:type owl:Restriction ;
owl:onProperty s4wear:isLocatedNear ;
owl:someValuesFrom s4wear:Wearer
@@ -893,7 +878,7 @@ s4wear:Occurrence rdf:type owl:Class ;
### https://saref.etsi.org/saref4wear/OnBodyWearable
s4wear:OnBodyWearable rdf:type owl:Class ;
- rdfs:subClassOf [ owl:intersectionOf ( s4wear:Wearable
+ rdfs:subClassOf [ owl:intersectionOf ( s4wear:WearableDevice
[ rdf:type owl:Restriction ;
owl:onProperty s4wear:isLocatedOn ;
owl:someValuesFrom s4wear:Wearer
@@ -946,20 +931,20 @@ s4wear:User rdf:type owl:Class ;
rdfs:label "User"@en .
-### https://saref.etsi.org/saref4wear/Wearable
-s4wear:Wearable rdf:type owl:Class ;
- rdfs:subClassOf geo:Feature ,
- saref:Device ,
- [ rdf:type owl:Restriction ;
- owl:onProperty ssn-system:hasSystemCapability ;
- owl:allValuesFrom ssn-system:SystemCapability
- ] ,
- [ rdf:type owl:Restriction ;
- owl:onProperty saref:hasProperty ;
- owl:allValuesFrom s4wear:WearableProperty
- ] ;
- rdfs:comment "A wearable device is a device that is intended to be located near, on or in an organism."@en ;
- rdfs:label "Wearable device"@en .
+### https://saref.etsi.org/saref4wear/WearableDevice
+s4wear:WearableDevice rdf:type owl:Class ;
+ rdfs:subClassOf geo:Feature ,
+ saref:Device ,
+ [ rdf:type owl:Restriction ;
+ owl:onProperty ssn-system:hasSystemCapability ;
+ owl:allValuesFrom ssn-system:SystemCapability
+ ] ,
+ [ rdf:type owl:Restriction ;
+ owl:onProperty saref:hasProperty ;
+ owl:allValuesFrom s4wear:WearableProperty
+ ] ;
+ rdfs:comment "A wearable device is a device that is intended to be located near, on or in an organism."@en ;
+ rdfs:label "Wearable device"@en .
### https://saref.etsi.org/saref4wear/WearableProperty
@@ -975,7 +960,7 @@ s4wear:Wearer rdf:type owl:Class ;
[ owl:intersectionOf ( s4wear:LivingOrganism
[ rdf:type owl:Restriction ;
owl:onProperty s4wear:featureIsMeasuredByDevice ;
- owl:someValuesFrom s4wear:Wearable
+ owl:someValuesFrom s4wear:WearableDevice
]
) ;
rdf:type owl:Class