Changeset: 1486aff661b8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1486aff661b8
Added Files:
geom/sql/Tests/pointOnSurface.sql
geom/sql/Tests/pointOnSurface.stable.err
geom/sql/Tests/pointOnSurface.stable.out
Modified Files:
geom/monetdb5/geom.c
geom/monetdb5/geom.mal
geom/sql/40_geom.sql
Branch: geo
Log Message:
PointOnSurface + Mtest
diffs (219 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -183,6 +183,9 @@ geom_export str wkbGeometryN(wkb** out,
geom_export str wkbNumGeometries(int* out, wkb** geom);
geom_export str wkbTransform(wkb**, wkb**, int*, int*, char**, char**);
+geom_export str wkbPointOnSurface(wkb**, wkb**);
+
+
geom_export str geom_2_geom(wkb** resWKB, wkb **valueWKB, int* columnType,
int* columnSRID);
geom_export str geom_2_geom_bat(int* outBAT_id, int* inBAT_id, int*
columnType, int* columnSRID);
@@ -597,6 +600,35 @@ return createException(MAL, "geom.Transf
}
+str wkbPointOnSurface(wkb** resWKB, wkb** geomWKB) {
+ GEOSGeom geosGeometry, resGeosGeometry;
+
+ if(wkb_isnil(*geomWKB)){
+ *resWKB = wkb_nil;
+ return MAL_SUCCEED;
+ }
+
+ geosGeometry = wkb2geos(*geomWKB);
+ if(!geosGeometry) {
+ *resWKB = wkb_nil;
+ throw(MAL, "geom.PointOnSurface", "wkb2geos failed");
+ }
+
+ resGeosGeometry = GEOSPointOnSurface(geosGeometry);
+ if(!resGeosGeometry) {
+ *resWKB = wkb_nil;
+ throw(MAL, "geom.PointOnSurface", "GEOSPointOnSurface failed");
+ }
+
+ *resWKB = geos2wkb(resGeosGeometry);
+
+ GEOSGeom_destroy(geosGeometry);
+ GEOSGeom_destroy(resGeosGeometry);
+
+ return MAL_SUCCEED;
+}
+
+
str geom_2_geom(wkb** resWKB, wkb **valueWKB, int* columnType, int*
columnSRID) {
GEOSGeom geosGeometry;
int geoCoordinatesNum = 2;
diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal
--- a/geom/monetdb5/geom.mal
+++ b/geom/monetdb5/geom.mal
@@ -317,6 +317,10 @@ end MakePolygon;
# return x;
#end MakePolygon;
+command PointOnSurface(w:wkb) :wkb address wkbPointOnSurface
+comment "Returns a point guaranteed to lie on the surface. Similar to postGIS
it works for points and lines in addition to surfaces and for 3d geometries.";
+
+
command mbr(:wkb) :mbr address wkbMBR
comment "Creates the mbr for the given wkb.";
command MakeBox2D(:wkb,:wkb) :mbr address wkbBox2D
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
@@ -4079,7 +4079,7 @@ CREATE FUNCTION ST_PointN(geom Geometry,
--Functions on Surface (i.e. Polygon and Polyhedral Surface) and MultiSurface
CREATE FUNCTION ST_Centroid(geom Geometry) RETURNS Geometry EXTERNAL NAME
geom."Centroid";
---CREATE FUNCTION ST_PointOnSurface RETURNS EXTERNAL NAME
+CREATE FUNCTION ST_PointOnSurface(geom Geometry) RETURNS Geometry EXTERNAL
NAME geom."PointOnSurface";
CREATE FUNCTION ST_Area(geom Geometry) RETURNS double EXTERNAL NAME
geom."Area";
--Functions on Polygon
diff --git a/geom/sql/Tests/pointOnSurface.sql
b/geom/sql/Tests/pointOnSurface.sql
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/pointOnSurface.sql
@@ -0,0 +1,5 @@
+select ST_PointOnSurface(st_wkttosql('POINT(0 5)'));
+select ST_PointOnSurface(st_wkttosql('LINESTRING(0 5, 0 10)'));
+select ST_PointOnSurface(st_wkttosql('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'));
+select ST_PointOnSurface(st_wkttosql('LINESTRING(0 5 1, 0 0 1, 0 10 2)'));
+
diff --git a/geom/sql/Tests/pointOnSurface.stable.err
b/geom/sql/Tests/pointOnSurface.stable.err
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/pointOnSurface.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'pointOnSurface` in directory 'geom/sql` itself:
+
+
+# 16:34:02 >
+# 16:34:02 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30263" "--set"
"mapi_usock=/var/tmp/mtest-20290/.s.monetdb.30263" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/alvanaki/INSTALL/monetdb/var/MonetDB/mTests_geom_sql"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 16:34:02 >
+
+# 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 = 30263
+# cmdline opt mapi_usock = /var/tmp/mtest-20290/.s.monetdb.30263
+# 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 embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 16:34:03 >
+# 16:34:03 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20290" "--port=30263"
+# 16:34:03 >
+
+
+# 16:34:04 >
+# 16:34:04 > "Done."
+# 16:34:04 >
+
diff --git a/geom/sql/Tests/pointOnSurface.stable.out
b/geom/sql/Tests/pointOnSurface.stable.out
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/pointOnSurface.stable.out
@@ -0,0 +1,87 @@
+stdout of test 'pointOnSurface` in directory 'geom/sql` itself:
+
+
+# 16:34:02 >
+# 16:34:02 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30263" "--set"
"mapi_usock=/var/tmp/mtest-20290/.s.monetdb.30263" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/alvanaki/INSTALL/monetdb/var/MonetDB/mTests_geom_sql"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 16:34:02 >
+
+# MonetDB 5 server v11.20.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 and 128bit
integers 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:30263/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-20290/.s.monetdb.30263
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R 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: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.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: 80_udf_hge.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 99_system.sql
+
+# 16:34:03 >
+# 16:34:03 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20290" "--port=30263"
+# 16:34:03 >
+
+#select ST_PointOnSurface(st_wkttosql('POINT(0 5)'));
+% .L # table_name
+% st_wkttosql_single_value # name
+% geometry # type
+% 0 # length
+[ "POINT (0 5)" ]
+#select ST_PointOnSurface(st_wkttosql('LINESTRING(0 5, 0 10)'));
+% .L # table_name
+% st_wkttosql_single_value # name
+% geometry # type
+% 0 # length
+[ "POINT (0 5)" ]
+#select ST_PointOnSurface(st_wkttosql('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'));
+% .L # table_name
+% st_wkttosql_single_value # name
+% geometry # type
+% 0 # length
+[ "POINT (2.5 2.5)" ]
+#select ST_PointOnSurface(st_wkttosql('LINESTRING(0 5 1, 0 0 1, 0 10 2)'));
+% .L # table_name
+% st_wkttosql_single_value # name
+% geometry # type
+% 0 # length
+[ "POINT Z (0 0 1)" ]
+
+# 16:34:04 >
+# 16:34:04 > "Done."
+# 16:34:04 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
