Merge branch 'v0.7.0' into v0.7.0

src/ifcpatch/ifcpatch/recipes/RecycleNonRootedElements.py

@@ -1,4 +1,3 @@
-
 # IfcPatch - IFC patching utiliy
 # Copyright (C) 2020, 2021 Dion Moult <dion@thinkmoult.com>
 #
@@ -20,6 +19,7 @@
 from collections import deque
 import ifcopenshell.util.element
 
+
 class Patcher:
     def __init__(self, src, file, logger, args=None):
         self.src = src
@@ -31,9 +31,16 @@ class Patcher:
         deleted = []
         hashes = {}
         for element in self.file:
-            if element.is_a('IfcRoot') or element.is_a('IfcPropertySingleValue'):
+            if element.is_a("IfcRoot"):
                 continue
-            h = hash(tuple(element))
+            h = hash(
+                tuple(
+                    [
+                        a.wrappedValue if isinstance(a, ifcopenshell.entity_instance) and not a.id() else a
+                        for a in element
+                    ]
+                )
+            )
             if h in hashes:
                 for inverse in self.file.get_inverse(element):
                     ifcopenshell.util.element.replace_attribute(inverse, element, hashes[h])
@@ -42,13 +49,13 @@ class Patcher:
                 hashes[h] = element
         deleted.sort()
         deleted_q = deque(deleted)
-        new = ''
+        new = ""
-        for line in self.file.wrapped_data.to_string().split('\n'):
+        for line in self.file.wrapped_data.to_string().split("\n"):
             try:
-                if int(line.split('=')[0][1:]) != deleted_q[0]:
+                if int(line.split("=")[0][1:]) != deleted_q[0]:
-                    new += (line + '\n')
+                    new += line + "\n"
                 else:
                     deleted_q.popleft()
             except:
-                new += (line + '\n')
+                new += line + "\n"
         self.file = new