more cleanups

This commit is contained in:
artemp 2015-02-18 13:51:20 +01:00
parent 604d7b08af
commit 8e34077aef

View file

@ -102,18 +102,15 @@ feature_ptr shape_featureset<filterT>::next()
shape_io::read_bbox(record, feature_bbox_); shape_io::read_bbox(record, feature_bbox_);
if (!filter_.pass(feature_bbox_)) continue; if (!filter_.pass(feature_bbox_)) continue;
int num_points = record.read_ndr_integer(); int num_points = record.read_ndr_integer();
mapnik::new_geometry::multi_point multi_pt; mapnik::new_geometry::multi_point multi_point;
for (int i = 0; i < num_points; ++i) for (int i = 0; i < num_points; ++i)
{ {
double x = record.read_double(); double x = record.read_double();
double y = record.read_double(); double y = record.read_double();
mapnik::new_geometry::point pt(x, y); mapnik::new_geometry::point point(x, y);
//std::unique_ptr<geometry_type> point(new geometry_type(mapnik::geometry_type::types::Point)); multi_point.push_back(std::move(point));
//point->move_to(x, y);
//feature->paths().push_back(point.release());
multi_pt.push_back(std::move(pt));
} }
feature->set_geometry(std::move(multi_pt)); feature->set_geometry(std::move(multi_point));
break; break;
} }