librtree 1.0.2 → 1.0.4

data/ext/rtree/lib/{csv.h → private/csv.h}

@@ -1,16 +1,16 @@
 /*
-  csv.h
+  private/csv.h
   Copyright (c) J.J. Green 2020
 */
 
-#ifndef CSV_H
-#define CSV_H
-
-#include <stdio.h>
+#ifndef PRIVATE_CSV_H
+#define PRIVATE_CSV_H
 
 #include <rtree.h>
 #include <rtree/state.h>
 
+#include <stdio.h>
+
 rtree_t* csv_rtree_read(FILE*, size_t, state_flags_t);
 
 #endif

data/ext/rtree/lib/{endianness.h → private/endianness.h}

@@ -1,9 +1,5 @@
 /*
-  endian.h
-
-  This is an "internal" header, it is not used by any public headers
-  and not installed; it handles the messing around that you need to
-  do to get endinannes functions even close to portable.
+  private/endianness.h
 
   This is largely from https://github.com/mikepb/endian.h which is
   based on a Gist by Mathias Panzenböck, those are both released into
@@ -19,11 +15,11 @@
   Copyright (c) J.J. Green 2020
 */
 
-#ifndef ENDIANNESS_H
-#define ENDIANNESS_H
+#ifndef PRIVATE_ENDIANNESS_H
+#define PRIVATE_ENDIANNESS_H
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #if defined HAVE_ENDIAN_H

data/ext/rtree/lib/{json.h → private/json.h}

@@ -1,15 +1,15 @@
 /*
-  json.h
+  private/json.h
   Copyright (c) J.J. Green 2019
 */
 
-#ifndef JSON_H
-#define JSON_H
-
-#include <stdio.h>
+#ifndef PRIVATE_JSON_H
+#define PRIVATE_JSON_H
 
 #include <rtree.h>
 
+#include <stdio.h>
+
 int json_rtree_write(const rtree_t*, FILE*);
 rtree_t* json_rtree_read(FILE*);
 

data/ext/rtree/lib/private/node.h

@@ -0,0 +1,86 @@
+/*
+  node.h
+  Copyright (c) J.J. Green 2023
+*/
+
+#ifndef NODE_H
+#define NODE_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+
+typedef uint16_t node_level_t;
+typedef uint16_t node_count_t;
+typedef uint16_t node_height_t;
+
+#define NODE_LEVEL_MAX UINT16_MAX
+#define NODE_COUNT_MAX UINT16_MAX
+
+typedef struct node_t node_t;
+
+#include <private/branch.h>
+#include <private/state.h>
+
+#include <rtree/node.h>
+#include <rtree/types.h>
+
+struct node_t
+{
+  node_level_t level;
+  node_count_t count;
+  char branches[];
+};
+
+typedef int (nbe_cb_t)(const state_t*, const branch_t*, void*);
+
+int node_init(const state_t*, node_t*);
+node_t* node_new(const state_t*);
+void node_destroy(const state_t*, node_t*);
+node_t* node_clone(const state_t*, const node_t*);
+int node_branch_each(const state_t*, const node_t*, nbe_cb_t*, void*);
+int node_branch_each_level(const state_t*, const node_t*, node_level_t,
+                           nbe_cb_t*, void*);
+size_t node_num_branch(size_t, size_t);
+int node_detach_branch(const state_t*, node_t*, size_t);
+node_t* node_add_branch(const state_t*, node_t*, branch_t*);
+int node_envelope(const state_t*, const node_t*, rtree_coord_t*);
+node_t* node_add_rect(const state_t*, rtree_id_t, rtree_coord_t*,
+                      node_t*, node_level_t);
+int node_update(const state_t*, const node_t*, rtree_update_t*, void*);
+bool node_identical(const state_t*, const node_t*, const node_t*);
+node_height_t node_height(const state_t*, const node_t*);
+size_t node_bytes(const state_t*, const node_t*);
+bool node_nonempty(const state_t*, const node_t*);
+
+inline node_count_t node_count(const node_t *node)
+{
+  return node->count;
+}
+
+inline void node_count_increment(node_t *node)
+{
+  node->count++;
+}
+
+inline void node_count_decrement(node_t *node)
+{
+  node->count--;
+}
+
+inline node_level_t node_level(const node_t *node)
+{
+  return node->level;
+}
+
+inline void node_set_level(node_t *node, node_level_t level)
+{
+  node->level = level;
+}
+
+inline void* node_get_branches(node_t *node)
+{
+  return node->branches;
+}
+
+#endif

