Added AUTOCACHE_BBOX variable, defaulting to 1.

git-svn-id: http://svn.osgeo.org/postgis/trunk@1195 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/Makefile.config b/Makefile.config
index 41558deb963bf14ed4a3baad3f6d679a05d40a4c..b4fa58ce3e7cb789d72177a86bb4c85e3452be85 100644 (file)
--- a/Makefile.config
+++ b/Makefile.config
@@ -41,6 +41,12 @@ GEOS_DIR ?= /usr/local
 #
 USE_STATS=1
 
+#
+# Set AUTOCACHE_BBOX to 0 if you want finer control over
+# bounding box computation and caching for your geometries.
+#
+AUTOCACHE_BBOX ?= 1
+
 #
 # Root of the PostgreSQL source tree 
 # If you are not building from within postgresql 'contrib' directory

diff --git a/lwgeom/Makefile b/lwgeom/Makefile
index db3c52ecd2186bbce6d7497f20e4635b0995086f..a51091bb55ff665035bd5a5382fce16e0043d167 100644 (file)
--- a/lwgeom/Makefile
+++ b/lwgeom/Makefile
@@ -60,6 +60,8 @@ ifeq ($(USE_PROJ),1)
        override CFLAGS += -I$(PROJ_DIR)/include -DUSE_PROJ 
 endif
 
+override CFLAGS += -I$(PROJ_DIR)/include -DAUTOCACHE_BBOX=$(AUTOCACHE_BBOX) 
+
 override DLLLIBS += $(BE_DLLLIBS) 
 
 override CXXFLAGS := $(CFLAGS)

diff --git a/lwgeom/lwgeom_inout.c b/lwgeom/lwgeom_inout.c
index b50e1355f1bce0c1d0cbb302040b10f16cf1f41a..770579add36b8d1a66727778814a811e5a71fb64 100644 (file)
--- a/lwgeom/lwgeom_inout.c
+++ b/lwgeom/lwgeom_inout.c
@@ -335,6 +335,9 @@ Datum LWGEOM_addBBOX(PG_FUNCTION_ARGS)
 char
 is_worth_caching_pglwgeom_bbox(PG_LWGEOM *in)
 {
+#if ! AUTOCACHE_BBOX
+       return false;
+#endif
        if ( TYPE_GETTYPE(in->type) == POINTTYPE ) return false;
        return true;
 }
@@ -342,6 +345,9 @@ is_worth_caching_pglwgeom_bbox(PG_LWGEOM *in)
 char
 is_worth_caching_lwgeom_bbox(LWGEOM *in)
 {
+#if ! AUTOCACHE_BBOX
+       return false;
+#endif
        if ( TYPE_GETTYPE(in->type) == POINTTYPE ) return false;
        return true;
 }