Fixes for gcc compiling, temporary hacks to remove later
This commit is contained in:
parent
f1aa03c360
commit
e0f009b3b9
@ -100,7 +100,7 @@ util::json::Object makeStepManeuver(const guidance::StepManeuver &maneuver)
|
|||||||
{
|
{
|
||||||
util::json::Object step_maneuver;
|
util::json::Object step_maneuver;
|
||||||
step_maneuver.values["type"] = detail::instructionTypeToString(maneuver.instruction.type);
|
step_maneuver.values["type"] = detail::instructionTypeToString(maneuver.instruction.type);
|
||||||
if( isValidModifier( maneuver.instruction.type, maneuver.instruction.direction_modifier ) )
|
if( guidance::isValidModifier( maneuver.instruction.type, maneuver.instruction.direction_modifier ) )
|
||||||
step_maneuver.values["modifier"] =
|
step_maneuver.values["modifier"] =
|
||||||
detail::instructionModifierToString(maneuver.instruction.direction_modifier);
|
detail::instructionModifierToString(maneuver.instruction.direction_modifier);
|
||||||
step_maneuver.values["location"] = detail::coordinateToLonLat(maneuver.location);
|
step_maneuver.values["location"] = detail::coordinateToLonLat(maneuver.location);
|
||||||
|
@ -47,6 +47,7 @@ using engine::guidance::isConflict;
|
|||||||
using engine::guidance::isSlightTurn;
|
using engine::guidance::isSlightTurn;
|
||||||
using engine::guidance::isSlightModifier;
|
using engine::guidance::isSlightModifier;
|
||||||
using engine::guidance::mirrorDirectionModifier;
|
using engine::guidance::mirrorDirectionModifier;
|
||||||
|
using engine::guidance::canBeSuppressed;
|
||||||
|
|
||||||
#define PRINT_DEBUG_CANDIDATES 0
|
#define PRINT_DEBUG_CANDIDATES 0
|
||||||
std::vector<TurnCandidate>
|
std::vector<TurnCandidate>
|
||||||
|
Loading…
Reference in New Issue
Block a user