From 392c07951e367df218e49405026c7694161aa666 Mon Sep 17 00:00:00 2001
From: Dennis Luxen <info@project-osrm.org>
Date: Mon, 15 Sep 2014 14:23:43 +0200
Subject: [PATCH] some renaming of member functions to remove ambiguity

---
 Descriptors/DescriptionFactory.cpp |  2 +-
 Descriptors/DescriptionFactory.h   | 15 +++++++++------
 Descriptors/JSONDescriptor.h       |  5 ++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Descriptors/DescriptionFactory.cpp b/Descriptors/DescriptionFactory.cpp
index e8346fdcf..715bf6903 100644
--- a/Descriptors/DescriptionFactory.cpp
+++ b/Descriptors/DescriptionFactory.cpp
@@ -109,7 +109,7 @@ void DescriptionFactory::AppendSegment(const FixedPointCoordinate &coordinate,
                                   path_point.travel_mode);
 }
 
-JSON::Value DescriptionFactory::AppendEncodedPolylineString(const bool return_encoded)
+JSON::Value DescriptionFactory::AppendGeometryString(const bool return_encoded)
 {
     if (return_encoded)
     {
diff --git a/Descriptors/DescriptionFactory.h b/Descriptors/DescriptionFactory.h
index 96f7537eb..ac4c70234 100644
--- a/Descriptors/DescriptionFactory.h
+++ b/Descriptors/DescriptionFactory.h
@@ -80,9 +80,11 @@ class DescriptionFactory
     void AppendSegment(const FixedPointCoordinate &coordinate, const PathData &data);
     void BuildRouteSummary(const double distance, const unsigned time);
     void SetStartSegment(const PhantomNode &start_phantom, const bool traversed_in_reverse);
-    void SetEndSegment(const PhantomNode &start_phantom, const bool traversed_in_reverse, const bool is_via_location = false);
-    JSON::Value AppendEncodedPolylineString(const bool return_encoded);
-    std::vector<unsigned> const & GetViaIndices() const;
+    void SetEndSegment(const PhantomNode &start_phantom,
+                       const bool traversed_in_reverse,
+                       const bool is_via_location = false);
+    JSON::Value AppendGeometryString(const bool return_encoded);
+    std::vector<unsigned> const &GetViaIndices() const;
 
     template <class DataFacadeT> void Run(const DataFacadeT *facade, const unsigned zoomLevel)
     {
@@ -198,14 +200,15 @@ class DescriptionFactory
             {
                 ++necessary_pieces;
                 if (path_description[i].is_via_location)
-                {   //mark the end of a leg
+                { // mark the end of a leg
                     via_indices.push_back(necessary_pieces);
                 }
-                const double angle = path_description[i+1].location.GetBearing(path_description[i].location);
+                const double angle =
+                    path_description[i + 1].location.GetBearing(path_description[i].location);
                 path_description[i].bearing = static_cast<unsigned>(angle * 10);
             }
         }
-        via_indices.push_back(necessary_pieces+1);
+        via_indices.push_back(necessary_pieces + 1);
         BOOST_ASSERT(via_indices.size() >= 2);
         // BOOST_ASSERT(0 != necessary_pieces || path_description.empty());
         return;
diff --git a/Descriptors/JSONDescriptor.h b/Descriptors/JSONDescriptor.h
index 33728b740..fecbea51f 100644
--- a/Descriptors/JSONDescriptor.h
+++ b/Descriptors/JSONDescriptor.h
@@ -137,7 +137,7 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
         if (config.geometry)
         {
             JSON::Value route_geometry =
-                description_factory.AppendEncodedPolylineString(config.encode_geometry);
+                description_factory.AppendGeometryString(config.encode_geometry);
             json_result.values["route_geometry"] = route_geometry;
         }
         if (config.instructions)
@@ -213,8 +213,7 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
             if (config.geometry)
             {
                 JSON::Value alternate_geometry_string =
-                    alternate_description_factory.AppendEncodedPolylineString(
-                        config.encode_geometry);
+                    alternate_description_factory.AppendGeometryString(config.encode_geometry);
                 JSON::Array json_alternate_geometries_array;
                 json_alternate_geometries_array.values.push_back(alternate_geometry_string);
                 json_result.values["alternative_geometries"] = json_alternate_geometries_array;