data/ext/rtree/lib/private/page.h

@@ -0,0 +1,13 @@
+/*
+  private/page.h
+  Copyright (c) J.J. Green 2019
+*/
+
+#ifndef PRIVATE_PAGE_H
+#define PRIVATE_PAGE_H
+
+#include <stddef.h>
+
+int page_size(size_t*);
+
+#endif

data/ext/rtree/lib/private/postscript.h

@@ -0,0 +1,17 @@
+/*
+  private/postscript.h
+  Copyright (c) J.J. Green 2023
+*/
+
+#ifndef PRIVATE_POSTSCRIPT_H
+#define PRIVATE_POSTSCRIPT_H
+
+#include <private/node.h>
+#include <private/state.h>
+
+#include <rtree/postscript.h>
+
+int postscript_write(const state_t*, const node_t*,
+                     const rtree_postscript_t*, FILE*);
+
+#endif

data/ext/rtree/lib/{rtree → private}/rect.h

@@ -1,21 +1,17 @@
 /*
-  rtree/rect.h
+  private/rect.h
   Copyright (c) J.J. Green 2019
 */
 
-#ifndef RTREE_RECT_H
-#define RTREE_RECT_H
+#ifndef PRIVATE_RECT_H
+#define PRIVATE_RECT_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <private/state.h>
+#include <rtree/types.h>
 
-#include <stdlib.h>
+#include <stddef.h>
 #include <stdbool.h>
 
-#include <rtree/state.h>
-#include <rtree/types.h>
-
 int rect_init(const state_t*, rtree_coord_t*);
 
 rtree_coord_t rect_volume(const state_t*, const rtree_coord_t*);
@@ -31,8 +27,4 @@ bool rect_identical(const state_t*, const rtree_coord_t*, const rtree_coord_t*);
 int rects_alloc(const state_t*, size_t, rtree_coord_t**);
 void rects_free(size_t, rtree_coord_t**);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

data/ext/rtree/lib/{rtree → private}/rectf.h

@@ -1,26 +1,18 @@
 /*
-  rtree/rectf.h
+  private/rectf.h
   Copyright (c) J.J. Green 2022
 */
 
-#ifndef RTREE_RECTF_H
-#define RTREE_RECTF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef PRIVATE_RECTF_H
+#define PRIVATE_RECTF_H
 
 #include <rtree/types.h>
 #include <stddef.h>
 
-/* rect-spherical-volume */
-
 typedef rtree_coord_t (rectf_rsv_t)(size_t, const rtree_coord_t*);
 
 rectf_rsv_t* rectf_spherical_volume(size_t);
 
