Round integers to remove fake precision

This commit is contained in:
Patrick Niklaus 2016-03-25 17:13:46 +01:00
parent 156b01ae93
commit ebd8bf7c7c

View File

@ -145,8 +145,8 @@ util::json::Object makeStepManeuver(const guidance::StepManeuver &maneuver)
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);
step_maneuver.values["bearing_before"] = maneuver.bearing_before; step_maneuver.values["bearing_before"] = std::round(maneuver.bearing_before);
step_maneuver.values["bearing_after"] = maneuver.bearing_after; step_maneuver.values["bearing_after"] = std::round(maneuver.bearing_after);
if (maneuver.exit != 0) if (maneuver.exit != 0)
step_maneuver.values["exit"] = maneuver.exit; step_maneuver.values["exit"] = maneuver.exit;
@ -161,8 +161,8 @@ util::json::Object makeStepManeuver(const guidance::StepManeuver &maneuver)
util::json::Object makeRouteStep(guidance::RouteStep step, util::json::Value geometry) util::json::Object makeRouteStep(guidance::RouteStep step, util::json::Value geometry)
{ {
util::json::Object route_step; util::json::Object route_step;
route_step.values["distance"] = std::move(step.distance); route_step.values["distance"] = std::round(step.distance * 10) / 10.;
route_step.values["duration"] = std::move(step.duration); route_step.values["duration"] = std::round(step.duration * 10) / 10.;
route_step.values["name"] = std::move(step.name); route_step.values["name"] = std::move(step.name);
route_step.values["mode"] = detail::modeToString(std::move(step.mode)); route_step.values["mode"] = detail::modeToString(std::move(step.mode));
route_step.values["maneuver"] = makeStepManeuver(std::move(step.maneuver)); route_step.values["maneuver"] = makeStepManeuver(std::move(step.maneuver));
@ -175,8 +175,8 @@ util::json::Object makeRoute(const guidance::Route &route,
boost::optional<util::json::Value> geometry) boost::optional<util::json::Value> geometry)
{ {
util::json::Object json_route; util::json::Object json_route;
json_route.values["distance"] = route.distance; json_route.values["distance"] = std::round(route.distance * 10) / 10.;
json_route.values["duration"] = route.duration; json_route.values["duration"] = std::round(route.duration * 10) / 10.;
json_route.values["legs"] = std::move(legs); json_route.values["legs"] = std::move(legs);
if (geometry) if (geometry)
{ {
@ -197,8 +197,8 @@ util::json::Object makeWaypoint(const util::Coordinate location, std::string nam
util::json::Object makeRouteLeg(guidance::RouteLeg leg, util::json::Array steps) util::json::Object makeRouteLeg(guidance::RouteLeg leg, util::json::Array steps)
{ {
util::json::Object route_leg; util::json::Object route_leg;
route_leg.values["distance"] = std::move(leg.distance); route_leg.values["distance"] = std::round(leg.distance * 10) / 10.;
route_leg.values["duration"] = std::move(leg.duration); route_leg.values["duration"] = std::round(leg.duration * 10) / 10.;
route_leg.values["summary"] = std::move(leg.summary); route_leg.values["summary"] = std::move(leg.summary);
route_leg.values["steps"] = std::move(steps); route_leg.values["steps"] = std::move(steps);
return route_leg; return route_leg;