Changeset: 7d29afa32be7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d29afa32be7
Modified Files:
geom/monetdb5/geom.c
Branch: Jun2016
Log Message:
Squash empty lines.
diffs (222 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -76,7 +76,6 @@ transformCoordSeq(int idx, int coordinat
if (pj_is_latlong(proj4_src))
degrees2radians(&x, &y, &z);
-
pj_transform(proj4_src, proj4_dst, 1, 0, &x, &y, &z);
errorNum = pj_get_errno_ref();
@@ -87,21 +86,17 @@ transformCoordSeq(int idx, int coordinat
throw(MAL, "geom.wkbTransform", "Couldn't transform
point (%f %f): %s\n", x, y, pj_strerrno(*errorNum));
}
-
/* check if the destination reference system is geographic and change
* the destination coordinates from radians to degrees */
if (pj_is_latlong(proj4_dst))
radians2degrees(&x, &y, &z);
-
GEOSCoordSeq_setX(*gcs_new, idx, x);
GEOSCoordSeq_setY(*gcs_new, idx, y);
if (coordinatesNum > 2)
GEOSCoordSeq_setZ(*gcs_new, idx, z);
-
-
return MAL_SUCCEED;
}
@@ -171,7 +166,6 @@ transformLine(GEOSCoordSeq *gcs_new, con
}
}
-
return MAL_SUCCEED;
}
@@ -320,7 +314,6 @@ projFromStr(char *projStr)
char *str;
projPJ result;
-
if (projStr == NULL)
return NULL;
@@ -381,7 +374,6 @@ wkbTransform(wkb **transformedWKB, wkb *
proj4_src = /*pj_init_plus */ projFromStr(*proj4_src_str);
proj4_dst = /*pj_init_plus */ projFromStr(*proj4_dst_str);
-
if (*geomWKB == NULL) {
pj_free(proj4_src);
pj_free(proj4_dst);
@@ -1010,7 +1002,6 @@ wkbSegmentize(wkb **outWKB, wkb **geomWK
return MAL_SUCCEED;
}
-
//gets a coord seq and moves it dx, dy, dz
static str
translateCoordSeq(int idx, int coordinatesNum, double dx, double dy, double
dz, const GEOSCoordSequence *gcs_old, GEOSCoordSequence **gcs_new)
@@ -1146,7 +1137,6 @@ translateLinearRing(GEOSGeometry **outGe
return MAL_SUCCEED;
}
-
static str
translatePolygon(GEOSGeometry **outGeometry, const GEOSGeometry *geosGeometry,
double dx, double dy, double dz)
{
@@ -1242,8 +1232,6 @@ translateGeometry(GEOSGeometry **outGeom
}
}
-
-
str
wkbTranslate(wkb **outWKB, wkb **geomWKB, dbl *dx, dbl *dy, dbl *dz)
{
@@ -1303,7 +1291,6 @@ wkbDelaunayTriangles(wkb **outWKB, wkb *
return MAL_SUCCEED;
}
-
str
wkbPointOnSurface(wkb **resWKB, wkb **geomWKB)
{
@@ -1561,7 +1548,6 @@ dumpPointsPolygon(BAT *idBAT, BAT *geomB
char *extraStr = ",";
int extraLength = 1;
-
//get the exterior ring of the polygon
exteriorRingGeometry = GEOSGetExteriorRing(geosGeometry);
if (!exteriorRingGeometry) {
@@ -1961,8 +1947,6 @@ wkbaFROMSTR_withSRID(char *fromStr, int
return (int) skipBytes;
}
-
-
/* create the WKB out of the GEOSGeometry
* It makes sure to make all checks before returning
* the input geosGeometry should not be altered by this function*/
@@ -2064,10 +2048,6 @@ mbrFromGeos(const GEOSGeom geosGeometry)
return geomMBR;
}
-
-
-
-
//Returns the wkb in a hex representation */
static char hexit[] = "0123456789ABCDEF";
@@ -2169,14 +2149,6 @@ wkbFromBinary(wkb **geomWKB, char **inSt
return MAL_SUCCEED;
}
-
-
-
-
-
-
-
-
str
mbrFromMBR(mbr **w, mbr **src)
{
@@ -2263,7 +2235,6 @@ wkbAsText(char **txt, wkb **geomWKB, int
size_t len2 = 0;
int digitsNum = 10; //MAX_INT = 2,147,483,647
-
//count the number of digits in srid
int tmp = (*geomWKB)->srid;
if (tmp < 0)
@@ -2564,7 +2535,6 @@ wkbBasicInt(int *out, wkb *geom, int (*f
return ret;
}
-
/* returns the type of the geometry as a string*/
str
wkbGeometryType(char **out, wkb **geomWKB, int *flag)
@@ -3120,7 +3090,6 @@ numPointsGeometry(unsigned int *out, con
}
}
-
/* Returns the number of points in a geometry */
str
wkbNumPoints(int *out, wkb **geom, int *check)
@@ -3528,7 +3497,6 @@ wkbIsRing(bit *out, wkb **geomWKB)
return MAL_SUCCEED;
}
-
str
wkbIsSimple(bit *out, wkb **geomWKB)
{
@@ -3683,7 +3651,6 @@ wkbDistance(dbl *out, wkb **a, wkb **b)
GEOSGeom ga = wkb2geos(*a);
GEOSGeom gb = wkb2geos(*b);
-
if (!ga && gb) {
GEOSGeom_destroy(gb);
*out = dbl_nil;
@@ -4918,7 +4885,6 @@ wkbIsnil(bit *r, wkb **v)
return MAL_SUCCEED;
}
-
/* COMMAND mbr
* Creates the mbr for the given geom_geometry.
*/
@@ -4989,7 +4955,6 @@ wkbTOSTR(char **geomWKT, int *len, wkb *
return (int) dstStrLen;
}
-
int
wkbFROMSTR(char *geomWKT, int *len, wkb **geomWKB)
{
@@ -5095,8 +5060,6 @@ wkbDEL(Heap *h, var_t *index)
HEAP_free(h, *index);
}
-
-
int
wkbLENGTH(wkb *p)
{
@@ -5111,7 +5074,6 @@ wkbHEAP(Heap *heap, size_t capacity)
HEAP_initialize(heap, capacity, 0, (int) sizeof(var_t));
}
-
/***********************************************/
/************* mbr type functions **************/
/***********************************************/
@@ -5306,7 +5268,6 @@ wkbaTOSTR(char **toStr, int *len, wkba *
sprintf(itemsNumStr, "%d", items);
dataSize = strlen(itemsNumStr);
-
//reserve space for an array with pointers to the partial strings, i.e.
for each wkbTOSTR
partialStrs = (char **) GDKzalloc(items * sizeof(char **));
//create the string version of each wkb
@@ -5668,7 +5629,6 @@ wkbContains_point_bat(bat *out, wkb **a,
wkb *geom = NULL;
str msg = NULL;
-
str err = NULL;
str geom_str = NULL;
char *str2, *token, *subtoken;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
