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

update geometry adapters to use polygon_interior<T> as mutable interior rings proxy container

Browse source
This commit is contained in:
artemp 2016-07-04 10:30:23 +01:00
parent f5ec3ba0e0
commit 81419154eb
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
include/mapnik/geometry_adapters.hpp
View file

@ -41,7 +41,7 @@
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/box2d.hpp>
#include <mapnik/polygon_interior.hpp>
#include <cstdint> #include <cstdint>
// register point // register point
@ -183,7 +183,8 @@ struct interior_const_type<mapnik::geometry::polygon<CoordinateType> >
template <typename CoordinateType> template <typename CoordinateType>
struct interior_mutable_type<mapnik::geometry::polygon<CoordinateType> > struct interior_mutable_type<mapnik::geometry::polygon<CoordinateType> >
{ {
using type = boost::iterator_range<typename mapbox::geometry::polygon<CoordinateType>::iterator>; //using type = boost::iterator_range<typename mapbox::geometry::polygon<CoordinateType>::iterator>;
using type = mapnik::detail::polygon_interior<CoordinateType>;
}; };
// exterior // exterior
@ -192,17 +193,13 @@ struct exterior_ring<mapnik::geometry::polygon<CoordinateType> >
{ {
static mapnik::geometry::linear_ring<CoordinateType> & get(mapnik::geometry::polygon<CoordinateType> & p) static mapnik::geometry::linear_ring<CoordinateType> & get(mapnik::geometry::polygon<CoordinateType> & p)
{ {
if (p.empty()) { if (p.empty()) throw std::runtime_error("ring must be initialized 1");
throw std::runtime_error("ring must be initialized 1");
}
return p[0]; return p[0];
} }
static mapnik::geometry::linear_ring<CoordinateType> const& get(mapnik::geometry::polygon<CoordinateType> const& p) static mapnik::geometry::linear_ring<CoordinateType> const& get(mapnik::geometry::polygon<CoordinateType> const& p)
{ {
if (p.empty()) { if (p.empty()) throw std::runtime_error("ring must be initialized 2");
throw std::runtime_error("ring must be initialized 2");
}
return p[0]; return p[0];
} }
}; };
@ -210,18 +207,15 @@ struct exterior_ring<mapnik::geometry::polygon<CoordinateType> >
template <typename CoordinateType> template <typename CoordinateType>
struct interior_rings<mapnik::geometry::polygon<CoordinateType> > struct interior_rings<mapnik::geometry::polygon<CoordinateType> >
{ {
using ring_iterator = typename mapbox::geometry::polygon<CoordinateType>::iterator;
using const_ring_iterator = typename mapbox::geometry::polygon<CoordinateType>::const_iterator; using const_ring_iterator = typename mapbox::geometry::polygon<CoordinateType>::const_iterator;
using holes_type = boost::iterator_range<ring_iterator>; using interior_type = mapnik::detail::polygon_interior<CoordinateType>;
using const_holes_type = boost::iterator_range<const_ring_iterator>; using const_interior_type = boost::iterator_range<const_ring_iterator>;
static holes_type get(mapnik::geometry::polygon<CoordinateType> & p) static interior_type get(mapnik::geometry::polygon<CoordinateType> & p)
// -> decltype(boost::make_iterator_range(p.begin() + 1, p.end()))
{ {
return boost::make_iterator_range(p.begin() + 1, p.end()); return mapnik::detail::polygon_interior<CoordinateType>(p);
} }
static const_holes_type get(mapnik::geometry::polygon<CoordinateType> const& p) static const_interior_type get(mapnik::geometry::polygon<CoordinateType> const& p)
// -> decltype(boost::make_iterator_range(p.begin() + 1, p.end())) const
{ {
return boost::make_iterator_range(p.begin() + 1, p.end()); return boost::make_iterator_range(p.begin() + 1, p.end());
} }