Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Use correct node-loading code in rtree benchmark. (#4064)

Browse Source
This commit is contained in:
Daniel Patterson 2017-05-18 13:29:50 -07:00 committed by GitHub
parent a971c2ef37
commit aef3ff3e7b
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/benchmarks/static_rtree.cpp
View File

@ -5,6 +5,7 @@
#include "storage/io.hpp" #include "storage/io.hpp"
#include "engine/geospatial_query.hpp" #include "engine/geospatial_query.hpp"
#include "util/coordinate.hpp" #include "util/coordinate.hpp"
#include "util/serialization.hpp"
#include "util/timing_util.hpp" #include "util/timing_util.hpp"
#include <iostream> #include <iostream>
@ -34,14 +35,8 @@ std::vector<util::Coordinate> loadCoordinates(const boost::filesystem::path &nod
storage::io::FileReader nodes_path_file_reader(nodes_file, storage::io::FileReader nodes_path_file_reader(nodes_file,
storage::io::FileReader::VerifyFingerprint); storage::io::FileReader::VerifyFingerprint);
extractor::QueryNode current_node; std::vector<util::Coordinate> coords;
auto coordinate_count = nodes_path_file_reader.ReadElementCount64(); storage::serialization::read(nodes_path_file_reader, coords);
std::vector<util::Coordinate> coords(coordinate_count);
for (unsigned i = 0; i < coordinate_count; ++i)
{
nodes_path_file_reader.ReadInto(&current_node, 1);
coords[i] = util::Coordinate(current_node.lon, current_node.lat);
}
return coords; return coords;
} }