From: Regina Obe <lr@pcorp.us>
Date: Sun, 12 May 2013 02:27:58 +0000 (+0000)
Subject: #1898, #2322 move geos functions in lwtin.c to lwgeom_geos.c  to prevent unhealthy... 
X-Git-Tag: 2.1.0beta2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6c8cb8f3ca966728881ceb84ccd8dadc11ae5fe;p=postgis

#1898, #2322 move geos functions in lwtin.c to lwgeom_geos.c  to prevent unhealthy dependency on geos (for loader tools and also image generator), roll back change to cunit for loader (the geos includes). bump up version number to beta2dev

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

diff --git a/Version.config b/Version.config
index f54903211..3ca74384d 100644
--- a/Version.config
+++ b/Version.config
@@ -5,5 +5,5 @@
 
 POSTGIS_MAJOR_VERSION=2
 POSTGIS_MINOR_VERSION=1
-POSTGIS_MICRO_VERSION=0beta1
+POSTGIS_MICRO_VERSION=0beta2dev
 
diff --git a/extensions/upgradeable_versions.mk b/extensions/upgradeable_versions.mk
index 49c34ed57..8c0d4cd91 100644
--- a/extensions/upgradeable_versions.mk
+++ b/extensions/upgradeable_versions.mk
@@ -3,4 +3,5 @@ UPGRADEABLE_VERSIONS = \
     2.0.1 \
     2.0.2 \
     2.0.3 \
-    2.1.0SVN
+    2.1.0SVN \
+	2.1.0beta1
diff --git a/liblwgeom/lwgeom_geos.c b/liblwgeom/lwgeom_geos.c
index 50bdba9c5..f627fa08b 100644
--- a/liblwgeom/lwgeom_geos.c
+++ b/liblwgeom/lwgeom_geos.c
@@ -1300,6 +1300,68 @@ lwgeom_offsetcurve(const LWLINE *lwline, double size, int quadsegs, int joinStyl
 #endif /* POSTGIS_GEOS_VERSION < 32 */
 }
 
+LWTIN *lwtin_from_geos(const GEOSGeometry *geom, int want3d) {
+	int type = GEOSGeomTypeId(geom);
+	int hasZ;
+	int SRID = GEOSGetSRID(geom);
+
+	/* GEOS's 0 is equivalent to our unknown as for SRID values */
+	if ( SRID == 0 ) SRID = SRID_UNKNOWN;
+
+	if ( want3d ) {
+		hasZ = GEOSHasZ(geom);
+		if ( ! hasZ ) {
+			LWDEBUG(3, "Geometry has no Z, won't provide one");
+			want3d = 0;
+		}
+	}
+
+	switch (type) {
+		LWTRIANGLE **geoms;
+		uint32_t i, ngeoms;
+	case GEOS_GEOMETRYCOLLECTION:
+		LWDEBUG(4, "lwgeom_from_geometry: it's a Collection or Multi");
+
+		ngeoms = GEOSGetNumGeometries(geom);
+		geoms = NULL;
+		if ( ngeoms ) {
+			geoms = lwalloc(ngeoms * sizeof *geoms);
+			if (!geoms) {
+				lwerror("lwtin_from_geos: can't allocate geoms");
+				return NULL;
+			}
+			for (i=0; i<ngeoms; i++) {
+				const GEOSGeometry *poly, *ring;
+				const GEOSCoordSequence *cs;
+				POINTARRAY *pa;
+
+				poly = GEOSGetGeometryN(geom, i);
+				ring = GEOSGetExteriorRing(poly);
+				cs = GEOSGeom_getCoordSeq(ring);
+				pa = ptarray_from_GEOSCoordSeq(cs, want3d);
+
+				geoms[i] = lwtriangle_construct(SRID, NULL, pa);
+			}
+		}
+		return (LWTIN *)lwcollection_construct(TINTYPE, SRID, NULL, ngeoms, (LWGEOM **)geoms);
+	case GEOS_POLYGON:
+	case GEOS_MULTIPOINT:
+	case GEOS_MULTILINESTRING:
+	case GEOS_MULTIPOLYGON:
+	case GEOS_LINESTRING:
+	case GEOS_LINEARRING:
+	case GEOS_POINT:
+		lwerror("lwtin_from_geos: invalid geometry type for tin: %d", type);
+		break;
+
+	default:
+		lwerror("GEOS2LWGEOM: unknown geometry type: %d", type);
+		return NULL;
+	}
+
+	/* shouldn't get here */
+	return NULL;
+}
 /*
  * output = 1 for edges, 2 for TIN, 0 for polygons
  */
