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

Merge branch 'master' into bbox-index

Browse source
This commit is contained in:
Artem Pavlenko 2017-09-11 17:32:35 +01:00
commit f19ca6672e
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/input/geojson/geojson_datasource.cpp
View file

@ -274,6 +274,7 @@ void geojson_datasource::initialise_index(Iterator start, Iterator end)
try try
{ {
mapnik::json::extract_bounding_boxes(itr, end, boxes); mapnik::json::extract_bounding_boxes(itr, end, boxes);
if (itr != end || boxes.empty()) throw std::exception();
// bulk insert initialise r-tree // bulk insert initialise r-tree
tree_ = std::make_unique<spatial_index_type>(boxes); tree_ = std::make_unique<spatial_index_type>(boxes);
// calculate total extent // calculate total extent
@ -365,9 +366,7 @@ void geojson_datasource::parse_geojson(Iterator start, Iterator end)
{ {
boxes_type boxes; boxes_type boxes;
mapnik::json::extract_bounding_boxes(itr, end, boxes); mapnik::json::extract_bounding_boxes(itr, end, boxes);
if (itr != end || boxes.empty()) throw std::exception(); //ensure we've consumed all input and we extracted at least one bbox;
if (itr != end) throw std::runtime_error("Malformed GeoJSON"); //ensure we've consumed all input
for (auto const& item : boxes) for (auto const& item : boxes)
{ {
auto const& geometry_index = std::get<1>(item); auto const& geometry_index = std::get<1>(item);