Finalize 1.4 release (#625)

* 1.3 -> 1.4 * add more REC class mappings * add REC ICT equipment
BrickSchema · Apr 10, 2024 · 21c451b · 21c451b
1 parent 6fb9a88
commit 21c451b
Show file tree

Hide file tree

Showing 29 changed files with 381 additions and 41 deletions.
diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv
@@ -464,7 +464,7 @@ https://brickschema.org/schema/Brick#Fire_Safety_System,"A system containing dev
 https://brickschema.org/schema/Brick#Fire_Sensor,Measures the presence of fire,
 https://brickschema.org/schema/Brick#Fire_Sprinkler_Thermal_Expansion_Tank,A specialized thermal expansion tank that is part of a building's fire suppression system.,
 https://brickschema.org/schema/Brick#Fire_Sprinkler_Water_Storage_Tank,A specialized tank intended to store water that can be quickly accessed for fire suppression.,
-https://brickschema.org/schema/Brick#Fire_Zone,combustion chamber in a furnace or boiler.,
+https://brickschema.org/schema/Brick#Fire_Zone,A logical subdivision of a building that is monitored for fire; may also have a classification for the type of fire hazard that can occur,
 https://brickschema.org/schema/Brick#First_Aid_Room,A room for a person with minor injuries can be treated or temporarily treated until transferred to a more advanced medical facility,
 https://brickschema.org/schema/Brick#Floor,"A level, typically representing a horizontal aggregation of spaces that are vertically bound. (referring to IFC)",
 https://brickschema.org/schema/Brick#Floor_Fan_Coil_Unit,"A fan coil unit installed on the floor, typically against a wall, for providing heating and cooling in residential or small office spaces",

diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py
@@ -15,10 +15,73 @@
                     "Tablet": {
                         "tags": [TAG.Equipment, TAG.ICT, TAG.Hardware, TAG.Tablet]
                     },
+                    "Server": {
+                        "tags": [TAG.Equipment, TAG.ICT, TAG.Hardware, TAG.Server]
+                    },  
                 },
             },
+            "ICT_Rack": {
+                "tags": [TAG.Equipment, TAG.ICT, TAG.Rack],
+            },
             "Sensor_Equipment": {
                 "tags": [TAG.Sensor, TAG.Equipment, TAG.ICT],
+                "subclasses": {
+                    "Daylight_Sensor_Equipment": {
+                        "tags": [TAG.Daylight, TAG.Sensor, TAG.Equipment, TAG.ICT],
+                    },
+                    "IAQ_Sensor_Equipment": {
+                        "tags": [TAG.IAQ, TAG.Sensor, TAG.Equipment, TAG.ICT],
+                    },
+                    "Leak_Detector_Equipment": {
+                        "tags": [TAG.Leak, TAG.Detector, TAG.Equipment, TAG.ICT],
+                    },
+                    "Occupancy_Sensor_Equipment": {
+                        "tags": [TAG.Occupancy, TAG.Sensor, TAG.Equipment, TAG.ICT],
+                    },
+                    "People_Count_Sensor_Equipment": {
+                        "tags": [TAG.People, TAG.Count, TAG.Sensor, TAG.Equipment, TAG.ICT],
+                    },
+                    "Thermostat_Equipment": {
+                        "tags": [TAG.Thermostat, TAG.Equipment, TAG.ICT],
+                    },
+                    "Vibration_Sensor_Equipment": {
+                        "tags": [TAG.Vibration, TAG.Sensor, TAG.Equipment, TAG.ICT],
+                    },
+                },
+            },
+            "Controller": {
+                "tags": [TAG.Equipment, TAG.ICT, TAG.Controller],
+                "subclasses": {
+                    "BACnet_Controller": {
+                        "tags": [TAG.Equipment, TAG.BACnet, TAG.Controller],
+                    },
+                    "Modbus_Controller": {
+                        "tags": [TAG.Equipment, TAG.Modbus, TAG.Controller],
+                    },
+                },
+            },
+            "Data_Network_Equipment": {
+                "tags": [TAG.Equipment, TAG.Data, TAG.Network],
+                "subclasses": {
+                    "Ethernet_Port": {
+                        "tags": [TAG.Ethernet, TAG.Port, TAG.Equipment],
+                    },
+                    "Ethernet_Switch": {
+                        "tags": [TAG.Ethernet, TAG.Switch, TAG.Equipment],
+                    },
+                    "Network_Router": {
+                        "tags": [TAG.Network, TAG.Router, TAG.Equipment],
+                    },
+                    "Network_Security_Equipment": {
+                        "tags": [TAG.Network, TAG.Security, TAG.Equipment],
+                    },
+                    "Wireless_Access_Point": {
+                        "tags": [TAG.Wireless, TAG.Access, TAG.Point, TAG.Equipment],
+                    },
+                },
+            },
+            "Gateway": {
+                "tags": [TAG.Equipment, TAG.Gateway, TAG.ICT],
             },
             "Audio_Visual_Equipment": {
                 "tags": [TAG.Equipment, TAG.ICT, TAG.Audio, TAG.Visual]
@@ -489,7 +552,10 @@
     },
     "Hot_Deck": {"tags": [TAG.Equipment, TAG.Hot, TAG.Deck]},
     "Cold_Deck": {"tags": [TAG.Equipment, TAG.Cold, TAG.Deck]},