diff --git a/liblwgeom/lwtin.c b/liblwgeom/lwtin.c
index daf001204..b55ccc214 100644
--- a/liblwgeom/lwtin.c
+++ b/liblwgeom/lwtin.c
@@ -14,81 +14,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "lwgeom_geos.h"
 #include "liblwgeom_internal.h"
 #include "lwgeom_log.h"
 
-LWTIN *lwtin_from_geos(const GEOSGeometry *geom, int want3d);
-
 
 LWTIN* lwtin_add_lwtriangle(LWTIN *mobj, const LWTRIANGLE *obj)
 {
 	return (LWTIN*)lwcollection_add_lwgeom((LWCOLLECTION*)mobj, (LWGEOM*)obj);
 }
 
-LWTIN *lwtin_from_geos(const GEOSGeometry *geom, int want3d) {
-	int type = GEOSGeomTypeId(geom);
-	int hasZ;
-	int SRID = GEOSGetSRID(geom);
-
-	/* GEOS's 0 is equivalent to our unknown as for SRID values */
-	if ( SRID == 0 ) SRID = SRID_UNKNOWN;
-
-	if ( want3d ) {
-		hasZ = GEOSHasZ(geom);
-		if ( ! hasZ ) {
-			LWDEBUG(3, "Geometry has no Z, won't provide one");
-			want3d = 0;
-		}
-	}
-
-	switch (type) {
-		LWTRIANGLE **geoms;
-		uint32_t i, ngeoms;
-	case GEOS_GEOMETRYCOLLECTION:
-		LWDEBUG(4, "lwgeom_from_geometry: it's a Collection or Multi");
-
-		ngeoms = GEOSGetNumGeometries(geom);
-		geoms = NULL;
-		if ( ngeoms ) {
-			geoms = lwalloc(ngeoms * sizeof *geoms);
-			if (!geoms) {
-				lwerror("lwtin_from_geos: can't allocate geoms");
-				return NULL;
-			}
-			for (i=0; i<ngeoms; i++) {
-				const GEOSGeometry *poly, *ring;
-				const GEOSCoordSequence *cs;
-				POINTARRAY *pa;
-
-				poly = GEOSGetGeometryN(geom, i);
-				ring = GEOSGetExteriorRing(poly);
-				cs = GEOSGeom_getCoordSeq(ring);
-				pa = ptarray_from_GEOSCoordSeq(cs, want3d);
-
-				geoms[i] = lwtriangle_construct(SRID, NULL, pa);
-			}
-		}
-		return (LWTIN *)lwcollection_construct(TINTYPE, SRID, NULL, ngeoms, (LWGEOM **)geoms);
-	case GEOS_POLYGON:
-	case GEOS_MULTIPOINT:
-	case GEOS_MULTILINESTRING:
-	case GEOS_MULTIPOLYGON:
-	case GEOS_LINESTRING:
-	case GEOS_LINEARRING:
-	case GEOS_POINT:
-		lwerror("lwtin_from_geos: invalid geometry type for tin: %d", type);
-		break;
-
-	default:
-		lwerror("GEOS2LWGEOM: unknown geometry type: %d", type);
-		return NULL;
-	}
-
-	/* shouldn't get here */
-	return NULL;
-}
-
 void lwtin_free(LWTIN *tin)
 {
 	int i;
diff --git a/loader/cunit/Makefile.in b/loader/cunit/Makefile.in
index 017a48aae..ece86faee 100644
--- a/loader/cunit/Makefile.in
+++ b/loader/cunit/Makefile.in
@@ -11,10 +11,7 @@
 # **********************************************************************
 
 CC=@CC@
-GEOS_CFLAGS=@GEOS_CPPFLAGS@
-GEOS_LDFLAGS=@GEOS_LDFLAGS@ -lgeos_c
-
-CFLAGS=@CFLAGS@ @WARNFLAGS@ $(GEOS_CFLAGS)
+CFLAGS=@CFLAGS@ @WARNFLAGS@
 
 CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
 CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I..