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

Fixes AppVeyor tests

Browse Source
This commit is contained in:
Daniel J. Hofmann 2017-11-03 13:57:11 -04:00 committed by Daniel J. H
parent 2224389fb3
commit 9b83649a03
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/util/debug.hpp
View File

@ -23,8 +23,6 @@ namespace util
namespace guidance
{
inline void print(const engine::guidance::RouteStep &step)
{
std::cout << static_cast<int>(step.maneuver.instruction.type) << " "

2
src/engine/plugins/tile.cpp
View File

@ -1,7 +1,7 @@
#include "extractor/guidance/turn_instruction.hpp"
#include "engine/plugins/tile.hpp"
#include "engine/plugins/plugin_base.hpp"
#include "engine/plugins/tile.hpp"
#include "util/coordinate_calculation.hpp"
#include "util/string_view.hpp"

4
src/extractor/scripting_environment_lua.cpp
View File

@ -395,8 +395,8 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
"get_relations",
[&getTypedRefBySol](ExtractionRelationContainer &cont, const sol::object &obj)
-> const ExtractionRelationContainer::RelationIDList & {
return cont.GetRelations(getTypedRefBySol(obj));
},
return cont.GetRelations(getTypedRefBySol(obj));
},
"relation",
[](ExtractionRelationContainer &cont, const ExtractionRelation::OsmIDTyped &rel_id)
-> const ExtractionRelation & { return cont.GetRelationData(rel_id); });

7
unit_tests/engine/guidance_assembly.cpp
View File

@ -1,3 +1,5 @@
#include "extractor/travel_mode.hpp"
#include "engine/guidance/assemble_geometry.hpp"
#include "engine/guidance/assemble_leg.hpp"
#include "engine/guidance/assemble_overview.hpp"
@ -12,6 +14,7 @@ BOOST_AUTO_TEST_SUITE(guidance_assembly)
BOOST_AUTO_TEST_CASE(trim_short_segments)
{
using namespace osrm::extractor;
using namespace osrm::extractor::guidance;
using namespace osrm::engine::guidance;
using namespace osrm::engine;
@ -46,7 +49,7 @@ BOOST_AUTO_TEST_CASE(trim_short_segments)
0.2,
1.9076601161280742,
0.2,
extractor::TRAVEL_MODE_DRIVING,
TRAVEL_MODE_DRIVING,
{{FloatLongitude{-73.981492}, FloatLatitude{40.768258}},
329,
348,
@ -67,7 +70,7 @@ BOOST_AUTO_TEST_CASE(trim_short_segments)
0,
0,
0,
extractor::TRAVEL_MODE_DRIVING,
TRAVEL_MODE_DRIVING,
{{FloatLongitude{-73.981495}, FloatLatitude{40.768275}},
0,
0,