Changeset: 452bdcf8bcf2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=452bdcf8bcf2
Added Files:
geom/sql/Tests/makeEnvelope.sql
geom/sql/Tests/makeEnvelope.stable.err
geom/sql/Tests/makeEnvelope.stable.out
Modified Files:
geom/monetdb5/geom.c
geom/monetdb5/geom.mal
geom/sql/40_geom.sql
geom/sql/Tests/All
Branch: geo
Log Message:
MakeEnvelope + mTest
diffs (228 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -154,6 +154,7 @@ geom_export str wkbEndPoint(wkb **out, w
geom_export str wkbNumPoints(int *out, wkb **geom);
geom_export str wkbPointN(wkb **out, wkb **geom, int *n);
geom_export str wkbEnvelope(wkb **out, wkb **geom);
+geom_export str wkbEnvelopeFromCoordinates(wkb** out, double* xmin, double*
ymin, double* xmax, double* ymax, int* srid);
geom_export str wkbExteriorRing(wkb**, wkb**);
geom_export str wkbInteriorRingN(wkb**, wkb**, short*);
geom_export str wkbNumRings(int*, wkb**, int*);
@@ -1897,6 +1898,42 @@ str wkbEnvelope(wkb **out, wkb **geom) {
return wkbBasic(out, geom, GEOSEnvelope, "geom.Envelope");
}
+str wkbEnvelopeFromCoordinates(wkb** out, double* xmin, double* ymin, double*
xmax, double* ymax, int* srid) {
+ GEOSGeom geosGeometry, linearRingGeometry;
+
+ //create the coordinates sequence
+ GEOSCoordSeq coordSeq = GEOSCoordSeq_create(5, 2);
+
+ //set the values
+ GEOSCoordSeq_setX(coordSeq, 0, *xmin);
+ GEOSCoordSeq_setY(coordSeq, 0, *ymin);
+ GEOSCoordSeq_setX(coordSeq, 1, *xmin);
+ GEOSCoordSeq_setY(coordSeq, 1, *ymax);
+ GEOSCoordSeq_setX(coordSeq, 2, *xmax);
+ GEOSCoordSeq_setY(coordSeq, 2, *ymax);
+ GEOSCoordSeq_setX(coordSeq, 3, *xmax);
+ GEOSCoordSeq_setY(coordSeq, 3, *ymin);
+ GEOSCoordSeq_setX(coordSeq, 4, *xmin);
+ GEOSCoordSeq_setY(coordSeq, 4, *ymin);
+
+ linearRingGeometry = GEOSGeom_createLinearRing(coordSeq);
+
+ if(linearRingGeometry == NULL) {
+ //Gives segmentation fault GEOSCoordSeq_destroy(coordSeq);
+ throw(MAL, "geom.MakeEnvelope", "Error creating LinearRing from
coordinates");
+ }
+ geosGeometry = GEOSGeom_createPolygon(linearRingGeometry, NULL, 0);
+ if(geosGeometry == NULL) {
+ GEOSGeom_destroy(linearRingGeometry);
+ throw(MAL, "geom.MakeEnvelope", "Error creating Polygon from
LinearRing");
+ }
+ GEOSSetSRID(geosGeometry, *srid);
+
+ *out = geos2wkb(geosGeometry);
+
+ return MAL_SUCCEED;
+}
+
/* Returns the first or last point of a linestring */
static str wkbBorderPoint(wkb **out, wkb **geom, GEOSGeometry* (*func)(const
GEOSGeometry *), const char *name) {
GEOSGeom geosGeometry = wkb2geos(*geom);
diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal
--- a/geom/monetdb5/geom.mal
+++ b/geom/monetdb5/geom.mal
@@ -207,6 +207,8 @@ command PointN(w:wkb, n:int) :wkb addres
comment "Returns the n-th point of the Geometry. Argument w should be
Linestring.";
command Envelope(w:wkb) :wkb address wkbEnvelope
comment "The minimum bounding box for this Geometry, returned as a Geometry.
The polygon is defined by the corner points of the bounding box
((MINX,MINY),(MAXX,MINY),(MAXX,MAXY),(MINX,MAXY)).";
+command EnvelopeFromCoordinates(:dbl, :dbl, :dbl, :dbl, :int) :wkb address
wkbEnvelopeFromCoordinates
+comment "A polygon created by the provided coordinates";
command ExteriorRing(w:wkb) :wkb address wkbExteriorRing
comment "Returns a line string representing the exterior ring of the POLYGON
geometry. Return NULL if the geometry is not a polygon.";
command InteriorRingN(w:wkb, n:int) :wkb address wkbInteriorRingN
@@ -275,6 +277,17 @@ comment "Returns the number of geometrie
command Transform(g:wkb, srid_src:int, srid_dst:int, proj_src:str,
proj_dest:str) :wkb address wkbTransform
comment "Transforms a geometry from one srid to another";
+function MakeEnvelope(xmin:dbl, ymin:dbl, xmax:dbl, ymax:dbl, srid:int) :wkb;
+ x := EnvelopeFromCoordinates(xmin, ymin, xmax, ymax, srid);
+ return x;
+end MakeEnvelope;
+
+function MakeEnvelope(xmin:dbl, ymin:dbl, xmax:dbl, ymax:dbl) :wkb;
+ x := EnvelopeFromCoordinates(xmin, ymin, xmax, ymax, 0);
+ return x;
+end MakeEnvelope;
+
+
command mbr(:wkb) :mbr address wkbMBR
comment "Creates the mbr for the given wkb.";
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
@@ -4068,7 +4068,8 @@ CREATE FUNCTION ST_MakePointM(x double,
--CREATE FUNCTION ST_MakeLine(geom1 Geometry, geom2 Geometry) RETURNS Geometry
external name geom."MakeLine";
--CREATE FUNCTION ST_MakeLine(geoms_arr Geometry[]) RETURNS Geometry external
name geom."MakeLine";
--CREATE FUNCTION ST_LineFromMultiPoint(pointGeom Geometry) RETURNS Geometry
external name geom."LineFromMultiPoint"; --gets mutlipoint returns linestring
---CREATE FUNCTION ST_MakeEnvelope(xmin double, ymin double, xmax double, ymax
double, srid SMALLINT) RETURNS Geometry external name geom."MakeEnvelope";
+CREATE FUNCTION ST_MakeEnvelope(xmin double, ymin double, xmax double, ymax
double, srid integer) RETURNS Geometry external name geom."MakeEnvelope";
+CREATE FUNCTION ST_MakeEnvelope(xmin double, ymin double, xmax double, ymax
double) RETURNS Geometry external name geom."MakeEnvelope";
--CREATE FUNCTION ST_MakePolygon(geom Geometry) RETURNS Geometry external name
geom."MakePolygon"; --gets linestring
--CREATE FUNCTION ST_MakePolygon(outerGeom Geometry, interiorGeoms Geometry[])
RETURNS Geometry external name geom."MakePolygon"; --gets linestrings
--CREATE FUNCTION ST_Polygon(geom Geometry, srid SMALLINT) RETURNS Geometry
external name geom."Polygon" --gets linestring
diff --git a/geom/sql/Tests/All b/geom/sql/Tests/All
--- a/geom/sql/Tests/All
+++ b/geom/sql/Tests/All
@@ -40,3 +40,4 @@ mbr_distance
covers
coveredBy
makeBox2D
+makeEnvelope
diff --git a/geom/sql/Tests/makeEnvelope.sql b/geom/sql/Tests/makeEnvelope.sql
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/makeEnvelope.sql
@@ -0,0 +1,2 @@
+select ST_MakeEnvelope(10, 10, 11, 11);
+select ST_MakeEnvelope(10, 11, 12, 13, 4326);
diff --git a/geom/sql/Tests/makeEnvelope.stable.err
b/geom/sql/Tests/makeEnvelope.stable.err
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/makeEnvelope.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'makeEnvelope` in directory 'geom/sql` itself:
+
+
+# 14:07:45 >
+# 14:07:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31386" "--set"
"mapi_usock=/var/tmp/mtest-11336/.s.monetdb.31386" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/alvanaki/INSTALL/monetdb/var/MonetDB/mTests_geom_sql"
"--set" "mal_listing=0"
+# 14:07:45 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/alvanaki/INSTALL/monetdb/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 31386
+# cmdline opt mapi_usock = /var/tmp/mtest-11336/.s.monetdb.31386
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/alvanaki/INSTALL/monetdb/var/MonetDB/mTests_geom_sql
+# cmdline opt mal_listing = 0
+# cmdline opt gdk_debug = 536870922
+
+# 14:07:45 >
+# 14:07:45 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11336" "--port=31386"
+# 14:07:45 >
+
+
+# 14:07:45 >
+# 14:07:45 > "Done."
+# 14:07:45 >
+
diff --git a/geom/sql/Tests/makeEnvelope.stable.out
b/geom/sql/Tests/makeEnvelope.stable.out
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/makeEnvelope.stable.out
@@ -0,0 +1,70 @@
+stdout of test 'makeEnvelope` in directory 'geom/sql` itself:
+
+
+# 14:07:45 >
+# 14:07:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31386" "--set"
"mapi_usock=/var/tmp/mtest-11336/.s.monetdb.31386" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/alvanaki/INSTALL/monetdb/var/MonetDB/mTests_geom_sql"
"--set" "mal_listing=0"
+# 14:07:45 >
+
+# MonetDB 5 server v11.18.0
+# This is an unreleased version
+# Serving database 'mTests_geom_sql', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.356 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://sibuyan.da.cwi.nl:31386/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-11336/.s.monetdb.31386
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 41_jsonstore.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+
+# 14:07:45 >
+# 14:07:45 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11336" "--port=31386"
+# 14:07:45 >
+
+#select ST_MakeEnvelope(10, 10, 11, 11);
+% .L # table_name
+% st_makeenvelope_single_value # name
+% geometry # type
+% 0 # length
+[ "POLYGON ((10 10, 10 11, 11 11, 11 10, 10 10))" ]
+#select ST_MakeEnvelope(10, 11, 12, 13, 4326);
+% .L # table_name
+% st_makeenvelope_single_value # name
+% geometry # type
+% 0 # length
+[ "POLYGON ((10 11, 10 13, 12 13, 12 11, 10 11))" ]
+
+# 14:07:45 >
+# 14:07:45 > "Done."
+# 14:07:45 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
