[geos-commits] [SCM] GEOS branch main updated. 2696f86ec20ce4100c742b730c87ab401492f1b7
git at osgeo.org
git at osgeo.org
Mon Oct 4 08:24:24 PDT 2021
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".
The branch, main has been updated
via 2696f86ec20ce4100c742b730c87ab401492f1b7 (commit)
via 12bd49a4c6a08413d8e2e74ac4ae188d3e5d49a9 (commit)
from 98ecf63991261f4690e2d06be921809f720d5090 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2696f86ec20ce4100c742b730c87ab401492f1b7
Merge: 98ecf63 12bd49a
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Oct 4 17:23:58 2021 +0200
Merge branch 'more_geosdistancewithin_tests' of https://github.com/brendan-ward/geos into main
commit 12bd49a4c6a08413d8e2e74ac4ae188d3e5d49a9
Author: Brendan C. Ward <bcward at astutespruce.com>
Date: Sat Oct 2 06:18:25 2021 -0700
Adds several CAPI tests for GEOSDistanceWithin
diff --git a/tests/unit/capi/GEOSDistanceWithinTest.cpp b/tests/unit/capi/GEOSDistanceWithinTest.cpp
index 6d18b4e..9469179 100644
--- a/tests/unit/capi/GEOSDistanceWithinTest.cpp
+++ b/tests/unit/capi/GEOSDistanceWithinTest.cpp
@@ -1,16 +1,16 @@
//
-// Test Suite for C-API GEOSDistance
+// Test Suite for C-API GEOSDistanceWithin
#include <tut/tut.hpp>
// geos
-#include <geos_c.h>
#include <geos/constants.h>
+#include <geos_c.h>
// std
#include <cstdarg>
#include <cstdio>
#include <cstdlib>
-#include <memory>
#include <math.h>
+#include <memory>
#include "capi_test_utils.h"
@@ -19,11 +19,23 @@ namespace tut {
// Test Group
//
-// Common data used in test cases.
struct test_capigeosdistancewithin_data : public capitest::utility {
- test_capigeosdistancewithin_data() {
- GEOSWKTWriter_setTrim(wktw_, 1);
- }
+ void testGEOSDistanceWithin(const char* wkt1, const char* wkt2,
+ double distance, char expectedResult) {
+
+ GEOSGeometry *input1 = GEOSGeomFromWKT(wkt1);
+ ensure(input1 != nullptr);
+ GEOSGeometry *input2 = GEOSGeomFromWKT(wkt2);
+ ensure(input2 != nullptr);
+
+ char ret = GEOSDistanceWithin(input1, input2, distance);
+
+ GEOSGeom_destroy(input1);
+ GEOSGeom_destroy(input2);
+
+ ensure_equals("return code", (int)ret, (int)expectedResult);
+
+ };
};
typedef test_group<test_capigeosdistancewithin_data> group;
@@ -31,25 +43,348 @@ typedef group::object object;
group test_capigeosdistancewithin_group("capi::GEOSDistanceWithin");
-//
-// Test Cases
-//
+// point within distance should return true
+template <>
+template <>
+void object::test<1>() {
+ testGEOSDistanceWithin(
+ "POINT(0 0)",
+ "POINT(0 1)",
+ 1.0,
+ 1
+ );
+}
-template<>
-template<>
-void object::test<1>
-()
-{
- geom1_ = GEOSGeomFromWKT("POINT(10 10)");
- geom2_ = GEOSGeomFromWKT("POINT(3 6)");
+// point not within distance should return false
+template <>
+template <>
+void object::test<2>() {
+ testGEOSDistanceWithin(
+ "POINT(0 0)",
+ "POINT(0 1)",
+ 0.999999,
+ 0
+ );
+}
- double dist = 8.1;
- char ret = GEOSDistanceWithin(geom1_, geom2_, dist);
- ensure_equals(ret, 1);
+// point at same location should return true even if distance is 0
+template <>
+template <>
+void object::test<3>() {
+ testGEOSDistanceWithin(
+ "POINT(0 0)",
+ "POINT(0 0)",
+ 0.0,
+ 1
+ );
+}
- ret = GEOSDistanceWithin(geom1_, geom2_, dist-0.1);
- ensure_equals(ret, 0);
+// line within distance of another line should return true
+template <>
+template <>
+void object::test<4>() {
+ testGEOSDistanceWithin(
+ "LINESTRING(0 0, 1 1)",
+ "LINESTRING(0 1, 1 2)",
+ 1.0,
+ 1
+ );
}
-} // namespace tut
+// line not within distance of another line should return false
+template <>
+template <>
+void object::test<5>() {
+ testGEOSDistanceWithin(
+ "LINESTRING(0 0, 1 0)",
+ "LINESTRING(0 1, 1 1)",
+ 0.999999,
+ 0
+ );
+}
+
+// line that equals another line should return true even if distance is 0
+template <>
+template <>
+void object::test<6>() {
+ testGEOSDistanceWithin(
+ "LINESTRING(0 0, 1 1)",
+ "LINESTRING(0 0, 1 1)",
+ 0.0,
+ 1
+ );
+}
+// line that intersects another line should return true even if distance is 0
+template <>
+template <>
+void object::test<7>() {
+ testGEOSDistanceWithin(
+ "LINESTRING(0 0, 1 1)",
+ "LINESTRING(1 1, 0 0)",
+ 0.0,
+ 1
+ );
+}
+
+// line that shares segment with other line should return true even if distance is 0
+template <>
+template <>
+void object::test<8>() {
+ testGEOSDistanceWithin(
+ "LINESTRING(0 0, 2 2)",
+ "LINESTRING(0 0, 1 1)",
+ 0.0,
+ 1
+ );
+}
+
+
+// point within distance of line should return true
+template <>
+template <>
+void object::test<9>() {
+ testGEOSDistanceWithin(
+ "LINESTRING(0 0, 1 1)",
+ "POINT( 0 1)",
+ 1.0,
+ 1
+ );
+}
+
+// point not within distance of line should return false
+template <>
+template <>
+void object::test<10>() {
+ testGEOSDistanceWithin(
+ "LINESTRING(0 0, 1 0)",
+ "POINT(0 1)",
+ 0.999999,
+ 0
+ );
+}
+
+// line within distance of point should return true
+template <>
+template <>
+void object::test<11>() {
+ testGEOSDistanceWithin(
+ "POINT( 0 1)",
+ "LINESTRING(0 0, 1 1)",
+ 1.0,
+ 1
+ );
+}
+
+// line not within distance of point should return false
+template <>
+template <>
+void object::test<12>() {
+ testGEOSDistanceWithin(
+ "POINT(0 1)",
+ "LINESTRING(0 0, 1 0)",
+ 0.999999,
+ 0
+ );
+}
+
+
+
+// point that intersects line should return true even if distance is 0
+template <>
+template <>
+void object::test<13>() {
+ testGEOSDistanceWithin(
+ "LINESTRING(0 0, 1 1)",
+ "POINT(0.5 0.5)",
+ 0.0,
+ 1
+ );
+}
+
+// polygon within distance of other polygon should return true
+template <>
+template <>
+void object::test<14>() {
+ testGEOSDistanceWithin(
+ "POLYGON((0 0, 1 1, 2 0, 0 0))",
+ "POLYGON((0 3, 2 3, 1 2, 0 3))",
+ 1.0,
+ 1
+ );
+}
+
+// polygon not within distance of other polygon should return true
+template <>
+template <>
+void object::test<15>() {
+ testGEOSDistanceWithin(
+ "POLYGON((0 0, 1 1, 2 0, 0 0))",
+ "POLYGON((0 3, 2 3, 1 2, 0 3))",
+ 0.999999,
+ 0
+ );
+}
+
+// polygon that intersects polygon should return true even if distance is 0
+template <>
+template <>
+void object::test<16>() {
+ testGEOSDistanceWithin(
+ "POLYGON((0 0, 1 1, 2 0, 0 0))",
+ "POLYGON((0 3, 2 3, 1 0, 0 3))",
+ 0.0,
+ 1
+ );
+}
+
+// polygon that is equal to polygon should return true even if distance is 0
+template <>
+template <>
+void object::test<17>() {
+ testGEOSDistanceWithin(
+ "POLYGON((0 0, 1 1, 2 0, 0 0))",
+ "POLYGON((1 1, 2 0, 0 0, 1 1))",
+ 0.0,
+ 1
+ );
+}
+
+// point within distance of polygon should return true
+template <>
+template <>
+void object::test<18>() {
+ testGEOSDistanceWithin(
+ "POLYGON((0 0, 1 1, 2 0, 0 0))",
+ "POINT(1 2)",
+ 1.0,
+ 1
+ );
+}
+
+// point not within distance of polygon should return false
+template <>
+template <>
+void object::test<19>() {
+ testGEOSDistanceWithin(
+ "POLYGON((0 0, 1 1, 2 0, 0 0))",
+ "POINT(1 2)",
+ 0.999999,
+ 0
+ );
+}
+
+
+// polygon within distance of point should return true
+template <>
+template <>
+void object::test<20>() {
+ testGEOSDistanceWithin(
+ "POINT(1 2)",
+ "POLYGON((0 0, 1 1, 2 0, 0 0))",
+ 1.0,
+ 1
+ );
+}
+
+// point not within distance of polygon should return false
+template <>
+template <>
+void object::test<21>() {
+ testGEOSDistanceWithin(
+ "POINT(1 2)",
+ "POLYGON((0 0, 1 1, 2 0, 0 0))",
+ 0.999999,
+ 0
+ );
+}
+
+// polygon that intersects point should return true even if distance is 0
+template <>
+template <>
+void object::test<22>() {
+ testGEOSDistanceWithin(
+ "POLYGON((0 0, 1 1, 2 0, 0 0))",
+ "POINT(1 0)",
+ 0.0,
+ 1
+ );
+}
+
+// polygon within distance of line should return true
+template <>
+template <>
+void object::test<23>() {
+ testGEOSDistanceWithin(
+ "POLYGON((0 0, 1 1, 2 0, 0 0))",
+ "LINESTRING(0 -1, 2 -1)",
+ 1.0,
+ 1
+ );
+}
+
+// polygon not within distance of line should return false
+template <>
+template <>
+void object::test<24>() {
+ testGEOSDistanceWithin(
+ "POLYGON((0 0, 1 1, 2 0, 0 0))",
+ "LINESTRING(0 -1, 2 -1)",
+ 0.999999,
+ 0
+ );
+}
+
+// polygon that intersects line should return true even if distance is 0
+template <>
+template <>
+void object::test<25>() {
+ testGEOSDistanceWithin(
+ "POLYGON((0 0, 1 1, 2 0, 0 0))",
+ "LINESTRING(0 -1, 0.5 0.5, 2 -1)",
+ 0.0,
+ 1
+ );
+}
+
+// polygon that shares edge with line should return true even if distance is 0
+template <>
+template <>
+void object::test<26>() {
+ testGEOSDistanceWithin(
+ "POLYGON((0 0, 1 1, 2 0, 0 0))",
+ "LINESTRING(0 0, 1 1, 2 0)",
+ 0.0,
+ 1
+ );
+}
+
+
+// empty geometries should always return true (distance 1)
+template <>
+template <>
+void object::test<27>() {
+ testGEOSDistanceWithin(
+ "POINT EMPTY",
+ "LINESTRING EMPTY",
+ 1.0,
+ 1
+ );
+}
+
+// empty geometries should always return true (distance 0)
+template <>
+template <>
+void object::test<28>() {
+ testGEOSDistanceWithin(
+ "POINT EMPTY",
+ "LINESTRING EMPTY",
+ 0.0,
+ 1
+ );
+}
+
+
+
+
+} // namespace tut
-----------------------------------------------------------------------
Summary of changes:
tests/unit/capi/GEOSDistanceWithinTest.cpp | 381 +++++++++++++++++++++++++++--
1 file changed, 358 insertions(+), 23 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list