Commit 98d59726 authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

Merge branch 'issue-18' into 'develop-v2.1.1'

closes #18: delete :contains

Closes #18 and #16

See merge request !17
parents bdd5d410 b331ca4f
Loading
Loading
Loading
Loading
Loading
+2 −73
Original line number Diff line number Diff line
@@ -75,13 +75,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
#################################################################


###  https://saref.etsi.org/saref4envi/contains
:contains rdf:type owl:ObjectProperty ;
          owl:inverseOf :isContainedIn ;
          rdfs:comment "A relation between a physical object and the physical objects that can be contained in it."@en ;
          rdfs:label "contains"@en .


###  https://saref.etsi.org/saref4envi/encapsulates
:encapsulates rdf:type owl:ObjectProperty ;
              owl:inverseOf :hasDigitalRepresentation ;
@@ -96,14 +89,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
          rdfs:label "has color"@en .


###  https://saref.etsi.org/saref4envi/hasComponent
:hasComponent rdf:type owl:ObjectProperty ;
              owl:inverseOf :isComponentOf ;
              rdf:type owl:TransitiveProperty ;
              rdfs:comment "A relation between a system and the system in which it might be decomposed."@en ;
              rdfs:label "has component"@en .


###  https://saref.etsi.org/saref4envi/hasDigitalRepresentation
:hasDigitalRepresentation rdf:type owl:ObjectProperty ,
                                   owl:InverseFunctionalProperty ;
@@ -149,19 +134,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
               rdfs:label "is component of"@en .


###  https://saref.etsi.org/saref4envi/isConnectedTo
:isConnectedTo rdf:type owl:ObjectProperty ,
                        owl:SymmetricProperty ;
               rdfs:comment "A relation between a system and the system to which it is connected."@en ;
               rdfs:label "is connected to"@en .


###  https://saref.etsi.org/saref4envi/isContainedIn
:isContainedIn rdf:type owl:ObjectProperty ;
               rdfs:comment "A relation between a physical object and the physical object in which it might be contained."@en ;
               rdfs:label "is contained in"@en .


###  https://saref.etsi.org/saref4envi/isProjectedFromHeight
:isProjectedFromHeight rdf:type owl:ObjectProperty ;
                       rdfs:comment "A relation between a light and the height measurement from which it is projected."@en ;
@@ -300,10 +272,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
                          owl:onProperty :hasTransmissionPeriod ;
                          owl:allValuesFrom :PeriodMeasurement
                        ] ,
                        [ rdf:type owl:Restriction ;
                          owl:onProperty :isContainedIn ;
                          owl:allValuesFrom :PhysicalObject
                        ] ,
                        [ rdf:type owl:Restriction ;
                          owl:onProperty saref:hasManufacturer ;
                          owl:allValuesFrom xsd:string
@@ -334,7 +302,7 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
:DigitalRepresentation rdf:type owl:Class ;
                       rdfs:subClassOf [ rdf:type owl:Restriction ;
                                         owl:onProperty :encapsulates ;
                                         owl:allValuesFrom :PhysicalObject
                                         owl:allValuesFrom [ a owl:Class ; owl:intersectionOf ( saref:FeatureOfInterest geo:Feature ) ]
                                       ] ,
                                       [ rdf:type owl:Restriction ;
                                         owl:onProperty :isAccesibleThrough ;
@@ -519,48 +487,9 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
            rdfs:label "Photometer"@en .


###  https://saref.etsi.org/saref4envi/PhysicalObject
:PhysicalObject rdf:type owl:Class ;
                rdfs:subClassOf geo:SpatialThing ,
                                [ rdf:type owl:Restriction ;
                                  owl:onProperty geo:location ;
                                  owl:allValuesFrom geo:SpatialThing
                                ] ,
                                [ rdf:type owl:Restriction ;
                                  owl:onProperty :contains ;
                                  owl:allValuesFrom :PhysicalObject
                                ] ,
                                [ rdf:type owl:Restriction ;
                                  owl:onProperty :hasDigitalRepresentation ;
                                  owl:allValuesFrom :DigitalRepresentation
                                ] ,
                                [ rdf:type owl:Restriction ;
                                  owl:onProperty :isContainedIn ;
                                  owl:allValuesFrom :PhysicalObject
                                ] ,
                                [ rdf:type owl:Restriction ;
                                  owl:onProperty saref:hasDescription ;
                                  owl:allValuesFrom xsd:string
                                ] ;
                rdfs:comment "Any Object that has a proper space region.  (Definition extracted from DUL ontology)"@en ;
                rdfs:label "Physical object"@en .


###  https://saref.etsi.org/saref4envi/System
:System rdf:type owl:Class ;
        rdfs:subClassOf :PhysicalObject ,
                        [ rdf:type owl:Restriction ;
                          owl:onProperty :hasComponent ;
                          owl:allValuesFrom :System
                        ] ,
                        [ rdf:type owl:Restriction ;
                          owl:onProperty :isComponentOf ;
                          owl:allValuesFrom :System
                        ] ,
                        [ rdf:type owl:Restriction ;
                          owl:onProperty :isConnectedTo ;
                          owl:allValuesFrom :System
                        ] ,
        rdfs:subClassOf saref:FeatureOfInterest , geo:Feature ,
                        [ rdf:type owl:Restriction ;
                          owl:onProperty :usesCommunicationInterface ;
                          owl:allValuesFrom :CommunicationInterface