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

+ pipe-style range adaptors for readability

Browse source
This commit is contained in:
artemp 2013-10-07 11:22:50 +01:00
parent b0edff4d11
commit 0febcd76ba
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
plugins/input/topojson/topojson_featureset.cpp
View file

@ -163,8 +163,8 @@ struct feature_generator : public boost::static_visitor<mapnik::feature_ptr>
double px = 0, py = 0;
bool first = true;
bool reversed = index < 0;
index_type arc_index = reversed ? std::abs(index) - 1 : index;
bool reverse = index < 0;
index_type arc_index = reverse ? std::abs(index) - 1 : index;
for (auto pt : topo_.arcs[arc_index].coordinates)
{
double x = pt.x;
@ -202,8 +202,8 @@ struct feature_generator : public boost::static_visitor<mapnik::feature_ptr>
for (auto const& index : ring)
{
double px = 0, py = 0;
bool reversed = index < 0;
index_type arc_index = reversed ? std::abs(index) - 1 : index;
bool reverse = index < 0;
index_type arc_index = reverse ? std::abs(index) - 1 : index;
auto const& coords = topo_.arcs[arc_index].coordinates;
processed_coords.clear();
processed_coords.reserve(coords.size());
@ -223,9 +223,9 @@ struct feature_generator : public boost::static_visitor<mapnik::feature_ptr>
using namespace boost::adaptors;
if (reversed)
if (reverse)
{
for (auto const& c : reverse(processed_coords) | sliced(0,processed_coords.size()-1))
for (auto const& c : processed_coords | reversed | sliced(0,processed_coords.size()-1))
{
if (first)
{
@ -269,8 +269,8 @@ struct feature_generator : public boost::static_visitor<mapnik::feature_ptr>
for (auto const& index : ring)
{
double px = 0, py = 0;
bool reversed = index < 0;
index_type arc_index = reversed ? std::abs(index) - 1 : index;
bool reverse = index < 0;
index_type arc_index = reverse ? std::abs(index) - 1 : index;
auto const& coords = topo_.arcs[arc_index].coordinates;
processed_coords.clear();
processed_coords.reserve(coords.size());
@ -287,9 +287,11 @@ struct feature_generator : public boost::static_visitor<mapnik::feature_ptr>
processed_coords.emplace_back(coordinate{x,y});
}
if (reversed)
using namespace boost::adaptors;
if (reverse)
{
for (auto const& c : boost::adaptors::reverse(processed_coords))
for (auto const& c : (processed_coords | reversed | sliced(0,processed_coords.size() - 1)))
{
if (first)
{
@ -301,7 +303,7 @@ struct feature_generator : public boost::static_visitor<mapnik::feature_ptr>
}
else
{
for (auto const& c : processed_coords)
for (auto const& c : processed_coords | sliced(0,processed_coords.size() - 1))
{
if (first)
{