From 4684921e51ec24433f84bf5f4e69484ce219d38e Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Fri, 17 Oct 2014 12:31:02 +0200 Subject: [PATCH] fix implicit casts --- DataStructures/Coordinate.cpp | 12 ++++++------ Plugins/NearestPlugin.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DataStructures/Coordinate.cpp b/DataStructures/Coordinate.cpp index 78fdee2c1..415b8d9f4 100644 --- a/DataStructures/Coordinate.cpp +++ b/DataStructures/Coordinate.cpp @@ -159,11 +159,11 @@ FixedPointCoordinate::ComputePerpendicularDistance(const FixedPointCoordinate &s const FixedPointCoordinate &point) { // initialize values - const float x_value = lat2y(point.lat / COORDINATE_PRECISION); + const float x_value = static_cast(lat2y(point.lat / COORDINATE_PRECISION)); const float y_value = point.lon / COORDINATE_PRECISION; - float a = lat2y(source_coordinate.lat / COORDINATE_PRECISION); + float a = static_cast(lat2y(source_coordinate.lat / COORDINATE_PRECISION)); float b = source_coordinate.lon / COORDINATE_PRECISION; - float c = lat2y(target_coordinate.lat / COORDINATE_PRECISION); + float c = static_cast(lat2y(target_coordinate.lat / COORDINATE_PRECISION)); float d = target_coordinate.lon / COORDINATE_PRECISION; float p, q; if (std::abs(a - c) > std::numeric_limits::epsilon()) @@ -429,11 +429,11 @@ int FixedPointCoordinate::OrderedPerpendicularDistanceApproximation( const FixedPointCoordinate &segment_target) { // initialize values - const float x = lat2y(input_point.lat / COORDINATE_PRECISION); + const float x = static_cast(lat2y(input_point.lat / COORDINATE_PRECISION)); const float y = input_point.lon / COORDINATE_PRECISION; - const float a = lat2y(segment_source.lat / COORDINATE_PRECISION); + const float a = static_cast(lat2y(segment_source.lat / COORDINATE_PRECISION)); const float b = segment_source.lon / COORDINATE_PRECISION; - const float c = lat2y(segment_target.lat / COORDINATE_PRECISION); + const float c = static_cast(lat2y(segment_target.lat / COORDINATE_PRECISION)); const float d = segment_target.lon / COORDINATE_PRECISION; float p, q; diff --git a/Plugins/NearestPlugin.h b/Plugins/NearestPlugin.h index b8b4092a7..e71f940fc 100644 --- a/Plugins/NearestPlugin.h +++ b/Plugins/NearestPlugin.h @@ -53,7 +53,7 @@ template class NearestPlugin final : public BasePlugin reply = http::Reply::StockReply(http::Reply::badRequest); return; } - int number_of_results = route_parameters.num_results; + int number_of_results = static_cast(route_parameters.num_results); std::vector phantom_node_vector; facade->IncrementalFindPhantomNodeForCoordinate(route_parameters.coordinates.front(), phantom_node_vector,