Skip to content

Commit 21c451b

Browse files
gtfierrogtfierro
authored
Finalize 1.4 release (#625)
* 1.3 -> 1.4 * add more REC class mappings * add REC ICT equipment
1 parent 6fb9a88 commit 21c451b

29 files changed

+381
-41
lines changed

‎bricksrc/definitions.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ https://brickschema.org/schema/Brick#Fire_Safety_System,"A system containing dev
464464
https://brickschema.org/schema/Brick#Fire_Sensor,Measures the presence of fire,
465465
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.,
466466
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.,
467-
https://brickschema.org/schema/Brick#Fire_Zone,combustion chamber in a furnace or boiler.,
467+
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,
468468
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,
469469
https://brickschema.org/schema/Brick#Floor,"A level, typically representing a horizontal aggregation of spaces that are vertically bound. (referring to IFC)",
470470
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",

‎bricksrc/equipment.py‎

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,73 @@
1515
"Tablet": {
1616
"tags": [TAG.Equipment, TAG.ICT, TAG.Hardware, TAG.Tablet]
1717
},
18+
"Server": {
19+
"tags": [TAG.Equipment, TAG.ICT, TAG.Hardware, TAG.Server]
20+
},
1821
},
1922
},
23+
"ICT_Rack": {
24+
"tags": [TAG.Equipment, TAG.ICT, TAG.Rack],
25+
},
2026
"Sensor_Equipment": {
2127
"tags": [TAG.Sensor, TAG.Equipment, TAG.ICT],
28+
"subclasses": {
29+
"Daylight_Sensor_Equipment": {
30+
"tags": [TAG.Daylight, TAG.Sensor, TAG.Equipment, TAG.ICT],
31+
},
32+
"IAQ_Sensor_Equipment": {
33+
"tags": [TAG.IAQ, TAG.Sensor, TAG.Equipment, TAG.ICT],
34+
},
35+
"Leak_Detector_Equipment": {
36+
"tags": [TAG.Leak, TAG.Detector, TAG.Equipment, TAG.ICT],
37+
},
38+
"Occupancy_Sensor_Equipment": {
39+
"tags": [TAG.Occupancy, TAG.Sensor, TAG.Equipment, TAG.ICT],
40+
},
41+
"People_Count_Sensor_Equipment": {
42+
"tags": [TAG.People, TAG.Count, TAG.Sensor, TAG.Equipment, TAG.ICT],
43+
},
44+
"Thermostat_Equipment": {
45+
"tags": [TAG.Thermostat, TAG.Equipment, TAG.ICT],
46+
},
47+
"Vibration_Sensor_Equipment": {
48+
"tags": [TAG.Vibration, TAG.Sensor, TAG.Equipment, TAG.ICT],
49+
},
50+
},
51+
},
52+
"Controller": {
53+
"tags": [TAG.Equipment, TAG.ICT, TAG.Controller],
54+
"subclasses": {
55+
"BACnet_Controller": {
56+
"tags": [TAG.Equipment, TAG.BACnet, TAG.Controller],
57+
},
58+
"Modbus_Controller": {
59+
"tags": [TAG.Equipment, TAG.Modbus, TAG.Controller],
60+
},
61+
},
62+
},
63+
"Data_Network_Equipment": {
64+
"tags": [TAG.Equipment, TAG.Data, TAG.Network],
65+
"subclasses": {
66+
"Ethernet_Port": {
67+
"tags": [TAG.Ethernet, TAG.Port, TAG.Equipment],
68+
},
69+
"Ethernet_Switch": {
70+
"tags": [TAG.Ethernet, TAG.Switch, TAG.Equipment],
71+
},
72+
"Network_Router": {
73+
"tags": [TAG.Network, TAG.Router, TAG.Equipment],
74+
},
75+
"Network_Security_Equipment": {
76+
"tags": [TAG.Network, TAG.Security, TAG.Equipment],
77+
},
78+
"Wireless_Access_Point": {
79+
"tags": [TAG.Wireless, TAG.Access, TAG.Point, TAG.Equipment],
80+
},
81+
},
82+
},
83+
"Gateway": {
84+
"tags": [TAG.Equipment, TAG.Gateway, TAG.ICT],
2285
},
2386
"Audio_Visual_Equipment": {
2487
"tags": [TAG.Equipment, TAG.ICT, TAG.Audio, TAG.Visual]
@@ -489,7 +552,10 @@
489552
},
490553
"Hot_Deck": {"tags": [TAG.Equipment, TAG.Hot, TAG.Deck]},
491554
"Cold_Deck": {"tags": [TAG.Equipment, TAG.Cold, TAG.Deck]},
492-
"Thermostat": {"tags": [TAG.Equipment, TAG.Thermostat]},
555+
"Thermostat": {
556+
"tags": [TAG.Equipment, TAG.Thermostat],
557+
"parents": [BRICK.Sensor_Equipment],
558+
},
493559
"Terminal_Unit": {
494560
"tags": [TAG.Equipment, TAG.Terminal, TAG.Unit],
495561
"subclasses": {

‎bricksrc/rules.ttl‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CONSTRUCT {
3434
UNION
3535
{ ?t2 owl:equivalentProperty $this }
3636
}""" ;
37-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
37+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
3838
] ;
3939
sh:targetSubjectsOf owl:equivalentProperty ;
4040
.
@@ -51,7 +51,7 @@ CONSTRUCT {
5151
?s $this ?o .
5252
{ $this rdfs:subPropertyOf ?t2 }
5353
}""" ;
54-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
54+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
5555
] ;
5656
sh:targetSubjectsOf rdfs:subPropertyOf ;
5757
.
@@ -70,7 +70,7 @@ WHERE {
7070
?invP owl:inverseOf ?p .
7171
}
7272
""" ;
73-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
73+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
7474
] ;
7575
sh:targetClass brick:Entity ;
7676
.
@@ -88,7 +88,7 @@ WHERE {
8888
?invP owl:inverseOf ?p .
8989
}
9090
""" ;
91-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
91+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
9292
] ;
9393
sh:targetClass brick:Entity ;
9494
.
@@ -107,7 +107,7 @@ WHERE {
107107
?prop a owl:SymmetricProperty .
108108
}
109109
""" ;
110-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
110+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
111111
] ;
112112
sh:targetClass brick:Entity ;
113113
.
@@ -123,7 +123,7 @@ $this brick:hasTag ?tag .
123123
$this rdf:type/rdfs:subClassOf* ?class .
124124
?class brick:hasAssociatedTag ?tag .
125125
}""" ;
126-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
126+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
127127
] ;
128128
sh:targetClass brick:Entity ;
129129
.
@@ -141,7 +141,7 @@ CONSTRUCT {
141141
?ent $this ?val .
142142
FILTER NOT EXISTS { ?val a ?shape }
143143
}""" ;
144-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
144+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
145145
] ;
146146
sh:targetSubjectsOf rdfs:range ;
147147
.
@@ -163,7 +163,7 @@ bsh:RDFSSubPropertyOfRuleForEntityProperties
163163
?o ?ep ?eo .
164164
}
165165
""" ;
166-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
166+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
167167
] ;
168168
sh:targetSubjectsOf rdfs:subPropertyOf ;
169169
.
@@ -182,7 +182,7 @@ bsh:DeprecationRule
182182
CONSTRUCT { $this owl:deprecated true }
183183
WHERE { $this brick:deprecation ?dep }
184184
""" ;
185-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
185+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
186186
] ;
187187
sh:property [
188188
sh:path brick:deprecatedInVersion ;
@@ -215,7 +215,7 @@ $this a ?class .
215215
?class brick:isReplacedBy ?newClass .
216216
FILTER NOT EXISTS {$this a ?newClass}
217217
}""" ;
218-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
218+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
219219
] ;
220220
sh:targetClass brick:Entity ;
221221
.
@@ -224,7 +224,7 @@ bsh:DeprecationRuleForInstances a sh:NodeShape ;
224224
sh:severity sh:Warning ;
225225
sh:sparql [ a sh:SPARQLConstraint ;
226226
sh:message "{$this} has type {?class} which was deprecated in version {?depver}. For now, it has been updated to also be of type {?newClass}." ;
227-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
227+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
228228
sh:select """SELECT $this ?class ?newClass ?depver WHERE {
229229
$this a ?class .
230230
?class owl:deprecated true .
@@ -275,7 +275,7 @@ CONSTRUCT {
275275
UNION
276276
{ $this owl:equivalentClass ?t2 }
277277
}""" ;
278-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
278+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
279279
] ;
280280
sh:targetSubjectsOf owl:equivalentClass ;
281281
.
@@ -293,7 +293,7 @@ CONSTRUCT {
293293
UNION
294294
{ $this owl:equivalentClass ?t2 }
295295
}""" ;
296-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
296+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
297297
] ;
298298
sh:targetObjectsOf owl:equivalentClass ;
299299
.
@@ -331,7 +331,7 @@ bsh:BuildingMeterRule a sh:NodeShape ;
331331
FILTER (!strStarts(str(?type), "https://brickschema.org/schema/Brick#Building_"))
332332
}
333333
""" ;
334-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
334+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
335335
] ;
336336
.
337337