-/* rect-combine */
-
 typedef void (rectf_rc_t)(size_t,
                           const rtree_coord_t*,
                           const rtree_coord_t*,
@@ -28,7 +20,4 @@ typedef void (rectf_rc_t)(size_t,
 
 rectf_rc_t* rectf_combine(size_t);
 
-#ifdef __cplusplus
-}
-#endif
 #endif

data/ext/rtree/lib/private/rtree.h

@@ -0,0 +1,20 @@
+/*
+  private/rtree.h
+  Copyright (c) J.J. Green 2023
+*/
+
+#ifndef PRIVATE_RTREE_H
+#define PRIVATE_RTREE_H
+
+#include <private/state.h>
+#include <private/node.h>
+
+#include <rtree.h>
+
+struct rtree_t
+{
+  state_t *state;
+  node_t *root;
+};
+
+#endif

data/ext/rtree/lib/private/search.h

@@ -0,0 +1,20 @@
+/*
+  private/search.h
+  Copyright (c) J.J. Green 2023
+*/
+
+#ifndef PRIVATE_SEARCH_H
+#define PRIVATE_SEARCH_H
+
+#include <private/node.h>
+#include <private/state.h>
+#include <rtree/search.h>
+#include <rtree/types.h>
+
+int search(const state_t*,
+           const rtree_coord_t*,
+           const node_t*,
+           rtree_search_t*,
+           void*);
+
+#endif

data/ext/rtree/lib/private/split.h

@@ -0,0 +1,15 @@
+/*
+  private/split.h
+  Copyright (c) J.J. Green 2020
+*/
+
+#ifndef PRIVATE_SPLIT_H
+#define PRIVATE_SPLIT_H
+
+#include <private/branch.h>
+#include <private/node.h>
+#include <private/state.h>
+
+node_t* split_node(const state_t*, node_t*, branch_t*);
+
+#endif

data/ext/rtree/lib/{spvol.h → private/spvol.h}

@@ -1,10 +1,10 @@
 /*
-  spvol.h
+  private/spvol.h
   Copyright (c) J.J. Green 2020
 */
 
-#ifndef SPVOL_H
-#define SPVOL_H
+#ifndef PRIVATE_SPVOL_H
+#define PRIVATE_SPVOL_H
 
 #include <stddef.h>
 

data/ext/rtree/lib/private/state.h

@@ -0,0 +1,91 @@
+/*
+  private/state.h
+  Copyright (c) J.J. Green 2023
+*/
+
+#ifndef PRIVATE_STATE_H
+#define PRIVATE_STATE_H
+
+#include <private/rectf.h>
+
+#include <rtree/state.h>
+#include <rtree/types.h>
+
+#include <stddef.h>
+#include <stdbool.h>
+
+typedef struct
+{
+  size_t dims, factor;
+  rtree_coord_t volume;
+  struct {
+    size_t page, branch, node;
+  } size;
+  struct {
+    rectf_rsv_t *spherical_volume;
+    rectf_rc_t *combine;
+  } rectf;
+  state_flags_t flags;
+} state_t;
+
+state_t* state_new(size_t, state_flags_t);
+state_t* state_clone(const state_t*);
+void state_destroy(state_t*);
+state_flags_t state_split(const state_t*);
+state_flags_t state_node_page(const state_t*);
+bool state_identical(const state_t*, const state_t*);
+
+inline rtree_coord_t state_rsv(const state_t *state, const rtree_coord_t *rect)
+{
+  return state->rectf.spherical_volume(state->dims, rect) * state->volume;
+}
+
+inline void state_rc(const state_t *state,
+                     const rtree_coord_t *rect0,
+                     const rtree_coord_t *rect1,
+                     rtree_coord_t *rect2)
+{
+  state->rectf.combine(state->dims, rect0, rect1, rect2);
+}
+
+inline size_t state_dims(const state_t *state)
+{
+  return state->dims;
+}
+
+inline size_t state_branch_size(const state_t *state)
+{
+  return state->size.branch;
+}
+
+inline size_t state_page_size(const state_t *state)
+{
+  return state->size.page;
+}
+
+inline size_t state_node_size(const state_t *state)
+{
+  return state->size.node;
+}
+
+inline size_t state_rect_size(const state_t *state)
+{
+  return state_dims(state) * 2 * sizeof(rtree_coord_t);
+}
+
+inline size_t state_branching_factor(const state_t *state)
+{
+  return state->factor;
+}
+
+inline double state_unit_sphere_volume(const state_t *state)
+{
+  return state->volume;
+}
+
+inline size_t state_bytes(const state_t *state)
+{
+  return (state ? sizeof(state_t) : 0);
+}
+
+#endif

data/ext/rtree/lib/rect.c

@@ -2,7 +2,9 @@
 #include "config.h"
 #endif
 
-#include "rtree/rect.h"
+#include "private/rect.h"
+#include "private/state.h"
+
 #include "rtree/error.h"
 
 #ifdef HAVE_TGMATH_H
@@ -17,6 +19,7 @@
 
 #include <string.h>
 #include <errno.h>
+#include <stdlib.h>
 
 int rect_init(const state_t *state, rtree_coord_t *rect)
 {

data/ext/rtree/lib/rectf.c

@@ -2,7 +2,7 @@
 #include "config.h"
 #endif
 
-#include "rtree/rectf.h"
+#include "private/rectf.h"
 
 #ifdef HAVE_TGMATH_H
 #include <tgmath.h>

data/ext/rtree/lib/rtree/node.h

@@ -8,86 +8,11 @@
 
 #ifdef __cplusplus
 extern "C" {
-#if 0
-}
-#endif
 #endif
 
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-
-typedef uint16_t node_level_t;
-typedef uint16_t node_count_t;
-typedef uint16_t node_height_t;
-
-#define NODE_LEVEL_MAX UINT16_MAX
-#define NODE_COUNT_MAX UINT16_MAX
-
-typedef struct node_t node_t;
-
 #include <rtree/types.h>
-#include <rtree/state.h>
-#include <rtree/branch.h>
-
-struct node_t
-{
-  node_level_t level;
-  node_count_t count;
-  char branches[];
-};
 
 typedef int (rtree_update_t)(rtree_id_t, rtree_coord_t*, void*);
-typedef int (nbe_cb_t)(const state_t*, const branch_t*, void*);
-
-int node_init(const state_t*, node_t*);
-node_t* node_new(const state_t*);
-void node_destroy(const state_t*, node_t*);
-node_t* node_clone(const state_t*, const node_t*);
-int node_branch_each(const state_t*, const node_t*, nbe_cb_t*, void*);
-int node_branch_each_level(const state_t*, const node_t*, node_level_t,
-                           nbe_cb_t*, void*);
-size_t node_num_branch(size_t, size_t);
-int node_detach_branch(const state_t*, node_t*, size_t);
-node_t* node_add_branch(const state_t*, node_t*, branch_t*);
-int node_envelope(const state_t*, const node_t*, rtree_coord_t*);
-node_t* node_add_rect(const state_t*, rtree_id_t, rtree_coord_t*,
-                      node_t*, node_level_t);
-int node_update(const state_t*, const node_t*, rtree_update_t*, void*);
-bool node_identical(const state_t*, const node_t*, const node_t*);
-node_height_t node_height(const state_t*, const node_t*);
-size_t node_bytes(const state_t*, const node_t*);
-bool node_nonempty(const state_t*, const node_t*);
-
-inline node_count_t node_count(const node_t *node)
-{
-  return node->count;
-}
-
-inline void node_count_increment(node_t *node)
-{
-  node->count++;
-}
-
-inline void node_count_decrement(node_t *node)
-{
-  node->count--;
-}
-
-inline node_level_t node_level(const node_t *node)
-{
-  return node->level;
-}
-
-inline void node_set_level(node_t *node, node_level_t level)
-{
-  node->level = level;
-}
-
-inline void* node_get_branches(node_t *node)
-{
-  return node->branches;
-}
 
 #ifdef __cplusplus
 }

data/ext/rtree/lib/rtree/postscript.h

@@ -10,54 +10,52 @@
 extern "C" {
 #endif
 
-typedef struct rtree_postscript_t rtree_postscript_t;
+#include <rtree/extent.h>
 
 #include <stdio.h>
-#include <rtree/node.h>
-#include <rtree/extent.h>
 
-typedef enum
-  { model_none, model_grey, model_rgb, model_cmyk }
-  colour_model_t;
+typedef enum {
+  model_none,
+  model_grey,
+  model_rgb,
+  model_cmyk
+} postscript_colour_model_t;
 
 typedef struct {
-  colour_model_t model;
+  postscript_colour_model_t model;
   union {
     float grey[1];
     float rgb[3];
     float cmyk[4];
   };
-} colour_t;
+} postscript_colour_t;
 
 typedef struct {
   struct {
-    colour_t colour;
+    postscript_colour_t colour;
   } fill;
   struct {
-    colour_t colour;
+    postscript_colour_t colour;
     float width;
   } stroke;
-} style_level_t;
+} postscript_style_level_t;
 
 typedef struct {
   size_t n;
-  style_level_t *array;
-} style_t;
+  postscript_style_level_t *array;
+} postscript_style_t;
 
-style_t* postscript_style_read(FILE*);
-void postscript_style_destroy(style_t*);
+postscript_style_t* postscript_style_read(FILE*);
+void postscript_style_destroy(postscript_style_t*);
 
-struct rtree_postscript_t
+typedef struct rtree_postscript_t
 {
-  const style_t *style;
+  const postscript_style_t *style;
   extent_axis_t axis;
   float extent;
   float margin;
   const char *title;
-};
-
-int postscript_write(const state_t*, const node_t*,
-                     const rtree_postscript_t*, FILE*);
+} rtree_postscript_t;
 
 #ifdef __cplusplus
 }

data/ext/rtree/lib/rtree/search.h

@@ -10,16 +10,10 @@
 extern "C" {
 #endif
 
-#include <rtree/node.h>
 #include <rtree/types.h>
-#include <rtree/state.h>
 
 typedef int (rtree_search_t)(rtree_id_t, void*);
 
-int search(const state_t*,
-           const rtree_coord_t*, const node_t*,
-           rtree_search_t*, void*);
-
 #ifdef __cplusplus
 }
 #endif