Changeset: e5c1648b1c98 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e5c1648b1c98
Added Files:
geom/sql/functions/Tests/ST_DWithin.reqtest
geom/sql/functions/Tests/ST_DWithin.test
Modified Files:
geom/sql/functions/Tests/All
geom/sql/functions/Tests/ST_Intersects.test
Branch: geo-update
Log Message:
Added DWithin test.
diffs (131 lines):
diff --git a/geom/sql/functions/Tests/All b/geom/sql/functions/Tests/All
--- a/geom/sql/functions/Tests/All
+++ b/geom/sql/functions/Tests/All
@@ -15,6 +15,8 @@ HAVE_GEOM?ST_Collect
HAVE_GEOM?ST_MakeLine
HAVE_GEOM?ST_Intersects
HAVE_GEOM?ST_IntersectsRTree
+HAVE_GEOM?ST_DWithin
+HAVE_GEOM?ST_DWithinRTree
HAVE_GEOM?loadTestGeometries
diff --git a/geom/sql/functions/Tests/ST_DWithin.reqtest
b/geom/sql/functions/Tests/ST_DWithin.reqtest
new file mode 100644
--- /dev/null
+++ b/geom/sql/functions/Tests/ST_DWithin.reqtest
@@ -0,0 +1,1 @@
+loadTestPolygons
diff --git a/geom/sql/functions/Tests/ST_DWithin.test
b/geom/sql/functions/Tests/ST_DWithin.test
new file mode 100644
--- /dev/null
+++ b/geom/sql/functions/Tests/ST_DWithin.test
@@ -0,0 +1,96 @@
+# Geometric Intersects
+
+## Point - Polygon
+query T rowsort
+SELECT
+ geom
+FROM geometries
+WHERE
+ [ST_POINT(10,10)]
+ ST_DWITHIN
+ [geom, 5]
+----
+POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))
+POLYGON ((10 10, 20 10, 10 20, 10 10))
+POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
+
+query T rowsort
+SELECT
+ geom
+FROM geometries
+WHERE
+ [ST_POINT(15,10)]
+ ST_DWITHIN
+ [geom,5]
+----
+POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))
+POLYGON ((10 10, 20 10, 10 20, 10 10))
+POLYGON ((10 20, 20 10, 20 20, 10 20))
+POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
+
+query T rowsort
+SELECT
+ geom
+FROM geometries
+WHERE
+ [ST_POINT(15,15)]
+ ST_DWITHIN
+ [geom,0]
+----
+POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))
+POLYGON ((10 10, 20 10, 10 20, 10 10))
+POLYGON ((10 20, 20 10, 20 20, 10 20))
+POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
+
+query T rowsort
+SELECT
+ geom
+FROM geometries
+WHERE
+ [ST_POINT(17.5,17.5)]
+ ST_DWITHIN
+ [geom,2]
+----
+POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))
+POLYGON ((10 20, 20 10, 20 20, 10 20))
+POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
+
+query T rowsort
+SELECT
+ geom
+FROM geometries
+WHERE
+ [ST_POINT(5,15)]
+ ST_DWITHIN
+ [geom,3]
+----
+POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
+
+## Line - Polygon
+query T rowsort
+SELECT
+ geom
+FROM geometries
+WHERE
+ [ST_GEOMFROMTEXT('LINESTRING (0 0, 15 15)')]
+ ST_DWITHIN
+ [geom,0]
+----
+POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))
+POLYGON ((10 10, 20 10, 10 20, 10 10))
+POLYGON ((10 20, 20 10, 20 20, 10 20))
+POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
+
+query T rowsort
+SELECT
+ geom
+FROM geometries
+WHERE
+ [ST_GEOMFROMTEXT('LINESTRING(5 5, 10 15)')]
+ ST_INTERSECTS
+ [geom,4]
+----
+POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))
+POLYGON ((10 10, 20 10, 10 20, 10 10))
+POLYGON ((10 20, 20 10, 20 20, 10 20))
+POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
diff --git a/geom/sql/functions/Tests/ST_Intersects.test
b/geom/sql/functions/Tests/ST_Intersects.test
--- a/geom/sql/functions/Tests/ST_Intersects.test
+++ b/geom/sql/functions/Tests/ST_Intersects.test
@@ -75,6 +75,8 @@ WHERE
----
POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))
POLYGON ((10 10, 20 10, 10 20, 10 10))
+POLYGON ((10 20, 20 10, 20 20, 10 20))
+POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
query T rowsort
SELECT
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
