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

topojson plugin : fix spatial index population, rename 'count' to 'index'

Browse source
This commit is contained in:
artemp 2014-08-20 16:00:12 +01:00
parent 3c99514c85
commit 2d50a2dccc
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/input/topojson/topojson_datasource.cpp
View file

@ -208,7 +208,7 @@ void topojson_datasource::parse_topojson(T & stream)
throw mapnik::datasource_exception("topojson_datasource: Failed parse TopoJSON file '" + filename_ + "'"); throw mapnik::datasource_exception("topojson_datasource: Failed parse TopoJSON file '" + filename_ + "'");
} }
std::size_t count = 0; std::size_t index = 0;
for (auto const& geom : topo_.geometries) for (auto const& geom : topo_.geometries)
{ {
mapnik::box2d<double> box = mapnik::util::apply_visitor(mapnik::topojson::bounding_box_visitor(topo_), geom); mapnik::box2d<double> box = mapnik::util::apply_visitor(mapnik::topojson::bounding_box_visitor(topo_), geom);
@ -225,11 +225,12 @@ void topojson_datasource::parse_topojson(T & stream)
extent_.expand_to_include(box); extent_.expand_to_include(box);
} }
#if BOOST_VERSION >= 105600 #if BOOST_VERSION >= 105600
tree_.insert(std::make_pair(box_type(point_type(box.minx(),box.miny()),point_type(box.maxx(),box.maxy())),count++)); tree_.insert(std::make_pair(box_type(point_type(box.minx(),box.miny()),point_type(box.maxx(),box.maxy())),index));
#else #else
tree_.insert(box_type(point_type(box.minx(),box.miny()),point_type(box.maxx(),box.maxy())),count++); tree_.insert(box_type(point_type(box.minx(),box.miny()),point_type(box.maxx(),box.maxy())),index);
#endif #endif
} }
++index;
} }
} }