relative waypoint locations

src/engine/api/json_factory.cpp

@@ -100,8 +100,9 @@ util::json::Object makeStepManeuver(const guidance::StepManeuver &maneuver)
 {
     util::json::Object step_maneuver;
     step_maneuver.values["type"] = detail::instructionTypeToString(maneuver.instruction.type);
-    step_maneuver.values["modifier"] =
-        detail::instructionModifierToString(maneuver.instruction.direction_modifier);
+    if( isValidModifier( maneuver.instruction.type, maneuver.instruction.direction_modifier )
+      step_maneuver.values["modifier"] =
+          detail::instructionModifierToString(maneuver.instruction.direction_modifier);
     step_maneuver.values["location"] = detail::coordinateToLonLat(maneuver.location);
     step_maneuver.values["bearing_before"] = maneuver.bearing_before;
     step_maneuver.values["bearing_after"] = maneuver.bearing_after;

src/engine/plugins/trip.cpp

@@ -243,13 +243,18 @@ Status TripPlugin::HandleRequest(const api::TripParameters &parameters,
     // compute all round trip routes
     std::vector<InternalRouteResult> routes;
     routes.reserve(trips.size());
-    for (auto &trip : trips)
+    std::vector<std::vector<util::Coordinate>> ordered_coordinates;
+    ordered_coordinates.reserve(trips.size());
+    for (const auto &trip : trips)
     {
         routes.push_back(ComputeRoute(snapped_phantoms, parameters, trip));
+        ordered_coordinates.push_back( std::vector<util::Coordinate>() );
+        for( const auto nid : trip )
+          ordered_coordinates.back().push_back( parameters.coordinates[nid] );
     }
 
     api::TripAPI trip_api{BasePlugin::facade, parameters};
-    trip_api.MakeResponse(trips, routes, snapped_phantoms, json_result);
+    trip_api.MakeResponse(trips, routes, snapped_phantoms, json_result, &ordered_coordinates);
 
     return Status::Ok;
 }

src/engine/plugins/viaroute.cpp

@@ -87,7 +87,7 @@ Status ViaRoutePlugin::HandleRequest(const api::RouteParameters &route_parameter
     if (raw_route.is_valid())
     {
         api::RouteAPI route_api{BasePlugin::facade, route_parameters};
-        route_api.MakeResponse(raw_route, json_result);
+        route_api.MakeResponse(raw_route, json_result, &route_parameters.coordinates);
     }
     else
     {