mirror of
https://github.com/boostorg/geometry.git
synced 2026-02-13 12:32:09 +00:00
Merge branch 'develop' into bg-prepare
This commit is contained in:
@@ -207,6 +207,15 @@ void test_all()
|
||||
test_geometry<ls, poly>("LINESTRING(7 8, 6 10, 11 0)",
|
||||
"POLYGON((0 0,0 10,10 10,10 0,0 0))",
|
||||
expected("miu+")("iuu+"));
|
||||
|
||||
// 25.01.2015
|
||||
test_geometry<ls, poly>("LINESTRING(2 3, 4 5, 0 6, 5 6)",
|
||||
"POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,6 4,6 6,4 6,4 4))",
|
||||
expected("miu+")("miu+")("mcu+")("mxc="));
|
||||
test_geometry<ls, poly>("LINESTRING(0 6, 5 6)",
|
||||
"POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,6 4,6 6,4 6,4 4))",
|
||||
expected("miu+")("mcu+")("mxc="));
|
||||
|
||||
}
|
||||
|
||||
int test_main(int, char* [])
|
||||
|
||||
@@ -264,6 +264,17 @@ void test_linestring_polygon()
|
||||
test_geometry<ls, poly>("LINESTRING(0 0, 7 7)",
|
||||
"POLYGON((5 5,5 15,15 15,15 5,5 5))",
|
||||
"1010F0212");
|
||||
|
||||
// 25.01.2015
|
||||
test_geometry<ls, poly>("LINESTRING(4 5, 0 6, 5 6)",
|
||||
"POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,6 4,6 6,4 6,4 4))",
|
||||
"11FF0F212");
|
||||
test_geometry<ls, poly>("LINESTRING(2 3, 4 5, 0 6, 5 6)",
|
||||
"POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,6 4,6 6,4 6,4 4))",
|
||||
"11F00F212");
|
||||
test_geometry<ls, poly>("LINESTRING(2 9, 1 1, 10 1, 10 10, 1 10, 0 6, 5 6)",
|
||||
"POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))",
|
||||
"11F00F212");
|
||||
}
|
||||
|
||||
template <typename P>
|
||||
|
||||
@@ -333,9 +333,32 @@ void test_linestring_multi_linestring()
|
||||
"10FF0F102"); // |
|
||||
// |
|
||||
|
||||
// 22.01 2015
|
||||
// 22.01.2015
|
||||
// inspired by L/A and A/A
|
||||
test_geometry<ls, mls>("LINESTRING(1 1,2 2)", "MULTILINESTRING((0 0,1 1),(1 1,3 3))", "1FF0FF102");
|
||||
|
||||
// 25.01.2015
|
||||
test_geometry<ls, mls>("LINESTRING(1 1, 5 5, 4 4)",
|
||||
"MULTILINESTRING((2 5, 7 5, 8 3, 6 3, 4 0),(0 0,10 10))",
|
||||
"1FF0FF102");
|
||||
test_geometry<ls, mls>("LINESTRING(4 1, 4 5, 4 4)",
|
||||
"MULTILINESTRING((2 5, 7 5, 8 3, 6 3, 4 0),(4 0, 4 8, 0 4))",
|
||||
"1FF0FF102");
|
||||
test_geometry<ls, mls>("LINESTRING(1 1,5 5,4 4)",
|
||||
"MULTILINESTRING((5 0,5 5,5 10),(0 0,10 10))",
|
||||
"1FF0FF102");
|
||||
test_geometry<ls, mls>("LINESTRING(1 1,5 5,1 0)",
|
||||
"MULTILINESTRING((5 0,5 5,5 10),(0 0,5 5,1 0))",
|
||||
"1FF00F102");
|
||||
test_geometry<ls, mls>("LINESTRING(5 5,4 4)",
|
||||
"MULTILINESTRING((5 0,5 5,5 10),(0 0,10 10))",
|
||||
"1FF0FF102");
|
||||
test_geometry<ls, mls>("LINESTRING(6 6,5 5,4 4)",
|
||||
"MULTILINESTRING((5 0,5 5,5 10),(0 0,10 10))",
|
||||
"1FF0FF102");
|
||||
test_geometry<ls, mls>("LINESTRING(5 5,4 4)",
|
||||
"MULTILINESTRING((5 0,5 5,5 10))",
|
||||
"FF10F0102");
|
||||
}
|
||||
|
||||
template <typename P>
|
||||
|
||||
Reference in New Issue
Block a user