fairyfly-core 0.2.8__py3-none-any.whl → 0.2.10__py3-none-any.whl

fairyfly/model.py

@@ -606,6 +606,27 @@ class Model(_Base):
         for i in reversed(i_to_remove):
             self._shapes.pop(i)
 
+    def remove_duplicate_vertices(self, tolerance=None):
+        """Remove any duplicate vertices from the model.
+
+        Any degenerate shapes found while removing duplicate vertices will be
+        automatically removed from the model.
+
+        Args:
+            tolerance: The minimum distance between a vertex and the boundary segments
+                at which point the vertex is considered distinct. If None, the
+                Model's tolerance will be used. (Default: None).
+        """
+        tolerance = self.tolerance if tolerance is None else tolerance
+        i_to_remove = []
+        for i, shape in enumerate(self._shapes):
+            try:
+                shape.remove_duplicate_vertices(tolerance)
+            except ValueError:  # degenerate shape found!
+                i_to_remove.append(i)
+        for i in reversed(i_to_remove):
+            self._shapes.pop(i)
+
     def check_all(self, raise_exception=True, detailed=False, all_ext_checks=False):
         """Check all of the aspects of the Model for validation errors.
 

fairyfly/shape.py

@@ -247,6 +247,21 @@ class Shape(_Base):
         self._geometry = self.geometry.scale(factor, origin)
         self.properties.scale(factor, origin)
 
+    def remove_duplicate_vertices(self, tolerance=0.01):
+        """Remove all duplicate vertices from this object's geometry.
+
+        Args:
+            tolerance: The minimum distance between a vertex and the boundary segments
+                at which point the vertex is considered duplicate. Default: 0.01,
+                suitable for objects in millimeters.
+        """
+        try:
+            self._geometry = self.geometry.remove_duplicate_vertices(tolerance)
+        except AssertionError as e:  # usually a sliver face of some kind
+            raise ValueError(
+                'Shape "{}" is invalid with dimensions less than the '
+                'tolerance.\n{}'.format(self.full_id, e))
+
     def remove_colinear_vertices(self, tolerance=0.01):
         """Remove all colinear and duplicate vertices from this object's geometry.
 
@@ -469,6 +484,20 @@ class Shape(_Base):
                     pts_2d = tuple(master_plane.xyz_to_xy(pt) for pt in hole)
                     polygon_2ds.append(Polygon2D(pts_2d))
 
+        # snap all polygons together
+        polygon_2ds = Polygon2D.snap_polygons(polygon_2ds, tol)
+
+        # remove colinear and degenerate geometry
+        i_to_remove = []
+        for i, poly in enumerate(polygon_2ds):
+            try:
+                poly.remove_colinear_vertices(tol)
+            except ValueError:  # degenerate shape found!
+                i_to_remove.append(i)
+        for i in reversed(i_to_remove):
+            polygon_2ds.pop(i)
+            is_holes.pop(i)
+
         # intersect the Room2D polygons within the 2D space
         int_poly = Polygon2D.intersect_polygon_segments(polygon_2ds, tol)
 

{fairyfly_core-0.2.8.dist-info → fairyfly_core-0.2.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fairyfly-core
-Version: 0.2.8
+Version: 0.2.10
 Summary: A library to represent construction detail geometry for environmental simulation.
 Home-page: https://github.com/ladybug-tools/fairyfly-core
 Author: Ladybug Tools

{fairyfly_core-0.2.8.dist-info → fairyfly_core-0.2.10.dist-info}/RECORD

@@ -10,10 +10,10 @@ fairyfly/config.py,sha256=VfQ-vRX-q1CLja4xFMGVte-FpdFStdMXj98WKpmMOFA,10633
 fairyfly/dictutil.py,sha256=nVwoWG4FsoV9nYjQxI3jBxVeZcdy2TQd1FKhEquVLR8,1469
 fairyfly/extensionutil.py,sha256=5MQV0gZBc6_vfbVr4j8l_8JslMsj4bBbsZ4yqZ2VPG4,2716
 fairyfly/logutil.py,sha256=Urxl0U14-qffIt6NiGLT6pV-796oAGUvnnf2ypj1j9Q,2564
-fairyfly/model.py,sha256=R3BXbVgICTM-5K0O1HAnyODqDYrOXXQjZpkT73PGMos,46274
+fairyfly/model.py,sha256=PL8mQRcgRQ8bBn2rl1XfXYJsGciqAo_EwbxsSe2vUq0,47161
 fairyfly/properties.py,sha256=uGBA8YY0Sr_dp3NUCAx-XvXhctoBBwDlqsCiyNU_TTo,21402
 fairyfly/search.py,sha256=-DapYpzfX3nwZx1eF2elcmYG7vxitsvAiv_e3TGlTJ0,4806
-fairyfly/shape.py,sha256=UaG-CWt2w_h513MpY3sIdr6XNCyQUk6VaI2lTHrQ_94,22314
+fairyfly/shape.py,sha256=5Fp5DYlvFL3BPaopGNpNqKSjBeMQHGI-JEa6ksmZcqc,23505
 fairyfly/typing.py,sha256=1djGuUI0Ui-96EjBKPKw6rrMF7dPUq97q24Pg6NNfTM,7219
 fairyfly/units.py,sha256=wM3TEAF_ir8VWHFJYSbAKYrLU7VHzBGTtRTw6Tbh4Aw,3216
 fairyfly/cli/__init__.py,sha256=1qvLWWmJtYVDdTTQHVtoCNTMKyeAq_VWZ4tp-ap-Ajk,3187
@@ -22,9 +22,9 @@ fairyfly/writer/__init__.py,sha256=D4FdE2LUVCMvfud3qL2UquH1uCz3EGlKOEMgstMjtXc,2
 fairyfly/writer/boundary.py,sha256=skpfcFyxWLvjTSStbCh5f4wehSHeI-eKMgoeSCzvO7Q,190
 fairyfly/writer/model.py,sha256=6Y15NVGCjmYcBdimxyQWnE8AAhQAJi6A7QfMi4P49M4,181
 fairyfly/writer/shape.py,sha256=pMlLbk3WkrNPbNvowDQ_JFgNkhHNOlqL52TMZKB7zKo,181
-fairyfly_core-0.2.8.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-fairyfly_core-0.2.8.dist-info/METADATA,sha256=m4J4gL2Hb3I_WIUrjmkAhVvN8aUWbsG9PWe_eQ8C6hI,3291
-fairyfly_core-0.2.8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-fairyfly_core-0.2.8.dist-info/entry_points.txt,sha256=KM3hAPV0ivux3CUx1-pDT0BL1WSUFt2jmT4i_MFbdzc,47
-fairyfly_core-0.2.8.dist-info/top_level.txt,sha256=8ZUsvZOSB3g5enmv1R0vxJilNeW8Uft5KrTL0rUNj7k,9
-fairyfly_core-0.2.8.dist-info/RECORD,,
+fairyfly_core-0.2.10.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+fairyfly_core-0.2.10.dist-info/METADATA,sha256=m0uZyPLtkGR7Hf-jaEGvC4jdrQkpb386dl7vx4GGmrc,3292
+fairyfly_core-0.2.10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+fairyfly_core-0.2.10.dist-info/entry_points.txt,sha256=KM3hAPV0ivux3CUx1-pDT0BL1WSUFt2jmT4i_MFbdzc,47
+fairyfly_core-0.2.10.dist-info/top_level.txt,sha256=8ZUsvZOSB3g5enmv1R0vxJilNeW8Uft5KrTL0rUNj7k,9
+fairyfly_core-0.2.10.dist-info/RECORD,,