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

untangle includes

Browse Source
This commit is contained in:
Dennis Luxen 2014-10-23 16:11:54 +02:00
parent ae269e12bb
commit 6f75d68d07
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/OSRM_impl.cpp
View File

@ -46,6 +46,7 @@ namespace boost { namespace interprocess { class named_mutex; } }
#include "../Server/DataStructures/SharedBarriers.h" #include "../Server/DataStructures/SharedBarriers.h"
#include "../Server/DataStructures/SharedDataFacade.h" #include "../Server/DataStructures/SharedDataFacade.h"
#include "../Util/make_unique.hpp" #include "../Util/make_unique.hpp"
#include "../Util/ProgramOptions.h"
#include "../Util/simple_logger.hpp" #include "../Util/simple_logger.hpp"
#include <boost/assert.hpp> #include <boost/assert.hpp>

8
Server/DataStructures/InternalDataFacade.h
View File

@ -41,10 +41,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../../DataStructures/RangeTable.h" #include "../../DataStructures/RangeTable.h"
#include "../../Util/BoostFileSystemFix.h" #include "../../Util/BoostFileSystemFix.h"
#include "../../Util/GraphLoader.h" #include "../../Util/GraphLoader.h"
#include "../../Util/ProgramOptions.h"
#include "../../Util/simple_logger.hpp" #include "../../Util/simple_logger.hpp"
#include <osrm/Coordinate.h> #include <osrm/Coordinate.h>
#include <osrm/ServerPaths.h>
template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<EdgeDataT> template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<EdgeDataT>
{ {
@ -396,9 +396,9 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
const unsigned zoom_level) final const unsigned zoom_level) final
{ {
std::vector<PhantomNode> resulting_phantom_node_vector; std::vector<PhantomNode> resulting_phantom_node_vector;
auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate, auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate,
resulting_phantom_node_vector, resulting_phantom_node_vector,
zoom_level, zoom_level,
1); 1);
if (result) if (result)
{ {

7
Server/DataStructures/SharedDataFacade.h
View File

@ -37,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../../DataStructures/StaticGraph.h" #include "../../DataStructures/StaticGraph.h"
#include "../../DataStructures/StaticRTree.h" #include "../../DataStructures/StaticRTree.h"
#include "../../Util/BoostFileSystemFix.h" #include "../../Util/BoostFileSystemFix.h"
#include "../../Util/ProgramOptions.h"
#include "../../Util/make_unique.hpp" #include "../../Util/make_unique.hpp"
#include "../../Util/simple_logger.hpp" #include "../../Util/simple_logger.hpp"
@ -389,9 +388,9 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
const unsigned zoom_level) final const unsigned zoom_level) final
{ {
std::vector<PhantomNode> resulting_phantom_node_vector; std::vector<PhantomNode> resulting_phantom_node_vector;
auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate, auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate,
resulting_phantom_node_vector, resulting_phantom_node_vector,
zoom_level, zoom_level,
1); 1);
if (result) if (result)
{ {