[postgis-commits] svn - r2841 - in trunk: liblwgeom lwgeom

[postgis-commits at postgis.refractions.net]

Author: mcayland
Date: 2008-07-13 10:33:19 -0700 (Sun, 13 Jul 2008)
New Revision: 2841

Modified:
   trunk/liblwgeom/liblwgeom.h
   trunk/liblwgeom/lwgeom.c
   trunk/lwgeom/lwgeom_inout.c
   trunk/lwgeom/lwgeom_ogc.c
   trunk/lwgeom/lwgeom_pg.c
Log:
Rename the new parser function ewkt_to_lwgeom() to lwgeon_from_ewkt() so that it matches the rest of the parser API

Modified: trunk/liblwgeom/liblwgeom.h
===================================================================
--- trunk/liblwgeom/liblwgeom.h	2008-07-13 11:09:34 UTC (rev 2840)
+++ trunk/liblwgeom/liblwgeom.h	2008-07-13 17:33:19 UTC (rev 2841)
@@ -1115,8 +1115,8 @@
 extern void deparse_hex(uchar str, char *result);
 
 /* Parser access routines */
-extern SERIALIZED_LWGEOM *ewkt_to_lwgeom(char *wkt_input);
 extern char *lwgeom_to_ewkt(LWGEOM *lwgeom);
+extern SERIALIZED_LWGEOM *lwgeom_from_ewkt(char *wkt_input);
 extern char *lwgeom_to_hexwkb(LWGEOM *lwgeom, unsigned int byteorder);
 extern LWGEOM *lwgeom_from_ewkb(uchar *ewkb, size_t ewkblen);
 extern uchar *lwgeom_to_ewkb(LWGEOM *lwgeom, char byteorder, size_t *ewkblen);

Modified: trunk/liblwgeom/lwgeom.c
===================================================================
--- trunk/liblwgeom/lwgeom.c	2008-07-13 11:09:34 UTC (rev 2840)
+++ trunk/liblwgeom/lwgeom.c	2008-07-13 17:33:19 UTC (rev 2841)
@@ -457,17 +457,17 @@
  * Make a LWGEOM object from a WKT input string
  */
 SERIALIZED_LWGEOM *
-ewkt_to_lwgeom(char *wkt_input)
+lwgeom_from_ewkt(char *wkt_input)
 {
 	SERIALIZED_LWGEOM *serialized_form = parse_lwg(wkt_input,
 		lwalloc, lwerror);
 
 
-	LWDEBUGF(2, "ewkt_to_lwgeom with %s",wkt_input);
+	LWDEBUGF(2, "lwgeom_from_ewkt with %s",wkt_input);
 
 	if (serialized_form == NULL)
 	{
-		lwerror("ewkt_to_lwgeom:: couldnt parse!");
+		lwerror("lwgeom_from_ewkt:: couldnt parse!");
 		return NULL;
 	}
 
@@ -543,7 +543,7 @@
 	hexewkb[hexewkblen] = '\0';
 
 	/* Rely on grammar parser to construct a LWGEOM */
-	serialized_lwgeom = ewkt_to_lwgeom(hexewkb);
+	serialized_lwgeom = lwgeom_from_ewkt(hexewkb);
 
 	/* Free intermediate HEXified representation */
 	lwfree(hexewkb);

Modified: trunk/lwgeom/lwgeom_inout.c
===================================================================
--- trunk/lwgeom/lwgeom_inout.c	2008-07-13 11:09:34 UTC (rev 2840)
+++ trunk/lwgeom/lwgeom_inout.c	2008-07-13 17:33:19 UTC (rev 2841)
@@ -68,7 +68,7 @@
     PG_LWGEOM *ret;
 
 	/* will handle both HEXEWKB and EWKT */
-    serialized_lwgeom = ewkt_to_lwgeom(str);
+    serialized_lwgeom = lwgeom_from_ewkt(str);
 	lwgeom = lwgeom_deserialize(serialized_lwgeom->lwgeom);
     
     ret = pglwgeom_serialize(lwgeom);
@@ -476,7 +476,7 @@
 
 	POSTGIS_DEBUGF(3, "in parse_WKT_lwgeom with input: '%s'",wkt);
 
-	serialized_lwgeom = ewkt_to_lwgeom(wkt);
+	serialized_lwgeom = lwgeom_from_ewkt(wkt);
 	lwgeom = lwgeom_deserialize(serialized_lwgeom->lwgeom);
     
 	ret = pglwgeom_serialize(lwgeom);

Modified: trunk/lwgeom/lwgeom_ogc.c
===================================================================
--- trunk/lwgeom/lwgeom_ogc.c	2008-07-13 11:09:34 UTC (rev 2840)
+++ trunk/lwgeom/lwgeom_ogc.c	2008-07-13 17:33:19 UTC (rev 2841)
@@ -1002,7 +1002,7 @@
 
 	POSTGIS_DEBUGF(3, "wkt: [%s]", wkt);
 
-	serialized_lwgeom = ewkt_to_lwgeom(wkt);
+	serialized_lwgeom = lwgeom_from_ewkt(wkt);
 	lwgeom = lwgeom_deserialize(serialized_lwgeom->lwgeom);
 
 	if ( lwgeom->SRID != -1 || TYPE_GETZM(lwgeom->type) != 0 )

Modified: trunk/lwgeom/lwgeom_pg.c
===================================================================
--- trunk/lwgeom/lwgeom_pg.c	2008-07-13 11:09:34 UTC (rev 2840)
+++ trunk/lwgeom/lwgeom_pg.c	2008-07-13 17:33:19 UTC (rev 2841)
@@ -264,7 +264,7 @@
 	}
 	hexewkb[hexewkblen] = '\0';
 
-    serialized_lwgeom = ewkt_to_lwgeom(hexewkb);
+    serialized_lwgeom = lwgeom_from_ewkt(hexewkb);
     
     ret = (PG_LWGEOM *)palloc(serialized_lwgeom->size + VARHDRSZ);
     SET_VARSIZE(ret, serialized_lwgeom->size + VARHDRSZ);