Changeset: 250579b90e18 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=250579b90e18
Modified Files:
geom/monetdb5/geom.c
Branch: geo
Log Message:
wkb to str also fixed to handle 3d
diffs (25 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -296,6 +296,9 @@ int wkbTOSTR(char **dst, int *len, wkb *
int dstStrLen = 3; /* "nil" */
GEOSGeom geosGeometry = wkb2geos(atom);
+
+dstStrLen = -1;
+dstStrLen = GEOSGeom_getCoordinateDimension(geosGeometry);
if (geosGeometry) {
size_t l;
wkt = GEOSGeomToWKT(geosGeometry);
@@ -1188,8 +1191,10 @@ geos2wkb(GEOSGeom geosGeometry)
unsigned char *w = NULL;
wkb *atom;
- if (geosGeometry != NULL)
+ if (geosGeometry != NULL){
+ GEOS_setWKBOutputDims(COORDINATES_NUM);
w = GEOSGeomToWKB_buf(geosGeometry, &wkbLen);
+ }
atom = GDKmalloc(wkb_size(wkbLen));
if (atom == NULL)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
