fastquadtree 0.9.0__tar.gz → 0.9.1__tar.gz

{fastquadtree-0.9.0 → fastquadtree-0.9.1}/Cargo.lock

@@ -10,7 +10,7 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "fastquadtree"
-version = "0.9.0"
+version = "0.9.1"
 dependencies = [
  "pyo3",
  "smallvec",

{fastquadtree-0.9.0 → fastquadtree-0.9.1}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fastquadtree"
-version = "0.9.0"
+version = "0.9.1"
 edition = "2021"
 readme = "README.md"
 

{fastquadtree-0.9.0 → fastquadtree-0.9.1}/PKG-INFO

@@ -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 → fastquadtree-0.9.1}/pysrc/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]