Commit ae3469ad authored by Mauro Dragoni's avatar Mauro Dragoni
Browse files

Merge branch 'fixes' into 'master'

Fixes

See merge request stf/stf-566/saref4wear!43
parents 8f22b286 1234b0a7
Loading
Loading
Loading
Loading
+18 −27
Original line number Original line Diff line number Diff line
@@ -116,16 +116,14 @@ geosp:sfWithin rdf:type owl:ObjectProperty ;


###  http://www.w3.org/2003/01/geo/wgs84_pos#location
###  http://www.w3.org/2003/01/geo/wgs84_pos#location
geo:location rdf:type owl:ObjectProperty ;
geo: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 realtionship between
             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 ;
 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 geo: ;
             rdfs:isDefinedBy geo: ;
             rdfs:label "location" .
             rdfs:label "location" .




###  http://www.w3.org/ns/ssn/systems/hasSystemCapability
###  http://www.w3.org/ns/ssn/systems/hasSystemCapability
ssn-system:hasSystemCapability rdf:type owl:ObjectProperty ;
ssn-system:hasSystemCapability rdf:type owl:ObjectProperty ;
                               rdfs:domain s4wear:Wearable ;
                               rdfs:isDefinedBy ssn-system: ;
                               rdfs:range ssn-system:SystemCapability ;
                               rdfs:comment "Relation from a System to a SystemCapability describing the capabilities of the System under certain Conditions."@en ;
                               rdfs:comment "Relation from a System to a SystemCapability describing the capabilities of the System under certain Conditions."@en ;
                               rdfs:label "has system capability"@en .
                               rdfs:label "has system capability"@en .


@@ -208,12 +206,6 @@ saref:relatesToProperty rdf:type owl:ObjectProperty ;
                        rdfs:label "relates to property"@en .
                        rdfs:label "relates to property"@en .




###  https://saref.etsi.org/saref4city/takesPlaceAt
s4city:takesPlaceAt rdf:type owl:ObjectProperty ;
                    rdfs:comment "The place where an occurrence takes place."@en ;
                    rdfs:label "takes place at"@en .


###  https://saref.etsi.org/saref4city/takesPlaceAtFacility
###  https://saref.etsi.org/saref4city/takesPlaceAtFacility
s4city:takesPlaceAtFacility rdf:type owl:ObjectProperty ;
s4city:takesPlaceAtFacility rdf:type owl:ObjectProperty ;
                            rdfs:comment "A relationship specifying in which facility and event takes place."@en ;
                            rdfs:comment "A relationship specifying in which facility and event takes place."@en ;
@@ -393,6 +385,12 @@ s4wear:sendsNotificationsTo rdf:type owl:ObjectProperty ;
                            rdfs:label "sends notifications to"@en .
                            rdfs:label "sends notifications to"@en .




###  https://saref.etsi.org/saref4wear/takesPlaceAt
s4wear:takesPlaceAt rdf:type owl:ObjectProperty ;
                    rdfs:comment "The place where an occurrence takes place."@en ;
                    rdfs:label "takes place at"@en .


###  https://saref.etsi.org/saref4wear/triggers
###  https://saref.etsi.org/saref4wear/triggers
s4wear:triggers rdf:type owl:ObjectProperty ;
s4wear:triggers rdf:type owl:ObjectProperty ;
                rdfs:domain saref:Device ;
                rdfs:domain saref:Device ;
@@ -556,6 +554,7 @@ geo:Point rdf:type owl:Class ;


###  http://www.w3.org/ns/ssn/systems/SystemCapability
###  http://www.w3.org/ns/ssn/systems/SystemCapability
ssn-system:SystemCapability rdf:type owl:Class ;
ssn-system:SystemCapability rdf:type owl:Class ;
                            rdfs:isDefinedBy ssn-system: ;
                            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.
                            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.
The capabilities specified here are those that affect the primary purpose of the System, while those in OperatingRange represent the system's normal operating environment, including Conditions that don't affect the Observations or the Actuations."""@en ;
The capabilities specified here are those that affect the primary purpose of the System, while those in OperatingRange represent the system's normal operating environment, including Conditions that don't affect the Observations or the Actuations."""@en ;
                            rdfs:label "System capability"@en .
                            rdfs:label "System capability"@en .
