diff --git a/test/algorithms/overlay/overlay_cases.hpp b/test/algorithms/overlay/overlay_cases.hpp index 4799cc26d..5bf92351f 100644 --- a/test/algorithms/overlay/overlay_cases.hpp +++ b/test/algorithms/overlay/overlay_cases.hpp @@ -43,9 +43,16 @@ static std::string case_3[2] = { "POLYGON((1 1,1 4,4 4,4 1,1 1))" }; static std::string case_3_sph[2] = { - "POLYGON((1 2,2 4.0012148518458881,4 3,3.0001521347633209 1.0003046174216719,1 2))", - "POLYGON((1 1,1 4,4 4,4 1,1 1))" }; + "POLYGON((1 2,2 4.0012148518458881,4 3,3.0001521347633209 1.0003046174216719,1 2))", + "POLYGON((1 1,1 4,4 4,4 1,1 1))" }; +static std::string case_3_2[2] = { + "POLYGON((1 1,1 2,1 4,2 4,4 4,4 3,4 1,3 1,1 1))", + "POLYGON((1 1,1 4,4 4,4 1,1 1))" }; + +static std::string case_3_2_sph[2] = { + "POLYGON((1 1,1 2,1 4,2 4.0012148518458881,4 4, 4 3,4 1,3.0001521347633209 1.0003046174216719,1 1))", + "POLYGON((1 1,1 4,4 4,4 1,1 1))" }; static std::string case_4[2] = { "POLYGON((0 2,2 5,5 3,3 0,0 2))", diff --git a/test/algorithms/relational_operations/covered_by/covered_by_sph.cpp b/test/algorithms/relational_operations/covered_by/covered_by_sph.cpp index 7bb42e82b..cf3d0906e 100644 --- a/test/algorithms/relational_operations/covered_by/covered_by_sph.cpp +++ b/test/algorithms/relational_operations/covered_by/covered_by_sph.cpp @@ -32,6 +32,8 @@ void test_polygon_polygon() false); test_geometry(case_3_sph[0], case_3_sph[1], true); + test_geometry(case_3_2_sph[0], case_3_2_sph[1], + true); test_geometry(case_4[0], case_4[1], false); test_geometry(case_5[0], case_5[1], diff --git a/test/algorithms/relational_operations/disjoint/disjoint_sph.cpp b/test/algorithms/relational_operations/disjoint/disjoint_sph.cpp index e10b28eb2..3d9ecd29c 100644 --- a/test/algorithms/relational_operations/disjoint/disjoint_sph.cpp +++ b/test/algorithms/relational_operations/disjoint/disjoint_sph.cpp @@ -34,6 +34,8 @@ void test_polygon_polygon() false); test_geometry(case_3_sph[0], case_3_sph[1], false); + test_geometry(case_3_2_sph[0], case_3_2_sph[1], + false); test_geometry(case_4[0], case_4[1], false); test_geometry(case_5[0], case_5[1], diff --git a/test/algorithms/relational_operations/equals/equals_sph.cpp b/test/algorithms/relational_operations/equals/equals_sph.cpp index 1c699d194..05e8b8344 100644 --- a/test/algorithms/relational_operations/equals/equals_sph.cpp +++ b/test/algorithms/relational_operations/equals/equals_sph.cpp @@ -34,11 +34,8 @@ void test_polygon_polygon() false); test_geometry(case_3_sph[0], case_3_sph[1], false); -#ifdef BOOST_GEOMETRY_ENABLE_FAILING - test_geometry("POLYGON((1 1,1 2,1 4,2 4.0012148518458881,4 4, 4 3,4 1,3.0001521347633209 1.0003046174216719,1 1))", - "POLYGON((1 1,1 4,4 4,4 1,1 1))", + test_geometry(case_3_2_sph[0], case_3_2_sph[1], true); -#endif test_geometry(case_4[0], case_4[1], false); test_geometry(case_5[0], case_5[1], diff --git a/test/algorithms/relational_operations/intersects/intersects_sph.cpp b/test/algorithms/relational_operations/intersects/intersects_sph.cpp index 8cf15dfd4..4b935bff4 100644 --- a/test/algorithms/relational_operations/intersects/intersects_sph.cpp +++ b/test/algorithms/relational_operations/intersects/intersects_sph.cpp @@ -32,6 +32,8 @@ void test_polygon_polygon() true); test_geometry(case_3_sph[0], case_3_sph[1], true); + test_geometry(case_3_2_sph[0], case_3_2_sph[1], + true); test_geometry(case_4[0], case_4[1], true); test_geometry(case_5[0], case_5[1], diff --git a/test/algorithms/relational_operations/overlaps/overlaps_sph.cpp b/test/algorithms/relational_operations/overlaps/overlaps_sph.cpp index ee79c87f4..79478ad3d 100644 --- a/test/algorithms/relational_operations/overlaps/overlaps_sph.cpp +++ b/test/algorithms/relational_operations/overlaps/overlaps_sph.cpp @@ -32,6 +32,8 @@ void test_polygon_polygon() true); test_geometry(case_3_sph[0], case_3_sph[1], false); + test_geometry(case_3_2_sph[0], case_3_2_sph[1], + false); test_geometry(case_4[0], case_4[1], true); test_geometry(case_5[0], case_5[1], diff --git a/test/algorithms/relational_operations/relate/relate_areal_areal_sph.cpp b/test/algorithms/relational_operations/relate/relate_areal_areal_sph.cpp index 4901bf354..5475a8fe7 100644 --- a/test/algorithms/relational_operations/relate/relate_areal_areal_sph.cpp +++ b/test/algorithms/relational_operations/relate/relate_areal_areal_sph.cpp @@ -33,6 +33,8 @@ void test_polygon_polygon() "212101212"); test_geometry(case_3_sph[0], case_3_sph[1], "2FF10F212"); + test_geometry(case_3_2_sph[0], case_3_2_sph[1], + "2FFF1FFF2"); test_geometry(case_4[0], case_4[1], "212101212"); test_geometry(case_5[0], case_5[1], diff --git a/test/algorithms/relational_operations/touches/touches_sph.cpp b/test/algorithms/relational_operations/touches/touches_sph.cpp index bacc2f62d..352a9bff1 100644 --- a/test/algorithms/relational_operations/touches/touches_sph.cpp +++ b/test/algorithms/relational_operations/touches/touches_sph.cpp @@ -32,6 +32,8 @@ void test_polygon_polygon() false); test_geometry(case_3_sph[0], case_3_sph[1], false); + test_geometry(case_3_2_sph[0], case_3_2_sph[1], + false); test_geometry(case_4[0], case_4[1], false); test_geometry(case_5[0], case_5[1], diff --git a/test/algorithms/relational_operations/within/within_sph.cpp b/test/algorithms/relational_operations/within/within_sph.cpp index e74652861..22761af98 100644 --- a/test/algorithms/relational_operations/within/within_sph.cpp +++ b/test/algorithms/relational_operations/within/within_sph.cpp @@ -32,6 +32,8 @@ void test_polygon_polygon() false); test_geometry(case_3_sph[0], case_3_sph[1], true); + test_geometry(case_3_2_sph[0], case_3_2_sph[1], + true); test_geometry(case_4[0], case_4[1], false); test_geometry(case_5[0], case_5[1],