Revert "fix geometry usage against new variant"

This reverts commit 4a480b18c9.
This commit is contained in:
Dane Springmeyer 2016-07-28 14:27:57 -07:00
parent 7469d7d4c9
commit 298a3ead0b
2 changed files with 2 additions and 2 deletions

View file

@ -105,7 +105,7 @@ public:
: id_(_id), : id_(_id),
ctx_(ctx), ctx_(ctx),
data_(ctx_->mapping_.size()), data_(ctx_->mapping_.size()),
geom_(), geom_(geometry::geometry_empty()),
raster_() {} raster_() {}
inline mapnik::value_integer id() const { return id_;} inline mapnik::value_integer id() const { return id_;}

View file

@ -119,7 +119,7 @@ void render_group_symbolizer(group_symbolizer const& sym,
// symbolizers with avoid-edges set: only the avoid-edges of // symbolizers with avoid-edges set: only the avoid-edges of
// the group symbolizer itself should matter. // the group symbolizer itself should matter.
geometry::point<double> origin_pt(x,y); geometry::point<double> origin_pt(x,y);
sub_feature->set_geometry(std::move(origin_pt)); sub_feature->set_geometry(origin_pt);
// get the layout for this set of properties // get the layout for this set of properties
for (auto const& rule : props->get_rules()) for (auto const& rule : props->get_rules())
{ {