Merge branch 'master' of

https://DennisOSRM@github.com/DennisOSRM/Project-OSRM.git
This commit is contained in:
DennisOSRM
2012-02-29 14:30:19 +01:00
7 changed files with 31 additions and 4 deletions
+2 -1
View File
@@ -26,9 +26,10 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include "../DataStructures/HashTable.h"
struct RouteParameters {
std::vector<unsigned> hints;
std::vector<std::string> parameters;
HashTable<std::string, std::string> options;
std::vector<std::string> viaPoints;
HashTable<std::string, std::string> options;
typedef HashTable<std::string, std::string>::MyIterator OptionsIterator;
};
+1
View File
@@ -121,6 +121,7 @@ public:
vector<PhantomNode> phantomNodeVector(rawRoute.rawViaNodeCoordinates.size());
for(unsigned i = 0; i < rawRoute.rawViaNodeCoordinates.size(); ++i) {
searchEngine->FindPhantomNodeForCoordinate( rawRoute.rawViaNodeCoordinates[i], phantomNodeVector[i]);
INFO("found coord [" << i << "|" << rawRoute.rawViaNodeCoordinates.size());
}
unsigned distance = 0;
//single route or via point routing