@@ -340,7 +340,7 @@ bsh:VirtualMeterRule a sh:NodeShape ;
340340
sh:sparql [
341341
a sh:SPARQLConstraint ;
342342
sh:message "Only meters can have the isVirtualMeter property be true" ;
343-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
343+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
344344
sh:select """
345345
SELECT $this WHERE {
346346
$this brick:isVirtualMeter/brick:value true .
@@ -354,7 +354,7 @@ bsh:MeterInferSubstance a sh:NodeShape ;
354354
sh:targetClass brick:Meter ;
355355
sh:rule [
356356
a sh:SPARQLRule ;
357-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
357+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
358358
sh:construct """
359359
CONSTRUCT {
360360
$this brick:hasSubstance ?substance .
@@ -373,7 +373,7 @@ bsh:MeterInferSubclassNonBuildingMeter a sh:NodeShape ;
373373
sh:targetClass brick:Meter ;
374374
sh:rule [
375375
a sh:SPARQLRule ;
376-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
376+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
377377
sh:construct """
378378
CONSTRUCT {
379379
$this rdf:type ?metertype .
@@ -397,7 +397,7 @@ bsh:MeterInferSubclassBuildingMeter a sh:NodeShape ;
397397
sh:targetClass brick:Building_Meter ;
398398
sh:rule [
399399
a sh:SPARQLRule ;
400-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
400+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
401401
sh:construct """
402402
CONSTRUCT {
403403
$this rdf:type ?metertype .
@@ -425,7 +425,7 @@ bsh:TimeseriesReferenceOnPointsConstraint a sh:NodeShape ;
425425
sh:sparql [
426426
a sh:SPARQLConstraint ;
427427
sh:message "Only Brick Points can have external timeseries references" ;
428-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
428+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
429429
sh:select """
430430
SELECT $this
431431
WHERE {
@@ -448,7 +448,7 @@ bsh:PointsHaveQuantityKinds a sh:NodeShape ;
448448
FILTER NOT EXISTS { ?class owl:deprecated true }
449449
}
450450
""" ;
451-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
451+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
452452
] ;
453453
sh:target [
454454
a sh:SPARQLTarget ;
@@ -459,7 +459,7 @@ bsh:PointsHaveQuantityKinds a sh:NodeShape ;
459459
FILTER NOT EXISTS { ?class owl:deprecated true }
460460
}
461461
""" ;
462-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
462+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
463463
] ;
464464
sh:property [
465465
sh:class qudt:QuantityKind ;
@@ -505,7 +505,7 @@ bsh:CollectionIncludesEquipment a sh:NodeShape ;
505505
}
506506
}
507507
""" ;
508-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
508+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
509509
] ;
510510
.
511511

@@ -516,7 +516,7 @@ bsh:AddDefaultEVSEChargerDirection a sh:NodeShape ;
516516
sh:targetClass brick:Electric_Vehicle_Charging_Station ;
517517
sh:rule [
518518
a sh:SPARQLRule ;
519-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
519+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
520520
sh:construct """
521521
CONSTRUCT {
522522
$this brick:electricVehicleChargerDirectionality [ brick:value "unidirectional" ]
@@ -540,7 +540,7 @@ bsh:InheritEVSEChargerDirection a sh:NodeShape ;
540540
sh:targetClass brick:Electric_Vehicle_Charging_Port ;
541541
sh:rule [
542542
a sh:SPARQLRule ;
543-
sh:prefixes <https://brickschema.org/schema/1.3/Brick> ;
543+
sh:prefixes <https://brickschema.org/schema/1.4/Brick> ;
544544
sh:construct """
545545
CONSTRUCT {
546546
$this brick:electricVehicleChargerDirectionality ?direction

‎bricksrc/version.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
# the simplified (no patch version) version number for Brick. Intended for
1313
# inclusion in the Brick namespace URI
14-
BRICK_VERSION = f"{BRICK_MAJOR_VERSION}.{BRICK_MINOR_VERSION}-rc1"
14+
BRICK_VERSION = f"{BRICK_MAJOR_VERSION}.{BRICK_MINOR_VERSION}"
1515

1616
# the full "semantic verersion" including the patch number
17-
BRICK_FULL_VERSION = f"{BRICK_VERSION}.{BRICK_PATCH_VERSION}-rc1"
17+
BRICK_FULL_VERSION = f"{BRICK_VERSION}.{BRICK_PATCH_VERSION}"

‎examples/air_quality_sensors/air_quality_sensor_example.ttl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
@prefix brick: <https://brickschema.org/schema/Brick#> .
33
@prefix unit: <http://qudt.org/vocab/unit/> .
44
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
5+
@prefix owl: <http://www.w3.org/2002/07/owl#> .
6+
7+
<urn:example> a owl:Ontology ;
8+
owl:imports <https://brickschema.org/schema/1.4/Brick> .
59

610
bldg:air_temp_sensor a brick:Air_Temperature_Sensor ;
711
brick:hasUnit unit:DEG_C ;

‎examples/bacnet/bacnet.ttl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
@prefix unit: <http://qudt.org/vocab/unit/> .
55
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
66
@prefix ref: <https://brickschema.org/schema/Brick/ref#> .
7+
@prefix owl: <http://www.w3.org/2002/07/owl#> .
8+
9+
<urn:example> a owl:Ontology ;
10+
owl:imports <https://brickschema.org/schema/1.4/Brick> .
711

812
bldg:sample-device a bacnet:BACnetDevice ;
913
bacnet:device-instance 123 ;

‎examples/building_meter/building_meter.ttl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
@prefix bldg: <urn:example#> .
22
@prefix brick: <https://brickschema.org/schema/Brick#> .
33
@prefix unit: <http://qudt.org/vocab/unit/> .
4+
@prefix owl: <http://www.w3.org/2002/07/owl#> .
5+
6+
<urn:example> a owl:Ontology ;
7+
owl:imports <https://brickschema.org/schema/1.4/Brick> .
48

59
bldg:building_energy_sensor a brick:Energy_Sensor ;
610
brick:hasUnit unit:KiloW-HR ;

‎examples/chiller-system/chiller-plant.ttl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
@prefix brick: <https://brickschema.org/schema/Brick#> .
33
@prefix unit: <http://qudt.org/vocab/unit/> .
44
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
5+
@prefix owl: <http://www.w3.org/2002/07/owl#> .
6+
7+
<urn:chiller-plant> a owl:Ontology ;
8+
owl:imports <https://brickschema.org/schema/1.4/Brick> .
59

610
:cws a brick:Chilled_Water_System ;
711
brick:hasPart :ct-1, :ct-2, :ct-3,

‎examples/evse/evse.ttl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
@prefix brick: <https://brickschema.org/schema/Brick#> .
22
@prefix unit: <http://qudt.org/vocab/unit/> .
33
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
4+
@prefix owl: <http://www.w3.org/2002/07/owl#> .
45
@prefix : <urn:evse#> .
56

7+
<urn:evse> a owl:Ontology ;
8+
owl:imports <https://brickschema.org/schema/1.4/Brick> .
9+
610
:parking_lot a brick:Parking_Structure ;
711
brick:isLocationOf :hub .
812

‎examples/example1/example.ttl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
@prefix bldg: <http://example.com/mybuilding#> .
22
@prefix brick: <https://brickschema.org/schema/Brick#> .
3+
@prefix owl: <http://www.w3.org/2002/07/owl#> .
4+
5+
<http://example.com/mybuilding> a owl:Ontology ;
6+
owl:imports <https://brickschema.org/schema/1.4/Brick> .
37

48
bldg:AHU1A a brick:Air_Handler_Unit ;
59
brick:feeds bldg:VAV2-4,

0 commit comments

Comments
 (0)