Updated QUDT to v2.1.32

bricksrc/alarm.py

@@ -41,7 +41,9 @@
                                 ],
                                 "subclasses": {
                                     "Low_Supply_Air_Flow_Alarm": {
-                                        "aliases": [BRICK["Low_Discharge_Air_Flow_Alarm"]],
+                                        "aliases": [
+                                            BRICK["Low_Discharge_Air_Flow_Alarm"]
+                                        ],
                                         "tags": [
                                             TAG.Point,
                                             TAG.Air,
@@ -217,7 +219,11 @@
                                 ],
                                 "subclasses": {
                                     "High_Supply_Air_Temperature_Alarm": {
-                                        "aliases": [BRICK["High_Discharge_Air_Temperature_Alarm"]],
+                                        "aliases": [
+                                            BRICK[
+                                                "High_Discharge_Air_Temperature_Alarm"
+                                            ]
+                                        ],
                                         "tags": [
                                             TAG.Point,
                                             TAG.High,
@@ -230,7 +236,9 @@
                                         "parents": [BRICK.High_Temperature_Alarm],
                                     },
                                     "Low_Supply_Air_Temperature_Alarm": {
-                                        "aliases": [BRICK["Low_Discharge_Air_Temperature_Alarm"]],
+                                        "aliases": [
+                                            BRICK["Low_Discharge_Air_Temperature_Alarm"]
+                                        ],
                                         "tags": [
                                             TAG.Point,
                                             TAG.Low,
@@ -288,7 +296,9 @@
                         "tags": [TAG.Point, TAG.Smoke, TAG.Detection, TAG.Alarm],
                         "subclasses": {
                             "Supply_Air_Smoke_Detection_Alarm": {
-                                "aliases": [BRICK["Discharge_Air_Smoke_Detection_Alarm"]],
+                                "aliases": [
+                                    BRICK["Discharge_Air_Smoke_Detection_Alarm"]
+                                ],
                                 "tags": [
                                     TAG.Point,
                                     TAG.Supply,

bricksrc/collections.py

@@ -40,7 +40,14 @@
     },
     "Gas_System": {"tags": [TAG.Gas, TAG.System]},
     "Heating_Ventilation_Air_Conditioning_System": {
-        "tags": [TAG.Heat, TAG.Ventilation, TAG.Air, TAG.Conditioning, TAG.HVAC, TAG.System],
+        "tags": [
+            TAG.Heat,
+            TAG.Ventilation,
+            TAG.Air,
+            TAG.Conditioning,
+            TAG.HVAC,
+            TAG.System,
+        ],
         "aliases": [BRICK["HVAC_System"]],
         "subclasses": {
             "Air_System": {

bricksrc/command.py

@@ -36,7 +36,6 @@
             },
             "Humidify_Command": {
                 "tags": [TAG.Point, TAG.Humidify, TAG.Command],
-                BRICK.hasQuantity: BRICK.Humidity,
             },
             "Position_Command": {
                 "tags": [TAG.Point, TAG.Position, TAG.Command],

bricksrc/deprecations.py

@@ -1,35 +1,45 @@
 from .namespaces import BRICK, RDFS, SKOS, A
 
 deprecations = {
+    BRICK.Heat_Sensor: {
+        "version": "1.4.0",
+        "mitigation_message": "This class has a poor definition is supplanted by Temperature_Sensor",
+        "replace_with": BRICK.Temperature_Sensor,
+    },
+    BRICK.Trace_Heat_Sensor: {
+        "version": "1.4.0",
+        "mitigation_message": "Removed due to unclear definition",
+        "replace_with": BRICK.Sensor,
+    },
     BRICK.Solar_Radiance_Sensor: {
         "version": "1.3.0",
         "mitigation_message": "The class 'Solar_Radiance_Sensor' is deprecated in favor of 'Solar_Irradiance_Sensor'. The new name better reflects the standard unit of measurement, watts per square meter (W/m²), and aligns with the terminology commonly used in solar applications.",
         "replace_with": BRICK.Solar_Irradiance_Sensor,
         RDFS.subClassOf: BRICK.Sensor,
     },
     BRICK.Occupied_Air_Temperature_Cooling_Setpoint: {
-            "version": "1.3.0",
-            "mitigation_message": "'Occupied_Air_Temperature_Cooling_Setpoint' is deprecated in favor of further specifying that it is a zone air setpoint.",
-            "replace_with": BRICK.Occupied_Cooling_Zone_Air_Temperature_Setpoint,
-            RDFS.subClassOf: BRICK.Occupied_Air_Temperature_Setpoint,
+        "version": "1.3.0",
+        "mitigation_message": "'Occupied_Air_Temperature_Cooling_Setpoint' is deprecated in favor of further specifying that it is a zone air setpoint.",
+        "replace_with": BRICK.Occupied_Cooling_Zone_Air_Temperature_Setpoint,
+        RDFS.subClassOf: BRICK.Occupied_Air_Temperature_Setpoint,
     },
     BRICK.Occupied_Air_Temperature_Heating_Setpoint: {
-            "version": "1.3.0",
-            "mitigation_message": "'Occupied_Air_Temperature_Heating_Setpoint' is deprecated in favor of further specifying that it is a zone air setpoint.",
-            "replace_with": BRICK.Occupied_Heating_Zone_Air_Temperature_Setpoint,
-            RDFS.subClassOf: BRICK.Occupied_Air_Temperature_Setpoint,
+        "version": "1.3.0",
+        "mitigation_message": "'Occupied_Air_Temperature_Heating_Setpoint' is deprecated in favor of further specifying that it is a zone air setpoint.",
+        "replace_with": BRICK.Occupied_Heating_Zone_Air_Temperature_Setpoint,
+        RDFS.subClassOf: BRICK.Occupied_Air_Temperature_Setpoint,
     },
     BRICK.Unoccupied_Air_Temperature_Cooling_Setpoint: {
-            "version": "1.3.0",
-            "mitigation_message": "'Unoccupied_Air_Temperature_Cooling_Setpoint' is deprecated in favor of further specifying that it is a zone air setpoint.",
-            "replace_with": BRICK.Unoccupied_Cooling_Zone_Air_Temperature_Setpoint,
-            RDFS.subClassOf: BRICK.Unoccupied_Air_Temperature_Setpoint,
+        "version": "1.3.0",
+        "mitigation_message": "'Unoccupied_Air_Temperature_Cooling_Setpoint' is deprecated in favor of further specifying that it is a zone air setpoint.",
+        "replace_with": BRICK.Unoccupied_Cooling_Zone_Air_Temperature_Setpoint,
+        RDFS.subClassOf: BRICK.Unoccupied_Air_Temperature_Setpoint,
     },
     BRICK.Unoccupied_Air_Temperature_Heating_Setpoint: {
-            "version": "1.3.0",
-            "mitigation_message": "'Unoccupied_Air_Temperature_Heating_Setpoint' is deprecated in favor of further specifying that it is a zone air setpoint.",
-            "replace_with": BRICK.Unoccupied_Heating_Zone_Air_Temperature_Setpoint,
-            RDFS.subClassOf: BRICK.Unoccupied_Air_Temperature_Setpoint,
+        "version": "1.3.0",
+        "mitigation_message": "'Unoccupied_Air_Temperature_Heating_Setpoint' is deprecated in favor of further specifying that it is a zone air setpoint.",
+        "replace_with": BRICK.Unoccupied_Heating_Zone_Air_Temperature_Setpoint,
+        RDFS.subClassOf: BRICK.Unoccupied_Air_Temperature_Setpoint,
     },
     BRICK.Effective_Air_Temperature_Cooling_Setpoint: {
         "version": "1.3.0",

bricksrc/entity_properties.py

@@ -3,7 +3,7 @@
 """
 from collections import defaultdict
 from rdflib import Literal
-from .namespaces import BRICK, RDFS, SKOS, UNIT, XSD, SH, BSH, REF
+from .namespaces import BRICK, RDFS, SKOS, UNIT, XSD, SH, BSH, REF, QUDTQK
 
 # these are the "relationship"/predicates/OWL properties that
 # relate a Brick entity to a structured value.
@@ -461,7 +461,7 @@
             BRICK.longitude: {"datatype": BSH.NumericValue},
         },
     },
-    BSH.TiltShape: {"unitsFromQuantity": BRICK.Angle, "datatype": BSH.NumericValue},
+    BSH.TiltShape: {"unitsFromQuantity": QUDTQK.Angle, "datatype": BSH.NumericValue},
     BSH.TemperatureShape: {
         "unitsFromQuantity": BRICK.Temperature,
         "datatype": BSH.NumericValue,
@@ -471,7 +471,7 @@
         "datatype": BSH.NumericValue,
     },
     BSH.AzimuthShape: {
-        "unitsFromQuantity": BRICK.Angle,
+        "unitsFromQuantity": QUDTQK.Angle,
         "datatype": BSH.NumericValue,
         "rotationalDirection": {"values": ["clockwise", "counterclockwise"]},
         "referenceDirection": {"values": ["North", "South", "East", "West"]},

bricksrc/ontology.py

@@ -36,13 +36,13 @@
 ontology_imports = {
     "qudtschema": "http://qudt.org/2.1/schema/shacl/qudt",
     "qudtoverlay": "http://qudt.org/2.1/schema/shacl/overlay/qudt",
-    "qudtfacade": "http://qudt.org/2.1/schema/facade/qudt",
-    "qudtsou": "http://qudt.org/2.1/vocab/sou",
     "unit": "http://qudt.org/2.1/vocab/unit",
-    "currency": "http://qudt.org/2.1/vocab/currency",
-    "quantitykind": "http://qudt.org/2.1/vocab/quantitykind",
-    "dimensionvector": "http://qudt.org/2.1/vocab/dimensionvector",
     "bacnet": "http://data.ashrae.org/bacnet/2020",
+    "quantitykind": "http://qudt.org/2.1/vocab/quantitykind",
+    "qudtsou": "http://qudt.org/2.1/vocab/sou",
+    "qudtdv": "http://qudt.org/2.1/vocab/dimensionvector",
+    "qudtprefix": "http://qudt.org/2.1/vocab/prefix",
+    "ref": "https://brickschema.org/schema/Brick/ref",
 }
 
 shacl_namespace_declarations = [
@@ -80,6 +80,7 @@
 
 BRICK_IRI_VERSION = URIRef(f"https://brickschema.org/schema/{BRICK_VERSION}/Brick")
 
+
 def define_ontology(G):
     G.add((BRICK_IRI_VERSION, RDF.type, OWL.Ontology))
     G.add((BRICK_IRI_VERSION, RDFS.isDefinedBy, BRICK_IRI_VERSION))