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

Adapts Hint encoding and decoding to new fixed data facade

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-03-14 14:21:18 +01:00 committed by Patrick Niklaus
parent 3d75d15361
commit a145520b5b
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/engine/hint.hpp
View File

@ -40,18 +40,20 @@ namespace osrm
namespace engine namespace engine
{ {
// Fwd. decls.
namespace datafacade
{
struct BaseDataFacade;
}
// Is returned as a temporary identifier for snapped coodinates // Is returned as a temporary identifier for snapped coodinates
struct Hint struct Hint
{ {
PhantomNode phantom; PhantomNode phantom;
std::uint32_t data_checksum; std::uint32_t data_checksum;
template <typename DataFacadeT> bool IsValid(const util::Coordinate new_input_coordinates,
bool IsValid(const util::Coordinate new_input_coordinates, DataFacadeT &facade) const const datafacade::BaseDataFacade &facade) const;
{
return phantom.IsValid(facade.GetNumberOfNodes(), new_input_coordinates) &&
facade.GetCheckSum() == data_checksum;
}
std::string ToBase64() const; std::string ToBase64() const;
static Hint FromBase64(const std::string &base64Hint); static Hint FromBase64(const std::string &base64Hint);

14
src/engine/hint.cpp
View File

@ -1,5 +1,6 @@
#include "engine/hint.hpp" #include "engine/hint.hpp"
#include "engine/object_encoder.hpp" #include "engine/object_encoder.hpp"
#include "engine/datafacade/datafacade_base.hpp"
#include <boost/assert.hpp> #include <boost/assert.hpp>
@ -7,14 +8,23 @@ namespace osrm
{ {
namespace engine namespace engine
{ {
bool Hint::IsValid(const util::Coordinate new_input_coordinates,
const datafacade::BaseDataFacade &facade) const
{
auto is_same_input_coordinate = new_input_coordinates.lon == phantom.input_location.lon &&
new_input_coordinates.lat == phantom.input_location.lat;
return is_same_input_coordinate && phantom.IsValid(facade.GetNumberOfNodes()) &&
facade.GetCheckSum() == data_checksum;
}
std::string Hint::ToBase64() const { return encodeBase64(*this); } std::string Hint::ToBase64() const { return encodeBase64(*this); }
Hint Hint::FromBase64(const std::string &base64Hint) Hint Hint::FromBase64(const std::string &base64Hint)
{ {
BOOST_ASSERT_MSG(base64Hint.size() == ENCODED_HINT_SIZE, "Hint has invalid size"); BOOST_ASSERT_MSG(base64Hint.size() == ENCODED_HINT_SIZE, "Hint has invalid size");
auto decoded = decodeBase64<Hint>(base64Hint); return decodeBase64<Hint>(base64Hint);
return decoded;
} }
} }
} }