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

GeoJSON - make geometry element stricter and throw on invalid input.

Browse source
This commit is contained in:
artemp 2017-03-21 12:40:58 +00:00
parent 8a18ef93e0
commit d9063db0a0
1 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
include/mapnik/json/create_geometry.hpp
View file

@ -44,7 +44,10 @@ struct create_point
} }
template <typename T> template <typename T>
void operator()(T const&) const {} // no-op - shouldn't get here void operator()(T const&) const
{
throw std::runtime_error("Failed to parse geojson geometry");
}
Geometry & geom_; Geometry & geom_;
}; };
@ -56,21 +59,21 @@ struct create_linestring
void operator() (ring const& points) const void operator() (ring const& points) const
{ {
mapnik::geometry::line_string<double> line;
std::size_t size = points.size(); std::size_t size = points.size();
if (size > 1) line.reserve(size);
for (auto && pt : points)
{ {
mapnik::geometry::line_string<double> line; line.emplace_back(std::move(pt));
line.reserve(size);
for (auto && pt : points)
{
line.emplace_back(std::move(pt));
}
geom_ = std::move(line);
} }
geom_ = std::move(line);
} }
template <typename T> template <typename T>
void operator()(T const&) const {} // no-op - shouldn't get here void operator()(T const&) const
{
throw std::runtime_error("Failed to parse geojson geometry");
}
Geometry & geom_; Geometry & geom_;
}; };
@ -107,7 +110,10 @@ struct create_polygon
} }
template <typename T> template <typename T>
void operator()(T const&) const {} // no-op - shouldn't get here void operator()(T const&) const
{
throw std::runtime_error("Failed to parse geojson geometry");
}
Geometry & geom_; Geometry & geom_;
}; };
@ -131,7 +137,10 @@ struct create_multipoint
} }
template <typename T> template <typename T>
void operator()(T const&) const {} // no-op - shouldn't get here void operator()(T const&) const
{
throw std::runtime_error("Failed to parse geojson geometry");
}
Geometry & geom_; Geometry & geom_;
}; };
@ -161,7 +170,10 @@ struct create_multilinestring
} }
template <typename T> template <typename T>
void operator()(T const&) const {} // no-op - shouldn't get here void operator()(T const&) const
{
throw std::runtime_error("Failed to parse geojson geometry");
}
Geometry & geom_; Geometry & geom_;
}; };
@ -202,7 +214,10 @@ struct create_multipolygon
} }
template <typename T> template <typename T>
void operator()(T const&) const {} // no-op - shouldn't get here void operator()(T const&) const
{
throw std::runtime_error("Failed to parse geojson geometry");
}
Geometry & geom_; Geometry & geom_;
}; };
@ -232,6 +247,7 @@ void create_geometry (Geometry & geom, int type, mapnik::json::positions const&
util::apply_visitor(create_multipolygon<Geometry>(geom), coords); util::apply_visitor(create_multipolygon<Geometry>(geom), coords);
break; break;
default: default:
throw std::runtime_error("Failed to parse geojson geometry");
break; break;
} }
} }