Unverified Commit 90121b2e authored by María's avatar María Committed by GitHub
Browse files

Merge pull request #66 from OnToologyUser/master

OnToology update
parents 49f40404 f44cf4ef
Loading
Loading
Loading
Loading
+4 −7
Original line number Diff line number Diff line
@@ -654,10 +654,6 @@
      "@id" : "https://w3id.org/def/saref4bldg#lockedRotorCurrent",
      "@type" : "@id"
    },
    "operatingWight" : {
      "@id" : "https://w3id.org/def/saref4bldg#operatingWight",
      "@type" : "@id"
    },
    "capacityWeight" : {
      "@id" : "https://w3id.org/def/saref4bldg#capacityWeight",
      "@type" : "@id"
@@ -1047,9 +1043,6 @@
    "Actuator" : {
      "@id" : "https://w3id.org/def/saref4bldg#Actuator"
    },
    "SpatialThing" : {
      "@id" : "http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing"
    },
    "secondaryFrequency" : {
      "@id" : "https://w3id.org/def/saref4bldg#secondaryFrequency",
      "@type" : "@id"
@@ -1258,6 +1251,10 @@
      "@id" : "https://w3id.org/def/saref4bldg#nominalBodyWidth",
      "@type" : "@id"
    },
    "operatingWeight" : {
      "@id" : "https://w3id.org/def/saref4bldg#operatingWeight",
      "@type" : "@id"
    },
    "preferredNamespaceUri" : {
      "@id" : "http://purl.org/vocab/vann/preferredNamespaceUri"
    },
+488 −531

File changed.

Preview size limit exceeded, changes collapsed.

+521 −533

File changed.

Preview size limit exceeded, changes collapsed.

+21 −31
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@
                                   <http://purl.org/dc/elements/1.1/title> "SAREF extension for building devices"@en ;
                                   <http://purl.org/dc/terms/creator> <http://purl.org/net/mpoveda> ,
                                                                      <http://www.garcia-castro.com/foaf.rdf#me> ;
                                   <http://purl.org/dc/terms/license> <http://purl.org/NET/rdflicense/cc-by4.0> ;
                                   <http://purl.org/vocab/vann/preferredNamespacePrefix> "s4bldg" ;
                                   <http://purl.org/vocab/vann/preferredNamespaceUri> "https://w3id.org/def/saref4bldg#" ;
                                   owl:versionInfo "1.0" .
@@ -22,6 +21,18 @@
#    Annotation properties
#################################################################

###  http://purl.org/dc/elements/1.1/description
<http://purl.org/dc/elements/1.1/description> rdf:type owl:AnnotationProperty .


###  http://purl.org/dc/elements/1.1/publisher
<http://purl.org/dc/elements/1.1/publisher> rdf:type owl:AnnotationProperty .


###  http://purl.org/dc/elements/1.1/title
<http://purl.org/dc/elements/1.1/title> rdf:type owl:AnnotationProperty .


###  http://purl.org/dc/terms/creator
<http://purl.org/dc/terms/creator> rdf:type owl:AnnotationProperty .

@@ -755,8 +766,8 @@ xsd:duration rdf:type rdfs:Datatype .
                  rdfs:label "open pressure drop"@en .


###  https://w3id.org/def/saref4bldg#operatingWight
:operatingWight rdf:type owl:ObjectProperty ;
###  https://w3id.org/def/saref4bldg#operatingWeight
:operatingWeight rdf:type owl:ObjectProperty ;
                 rdfs:comment "Operating weight of the tank including all of its contents. Usually measured in kilograms (kg) or grams (g)."@en ;
                 rdfs:label "operating wight"@en .

@@ -1733,16 +1744,6 @@ xsd:duration rdf:type rdfs:Datatype .
#    Classes
#################################################################

###  http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing
<http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing> rdf:type owl:Class ;
                                                       owl:disjointWith <https://w3id.org/saref#Measurement> ,
                                                                        <https://w3id.org/saref#Property> ,
                                                                        <https://w3id.org/saref#UnitOfMeasure> ;
                                                       rdfs:comment "Anything with spatial extent, i.e. size, shape, or position. e.g. people, places, bowling balls, as well as abstract areas like cubes."@en ;
                                                       rdfs:isDefinedBy <http://www.w3.org/2003/01/geo/wgs84_pos#> ;
                                                       rdfs:label "Spatial thing"@en .


###  https://w3id.org/def/saref4bldg#Actuator
:Actuator rdf:type owl:Class ;
          rdfs:subClassOf :DistributionControlDevice ,
@@ -1896,12 +1897,7 @@ Audio-visual appliances may be fixed in place or may be able to be moved from on

###  https://w3id.org/def/saref4bldg#Building
:Building rdf:type owl:Class ;
          rdfs:subClassOf <http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing> ,
                          [ rdf:type owl:Restriction ;
                            owl:onProperty <http://www.w3.org/2003/01/geo/wgs84_pos#location> ;
                            owl:allValuesFrom <http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing>
                          ] ,
                          [ rdf:type owl:Restriction ;
          rdfs:subClassOf [ rdf:type owl:Restriction ;
                            owl:onProperty :hasSpace ;
                            owl:allValuesFrom :BuildingSpace
                          ] ;
@@ -1928,8 +1924,7 @@ Audio-visual appliances may be fixed in place or may be able to be moved from on

###  https://w3id.org/def/saref4bldg#BuildingSpace
:BuildingSpace rdf:type owl:Class ;
               rdfs:subClassOf <http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing> ,
                               [ rdf:type owl:Restriction ;
               rdfs:subClassOf [ rdf:type owl:Restriction ;
                                 owl:onProperty :contains ;
                                 owl:allValuesFrom :PhysicalObject
                               ] ,
@@ -3056,12 +3051,7 @@ Power outlets are commonly connected within a junction box; data outlets may be

###  https://w3id.org/def/saref4bldg#PhysicalObject
:PhysicalObject rdf:type owl:Class ;
                rdfs:subClassOf <http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing> ,
                                [ rdf:type owl:Restriction ;
                                  owl:onProperty <http://www.w3.org/2003/01/geo/wgs84_pos#location> ;
                                  owl:allValuesFrom <http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing>
                                ] ,
                                [ rdf:type owl:Restriction ;
                rdfs:subClassOf [ rdf:type owl:Restriction ;
                                  owl:onProperty :contains ;
                                  owl:allValuesFrom :PhysicalObject
                                ] ,
@@ -3346,7 +3336,7 @@ Switches include those used for electrical power, communications, audio-visual,
                        owl:allValuesFrom <https://w3id.org/saref#Measurement>
                      ] ,
                      [ rdf:type owl:Restriction ;
                        owl:onProperty :operatingWight ;
                        owl:onProperty :operatingWeight ;
                        owl:allValuesFrom <https://w3id.org/saref#Measurement>
                      ] ,
                      [ rdf:type owl:Restriction ;
@@ -3698,4 +3688,4 @@ A device that has category saref:Sensor and performs a saref:SensingFunction."""
                                       rdfs:label "Unit of measure"@en .


###  Generated by the OWL API (version 5.1.7) https://github.com/owlcs/owlapi/
###  Generated by the OWL API (version 5.1.9) https://github.com/owlcs/owlapi/
+25 −34
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@
        <dc:title xml:lang="en">SAREF extension for building devices</dc:title>
        <terms:creator rdf:resource="http://purl.org/net/mpoveda"/>
        <terms:creator rdf:resource="http://www.garcia-castro.com/foaf.rdf#me"/>
        <terms:license rdf:resource="http://purl.org/NET/rdflicense/cc-by4.0"/>
        <vann:preferredNamespacePrefix>s4bldg</vann:preferredNamespacePrefix>
        <vann:preferredNamespaceUri>https://w3id.org/def/saref4bldg#</vann:preferredNamespaceUri>
        <owl:versionInfo>1.0</owl:versionInfo>
@@ -37,6 +36,27 @@
    


    <!-- http://purl.org/dc/elements/1.1/description -->


    <owl:AnnotationProperty rdf:about="http://purl.org/dc/elements/1.1/description"/>
    


    <!-- http://purl.org/dc/elements/1.1/publisher -->


    <owl:AnnotationProperty rdf:about="http://purl.org/dc/elements/1.1/publisher"/>
    


    <!-- http://purl.org/dc/elements/1.1/title -->


    <owl:AnnotationProperty rdf:about="http://purl.org/dc/elements/1.1/title"/>
    


    <!-- http://purl.org/dc/terms/creator -->


@@ -1267,10 +1287,10 @@
    


    <!-- https://w3id.org/def/saref4bldg#operatingWight -->
    <!-- https://w3id.org/def/saref4bldg#operatingWeight -->


    <owl:ObjectProperty rdf:about="https://w3id.org/def/saref4bldg#operatingWight">
    <owl:ObjectProperty rdf:about="https://w3id.org/def/saref4bldg#operatingWeight">
        <rdfs:comment xml:lang="en">Operating weight of the tank including all of its contents. Usually measured in kilograms (kg) or grams (g).</rdfs:comment>
        <rdfs:label xml:lang="en">operating wight</rdfs:label>
    </owl:ObjectProperty>
@@ -2849,20 +2869,6 @@
    


    <!-- http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing -->


    <owl:Class rdf:about="http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing">
        <owl:disjointWith rdf:resource="https://w3id.org/saref#Measurement"/>
        <owl:disjointWith rdf:resource="https://w3id.org/saref#Property"/>
        <owl:disjointWith rdf:resource="https://w3id.org/saref#UnitOfMeasure"/>
        <rdfs:comment xml:lang="en">Anything with spatial extent, i.e. size, shape, or position. e.g. people, places, bowling balls, as well as abstract areas like cubes.</rdfs:comment>
        <rdfs:isDefinedBy rdf:resource="http://www.w3.org/2003/01/geo/wgs84_pos#"/>
        <rdfs:label xml:lang="en">Spatial thing</rdfs:label>
    </owl:Class>
    


    <!-- https://w3id.org/def/saref4bldg#Actuator -->


@@ -3086,13 +3092,6 @@ Audio-visual appliances may be fixed in place or may be able to be moved from on


    <owl:Class rdf:about="https://w3id.org/def/saref4bldg#Building">
        <rdfs:subClassOf rdf:resource="http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing"/>
        <rdfs:subClassOf>
            <owl:Restriction>
                <owl:onProperty rdf:resource="http://www.w3.org/2003/01/geo/wgs84_pos#location"/>
                <owl:allValuesFrom rdf:resource="http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing"/>
            </owl:Restriction>
        </rdfs:subClassOf>
        <rdfs:subClassOf>
            <owl:Restriction>
                <owl:onProperty rdf:resource="https://w3id.org/def/saref4bldg#hasSpace"/>
@@ -3134,7 +3133,6 @@ Audio-visual appliances may be fixed in place or may be able to be moved from on


    <owl:Class rdf:about="https://w3id.org/def/saref4bldg#BuildingSpace">
        <rdfs:subClassOf rdf:resource="http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing"/>
        <rdfs:subClassOf>
            <owl:Restriction>
                <owl:onProperty rdf:resource="https://w3id.org/def/saref4bldg#contains"/>
@@ -4789,13 +4787,6 @@ Power outlets are commonly connected within a junction box; data outlets may be


    <owl:Class rdf:about="https://w3id.org/def/saref4bldg#PhysicalObject">
        <rdfs:subClassOf rdf:resource="http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing"/>
        <rdfs:subClassOf>
            <owl:Restriction>
                <owl:onProperty rdf:resource="http://www.w3.org/2003/01/geo/wgs84_pos#location"/>
                <owl:allValuesFrom rdf:resource="http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing"/>
            </owl:Restriction>
        </rdfs:subClassOf>
        <rdfs:subClassOf>
            <owl:Restriction>
                <owl:onProperty rdf:resource="https://w3id.org/def/saref4bldg#contains"/>
@@ -5213,7 +5204,7 @@ Switches include those used for electrical power, communications, audio-visual,
        </rdfs:subClassOf>
        <rdfs:subClassOf>
            <owl:Restriction>
                <owl:onProperty rdf:resource="https://w3id.org/def/saref4bldg#operatingWight"/>
                <owl:onProperty rdf:resource="https://w3id.org/def/saref4bldg#operatingWeight"/>
                <owl:allValuesFrom rdf:resource="https://w3id.org/saref#Measurement"/>
            </owl:Restriction>
        </rdfs:subClassOf>
@@ -5731,6 +5722,6 @@ A device that has category saref:Sensor and performs a saref:SensingFunction.</r



<!-- Generated by the OWL API (version 5.1.7) https://github.com/owlcs/owlapi/ -->
<!-- Generated by the OWL API (version 5.1.9) https://github.com/owlcs/owlapi/ -->

Loading