fastquadtree 1.1.0__tar.gz → 1.1.2__tar.gz

{fastquadtree-1.1.0 → fastquadtree-1.1.2}/Cargo.lock

@@ -10,7 +10,7 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "fastquadtree"
-version = "1.1.0"
+version = "1.1.2"
 dependencies = [
  "numpy",
  "pyo3",

{fastquadtree-1.1.0 → fastquadtree-1.1.2}/Cargo.toml

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

{fastquadtree-1.1.0 → fastquadtree-1.1.2}/PKG-INFO

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

{fastquadtree-1.1.0 → fastquadtree-1.1.2}/pysrc/fastquadtree/pyqtree.py

@@ -40,7 +40,7 @@ class Index:
     Based on the benchmarks, this gives a overall performance boost of 6.514x.
     See the benchmark section of the docs for more details and the latest numbers.
 
-
+    Original docstring from pyqtree follows:
     The top spatial index to be created by the user. Once created it can be
     populated with geographically placed members that can later be tested for
     intersection with a user inputted geographic bounding box. Note that the
@@ -122,6 +122,9 @@ 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)
         """
+        if type(bbox) is list:  # Handle list input
+            bbox = tuple(bbox)
+
         if self._free:
             rid = self._free.pop()
             self._objects[rid] = item
@@ -141,6 +144,9 @@ class Index:
 
         Both parameters need to exactly match the parameters provided to the insert method.
         """
+        if type(bbox) is list:  # Handle list input
+            bbox = tuple(bbox)
+
         rid = self._item_to_id.pop(id(item))
         self._qt.delete(rid, bbox)
         self._objects[rid] = None
@@ -157,6 +163,8 @@ class Index:
         Returns:
         - A list of inserted items whose bounding boxes intersect with the input bbox.
         """
+        if type(bbox) is list:  # Handle list input
+            bbox = tuple(bbox)
         result = self._qt.query_ids(bbox)
         # result = [id1, id2, ...]
         return gather_objs(self._objects, result)

{fastquadtree-1.1.0 → fastquadtree-1.1.2}/tests/test_pyqtree_shim_compat.py

@@ -343,3 +343,61 @@ def test_dense_targets_along_partition_lines_match_pyqtree():
     ]
     for q in thin_queries:
         results_match_exact(fqt, pyq, q)
+
+
+def test_query_list_and_tuple_equivalence():
+    """Test that both list and tuple inputs for bbox work the same."""
+    idx = FQTIndex(bbox=WORLD)
+
+    obj1, box1 = "obj1", (10.0, 10.0, 20.0, 20.0)
+    obj2, box2 = "obj2", (30.0, 30.0, 40.0, 40.0)
+
+    idx.insert(obj1, box1)
+    idx.insert(obj2, box2)
+
+    query_tuple = (15.0, 15.0, 25.0, 25.0)
+    query_list = [15.0, 15.0, 25.0, 25.0]
+
+    results_from_tuple = idx.intersect(query_tuple)
+    results_from_list = idx.intersect(query_list)
+
+    assert results_from_tuple == results_from_list == [obj1]
+
+
+def test_remove_list_and_tuple_equivalence():
+    """Test that both list and tuple inputs for bbox work the same in remove."""
+    idx = FQTIndex(bbox=WORLD)
+
+    obj1, box1 = "obj1", (10.0, 10.0, 20.0, 20.0)
+    obj2, box2 = "obj2", (30.0, 30.0, 40.0, 40.0)
+
+    idx.insert(obj1, box1)
+    idx.insert(obj2, box2)
+
+    # Remove using tuple
+    idx.remove(obj1, box1)
+
+    # Remove using list
+    box2_list = [30.0, 30.0, 40.0, 40.0]
+    idx.remove(obj2, box2_list)
+
+    # Both objects should be removed
+    assert idx.intersect((0.0, 0.0, 100.0, 100.0)) == []
+
+
+def test_insert_list_and_tuple_equivalence():
+    """Test that both list and tuple inputs for bbox work the same in insert."""
+    idx = FQTIndex(bbox=WORLD)
+
+    obj1, box1 = "obj1", (10.0, 10.0, 20.0, 20.0)
+    obj2, box2 = "obj2", [30.0, 30.0, 40.0, 40.0]  # box2 as list
+
+    # Insert using tuple
+    idx.insert(obj1, box1)
+
+    # Insert using list
+    idx.insert(obj2, box2)
+
+    # Both objects should be present
+    results = idx.intersect((0.0, 0.0, 100.0, 100.0))
+    assert set(results) == {obj1, obj2}