MonetDB: geo - minor changes on the names format

[Foteini Alvanaki]

Changeset: 1ffb2f22f668 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1ffb2f22f668
Modified Files:
        geom/monetdb5/geom.c
        geom/monetdb5/geom.mal
        geom/sql/40_geom.sql
Branch: geo
Log Message:

minor changes on the names format


diffs (48 lines):

diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -170,7 +170,7 @@ geom_export str wkbTransform(wkb**, wkb*
 geom_export str geom_2_geom(wkb** resWKB, wkb **valueWKB, int* columnType, 
int* columnSRID); 
 
 geom_export str wkbMBR(mbr **res, wkb **geom);
-geom_export str mbroverlaps(bit *out, mbr **b1, mbr **b2);
+geom_export str mbrOverlaps(bit *out, mbr **b1, mbr **b2);
 geom_export str wkbCoordinateFromWKB(dbl*, wkb**, int*);
 geom_export str wkbCoordinateFromMBR(dbl*, mbr**, int*);
 
@@ -2118,7 +2118,7 @@ str wkbMBR(mbr **geomMBR, wkb **geomWKB)
 }
 
 /*checks whether two mbrs overlap */
-str mbroverlaps(bit *out, mbr **b1, mbr **b2) {
+str mbrOverlaps(bit *out, mbr **b1, mbr **b2) {
        if (mbr_isnil(*b1) || mbr_isnil(*b2))
                *out = 0;
        else
diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal
--- a/geom/monetdb5/geom.mal
+++ b/geom/monetdb5/geom.mal
@@ -262,7 +262,7 @@ comment "Transforms a geometry from one 
 
 command mbr(:wkb) :mbr address wkbMBR
 comment "Creates the mbr for the given wkb.";
-command mbroverlaps(a:mbr, b:mbr) :bit address mbroverlaps
+command mbrOverlaps(a:mbr, b:mbr) :bit address mbrOverlaps
 comment "Returns true if the two mbrs overlap";
 command coordinateFromWKB(:wkb, :int) :dbl address wkbCoordinateFromWKB
 comment "returns xmin (=1), ymin (=2), xmax (=3) or ymax(=4) of the provided 
geometry";
diff --git a/geom/sql/40_geom.sql b/geom/sql/40_geom.sql
--- a/geom/sql/40_geom.sql
+++ b/geom/sql/40_geom.sql
@@ -63,9 +63,8 @@ CREATE TYPE mbr EXTERNAL NAME mbr;
 -- Envelope():Geometry
 -- as that returns Geometry objects, and we prefer the explicit mbr's
 -- minimum bounding rectangle (mbr)
-CREATE FUNCTION mbr (g Geometry) RETURNS mbr external name geom.mbr;
-CREATE FUNCTION mbroverlaps(a mbr, b mbr) RETURNS BOOLEAN external name 
geom."mbroverlaps";
-
+CREATE FUNCTION mbr(geom Geometry) RETURNS mbr external name geom."mbr";
+CREATE FUNCTION mbrOverlaps(box1 mbr, box2 mbr) RETURNS boolean external name 
geom."mbrOverlaps";
 
 
 -------------------------------------------------------------------------
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list