feat(programtype): Add the College Building Type

ladybug-tools · Oct 17, 2023 · 95ef1cc · 95ef1cc
1 parent 830a3e4
commit 95ef1cc
Show file tree

Hide file tree

Showing 17 changed files with 6,428 additions and 7 deletions.
diff --git a/honeybee_energy_standards/programtypes/1980_2004_data.json b/honeybee_energy_standards/programtypes/1980_2004_data.json
diff --git a/honeybee_energy_standards/programtypes/2004_data.json b/honeybee_energy_standards/programtypes/2004_data.json
diff --git a/honeybee_energy_standards/programtypes/2007_data.json b/honeybee_energy_standards/programtypes/2007_data.json
diff --git a/honeybee_energy_standards/programtypes/2010_data.json b/honeybee_energy_standards/programtypes/2010_data.json
diff --git a/honeybee_energy_standards/programtypes/2013_data.json b/honeybee_energy_standards/programtypes/2013_data.json
diff --git a/honeybee_energy_standards/programtypes/2016_data.json b/honeybee_energy_standards/programtypes/2016_data.json
diff --git a/honeybee_energy_standards/programtypes/2019_data.json b/honeybee_energy_standards/programtypes/2019_data.json
diff --git a/honeybee_energy_standards/programtypes/pre_1980_data.json b/honeybee_energy_standards/programtypes/pre_1980_data.json
diff --git a/honeybee_energy_standards/programtypes_registry/1980_2004_registry.json b/honeybee_energy_standards/programtypes_registry/1980_2004_registry.json
@@ -47,6 +47,23 @@
     "Stair",
     "Storage"
   ],
+  "College": [
+    "Art Classroom",
+    "Classroom",
+    "Conference",
+    "Corridor",
+    "Elevator Shaft",
+    "Entrance Lobby",
+    "Laboratory",
+    "Lecture Hall",
+    "Lounge",
+    "Media Center",
+    "Office",
+    "Restroom",
+    "Stairs",
+    "Storage",
+    "Utility"
+  ],
   "Courthouse": [
     "Break Room",
     "Cell",

diff --git a/honeybee_energy_standards/programtypes_registry/2004_registry.json b/honeybee_energy_standards/programtypes_registry/2004_registry.json
@@ -54,6 +54,23 @@
     "Stair",
     "Storage"
   ],
+  "College": [
+    "Art Classroom",
+    "Classroom",
+    "Conference",
+    "Corridor",
+    "Elevator Shaft",
+    "Entrance Lobby",
+    "Laboratory",
+    "Lecture Hall",
+    "Lounge",
+    "Media Center",
+    "Office",
+    "Restroom",
+    "Stairs",
+    "Storage",
+    "Utility"
+  ],
   "Courthouse": [
     "Break Room",
     "Cell",

diff --git a/honeybee_energy_standards/programtypes_registry/2007_registry.json b/honeybee_energy_standards/programtypes_registry/2007_registry.json
@@ -53,6 +53,23 @@
     "Stair",
     "Storage"
   ],
+  "College": [
+    "Art Classroom",
+    "Classroom",
+    "Conference",
+    "Corridor",
+    "Elevator Shaft",
+    "Entrance Lobby",
+    "Laboratory",
+    "Lecture Hall",
+    "Lounge",
+    "Media Center",
+    "Office",
+    "Restroom",
+    "Stairs",
+    "Storage",
+    "Utility"
+  ],
   "Courthouse": [
     "Break Room",
     "Cell",

diff --git a/honeybee_energy_standards/programtypes_registry/2010_registry.json b/honeybee_energy_standards/programtypes_registry/2010_registry.json
@@ -53,6 +53,23 @@
     "Stair",
     "Storage"
   ],
+  "College": [
+    "Art Classroom",
+    "Classroom",
+    "Conference",
+    "Corridor",
+    "Elevator Shaft",
+    "Entrance Lobby",
+    "Laboratory",
+    "Lecture Hall",
+    "Lounge",
+    "Media Center",
+    "Office",
+    "Restroom",
+    "Stairs",
+    "Storage",
+    "Utility"
+  ],
   "Courthouse": [
     "Break Room",
     "Cell",

diff --git a/honeybee_energy_standards/programtypes_registry/2013_registry.json b/honeybee_energy_standards/programtypes_registry/2013_registry.json
@@ -53,6 +53,23 @@
     "Stair",
     "Storage"
   ],