@@ -570,7 +569,7 @@ foaf:Person rdf:type owl:Class ;
###  https://saref.etsi.org/core/ActuatingFunction
###  https://saref.etsi.org/core/ActuatingFunction
saref:ActuatingFunction rdf:type owl:Class ;
saref:ActuatingFunction rdf:type owl:Class ;
                        rdfs:subClassOf saref:Function ;
                        rdfs:subClassOf saref:Function ;
                        rdfs:label "Action function"@en .
                        rdfs:label "Actuating function"@en .




###  https://saref.etsi.org/core/Actuator
###  https://saref.etsi.org/core/Actuator
@@ -593,10 +592,6 @@ saref:Device rdf:type owl:Class ;
                             [ rdf:type owl:Restriction ;
                             [ rdf:type owl:Restriction ;
                               owl:onProperty saref:measuresProperty ;
                               owl:onProperty saref:measuresProperty ;
                               owl:allValuesFrom saref:Property
                               owl:allValuesFrom saref:Property
                             ] ,
                             [ rdf:type owl:Restriction ;
                               owl:onProperty s4wear:interactsWith ;
                               owl:allValuesFrom saref:Device
                             ] ;
                             ] ;
             rdfs:isDefinedBy saref: ;
             rdfs:isDefinedBy saref: ;
             rdfs:label "Device"@en .
             rdfs:label "Device"@en .
@@ -847,7 +842,7 @@ s4wear:NearBodyWearable rdf:type owl:Class ;
###  https://saref.etsi.org/saref4wear/Occurrence
###  https://saref.etsi.org/saref4wear/Occurrence
s4wear:Occurrence rdf:type owl:Class ;
s4wear:Occurrence rdf:type owl:Class ;
                  rdfs:subClassOf [ rdf:type owl:Restriction ;
                  rdfs:subClassOf [ rdf:type owl:Restriction ;
                                    owl:onProperty s4city:takesPlaceAt ;
                                    owl:onProperty s4wear:takesPlaceAt ;
                                    owl:allValuesFrom geosp:Feature
                                    owl:allValuesFrom geosp:Feature
                                  ] ;
                                  ] ;
                  rdfs:comment "An occurrence is the fact of something existing or being found in a place."@en ;
                  rdfs:comment "An occurrence is the fact of something existing or being found in a place."@en ;
@@ -904,14 +899,7 @@ s4wear:TextileBasedWearable rdf:type owl:Class ;


###  https://saref.etsi.org/saref4wear/User
###  https://saref.etsi.org/saref4wear/User
s4wear:User rdf:type owl:Class ;
s4wear:User rdf:type owl:Class ;
            rdfs:subClassOf [ owl:intersectionOf ( saref:FeatureOfInterest
            rdfs:subClassOf saref:FeatureOfInterest;
                                                   [ rdf:type owl:Restriction ;
                                                     owl:onProperty s4wear:interactsWith ;
                                                     owl:someValuesFrom s4wear:Wearable
                                                   ]
                                                 ) ;
                              rdf:type owl:Class
                            ] ;
            rdfs:label "User"@en .
            rdfs:label "User"@en .




@@ -922,9 +910,12 @@ s4wear:Wearable rdf:type owl:Class ;
                                [ rdf:type owl:Restriction ;
                                [ rdf:type owl:Restriction ;
                                  owl:onProperty saref:hasProperty ;
                                  owl:onProperty saref:hasProperty ;
                                  owl:allValuesFrom s4wear:WearableProperty
                                  owl:allValuesFrom s4wear:WearableProperty
                                ] ,
                                [ rdf:type owl:Restriction ;
                                  owl:onProperty ssn-system:hasSystemCapability ;
                                  owl:allValuesFrom ssn-system:SystemCapability
                                ] ;
                                ] ;
                rdfs:comment """A wearable device is a device that is intended to be located near, on or in an organism.
                rdfs:comment "A wearable device is a device that is intended to be located near, on or in an organism."@en ;
The definition of this concept satisfies the requirement WEAR-1."""@en ;
                rdfs:label "Wearable device"@en .
                rdfs:label "Wearable device"@en .




@@ -955,7 +946,7 @@ s4wear:Wearer rdf:type owl:Class ;
                                owl:onProperty saref:hasProperty ;
                                owl:onProperty saref:hasProperty ;
                                owl:allValuesFrom s4wear:WearerProperty
                                owl:allValuesFrom s4wear:WearerProperty
                              ] ;
                              ] ;
              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."@en ;
              rdfs:label "Wearer"@en .
              rdfs:label "Wearer"@en .