From 86cc903835231bbb1e699ae30c68115678a09242 Mon Sep 17 00:00:00 2001 From: artemp Date: Wed, 22 Apr 2015 15:01:52 +0200 Subject: [PATCH] point_symbolizer - revive interior point placement --- .../renderer_common/process_point_symbolizer.hpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/include/mapnik/renderer_common/process_point_symbolizer.hpp b/include/mapnik/renderer_common/process_point_symbolizer.hpp index af3a7d671..19bba1522 100644 --- a/include/mapnik/renderer_common/process_point_symbolizer.hpp +++ b/include/mapnik/renderer_common/process_point_symbolizer.hpp @@ -30,6 +30,10 @@ #include #include #include +#include +#include +#include +#include namespace mapnik { @@ -69,11 +73,13 @@ void render_point_symbolizer(point_symbolizer const &sym, { if (!geometry::centroid(geometry, pt)) return; } - //else - //{ - // if (!label::interior_position(va ,x, y)) - // return; - //} + else if (mapnik::geometry::geometry_type(geometry) == mapnik::geometry::geometry_types::Polygon) + { + auto const& poly = mapnik::util::get >(geometry); + geometry::polygon_vertex_adapter va(poly); + if (!label::interior_position(va ,pt.x, pt.y)) + return; + } double x = pt.x; double y = pt.y; double z = 0;