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

use mapnik::quad_tree<T>

Browse source
This commit is contained in:
artemp 2015-09-29 12:21:02 +01:00
parent 2f35c71606
commit 9c292595b4
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
utils/csvindex/csvindex.cpp
View file

@ -24,11 +24,11 @@
#include <vector>
#include <string>
#include <fstream>
#include <mapnik/util/fs.hpp>
#include <mapnik/geometry_envelope.hpp>
#include <mapnik/quad_tree.hpp>
#include "../../plugins/input/csv/csv_utils.hpp"
#include "../shapeindex/quadtree.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
@ -347,7 +347,7 @@ int main (int argc, char** argv)
}
std::clog << extent << std::endl;
quadtree<std::pair<std::size_t, std::size_t>> tree(extent, depth, ratio);
mapnik::quad_tree<std::pair<std::size_t, std::size_t>> tree(extent, depth, ratio);
for (auto const& item : boxes)
{
tree.insert(std::get<1>(item), std::get<0>(item));

4
utils/shapeindex/shapeindex.cpp
View file

@ -25,7 +25,7 @@
#include <vector>
#include <string>
#include <mapnik/util/fs.hpp>
#include "quadtree.hpp"
#include <mapnik/quad_tree.hpp>
#include "shapefile.hpp"
#include "shape_io.hpp"
@ -153,7 +153,7 @@ int main (int argc,char** argv)
int pos=50;
shp.seek(pos*2);
quadtree<int> tree(extent,depth,ratio);
mapnik::quad_tree<int> tree(extent,depth,ratio);
int count=0;
while (true) {