sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backport #3838 to v3.0.x branch (fixes #3842)

Browse source
This commit is contained in:
Artem Pavlenko 2018-01-25 16:01:39 +01:00
parent 0259ad8041
commit a30f8ed20c
2 changed files with 58 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vertex_adapters.cpp
View file

@ -146,6 +146,12 @@ unsigned polygon_vertex_adapter<T>::vertex(coord_type * x, coord_type * y) const
{ {
current_index_ = 0; current_index_ = 0;
end_index_ = poly_.interior_rings[rings_itr_ - 1].size(); end_index_ = poly_.interior_rings[rings_itr_ - 1].size();
if (end_index_ == 0)
{
*x = 0;
*y = 0;
return mapnik::SEG_CLOSE;
}
point<T> const& coord = poly_.interior_rings[rings_itr_ - 1][current_index_++]; point<T> const& coord = poly_.interior_rings[rings_itr_ - 1][current_index_++];
*x = coord.x; *x = coord.x;
*y = coord.y; *y = coord.y;

53
test/unit/vertex_adapter/vertex_adapter.cpp
View file

@ -1,4 +1,3 @@
#include "catch.hpp" #include "catch.hpp"
#include <mapnik/vertex_adapters.hpp> #include <mapnik/vertex_adapters.hpp>
@ -267,4 +266,56 @@ SECTION("polygon with hole") {
REQUIRE( y == 0 ); REQUIRE( y == 0 );
} }
SECTION("polygon with empty interior ring") {
mapnik::geometry::polygon<double> g;
g.exterior_ring.add_coord(-1, -1);
g.exterior_ring.add_coord( 1, -1);
g.exterior_ring.add_coord( 1, 1);
g.exterior_ring.add_coord(-1, 1);
g.exterior_ring.add_coord(-1, -1);
// Emplace empty interior ring
mapnik::geometry::linear_ring<double> empty_ring;
g.add_hole(std::move(empty_ring));
mapnik::geometry::polygon_vertex_adapter<double> va(g);
double x,y;
unsigned cmd;
cmd = va.vertex(&x,&y);
CHECK( cmd == mapnik::SEG_MOVETO );
CHECK( x == Approx(-1) );
CHECK( y == Approx(-1) );
cmd = va.vertex(&x,&y);
CHECK( cmd == mapnik::SEG_LINETO );
CHECK( x == Approx(1) );
CHECK( y == Approx(-1) );
cmd = va.vertex(&x,&y);
CHECK( cmd == mapnik::SEG_LINETO );
CHECK( x == Approx(1) );
CHECK( y == Approx(1) );
cmd = va.vertex(&x,&y);
CHECK( cmd == mapnik::SEG_LINETO );
CHECK( x == Approx(-1) );
CHECK( y == Approx(1) );
cmd = va.vertex(&x,&y);
CHECK( cmd == mapnik::SEG_CLOSE );
CHECK( x == Approx(0) );
CHECK( y == Approx(0) );
cmd = va.vertex(&x,&y);
CHECK( cmd == mapnik::SEG_CLOSE );
CHECK( x == Approx(0) );
CHECK( y == Approx(0) );
cmd = va.vertex(&x,&y);
REQUIRE( cmd == mapnik::SEG_END );
REQUIRE( x == Approx(0) );
REQUIRE( y == Approx(0) );
}
} }