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

group_symbolizer - update to mapnik-geometry

Browse source
This commit is contained in:
artemp 2015-03-18 12:10:21 +01:00
parent ab5116df8d
commit 1bb06d89fa
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/mapnik/renderer_common/process_group_symbolizer.hpp
View file

@ -225,9 +225,6 @@ private:
void update_box() const;
};
geometry_type *origin_point(proj_transform const& prj_trans,
renderer_common const& common);
template <typename F>
void render_offset_placements(placements_list const& placements,
pixel_position const& offset,
@ -339,9 +336,15 @@ void render_group_symbolizer(group_symbolizer const& sym,
}
// add a single point geometry at pixel origin
// FIXME
//sub_feature->add_geometry(origin_point(prj_trans, common));
double x = common.width_ / 2.0, y = common.height_ / 2.0, z = 0.0;
common.t_.backward(&x, &y);
prj_trans.forward(x, y, z);
// note that we choose a point in the middle of the screen to
// try to ensure that we don't get edge artefacts due to any
// symbolizers with avoid-edges set: only the avoid-edges of
// the group symbolizer itself should matter.
new_geometry::point origin_pt(x,y);
sub_feature->set_geometry(origin_pt);
// get the layout for this set of properties
for (auto const& rule : props->get_rules())
{

15
src/renderer_common/process_group_symbolizer.cpp
View file

@ -208,19 +208,4 @@ void render_thunk_extractor::update_box() const
detector.clear();
}
geometry_type *origin_point(proj_transform const& prj_trans,
renderer_common const& common)
{
// note that we choose a point in the middle of the screen to
// try to ensure that we don't get edge artefacts due to any
// symbolizers with avoid-edges set: only the avoid-edges of
// the group symbolizer itself should matter.
double x = common.width_ / 2.0, y = common.height_ / 2.0, z = 0.0;
common.t_.backward(&x, &y);
prj_trans.forward(x, y, z);
geometry_type *geom = new geometry_type(geometry_type::Point);
geom->move_to(x, y);
return geom;
}
} // namespace mapnik