+  "College": [
+    "Art Classroom",
+    "Classroom",
+    "Conference",
+    "Corridor",
+    "Elevator Shaft",
+    "Entrance Lobby",
+    "Laboratory",
+    "Lecture Hall",
+    "Lounge",
+    "Media Center",
+    "Office",
+    "Restroom",
+    "Stairs",
+    "Storage",
+    "Utility"
+  ],
   "Courthouse": [
     "Break Room",
     "Cell",

diff --git a/honeybee_energy_standards/programtypes_registry/2016_registry.json b/honeybee_energy_standards/programtypes_registry/2016_registry.json
@@ -52,6 +52,23 @@
     "Stair",
     "Storage"
   ],
+  "College": [
+    "Art Classroom",
+    "Classroom",
+    "Conference",
+    "Corridor",
+    "Elevator Shaft",
+    "Entrance Lobby",
+    "Laboratory",
+    "Lecture Hall",
+    "Lounge",
+    "Media Center",
+    "Office",
+    "Restroom",
+    "Stairs",
+    "Storage",
+    "Utility"
+  ],
   "Courthouse": [
     "Break Room",
     "Cell",

diff --git a/honeybee_energy_standards/programtypes_registry/2019_registry.json b/honeybee_energy_standards/programtypes_registry/2019_registry.json
@@ -52,6 +52,23 @@
     "Stair",
     "Storage"
   ],
+  "College": [
+    "Art Classroom",
+    "Classroom",
+    "Conference",
+    "Corridor",
+    "Elevator Shaft",
+    "Entrance Lobby",
+    "Laboratory",
+    "Lecture Hall",
+    "Lounge",
+    "Media Center",
+    "Office",
+    "Restroom",
+    "Stairs",
+    "Storage",
+    "Utility"
+  ],
   "Courthouse": [
     "Break Room",
     "Cell",

diff --git a/honeybee_energy_standards/programtypes_registry/pre_1980_registry.json b/honeybee_energy_standards/programtypes_registry/pre_1980_registry.json
@@ -47,6 +47,23 @@
     "Stair",
     "Storage"
   ],
+  "College": [
+    "Art Classroom",
+    "Classroom",
+    "Conference",
+    "Corridor",
+    "Elevator Shaft",
+    "Entrance Lobby",
+    "Laboratory",
+    "Lecture Hall",
+    "Lounge",
+    "Media Center",
+    "Office",
+    "Restroom",
+    "Stairs",
+    "Storage",
+    "Utility"
+  ],
   "Courthouse": [
     "Break Room",
     "Cell",

diff --git a/standards_update/_util/_program_type.py b/standards_update/_util/_program_type.py
@@ -44,8 +44,8 @@ def clean_space_types(source_filename, dest_directory, vintage):
             the value is the dictionary representation of all the ProgramType data.
     """
     # list all edits to be made from the original file
-    _remove_bldg = ('College',)
-    _exclude_bldg = ('Office', 'Any', 'College')
+    _remove_bldg = ()
+    _exclude_bldg = ('Office', 'Any')
     _exclude = ('Apartment_topfloor_NS',
                 'Apartment_topfloor_WE',
                 'Corridor_topfloor',
@@ -85,14 +85,14 @@ def clean_space_types(source_filename, dest_directory, vintage):
                 'Courthouse - Stairs': 'Stairs',
                 'Courthouse - Storage': 'Storage',
                 'Courthouse - Utility': 'Utility',
-                'College -  Conference': 'Conference',
-                'College -  Corridor': 'Corridor',
-                'College -  Elevator Shaft': 'Elevator Shaft',
+                'College - Conference': 'Conference',
+                'College - Corridor': 'Corridor',
+                'College - Elevator Shaft': 'Elevator Shaft',
                 'College -  Entrance Lobby': 'Entrance Lobby',
                 'College -  Lounge': 'Lounge',
                 'College -  Office': 'Office',
-                'College -  Restroom': 'Restroom',
-                'College -  Utility': 'Utility',
+                'College - Restroom': 'Restroom',
+                'College - Utility': 'Utility',
                 'College - Art Classroom': 'Art Classroom',
                 'College - Classroom': 'Classroom',
                 'College - Entrance Lobby': 'Entrance Lobby',