Commit 04e8e541 authored by Mauro Dragoni's avatar Mauro Dragoni
Browse files

Merge branch 'develop' into 'master'

Removed event types. Issue #33.

See merge request stf/stf-566/saref4wear!26
parents 824bfe8a 34260ab7
Loading
Loading
Loading
Loading
+45 −40
Original line number Diff line number Diff line
@@ -628,17 +628,19 @@ s4wear:ActionFunction rdf:type owl:Class ;


###  https://saref.etsi.org/saref4wear/ActuableObject
s4wear:ActuableObject rdf:type owl:Class .
s4wear:ActuableObject rdf:type owl:Class ;
                      rdfs:label "Actuable object"@en .


###  https://saref.etsi.org/saref4wear/Biometric
s4wear:Biometric rdf:type owl:Class ;
                 rdfs:subClassOf s4wear:Information .
###  https://saref.etsi.org/saref4wear/Area
s4wear:Area rdf:type owl:Class ;
            rdfs:label "Area"@en .


###  https://saref.etsi.org/saref4wear/BusinessEvents
s4wear:BusinessEvents rdf:type owl:Class ;
                      rdfs:subClassOf s4city:Event .
###  https://saref.etsi.org/saref4wear/Biometric
s4wear:Biometric rdf:type owl:Class ;
                 rdfs:subClassOf s4wear:Information ;
                 rdfs:label "Biometric information"@en .


###  https://saref.etsi.org/saref4wear/CommunicationFunction
@@ -653,22 +655,20 @@ s4wear:ControlFunction rdf:type owl:Class ;

###  https://saref.etsi.org/saref4wear/ElectricalSafety
s4wear:ElectricalSafety rdf:type owl:Class ;
                        rdfs:subClassOf s4wear:Information .
                        rdfs:subClassOf s4wear:Information ;
                        rdfs:label "Electrical safety information"@en .


###  https://saref.etsi.org/saref4wear/Emission
s4wear:Emission rdf:type owl:Class ;
                rdfs:subClassOf s4wear:Information .
                rdfs:subClassOf s4wear:Information ;
                rdfs:label "Emission information"@en .


###  https://saref.etsi.org/saref4wear/FabricWearable
s4wear:FabricWearable rdf:type owl:Class ;
                      rdfs:subClassOf s4wear:TextileBasedWearable .


###  https://saref.etsi.org/saref4wear/FunEvents
s4wear:FunEvents rdf:type owl:Class ;
                 rdfs:subClassOf s4city:Event .
                      rdfs:subClassOf s4wear:TextileBasedWearable ;
                      rdfs:label "Fabric wearable"@en .


###  https://saref.etsi.org/saref4wear/InBodyWearable
@@ -680,31 +680,31 @@ s4wear:InBodyWearable rdf:type owl:Class ;
                                                             ]
                                                           ) ;
                                        rdf:type owl:Class
                                      ] .
                                      ] ;
                      rdfs:label "In-body wearable"@en .


###  https://saref.etsi.org/saref4wear/Information
s4wear:Information rdf:type owl:Class .
s4wear:Information rdf:type owl:Class ;
                   rdfs:label "Information"@en .


###  https://saref.etsi.org/saref4wear/Interface
s4wear:Interface rdf:type owl:Class .
s4wear:Interface rdf:type owl:Class ;
                 rdfs:label "Interface"@en .


###  https://saref.etsi.org/saref4wear/LivingOrganism
s4wear:LivingOrganism rdf:type owl:Class ;
                      rdfs:subClassOf geosp:Feature ,
                                      saref:FeatureOfInterest .
                                      saref:FeatureOfInterest ;
                      rdfs:label "Living organism"@en .


###  https://saref.etsi.org/saref4wear/MemoryStorage
s4wear:MemoryStorage rdf:type owl:Class ;
                     rdfs:subClassOf s4wear:WearableComponent .


