archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

c++ style - better syntax

Browse Source
This commit is contained in:
artemp 2015-02-19 10:20:17 +01:00
parent b49b8042c1
commit 33d45db318
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/input/shape/shape_featureset.cpp
View File

@ -88,11 +88,7 @@ feature_ptr shape_featureset<filterT>::next()
double y = record.read_double();
if (!filter_.pass(mapnik::box2d<double>(x,y,x,y)))
continue;
//std::unique_ptr<geometry_type> point(new geometry_type(mapnik::geometry_type::types::Point));
//point->move_to(x, y);
//feature->paths().push_back(point.release());
mapnik::new_geometry::point pt(x, y);
feature->set_geometry(std::move(pt));
feature->set_geometry(mapnik::new_geometry::point(x,y));
break;
}
case shape_io::shape_multipoint:
@ -107,8 +103,7 @@ feature_ptr shape_featureset<filterT>::next()
{
double x = record.read_double();
double y = record.read_double();
mapnik::new_geometry::point point(x, y);
multi_point.push_back(std::move(point));
multi_point.emplace_back(mapnik::new_geometry::point(x, y));
}
feature->set_geometry(std::move(multi_point));
break;

12
plugins/input/shape/shape_index_featureset.cpp
View File

@ -104,11 +104,7 @@ feature_ptr shape_index_featureset<filterT>::next()
{
double x = record.read_double();
double y = record.read_double();
mapnik::new_geometry::point point(x, y);
//std::unique_ptr<geometry_type> point(new geometry_type(mapnik::geometry_type::types::Point));
//point->move_to(x, y);
//feature->paths().push_back(point.release());
feature->set_geometry(std::move(point));
feature->set_geometry(mapnik::new_geometry::point(x,y));
break;
}
case shape_io::shape_multipoint:
@ -123,11 +119,7 @@ feature_ptr shape_index_featureset<filterT>::next()
{
double x = record.read_double();
double y = record.read_double();
mapnik::new_geometry::point point(x, y);
//std::unique_ptr<geometry_type> point(new geometry_type(mapnik::geometry_type::types::Point));
//point->move_to(x, y);
//feature->paths().push_back(point.release());
multi_point.emplace_back(point);
multi_point.emplace_back(mapnik::new_geometry::point(x, y));
}
feature->set_geometry(std::move(multi_point));
break;

1
plugins/input/shape/shape_io.cpp
View File

@ -204,7 +204,6 @@ mapnik::new_geometry::geometry shape_io::read_polygon(shape_file::record_type &
}
if (multi_poly.size() > 0)
{
std::cerr << "multi_polygon" << std::endl;
return std::move(mapnik::new_geometry::geometry(std::move(multi_poly)));
}
return std::move(mapnik::new_geometry::geometry(std::move(poly)));