diff --git a/Include/osrm/RouteParameters.h b/Include/osrm/RouteParameters.h index fd570a1ef..9eb1ccc08 100644 --- a/Include/osrm/RouteParameters.h +++ b/Include/osrm/RouteParameters.h @@ -40,7 +40,7 @@ struct RouteParameters RouteParameters(); void setZoomLevel(const short level); - + void setNumberOfResults(const short number); void setAlternateRouteFlag(const bool flag); @@ -78,13 +78,11 @@ struct RouteParameters bool compression; bool deprecatedAPI; bool uturn_default; - unsigned check_sum; short num_results; std::string service; std::string output_format; std::string jsonp_parameter; std::string language; - std::vector hints; std::vector uturns; std::vector coordinates; }; diff --git a/data_structures/route_parameters.cpp b/data_structures/route_parameters.cpp index 1019a9149..08aad949d 100644 --- a/data_structures/route_parameters.cpp +++ b/data_structures/route_parameters.cpp @@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. RouteParameters::RouteParameters() : zoom_level(18), print_instructions(false), alternate_route(true), geometry(true), - compression(true), deprecatedAPI(false), uturn_default(false), check_sum(-1), num_results(1) + compression(true), deprecatedAPI(false), uturn_default(false), num_results(1) { } @@ -77,7 +77,7 @@ void RouteParameters::setAllUTurns(const bool flag) void RouteParameters::setDeprecatedAPIFlag(const std::string &) { deprecatedAPI = true; } -void RouteParameters::setChecksum(const unsigned sum) { check_sum = sum; } +void RouteParameters::setChecksum(const unsigned sum) { } void RouteParameters::setInstructionFlag(const bool flag) { print_instructions = flag; } @@ -92,11 +92,11 @@ void RouteParameters::setJSONpParameter(const std::string ¶meter) void RouteParameters::addHint(const std::string &hint) { - hints.resize(coordinates.size()); - if (!hints.empty()) - { - hints.back() = hint; - } + // hints.resize(coordinates.size()); + // if (!hints.empty()) + // { + // hints.back() = hint; + // } } void RouteParameters::setLanguage(const std::string &language_string) diff --git a/plugins/hello_world.hpp b/plugins/hello_world.hpp index c8b07b081..c6cc1aed3 100644 --- a/plugins/hello_world.hpp +++ b/plugins/hello_world.hpp @@ -57,8 +57,6 @@ class HelloWorldPlugin final : public BasePlugin temp_string = cast::integral_to_string(routeParameters.zoom_level); json_result.values["zoom_level"] = temp_string; - temp_string = cast::integral_to_string(routeParameters.check_sum); - json_result.values["check_sum"] = temp_string; json_result.values["instructions"] = (routeParameters.print_instructions ? "yes" : "no"); json_result.values["geometry"] = (routeParameters.geometry ? "yes" : "no"); json_result.values["compression"] = (routeParameters.compression ? "yes" : "no"); @@ -86,16 +84,6 @@ class HelloWorldPlugin final : public BasePlugin ++counter; } json_result.values["locations"] = json_locations; - json_result.values["hint_count"] = routeParameters.hints.size(); - - JSON::Array json_hints; - counter = 0; - for (const std::string ¤t_hint : routeParameters.hints) - { - json_hints.values.push_back(current_hint); - ++counter; - } - json_result.values["hints"] = json_hints; JSON::render(reply.content, json_result); } diff --git a/tools/simpleclient.cpp b/tools/simpleclient.cpp index b6714566a..e328b4cc9 100644 --- a/tools/simpleclient.cpp +++ b/tools/simpleclient.cpp @@ -90,12 +90,10 @@ int main(int argc, const char *argv[]) route_parameters.alternate_route = true; // get an alternate route, too route_parameters.geometry = true; // retrieve geometry of route route_parameters.compression = true; // polyline encoding - route_parameters.check_sum = UINT_MAX; // see wiki route_parameters.service = "viaroute"; // that's routing route_parameters.output_format = "json"; route_parameters.jsonp_parameter = ""; // set for jsonp wrapping route_parameters.language = ""; // unused atm - // route_parameters.hints.push_back(); // see wiki, saves I/O if done properly // start_coordinate route_parameters.coordinates.emplace_back(52.519930 * COORDINATE_PRECISION,