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

markers_helper - add support for geometry collections

Browse source
This commit is contained in:
artemp 2015-03-25 16:15:48 +01:00
parent ba423f0955
commit 06f512f584
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
include/mapnik/marker_helpers.hpp
View file

@ -176,7 +176,8 @@ protected:
double scale_factor_;
};
void build_ellipse(symbolizer_base const& sym, mapnik::feature_impl & feature, attributes const& vars, svg_storage_type & marker_ellipse, svg::svg_path_adapter & svg_path);
void build_ellipse(symbolizer_base const& sym, mapnik::feature_impl & feature, attributes const& vars,
svg_storage_type & marker_ellipse, svg::svg_path_adapter & svg_path);
bool push_explicit_style(svg_attribute_type const& src,
svg_attribute_type & dst,
@ -209,7 +210,7 @@ void apply_markers_multi(feature_impl const& feature, attributes const& vars, Co
apply_vertex_converter_type apply(converter);
mapnik::util::apply_visitor(vertex_processor_type(apply), geom);
}
else //if (type != geometry::geometry_types::GeometryCollection) // multi geometries/collection
else
{
marker_multi_policy_enum multi_policy = get<marker_multi_policy_enum, keys::markers_multipolicy>(sym, feature, vars);
@ -254,19 +255,19 @@ void apply_markers_multi(feature_impl const& feature, attributes const& vars, Co
converter.apply(va);
}
}
else
{
MAPNIK_LOG_WARN(marker_symbolizer) << "TODO: if you get here -> open an issue";
}
}
else if (type == geometry::geometry_types::MultiPolygon)
else
{
if (multi_policy != MARKER_EACH_MULTI && placement != MARKER_POINT_PLACEMENT)
{
MAPNIK_LOG_WARN(marker_symbolizer) << "marker_multi_policy != 'each' has no effect with marker_placement != 'point'";
}
geometry::multi_polygon const& multi_poly = mapnik::util::get<geometry::multi_polygon>(geom);
for (auto const& poly : multi_poly)
{
geometry::polygon_vertex_adapter va(poly);
converter.apply(va);
}
apply_vertex_converter_type apply(converter);
mapnik::util::apply_visitor(vertex_processor_type(apply), geom);
}
}
}