fastquadtree 0.9.0__cp38-abi3-win_amd64.whl → 0.9.1__cp38-abi3-win_amd64.whl

fastquadtree/pyqtree.py

@@ -7,7 +7,7 @@ from __future__ import annotations
 
 from typing import Any, Tuple
 
-from .rect_quadtree import RectQuadTree
+from ._native import RectQuadTree
 
 Point = Tuple[float, float]  # only for type hints in docstrings
 
@@ -71,18 +71,15 @@ class Index:
         """
         if bbox is not None:
             x1, y1, x2, y2 = bbox
-            self.rect_quadtree = RectQuadTree(
-                (x1, y1, x2, y2), max_items, max_depth=max_depth, track_objects=True
-            )
+            self._qt = RectQuadTree((x1, y1, x2, y2), max_items, max_depth=max_depth)
 
         elif (
             x is not None and y is not None and width is not None and height is not None
         ):
-            self.rect_quadtree = RectQuadTree(
+            self._qt = RectQuadTree(
                 (x - width / 2, y - height / 2, x + width / 2, y + height / 2),
                 max_items,
                 max_depth=max_depth,
-                track_objects=True,
             )
 
         else:
@@ -90,6 +87,8 @@ class Index:
                 "Either the bbox argument must be set, or the x, y, width, and height arguments must be set"
             )
 
+        self._id_to_obj: dict[int, Any] = {}
+
     def insert(self, item: Any, bbox):  # pyright: ignore[reportIncompatibleMethodOverride]
         """
         Inserts an item into the quadtree along with its bounding box.
@@ -98,7 +97,8 @@ class Index:
         - **item**: The item to insert into the index, which will be returned by the intersection method
         - **bbox**: The spatial bounding box tuple of the item, with four members (xmin,ymin,xmax,ymax)
         """
-        self.rect_quadtree.insert(geom=bbox, obj=item)
+        self._id_to_obj[id(item)] = item
+        self._qt.insert(id(item), bbox)
 
     def remove(self, item, bbox):
         """
@@ -110,7 +110,10 @@ class Index:
 
         Both parameters need to exactly match the parameters provided to the insert method.
         """
-        self.rect_quadtree.delete_by_object(obj=item)
+        self._qt.delete(id(item), bbox)
+
+        # Pops
+        self._id_to_obj.pop(id(item), None)
 
     def intersect(self, bbox):
         """
@@ -123,5 +126,6 @@ class Index:
         Returns:
         - A list of inserted items whose bounding boxes intersect with the input bbox.
         """
-        out = list(self.rect_quadtree.query(bbox, as_items=True))
-        return [item.obj for item in out]
+        results = self._qt.query(bbox)
+        # result = (id, x0, y0, x1, y1)
+        return [self._id_to_obj[result[0]] for result in results]

{fastquadtree-0.9.0.dist-info → fastquadtree-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastquadtree
-Version: 0.9.0
+Version: 0.9.1
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Rust

{fastquadtree-0.9.0.dist-info → fastquadtree-0.9.1.dist-info}/RECORD

@@ -1,13 +1,13 @@
-fastquadtree-0.9.0.dist-info/METADATA,sha256=gbM0cGlXDdWETud8HF1dmIOr6mYkDjOWglp777BQg5o,9243
-fastquadtree-0.9.0.dist-info/WHEEL,sha256=CG8OzNtm0LMpJ2zhrjswlO8N-965OeMLklsQAG-nMvQ,94
-fastquadtree-0.9.0.dist-info/licenses/LICENSE,sha256=46IVFhoCIwMo-ocq4olyEB1eBvvtaKic5yGLeKXnDuc,1092
+fastquadtree-0.9.1.dist-info/METADATA,sha256=kye0Fazqa8vr4j0YDt2dW-dhl7HOW8_xhvZJjF1-k1Y,9243
+fastquadtree-0.9.1.dist-info/WHEEL,sha256=CG8OzNtm0LMpJ2zhrjswlO8N-965OeMLklsQAG-nMvQ,94
+fastquadtree-0.9.1.dist-info/licenses/LICENSE,sha256=46IVFhoCIwMo-ocq4olyEB1eBvvtaKic5yGLeKXnDuc,1092
 fastquadtree/__init__.py,sha256=jy7uimnd7QDllmNOgnRByKom1aONIKOWhCvCJxndsnM,200
 fastquadtree/_base_quadtree.py,sha256=sfHAvKsWbrBX6RSUNi32Lh0fxCu8D6hAnyp1-SJj0Ok,8676
 fastquadtree/_bimap.py,sha256=oNvJOk-BjYLo6aNJnG0i3uEQCq8FsUTGRE6c6_kVC2c,3439
 fastquadtree/_item.py,sha256=cXiKXCjCfOWK19LUbxnzvAx6xffejd3F1axxYR9SMeM,1400
-fastquadtree/_native.pyd,sha256=HbygXemNE8b2DXFAdo1jKODwij3_p5SCRQlayVYTrN8,264704
+fastquadtree/_native.pyd,sha256=_gxlEfX3srSGEOk64a8h1IlnxN7WUCAFPLO2Z7o68T4,264704
 fastquadtree/point_quadtree.py,sha256=Xs2Igat4ekewnMd2wHVYu0pm7f7duvLdEcm_DUrO2B4,5744
 fastquadtree/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastquadtree/pyqtree.py,sha256=7vgxL3ilfkw3XwYVdutHfxSkH00SasZUIERqDes7YBo,4809
+fastquadtree/pyqtree.py,sha256=bkxjgj61f5UL2jN_INgvqGtbKWJCA9DJfeufJyI19OM,4856
 fastquadtree/rect_quadtree.py,sha256=jGt3ThbKKu4VsrdiLfsWuyyFIJRv2g_kJYOubO2FVeA,3619
-fastquadtree-0.9.0.dist-info/RECORD,,
+fastquadtree-0.9.1.dist-info/RECORD,,