merge with upstream master

helix/models/dxf/graph_node_store.py

@@ -25,6 +25,7 @@ class GraphNodeStore(list):
         dy = node.coordinate.y - coordinate.y
         return dx * dx + dy * dy
 
+    # FIXME: This is slow if called thousands of times. Do not add any overhead in this method.
     def find_coordinate(self, coordinate):
         # create and populate the quadtree on first request
         if self.quadTree is None:
@@ -33,9 +34,15 @@ class GraphNodeStore(list):
                 self.quadTree.insert(node)
             del self[:]
 
-        possibilities = self.quadTree.retrieve(coordinate)
+        variance_square = self.variance ** 2
+        # Optimization: avoid creating a copy of the big list `self.quadTree.nodeList`
+        # Old: possibilities = self.quadTree.retrieve(coordinate)
+        possibilities = self.quadTree.nodeList
         for node in possibilities:
-            if self.distance_squared(node, coordinate) <= self.variance ** 2:
+            if self.distance_squared(node, coordinate) <= variance_square:
                 return node
-        else:
-            return None
+        more_possibilities = self.quadTree.retrieve(coordinate, only_quads_related=True)
+        for node in more_possibilities:
+            if self.distance_squared(node, coordinate) <= variance_square:
+                return node
+        return None