honeybee-core 1.61.23__tar.gz → 1.61.25__tar.gz

{honeybee_core-1.61.23/honeybee_core.egg-info → honeybee_core-1.61.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-core
-Version: 1.61.23
+Version: 1.61.25
 Summary: A library to create 3D building geometry for various types of environmental simulation.
 Home-page: https://github.com/ladybug-tools/honeybee-core
 Author: Ladybug Tools

{honeybee_core-1.61.23 → honeybee_core-1.61.25}/honeybee/face.py

@@ -1749,16 +1749,24 @@ class Face(_BaseWithShade):
                 at which point the vertex is considered colinear. Default: 0.01,
                 suitable for objects in meters.
         """
+        # set up lists to track sub-faces to remove
+        del_ap_i, del_dr_i = [], []
+        # remove degenerate apertures
         for i, ap in enumerate(self._apertures):
             try:
                 ap.remove_colinear_vertices(tolerance)
             except ValueError:
-                self._apertures.pop(i)
+                del_ap_i.append(i)
+        for del_i in reversed(del_ap_i):
+            self._apertures.pop(del_i)
+        # remove degenerate doors
         for i, dr in enumerate(self._doors):
             try:
                 dr.remove_colinear_vertices(tolerance)
             except ValueError:
-                self._apertures.pop(i)
+                del_dr_i.append(i)
+        for del_i in reversed(del_dr_i):
+            self._doors.pop(del_i)
 
     def is_geo_equivalent(self, face, tolerance=0.01):
         """Get a boolean for whether this object is geometrically equivalent to another.

{honeybee_core-1.61.23 → honeybee_core-1.61.25}/honeybee/room.py

@@ -2325,29 +2325,55 @@ class Room(_BaseWithShade):
             A string with the message or a list with a dictionary if detailed is True.
         """
         # create Polygon2Ds from the floors of the rooms
-        polys = [
-            [(Polygon2D(Point2D(p.x, p.y) for p in flr.vertices), flr.geometry[0].z)
-             for flr in room.floors if flr.geometry.is_horizontal(tolerance)]
-            for room in rooms
-        ]
+        b_polys, h_polys = [], []
+        for room in rooms:
+            rb_polys, rh_polys = [], []
+            for flr in room.floors:
+                flr_geo = flr.geometry
+                if flr_geo.is_horizontal(tolerance):
+                    b_poly = Polygon2D(Point2D(p.x, p.y) for p in flr_geo.boundary)
+                    rb_polys.append((b_poly, flr_geo[0].z))
+                    if flr_geo.has_holes:
+                        h_poly = [Polygon2D(Point2D(p.x, p.y) for p in hole)
+                                  for hole in flr_geo.holes]
+                        rh_polys.append(h_poly)
+                    else:
+                        rh_polys.append(None)
+            b_polys.append(rb_polys)
+            h_polys.append(rh_polys)
 
         # find the number of overlaps across the Rooms
         msgs = []
-        for i, (room_1, polys_1) in enumerate(zip(rooms, polys)):
+        for i, (room_1, polys_1, hp1) in enumerate(zip(rooms, b_polys, h_polys)):
             overlap_rooms = []
             if len(polys_1) == 0:
                 continue
             try:
-                for room_2, polys_2 in zip(rooms[i + 1:], polys[i + 1:]):
+                zip_obj = zip(rooms[i + 1:], b_polys[i + 1:], h_polys[i + 1:])
+                for room_2, polys_2, hp2 in zip_obj:
                     collision_found = False
-                    for ply_1, z1 in polys_1:
+                    for j, (ply_1, z1) in enumerate(polys_1):
                         if collision_found:
                             break
-                        for ply_2, z2 in polys_2:
+                        for k, (ply_2, z2) in enumerate(polys_2):
                             if collision_found:
                                 break
-                            if abs(z1 - z2) < tolerance:
-                                if ply_1.polygon_relationship(ply_2, tolerance) >= 0:
+                            if abs(z1 - z2) < tolerance and \
+                                    ply_1.polygon_relationship(ply_2, tolerance) >= 0:
+                                # check that one room is not inside the hole of another
+                                inside_hole = False
+                                if hp1[j] is not None:
+                                    for h in hp1[j]:
+                                        if h.polygon_relationship(ply_2, tolerance) == 1:
+                                            inside_hole = True
+                                            break
+                                if not inside_hole and hp2[k] is not None:
+                                    for h in hp2[k]:
+                                        if h.polygon_relationship(ply_1, tolerance) == 1:
+                                            inside_hole = True
+                                            break
+                                # if the room is not in a hole, then they overlap
+                                if not inside_hole:
                                     overlap_rooms.append(room_2)
                                     collision_found = True
                                     break

{honeybee_core-1.61.23 → honeybee_core-1.61.25/honeybee_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-core
-Version: 1.61.23
+Version: 1.61.25
 Summary: A library to create 3D building geometry for various types of environmental simulation.
 Home-page: https://github.com/ladybug-tools/honeybee-core
 Author: Ladybug Tools