From e67cf578aec3251804742ef1b7437de3b53aa36b Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Mon, 30 Jun 2014 15:16:35 +0200 Subject: [PATCH] remove explicit c'tor from Coordinate, use initializer list in PolylineCompressor --- Algorithms/PolylineCompressor.cpp | 2 +- Include/osrm/Coordinate.h | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Algorithms/PolylineCompressor.cpp b/Algorithms/PolylineCompressor.cpp index cc873e91e..ca4a019c0 100644 --- a/Algorithms/PolylineCompressor.cpp +++ b/Algorithms/PolylineCompressor.cpp @@ -76,7 +76,7 @@ JSON::String PolylineCompressor::printEncodedString(const std::vector delta_numbers; if (!polyline.empty()) { - FixedPointCoordinate last_coordinate = FixedPointCoordinate{0, 0}; + FixedPointCoordinate last_coordinate = {0, 0}; for (const auto &segment : polyline) { if (segment.necessary) diff --git a/Include/osrm/Coordinate.h b/Include/osrm/Coordinate.h index dc058552a..fc23d6689 100644 --- a/Include/osrm/Coordinate.h +++ b/Include/osrm/Coordinate.h @@ -40,7 +40,7 @@ struct FixedPointCoordinate int lon; FixedPointCoordinate(); - explicit FixedPointCoordinate(int lat, int lon); + FixedPointCoordinate(int lat, int lon); void Reset(); bool isSet() const; bool isValid() const; @@ -55,10 +55,8 @@ struct FixedPointCoordinate static float ApproximateEuclideanDistance(const FixedPointCoordinate &first_coordinate, const FixedPointCoordinate &second_coordinate); - static float ApproximateEuclideanDistance(const int lat1, - const int lon1, - const int lat2, - const int lon2); + static float + ApproximateEuclideanDistance(const int lat1, const int lon1, const int lat2, const int lon2); static float ApproximateSquaredEuclideanDistance(const FixedPointCoordinate &first_coordinate, const FixedPointCoordinate &second_coordinate); @@ -81,10 +79,10 @@ struct FixedPointCoordinate FixedPointCoordinate &nearest_location, float &ratio); - static int OrderedPerpendicularDistanceApproximation(const FixedPointCoordinate& segment_source, - const FixedPointCoordinate& segment_target, - const FixedPointCoordinate& query_location); - + static int + OrderedPerpendicularDistanceApproximation(const FixedPointCoordinate &segment_source, + const FixedPointCoordinate &segment_target, + const FixedPointCoordinate &query_location); static float GetBearing(const FixedPointCoordinate &A, const FixedPointCoordinate &B);