###  https://saref.etsi.org/saref4wear/MusicEvents
s4wear:MusicEvents rdf:type owl:Class ;
                   rdfs:subClassOf s4city:Event .
                     rdfs:subClassOf s4wear:WearableComponent ;
                     rdfs:label "Memory storage"@en .


###  https://saref.etsi.org/saref4wear/NearBodyWearable
@@ -716,7 +716,8 @@ s4wear:NearBodyWearable rdf:type owl:Class ;
                                                               ]
                                                             ) ;
                                          rdf:type owl:Class
                                        ] .
                                        ] ;
                        rdfs:label "Near-body wearable"@en .


###  https://saref.etsi.org/saref4wear/OnBodyWearable
@@ -728,23 +729,27 @@ s4wear:OnBodyWearable rdf:type owl:Class ;
                                                             ]
                                                           ) ;
                                        rdf:type owl:Class
                                      ] .
                                      ] ;
                      rdfs:label "On-body wearable"@en .


###  https://saref.etsi.org/saref4wear/PhysicalObject
s4wear:PhysicalObject rdf:type owl:Class ;
                      rdfs:subClassOf geosp:Feature ,
                                      saref:FeatureOfInterest .
                                      saref:FeatureOfInterest ;
                      rdfs:label "Physical object"@en .


###  https://saref.etsi.org/saref4wear/PositionedWearable
s4wear:PositionedWearable rdf:type owl:Class ;
                          rdfs:subClassOf s4wear:Wearable .
                          rdfs:subClassOf s4wear:Wearable ;
                          rdfs:label "Positioned wearable"@en .


###  https://saref.etsi.org/saref4wear/PowerSupply
s4wear:PowerSupply rdf:type owl:Class ;
                   rdfs:subClassOf saref:Device .
                   rdfs:subClassOf saref:Device ;
                   rdfs:label "Power supply"@en .


###  https://saref.etsi.org/saref4wear/Software
@@ -752,24 +757,22 @@ s4wear:Software rdf:type owl:Class ;
                rdfs:subClassOf saref:FeatureOfInterest .


###  https://saref.etsi.org/saref4wear/SportEvents
s4wear:SportEvents rdf:type owl:Class ;
                   rdfs:subClassOf s4city:Event .


###  https://saref.etsi.org/saref4wear/TextileBasedDevice
s4wear:TextileBasedDevice rdf:type owl:Class ;
                          rdfs:subClassOf s4wear:TextileBasedWearable .
                          rdfs:subClassOf s4wear:TextileBasedWearable ;
                          rdfs:label "Textile-based device"@en .


###  https://saref.etsi.org/saref4wear/TextileBasedSensor
s4wear:TextileBasedSensor rdf:type owl:Class ;
                          rdfs:subClassOf saref:Sensor .
                          rdfs:subClassOf saref:Sensor ;
                          rdfs:label "Textile-based sensor"@en .


###  https://saref.etsi.org/saref4wear/TextileBasedWearable
s4wear:TextileBasedWearable rdf:type owl:Class ;
                            rdfs:subClassOf s4wear:OnBodyWearable .
                            rdfs:subClassOf s4wear:OnBodyWearable ;
                            rdfs:label "Textile-based wearable"@en .


###  https://saref.etsi.org/saref4wear/User
@@ -781,7 +784,8 @@ s4wear:User rdf:type owl:Class ;
                                                   ]
                                                 ) ;
                              rdf:type owl:Class
                            ] .
                            ] ;
            rdfs:label "User"@en .


###  https://saref.etsi.org/saref4wear/Wearable
@@ -793,7 +797,8 @@ The definition of this concept satisfies the requirement WEAR-1."@en ;


###  https://saref.etsi.org/saref4wear/WearableComponent
s4wear:WearableComponent rdf:type owl:Class .
s4wear:WearableComponent rdf:type owl:Class ;
                         rdfs:label "Wearable component"@en .


###  https://saref.etsi.org/saref4wear/Wearer