-    "Thermostat": {"tags": [TAG.Equipment, TAG.Thermostat]},
+    "Thermostat": {
+        "tags": [TAG.Equipment, TAG.Thermostat],
+        "parents": [BRICK.Sensor_Equipment],
+    },
     "Terminal_Unit": {
         "tags": [TAG.Equipment, TAG.Terminal, TAG.Unit],
         "subclasses": {

diff --git a/bricksrc/rules.ttl b/bricksrc/rules.ttl
@@ -34,7 +34,7 @@ CONSTRUCT {
     UNION
     { ?t2 owl:equivalentProperty $this }
 }""" ;
-      sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+      sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
     ] ;
   sh:targetSubjectsOf owl:equivalentProperty ;
 .
@@ -51,7 +51,7 @@ CONSTRUCT {
     ?s $this ?o .
     { $this rdfs:subPropertyOf ?t2 }
 }""" ;
-      sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+      sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
     ] ;
     sh:targetSubjectsOf rdfs:subPropertyOf ;
 .
@@ -70,7 +70,7 @@ WHERE {
 ?invP owl:inverseOf ?p .
 }
 			""" ;
-      sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+      sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
     ] ;
   sh:targetClass brick:Entity ;
 .
@@ -88,7 +88,7 @@ WHERE {
 ?invP owl:inverseOf ?p .
 }
 			""" ;
-      sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+      sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
     ] ;
   sh:targetClass brick:Entity ;
 .
@@ -107,7 +107,7 @@ WHERE {
   ?prop a owl:SymmetricProperty .
 }
 			""" ;
-      sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+      sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
     ] ;
   sh:targetClass brick:Entity ;
 .
@@ -123,7 +123,7 @@ $this brick:hasTag ?tag .
     $this rdf:type/rdfs:subClassOf* ?class .
     ?class brick:hasAssociatedTag ?tag .
 }""" ;
-      sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+      sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
     ] ;
     sh:targetClass brick:Entity ;
 .
@@ -141,7 +141,7 @@ CONSTRUCT {
     ?ent $this ?val .
     FILTER NOT EXISTS { ?val a ?shape }
 }""" ;
-      sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+      sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
     ] ;
     sh:targetSubjectsOf rdfs:range ;
 .
@@ -163,7 +163,7 @@ bsh:RDFSSubPropertyOfRuleForEntityProperties
                 ?o ?ep ?eo .
             }
         """ ;
-        sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+        sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
     ] ;
     sh:targetSubjectsOf rdfs:subPropertyOf ;
 .
@@ -182,7 +182,7 @@ bsh:DeprecationRule
         CONSTRUCT { $this owl:deprecated true }
         WHERE { $this brick:deprecation ?dep }
         """ ;
-      sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+      sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
     ] ;
     sh:property [
         sh:path brick:deprecatedInVersion ;
@@ -215,7 +215,7 @@ $this a ?class .
 ?class brick:isReplacedBy ?newClass .
 FILTER NOT EXISTS {$this a ?newClass}
 }""" ;
-      sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+      sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
     ] ;
     sh:targetClass brick:Entity ;
 .
