honeybee-energy 1.116.20__py2.py3-none-any.whl → 1.116.21__py2.py3-none-any.whl

honeybee_energy/result/colorobj.py

@@ -326,7 +326,8 @@ class ColorRoom(_ColorObject):
         # match the rooms with the data collections
         self._space_based = bool(space_based)
         self._matched_objects = match_rooms_to_data(
-            data_collections, rooms, space_based=self._space_based)
+            data_collections, rooms, space_based=self._space_based,
+            zone_correct_mult=False)
         if len(self._matched_objects) == 0:
             raise ValueError('None of the ColorRoom data collections could be '
                              'matched to the input rooms')
@@ -424,14 +425,26 @@ class ColorRoom(_ColorObject):
         These floor areas will always be in either square meters or square feet
         depending on whether the geo_unit is either SI or IP.
         """
+        # correct for more than one room in a zone
+        if not self.space_based:
+            zones = {}
+            for room in self.matched_rooms:
+                try:
+                    zones[room.zone] += room.floor_area
+                except KeyError:  # first room to be found in the zone
+                    zones[room.zone] = room.floor_area
+            floor_areas = [zones[room.zone] for room in self.matched_rooms]
+        else:
+            floor_areas = [room.floor_area for room in self.matched_rooms]
+        # convert units if they are not conventional
         if self._geo_unit in ('m', 'ft'):  # no need to do unit conversions
-            return [room.floor_area for room in self.matched_rooms]
+            return floor_areas
         elif self._geo_unit == 'mm':  # convert to meters
-            return [room.floor_area / 1000000.0 for room in self.matched_rooms]
+            return [ar / 1000000.0 for ar in floor_areas]
         elif self._geo_unit == 'in':  # convert to feet
-            return [room.floor_area / 144.0 for room in self.matched_rooms]
+            return [ar / 144.0 for ar in floor_areas]
         else:  # assume it's cm; convert to meters
-            return [room.floor_area / 10000.0 for room in self.matched_rooms]
+            return [ar / 10000.0 for ar in floor_areas]
 
     @property
     def graphic_container(self):

{honeybee_energy-1.116.20.dist-info → honeybee_energy-1.116.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-energy
-Version: 1.116.20
+Version: 1.116.21
 Summary: Energy simulation library for honeybee.
 Home-page: https://github.com/ladybug-tools/honeybee-energy
 Author: Ladybug Tools

{honeybee_energy-1.116.20.dist-info → honeybee_energy-1.116.21.dist-info}/RECORD

@@ -120,7 +120,7 @@ honeybee_energy/properties/room.py,sha256=lCiw8wqRVOFgZc4FjXVjcrKk3hziZ9IvZ0CSEH
 honeybee_energy/properties/shade.py,sha256=Aj1RZh2KSkVMn5VT_QUckF_5R3I0O3b35EabqaI2i5g,14107
 honeybee_energy/properties/shademesh.py,sha256=ykbs4llT86C_U5BhQy2EbINewfg9eVxiPaq5yCRhud8,11486
 honeybee_energy/result/__init__.py,sha256=U9VEpLsVJg2vHfFflTkmXxc4QUpkw1Phz2io8pYHbHs,43
-honeybee_energy/result/colorobj.py,sha256=17osWW5KD-_2XS3qQJwygWOtps3wFYQCXcf5lhGN5RE,28047
+honeybee_energy/result/colorobj.py,sha256=O2BN3je04LtIRxuVbD8gwDRbfSEKa8vXiyr5FtCkvkc,28553
 honeybee_energy/result/emissions.py,sha256=ftb5ogxBhmZFLgwOaDkTwocfoQXQsf99jQlNUMlAzs4,12953
 honeybee_energy/result/err.py,sha256=xdxtpZFMbX2_hoCSPFgmgiOZzhSX1NCLNj3PkC8xjHc,3312
 honeybee_energy/result/eui.py,sha256=L3uWBoB6pE46seS9u6_791EhcZ7JGp2ZJgaXKM3kP5Y,4327
@@ -156,9 +156,9 @@ honeybee_energy/ventcool/opening.py,sha256=ZywoADlNQ6_8OfjV71ZUpbCAetQrRVj7aprBj
 honeybee_energy/ventcool/simulation.py,sha256=gMF4sgCQ5R4iFWPnvvB3wxgeP_zEwnWl71ObIIe4XGU,14423
 tests/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/fixtures/userdata_fixtures.py,sha256=yDvBR6nsltel_U8hUoUsJ6yufPKTR7Wnsgxe68HtswQ,313
-honeybee_energy-1.116.20.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-honeybee_energy-1.116.20.dist-info/METADATA,sha256=ywcoxs49swpFhagqerOeBWamtlP9JfhsKYISsePhY7E,3575
-honeybee_energy-1.116.20.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
-honeybee_energy-1.116.20.dist-info/entry_points.txt,sha256=QOMJbH-StaxT4hCjskZtqetNCMNioP3ZiuhoLQ6MANc,63
-honeybee_energy-1.116.20.dist-info/top_level.txt,sha256=V9Lz0281hfT83Fy0fSdn_6vwRK9vTQe1_LQXd0_-gAI,22
-honeybee_energy-1.116.20.dist-info/RECORD,,
+honeybee_energy-1.116.21.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+honeybee_energy-1.116.21.dist-info/METADATA,sha256=BTO6JVs1MYAPEKPOP95TVvLprfsIzhDwdvMAjT-rpG4,3575
+honeybee_energy-1.116.21.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
+honeybee_energy-1.116.21.dist-info/entry_points.txt,sha256=QOMJbH-StaxT4hCjskZtqetNCMNioP3ZiuhoLQ6MANc,63
+honeybee_energy-1.116.21.dist-info/top_level.txt,sha256=V9Lz0281hfT83Fy0fSdn_6vwRK9vTQe1_LQXd0_-gAI,22
+honeybee_energy-1.116.21.dist-info/RECORD,,