Unverified Commit 66ea771e authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

Merge branch 'develop-v2.1.1' of ssh://labs.etsi.org:29419/saref/saref4envi into develop-v2.1.1

parents 094cce68 22d199a2
Loading
Loading
Loading
Loading
Loading
+2 −102
Original line number Diff line number Diff line
@@ -109,11 +109,6 @@ saref:relatesToProperty rdf:type owl:ObjectProperty ;
                        rdfs:label "relates to property"@en .


###  https://saref.etsi.org/saref4envi/affectsProperty
:affectsProperty rdf:type owl:ObjectProperty ;
                 rdfs:comment "A relation between an actuator with the property or properties it can act on"@en ;
                 rdfs:label "affects property"@en .


###  https://saref.etsi.org/saref4envi/contains
:contains rdf:type owl:ObjectProperty ;
@@ -289,13 +284,6 @@ saref:hasValue rdf:type owl:DatatypeProperty ;
          rdfs:label "has flash"@en .


###  https://saref.etsi.org/saref4envi/hasIdentifier
:hasIdentifier rdf:type owl:DatatypeProperty ;
               rdfs:range xsd:string ;
               rdfs:comment "A relationship providing the identifier of an entity (e.g., digital representation)"@en ;
               rdfs:label "has identifier"@en .


###  https://saref.etsi.org/saref4envi/hasProjectionAngle
:hasProjectionAngle rdf:type owl:DatatypeProperty ,
                             owl:FunctionalProperty ;
@@ -478,17 +466,6 @@ saref:UnitOfMeasure rdf:type owl:Class ;
                    rdfs:label "Unit of measure"@en .


###  https://saref.etsi.org/saref4envi/Actuator
:Actuator rdf:type owl:Class ;
          rdfs:subClassOf :Device ,
                          [ rdf:type owl:Restriction ;
                            owl:onProperty :affectsProperty ;
                            owl:allValuesFrom saref:Property
                          ] ;
          rdfs:comment "Device that can act over at least one property."@en ;
          rdfs:label "Actuator"@en .


###  https://saref.etsi.org/saref4envi/Color
:Color rdf:type owl:Class ;
       owl:disjointWith :CommunicationInterface ,
@@ -604,10 +581,6 @@ saref:UnitOfMeasure rdf:type owl:Class ;
                                         owl:onProperty :hasCreationDate ;
                                         owl:allValuesFrom xsd:dateTime
                                       ] ,
                                       [ rdf:type owl:Restriction ;
                                         owl:onProperty :hasIdentifier ;
                                         owl:allValuesFrom xsd:string
                                       ] ,
                                       [ rdf:type owl:Restriction ;
                                         owl:onProperty :hasTag ;
                                         owl:allValuesFrom xsd:string
@@ -618,9 +591,8 @@ saref:UnitOfMeasure rdf:type owl:Class ;
                                         owl:onDataRange xsd:dateTime
                                       ] ,
                                       [ rdf:type owl:Restriction ;
                                         owl:onProperty :hasIdentifier ;
                                         owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
                                         owl:onDataRange xsd:string
                                         owl:onProperty saref:hasIdentifier ;
                                         owl:maxCardinality "1"^^xsd:nonNegativeInteger
                                       ] ;
                       owl:disjointWith :Geometry ,
                                        :Light ;
@@ -844,78 +816,6 @@ saref:UnitOfMeasure rdf:type owl:Class ;
#    Individuals
#################################################################

###  http://www.wurvoc.org/vocabularies/om-1.8/centimetre
<http://www.wurvoc.org/vocabularies/om-1.8/centimetre> rdf:type owl:NamedIndividual ,
                                                                :LengthUnit ;
                                                       rdfs:label "Centimetre"@en .


###  http://www.wurvoc.org/vocabularies/om-1.8/decametre
<http://www.wurvoc.org/vocabularies/om-1.8/decametre> rdf:type owl:NamedIndividual ,
                                                               :LengthUnit ;
                                                      rdfs:label "Decametre"@en .


###  http://www.wurvoc.org/vocabularies/om-1.8/decimetre
<http://www.wurvoc.org/vocabularies/om-1.8/decimetre> rdf:type owl:NamedIndividual ,
                                                               :LengthUnit ;
                                                      rdfs:label "Decimetre"@en .


###  http://www.wurvoc.org/vocabularies/om-1.8/hectometre
<http://www.wurvoc.org/vocabularies/om-1.8/hectometre> rdf:type owl:NamedIndividual ,
                                                                :LengthUnit ;
                                                       rdfs:label "Hectometre"@en .


###  http://www.wurvoc.org/vocabularies/om-1.8/hertz
<http://www.wurvoc.org/vocabularies/om-1.8/hertz> rdf:type owl:NamedIndividual ,
                                                           :FrequencyUnit ;
                                                  rdfs:label "Hertz"@en .


###  http://www.wurvoc.org/vocabularies/om-1.8/kilometre
<http://www.wurvoc.org/vocabularies/om-1.8/kilometre> rdf:type owl:NamedIndividual ,
                                                               :LengthUnit ;
                                                      rdfs:label "Kilometre"@en .


###  http://www.wurvoc.org/vocabularies/om-1.8/metre
<http://www.wurvoc.org/vocabularies/om-1.8/metre> rdf:type owl:NamedIndividual ,
                                                           :LengthUnit ;
                                                  rdfs:label "Metre"@en .


###  http://www.wurvoc.org/vocabularies/om-1.8/millimetre
<http://www.wurvoc.org/vocabularies/om-1.8/millimetre> rdf:type owl:NamedIndividual ,
                                                                :LengthUnit ;
                                                       rdfs:label "Milimetre"@en .


###  http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_day
<http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_day> rdf:type owl:NamedIndividual ,
                                                                    :FrequencyUnit ;
                                                           rdfs:label "Reciprocal day"@en .


###  http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_hour
<http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_hour> rdf:type owl:NamedIndividual ,
                                                                     :FrequencyUnit ;
                                                            rdfs:label "Reciprocal hour"@en .


###  http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_second-time
<http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_second-time> rdf:type owl:NamedIndividual ,
                                                                            :FrequencyUnit ;
                                                                   rdfs:label "Reciprocal second"@en .


###  http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_year
<http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_year> rdf:type owl:NamedIndividual ,
                                                                     :FrequencyUnit ;
                                                            rdfs:label "Reciprocal year"@en .


###  https://saref.etsi.org/saref4envi/Fluorescence
:Fluorescence rdf:type owl:NamedIndividual ,
                       :LightProperty ;