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

add const_interior_rings type and stop abusing type system. (NOTE: iterator/const_iterator types are required by boost::range_iterator)

Browse source
This commit is contained in:
artemp 2017-04-03 13:00:35 +01:00
parent adbbdea0fb
commit 20824cce79
1 changed files with 35 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
include/mapnik/geometry/boost_adapters.hpp
View file

@ -50,6 +50,36 @@ BOOST_GEOMETRY_REGISTER_POINT_2D(mapnik::coord2f, float, boost::geometry::cs::c
namespace mapnik { namespace mapnik {
template <typename CoordinateType>
struct const_interior_rings
{
using polygon_type = mapnik::geometry::polygon<CoordinateType> const;
using const_iterator = typename polygon_type::const_iterator;
using iterator = const_iterator; // needed by boost::range_iterator
using value_type = typename polygon_type::value_type;
const_interior_rings(polygon_type const& poly)
: poly_(poly) {}
const_iterator begin() const
{
auto itr = poly_.cbegin();
std::advance(itr, 1);
return itr;
}
const_iterator end() const { return poly_.cend();}
std::size_t size() const
{
return poly_.empty() ? 0 : poly_.size() - 1;
}
value_type const& back() const { return poly_.back(); }
polygon_type const& poly_;
};
template <typename CoordinateType> template <typename CoordinateType>
struct interior_rings struct interior_rings
{ {
@ -71,12 +101,12 @@ struct interior_rings
iterator end() { return poly_.end();} iterator end() { return poly_.end();}
const_iterator begin() const const_iterator begin() const
{ {
auto itr = poly_.begin(); auto itr = poly_.cbegin();
std::advance(itr, 1); std::advance(itr, 1);
return itr; return itr;
} }
const_iterator end() const { return poly_.end();} const_iterator end() const { return poly_.cend();}
void clear() void clear()
{ {
@ -183,9 +213,9 @@ struct ring_mutable_type<mapnik::geometry::polygon<CoordinateType> >
// interior // interior
template <typename CoordinateType> template <typename CoordinateType>
struct interior_const_type<mapnik::geometry::polygon<CoordinateType> > struct interior_const_type<mapnik::geometry::polygon<CoordinateType>>
{ {
using type = typename mapnik::interior_rings<CoordinateType> const; using type = typename mapnik::const_interior_rings<CoordinateType> const;
}; };
template <typename CoordinateType> template <typename CoordinateType>
@ -220,7 +250,7 @@ struct interior_rings<mapnik::geometry::polygon<CoordinateType> >
static interior_const_type get(mapnik::geometry::polygon<CoordinateType> const& p) static interior_const_type get(mapnik::geometry::polygon<CoordinateType> const& p)
{ {
return mapnik::interior_rings<CoordinateType>(const_cast<mapnik::geometry::polygon<CoordinateType>&>(p)); return mapnik::const_interior_rings<CoordinateType>(p);
} }
static interior_mutable_type get(mapnik::geometry::polygon<CoordinateType>& p) static interior_mutable_type get(mapnik::geometry::polygon<CoordinateType>& p)
@ -257,8 +287,6 @@ struct push_back<mapnik::interior_rings<CoordinateType>>
} }
}; };
}}} }}}
#endif //MAPNIK_BOOST_GEOMETRY_ADAPTERS_HPP #endif //MAPNIK_BOOST_GEOMETRY_ADAPTERS_HPP