remove node_id function

Author: leo-collins

rstar-capi/include/rstar-capi.h

@@ -9,7 +9,6 @@ enum RTreeError {
   Success = 0,
   NullPointer = 1,
   InvalidDimension = 2,
-  NodeNotLeaf = 3,
 };
 typedef uint16_t RTreeError;
 
@@ -47,6 +46,4 @@ RTreeError rtree_node_envelope(const struct RTreeNodeH *node, double *min_out, d
 
 RTreeError rtree_node_free(struct RTreeNodeH *node);
 
-RTreeError rtree_node_id(const struct RTreeNodeH *node, size_t *id);
-
 RTreeError rtree_root_node(const struct RTreeH *tree, struct RTreeNodeH **node);

rstar-capi/src/error.rs

@@ -3,5 +3,4 @@ pub enum RTreeError {
     Success = 0,
     NullPointer = 1,
     InvalidDimension = 2,
-    NodeNotLeaf = 3,
 }

rstar-capi/src/node.rs

@@ -93,32 +93,6 @@ pub extern "C" fn rtree_node_children(
     RTreeError::Success
 }
 
-#[no_mangle]
-pub extern "C" fn rtree_node_id(node: *const RTreeNodeH, id: *mut usize) -> RTreeError {
-    if node.is_null() || id.is_null() {
-        return RTreeError::NullPointer;
-    }
-    let node_ref = unsafe { &*(node as *const NodeRef) };
-
-    let node_id = match node_ref {
-        NodeRef::ITreeNode(_) => return RTreeError::NodeNotLeaf,
-        NodeRef::Parent2D(_) | NodeRef::Parent3D(_) => {
-            return RTreeError::NodeNotLeaf
-        }
-        NodeRef::Node2D(ptr) => match unsafe { &**ptr } {
-            RTreeNode::Leaf(leaf) => leaf.data,
-            RTreeNode::Parent(_) => return RTreeError::NodeNotLeaf,
-        },
-        NodeRef::Node3D(ptr) => match unsafe { &**ptr } {
-            RTreeNode::Leaf(leaf) => leaf.data,
-            RTreeNode::Parent(_) => return RTreeError::NodeNotLeaf,
-        },
-    };
-
-    unsafe { *id = node_id };
-    RTreeError::Success
-}
-
 /// Writes the lower and upper corners of the AABB into `min_out` and `max_out`.
 fn write_aabb<const DIM: usize>(aabb: AABB<[f64; DIM]>, min_out: *mut f64, max_out: *mut f64) {
     let lower = aabb.lower();

rstar-capi/tests/test.c

@@ -153,28 +153,6 @@ bool test_nodes(void) {
         return false;
     }
 
-    // Get id of first child, which is a leaf node
-    size_t child_id = 0;
-    rtree_node_id(children[0], &child_id);
-    if (child_id != 1) {
-        fprintf(stderr, "Expected child id to be 1, got %zu\n", child_id);
-        rtree_node_children_free(children, nchildren);
-        rtree_node_free(root);
-        rtree_free(tree);
-        return false;
-    }
-
-    // Get id of second child, which is a leaf node
-    size_t child_id2 = 0;
-    rtree_node_id(children[1], &child_id2);
-    if (child_id2 != 2) {
-        fprintf(stderr, "Expected child id to be 2, got %zu\n", child_id2);
-        rtree_node_children_free(children, nchildren);
-        rtree_node_free(root);
-        rtree_free(tree);
-        return false;
-    }
-
     rtree_node_children_free(children, nchildren);
     rtree_node_free(root);
     rtree_free(tree);
@@ -200,20 +178,7 @@ bool test_root_node_id(void) {
         rtree_free(tree);
         return false;
     }
-
-    size_t root_id = 0;
-    RTreeError err = rtree_node_id(root, &root_id);
-    // Root node should not have an id, so expect NodeNotLeaf error
-    if (err == NodeNotLeaf) {
-        rtree_node_free(root);
-        rtree_free(tree);
-        return true;
-    } else {
-        fprintf(stderr, "Expected NodeNotLeaf error");
-        rtree_node_free(root);
-        rtree_free(tree);
-        return false;
-    }
+    return true;
 }
 
 bool test_rtree_1d(void) {