@@ -224,7 +224,7 @@ bsh:DeprecationRuleForInstances a sh:NodeShape ;
 sh:severity sh:Warning ;
 sh:sparql [ a sh:SPARQLConstraint ;
 sh:message "{$this} has type {?class} which was deprecated in version {?depver}. For now, it has been updated to also be of type {?newClass}." ;
-sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
 sh:select """SELECT $this ?class ?newClass ?depver WHERE {
 $this a ?class .
 ?class owl:deprecated true .
@@ -275,7 +275,7 @@ CONSTRUCT {
     UNION
     { $this owl:equivalentClass ?t2 }
 }""" ;
-      sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+      sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
     ] ;
     sh:targetSubjectsOf owl:equivalentClass ;
 .
@@ -293,7 +293,7 @@ CONSTRUCT {
     UNION
     { $this owl:equivalentClass ?t2 }
 }""" ;
-      sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+      sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
     ] ;
     sh:targetObjectsOf owl:equivalentClass ;
 .
@@ -331,7 +331,7 @@ bsh:BuildingMeterRule a sh:NodeShape ;
             FILTER (!strStarts(str(?type), "https://brickschema.org/schema/Brick#Building_"))
         }
         """ ;
-        sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+        sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
     ] ;
 .
 
@@ -340,7 +340,7 @@ bsh:VirtualMeterRule a sh:NodeShape ;
     sh:sparql [
         a sh:SPARQLConstraint ;
         sh:message "Only meters can have the isVirtualMeter property be true" ;
-      sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+      sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
         sh:select """
             SELECT $this WHERE {
                 $this brick:isVirtualMeter/brick:value true .
@@ -354,7 +354,7 @@ bsh:MeterInferSubstance a sh:NodeShape ;
     sh:targetClass brick:Meter ;
     sh:rule [
         a sh:SPARQLRule ;
-        sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+        sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
         sh:construct """
         CONSTRUCT {
             $this brick:hasSubstance ?substance .
@@ -373,7 +373,7 @@ bsh:MeterInferSubclassNonBuildingMeter a sh:NodeShape ;
     sh:targetClass brick:Meter ;
     sh:rule [
         a sh:SPARQLRule ;
-        sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+        sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
         sh:construct """
         CONSTRUCT {
             $this rdf:type ?metertype .
@@ -397,7 +397,7 @@ bsh:MeterInferSubclassBuildingMeter a sh:NodeShape ;
     sh:targetClass brick:Building_Meter ;
     sh:rule [
         a sh:SPARQLRule ;
-        sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+        sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
         sh:construct """
         CONSTRUCT {
             $this rdf:type ?metertype .
@@ -425,7 +425,7 @@ bsh:TimeseriesReferenceOnPointsConstraint a sh:NodeShape ;
     sh:sparql [
         a sh:SPARQLConstraint ;
         sh:message "Only Brick Points can have external timeseries references" ;
-      sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+      sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
         sh:select """
             SELECT $this
             WHERE {
@@ -448,7 +448,7 @@ bsh:PointsHaveQuantityKinds a sh:NodeShape ;
             FILTER NOT EXISTS { ?class owl:deprecated true }
           }
         """ ;
-        sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+        sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
       ] ;
     sh:target [
         a sh:SPARQLTarget ;
@@ -459,7 +459,7 @@ bsh:PointsHaveQuantityKinds a sh:NodeShape ;
             FILTER NOT EXISTS { ?class owl:deprecated true }
           }
         """ ;
-        sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+        sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
       ] ;
     sh:property [
         sh:class qudt:QuantityKind ;
@@ -505,7 +505,7 @@ bsh:CollectionIncludesEquipment a sh:NodeShape ;
             }
         }
         """ ;
-        sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+        sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
     ] ;
 .
 
@@ -516,7 +516,7 @@ bsh:AddDefaultEVSEChargerDirection a sh:NodeShape ;
     sh:targetClass brick:Electric_Vehicle_Charging_Station ;
     sh:rule [
         a sh:SPARQLRule ;
-        sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+        sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
         sh:construct """
         CONSTRUCT {
             $this brick:electricVehicleChargerDirectionality [ brick:value "unidirectional" ]
@@ -540,7 +540,7 @@ bsh:InheritEVSEChargerDirection a sh:NodeShape ;
     sh:targetClass brick:Electric_Vehicle_Charging_Port ;
     sh:rule [
         a sh:SPARQLRule ;
-        sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
+        sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
         sh:construct """
         CONSTRUCT {
             $this brick:electricVehicleChargerDirectionality ?direction

diff --git a/bricksrc/version.py b/bricksrc/version.py
@@ -11,7 +11,7 @@
 
 # the simplified (no patch version) version number for Brick. Intended for
 # inclusion in the Brick namespace URI
-BRICK_VERSION = f"{BRICK_MAJOR_VERSION}.{BRICK_MINOR_VERSION}-rc1"
+BRICK_VERSION = f"{BRICK_MAJOR_VERSION}.{BRICK_MINOR_VERSION}"
 
 # the full "semantic verersion" including the patch number
-BRICK_FULL_VERSION = f"{BRICK_VERSION}.{BRICK_PATCH_VERSION}-rc1"
+BRICK_FULL_VERSION = f"{BRICK_VERSION}.{BRICK_PATCH_VERSION}"
diff --git a/examples/air_quality_sensors/air_quality_sensor_example.ttl b/examples/air_quality_sensors/air_quality_sensor_example.ttl
@@ -2,6 +2,10 @@
 @prefix brick: <https://brickschema.org/schema/Brick#> .
 @prefix unit: <http://qudt.org/vocab/unit/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+
+<urn:example> a owl:Ontology ;
+    owl:imports <https://brickschema.org/schema/1.4/Brick> .
 
 bldg:air_temp_sensor a brick:Air_Temperature_Sensor ;
     brick:hasUnit unit:DEG_C ;

diff --git a/examples/bacnet/bacnet.ttl b/examples/bacnet/bacnet.ttl
@@ -4,6 +4,10 @@
 @prefix unit: <http://qudt.org/vocab/unit/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix ref: <https://brickschema.org/schema/Brick/ref#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+
+<urn:example> a owl:Ontology ;
+    owl:imports <https://brickschema.org/schema/1.4/Brick> .
 
 bldg:sample-device a bacnet:BACnetDevice ;
     bacnet:device-instance 123 ;

diff --git a/examples/building_meter/building_meter.ttl b/examples/building_meter/building_meter.ttl
@@ -1,6 +1,10 @@
 @prefix bldg: <urn:example#> .
 @prefix brick: <https://brickschema.org/schema/Brick#> .
 @prefix unit: <http://qudt.org/vocab/unit/> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+
+<urn:example> a owl:Ontology ;
+    owl:imports <https://brickschema.org/schema/1.4/Brick> .
 
 bldg:building_energy_sensor a brick:Energy_Sensor ;
     brick:hasUnit unit:KiloW-HR ;

diff --git a/examples/chiller-system/chiller-plant.ttl b/examples/chiller-system/chiller-plant.ttl
@@ -2,6 +2,10 @@
 @prefix brick: <https://brickschema.org/schema/Brick#> .
 @prefix unit: <http://qudt.org/vocab/unit/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+
+<urn:chiller-plant> a owl:Ontology ;
+    owl:imports <https://brickschema.org/schema/1.4/Brick> .
 
 :cws a brick:Chilled_Water_System ;
     brick:hasPart :ct-1, :ct-2, :ct-3,

diff --git a/examples/evse/evse.ttl b/examples/evse/evse.ttl
@@ -1,8 +1,12 @@
 @prefix brick: <https://brickschema.org/schema/Brick#> .
 @prefix unit: <http://qudt.org/vocab/unit/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix : <urn:evse#> .
 
+<urn:evse> a owl:Ontology ;
+    owl:imports <https://brickschema.org/schema/1.4/Brick> .
+
 :parking_lot a brick:Parking_Structure ;
     brick:isLocationOf :hub .
 

diff --git a/examples/example1/example.ttl b/examples/example1/example.ttl
@@ -1,5 +1,9 @@
 @prefix bldg: <http://example.com/mybuilding#> .
 @prefix brick: <https://brickschema.org/schema/Brick#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+
+<http://example.com/mybuilding> a owl:Ontology ;
+    owl:imports <https://brickschema.org/schema/1.4/Brick> .
 
 bldg:AHU1A a brick:Air_Handler_Unit ;
     brick:feeds bldg:VAV2-4,

diff --git a/examples/g36/g36-ahu-a9.ttl b/examples/g36/g36-ahu-a9.ttl
@@ -6,6 +6,9 @@
 @prefix unit: <http://qudt.org/vocab/unit/> .
 @prefix ex: <http://example.org#> .
 
+<http://example.org> a owl:Ontology ;
+    owl:imports <https://brickschema.org/schema/1.4/Brick> .
+
 #  AHU (A-9 from G36)
 ex:ahu1 a   brick:AHU ;
     brick:hasPart   ex:exad1, ex:rad1, ex:ead1, ex:raf1, ex:saf1,