diff --git a/NEWS.md b/NEWS.md index cce2cdc68..759aafc8d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -6,9 +6,8 @@ - Remove undefined behaviour in use of null PrecisionModel (GH-931, Jeff Walton) - Explicitly set endianness for some tests so that output matches expected (GH-934, Paul Ramsey) - Fix IncrementalDelaunayTriangulator to ensure triangulation boundary is convex (GH-953, Martin Davis) - - Fix PreparedLineStringDistance for lines within envelope and polygons (GH-959, Martin Davis) - - + - Fix PreparedLineStringDistance for lines within envelope and polygons (GH-959, Martin Davis) + - Fix error in CoordinateSequence::add when disallowing repeated points (GH-963, Dan Baston) ## Changes in 3.12.0 diff --git a/src/geom/CoordinateSequence.cpp b/src/geom/CoordinateSequence.cpp index a0ff67944..fc36b4bb3 100644 --- a/src/geom/CoordinateSequence.cpp +++ b/src/geom/CoordinateSequence.cpp @@ -191,8 +191,13 @@ CoordinateSequence::add(const CoordinateSequence& cs, std::size_t from, std::siz } } + if (first > to) { + // No unique points to add. + return; + } + std::size_t last = first + 1; - const CoordinateXY* last_unique = &cs.front(); + const CoordinateXY* last_unique = &cs.getAt(first); while(last <= to) { const CoordinateXY* curr = &cs.getAt(last); if (curr->equals2D(*last_unique)) { diff --git a/tests/unit/geom/CoordinateSequenceTest.cpp b/tests/unit/geom/CoordinateSequenceTest.cpp index 7ec843bad..1d9c08782 100644 --- a/tests/unit/geom/CoordinateSequenceTest.cpp +++ b/tests/unit/geom/CoordinateSequenceTest.cpp @@ -1493,4 +1493,21 @@ void object::test<54> ensure(xyz3_2.equalsIdentical(xyz3)); } + +// test add(CoordinateSequence&, false) when last point of receiving sequence is found after the beginning of donor sequence +template<> +template<> +void object::test<55> +() +{ + CoordinateSequence seq1{CoordinateXY(1,2), CoordinateXY(3, 4)}; + CoordinateSequence seq2{CoordinateXY(3, 4), CoordinateXY(3, 4), CoordinateXY(5, 6), CoordinateXY(3, 4), CoordinateXY(7, 8), CoordinateXY(7, 8), CoordinateXY(9, 10)}; + + CoordinateSequence expected{CoordinateXY(1, 2), CoordinateXY(3, 4), CoordinateXY(5, 6), CoordinateXY(3, 4), CoordinateXY(7, 8), CoordinateXY(9, 10)}; + + seq1.add(seq2, false); + + ensure_equals(seq1, expected); +} + } // namespace tut