Changeset: f37bf1a5b38f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f37bf1a5b38f
Modified Files:
geom/lib/libgeom.c
Branch: Jun2016
Log Message:
Ran indent.
diffs (160 lines):
diff --git a/geom/lib/libgeom.c b/geom/lib/libgeom.c
--- a/geom/lib/libgeom.c
+++ b/geom/lib/libgeom.c
@@ -18,19 +18,25 @@
#include <math.h>
-void libgeom_init(void) {
+void
+libgeom_init(void)
+{
initGEOS((GEOSMessageHandler) GDKerror, (GEOSMessageHandler) GDKerror);
GEOS_setWKBByteOrder(1); /* NDR (little endian) */
printf("# MonetDB/GIS module loaded\n");
fflush(stdout); /* make merovingian see this *now* */
}
-void libgeom_exit(void) {
+void
+libgeom_exit(void)
+{
finishGEOS();
}
-int wkb_isnil(wkb *w) {
- if (!w ||w->len == ~0)
+int
+wkb_isnil(wkb *w)
+{
+ if (!w || w->len == ~0)
return 1;
return 0;
}
@@ -40,10 +46,13 @@ int wkb_isnil(wkb *w) {
* Creates an mbr holding the lower left and upper right coordinates
* of a GEOSGeom.
*/
-/*int getMbrGeos(mbr *res, const GEOSGeom geosGeometry) {
+/*
+int
+getMbrGeos(mbr *res, const GEOSGeom geosGeometry)
+{
GEOSGeom envelope;
//int coordinatesNum = 0;
- double xmin=0, ymin=0, xmax=0, ymax=0;
+ double xmin = 0, ymin = 0, xmax = 0, ymax = 0;
if (!geosGeometry || (envelope = GEOSEnvelope(geosGeometry)) == NULL)
return 0;
@@ -93,26 +102,30 @@ int wkb_isnil(wkb *w) {
}
GEOSGeom_destroy(envelope);
return 1;
-}*/
+}
+*/
-GEOSGeom wkb2geos(wkb* geomWKB) {
+GEOSGeom
+wkb2geos(wkb *geomWKB)
+{
GEOSGeom geosGeometry;
-
- if(wkb_isnil(geomWKB))
+
+ if (wkb_isnil(geomWKB))
return NULL;
-
- geosGeometry = GEOSGeomFromWKB_buf((unsigned char *)((geomWKB)->data),
(geomWKB)->len);
- if(geosGeometry != NULL)
+ geosGeometry = GEOSGeomFromWKB_buf((unsigned char *) ((geomWKB)->data),
(geomWKB)->len);
+
+ if (geosGeometry != NULL)
GEOSSetSRID(geosGeometry, (geomWKB)->srid);
-
+
return geosGeometry;
}
/* Function getMbrGeom
* A wrapper for getMbrGeos on a geom_geometry.
*/
-/*int
+/*
+int
getMbrGeom(mbr *res, wkb *geom)
{
GEOSGeom geosGeometry = wkb2geos(geom);
@@ -123,13 +136,16 @@ getMbrGeom(mbr *res, wkb *geom)
return r;
}
return 0;
-}*/
+}
+*/
-const char* geom_type2str(int t, int flag){
- if(flag == 0) {
+const char *
+geom_type2str(int t, int flag)
+{
+ if (flag == 0) {
switch (t) {
//case wkbGeometry:
- // return "GEOMETRY";
+ // return "GEOMETRY";
case wkbPoint_mdb:
return "POINT";
case wkbLineString_mdb:
@@ -146,12 +162,11 @@ const char* geom_type2str(int t, int fla
return "MULTIPOLYGON";
case wkbGeometryCollection_mdb:
return "GEOMETRYCOLLECTION";
- }
- }
- else if(flag == 1) {
+ }
+ } else if (flag == 1) {
switch (t) {
//case wkbGeometry:
- // return "ST_Geometry";
+ // return "ST_Geometry";
case wkbPoint_mdb:
return "ST_Point";
case wkbLineString_mdb:
@@ -175,18 +190,21 @@ const char* geom_type2str(int t, int fla
/*
-str geomerty_2_geometry(wkb *res, wkb **geom, int* columnType, int*
columnSRID, int* valueSRID) {
+str
+geomerty_2_geometry(wkb *res, wkb **geom, int *columnType, int *columnSRID,
int *valueSRID)
+{
-//char* geomStr;
-//int len = 0;
-//fprintf(stderr, "geometry_2_geometry\n");
-//wkbTOSTR(&geomStr, &len, *geom);
-if(*geom != NULL)
-fprintf(stderr, "type:%d - wkbTOSTR cannot be seen at this point\n",
*columnType);
+ //char* geomStr;
+ //int len = 0;
+ //fprintf(stderr, "geometry_2_geometry\n");
+ //wkbTOSTR(&geomStr, &len, *geom);
+ if (*geom != NULL)
+ fprintf(stderr, "type:%d - wkbTOSTR cannot be seen at this
point\n", *columnType);
-if(res == NULL)
- fprintf(stderr, "-> ");
+ if (res == NULL)
+ fprintf(stderr, "-> ");
- fprintf(stderr, "%d vs %d\n", *columnSRID, *valueSRID);
- return "0";
-}*/
+ fprintf(stderr, "%d vs %d\n", *columnSRID, *valueSRID);
+ return "0";
+}
+*/
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
