From 199c1e123e84f9d59e0a15e4f8b95326aaca0669 Mon Sep 17 00:00:00 2001
From: Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru>
Date: Mon, 5 Sep 2016 14:58:15 +0300
Subject: [PATCH] Review fixes.

---
 map/{generate_chart.cpp => chart_generator.cpp}             | 2 +-
 map/{generate_chart.hpp => chart_generator.hpp}             | 0
 map/framework.cpp                                           | 6 +++---
 map/map.pro                                                 | 4 ++--
 .../{generate_chart_tests.cpp => chart_generator_tests.cpp} | 6 +-----
 map/map_tests/map_tests.pro                                 | 2 +-
 routing/routing_session.hpp                                 | 3 +--
 7 files changed, 9 insertions(+), 14 deletions(-)
 rename map/{generate_chart.cpp => chart_generator.cpp} (99%)
 rename map/{generate_chart.hpp => chart_generator.hpp} (100%)
 rename map/map_tests/{generate_chart_tests.cpp => chart_generator_tests.cpp} (95%)

diff --git a/map/generate_chart.cpp b/map/chart_generator.cpp
similarity index 99%
rename from map/generate_chart.cpp
rename to map/chart_generator.cpp
index 47a9034855..0d6ce6abbc 100644
--- a/map/generate_chart.cpp
+++ b/map/chart_generator.cpp
@@ -1,4 +1,4 @@
-#include "map/generate_chart.hpp"
+#include "map/chart_generator.hpp"
 
 #include "base/assert.hpp"
 
diff --git a/map/generate_chart.hpp b/map/chart_generator.hpp
similarity index 100%
rename from map/generate_chart.hpp
rename to map/chart_generator.hpp
diff --git a/map/framework.cpp b/map/framework.cpp
index f8d03537cd..0340b224bc 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1,6 +1,6 @@
 #include "map/framework.hpp"
 #include "map/ge0_parser.hpp"
-#include "map/generate_chart.hpp"
+#include "map/chart_generator.hpp"
 #include "map/geourl_process.hpp"
 #include "map/gps_tracker.hpp"
 #include "map/user_mark.hpp"
@@ -2985,11 +2985,12 @@ bool Framework::OriginalFeatureHasDefaultName(FeatureID const & fid) const
 }
 
 bool Framework::HasRouteAltitude() const { return m_routingSession.HasRouteAltitude(); }
+
 bool Framework::GenerateRouteAltitudeChart(size_t width, size_t height, bool day,
                                            vector<uint8_t> & imageRGBAData) const
 {
   feature::TAltitudes altitudes;
-  if (!m_routingSession.GetRouteAltitudes(altitudes) && altitudes.empty())
+  if (!m_routingSession.GetRouteAltitudes(altitudes))
     return false;
   deque<double> segDistanceM;
   if (!m_routingSession.GetSegDistanceM(segDistanceM) && segDistanceM.empty())
@@ -3002,7 +3003,6 @@ bool Framework::GenerateRouteAltitudeChart(size_t width, size_t height, bool day
                  ". Number of segment is", segDistanceM.size()));
   }
 
-  // @TODO It's necessary to normalize and center altitude information.
   GenerateChart(width, height, segDistanceM, altitudes, day, imageRGBAData);
   return true;
 }
diff --git a/map/map.pro b/map/map.pro
index 5e0b516012..4aabaf916c 100644
--- a/map/map.pro
+++ b/map/map.pro
@@ -15,11 +15,11 @@ HEADERS += \
     booking_api.hpp \
     bookmark.hpp \
     bookmark_manager.hpp \
+    chart_generator.hpp \
     displacement_mode_manager.hpp \
     feature_vec_model.hpp \
     framework.hpp \
     ge0_parser.hpp \
-    generate_chart.hpp \
     geourl_process.hpp \
     gps_track.hpp \
     gps_track_collection.hpp \
@@ -39,11 +39,11 @@ SOURCES += \
     booking_api.cpp \
     bookmark.cpp \
     bookmark_manager.cpp \
+    chart_generator.cpp \
     displacement_mode_manager.cpp \
     feature_vec_model.cpp \
     framework.cpp \
     ge0_parser.cpp \
-    generate_chart.cpp \
     geourl_process.cpp \
     gps_track.cpp \
     gps_track_collection.cpp \
diff --git a/map/map_tests/generate_chart_tests.cpp b/map/map_tests/chart_generator_tests.cpp
similarity index 95%
rename from map/map_tests/generate_chart_tests.cpp
rename to map/map_tests/chart_generator_tests.cpp
index 5725af3a0b..eec4f88666 100644
--- a/map/map_tests/generate_chart_tests.cpp
+++ b/map/map_tests/chart_generator_tests.cpp
@@ -1,6 +1,6 @@
 #include "testing/testing.hpp"
 
-#include "map/generate_chart.hpp"
+#include "map/chart_generator.hpp"
 
 #include "base/math.hpp"
 
@@ -103,10 +103,6 @@ UNIT_TEST(GenerateChartTest)
   vector<uint8_t> frameBuffer;
 
   GenerateChart(width, 50 /* height */, distanceDataM, altitudeDataM, false /* day */, frameBuffer);
-  LOG(LINFO, (frameBuffer[0]));
-  LOG(LINFO, (frameBuffer[1]));
-  LOG(LINFO, (frameBuffer[2]));
-  LOG(LINFO, (frameBuffer[3]));
   TEST(IsColor(frameBuffer, 0 /* startColorIdx */, 255 /* expectedR */, 255 /* expectedG */,
                255 /* expectedB */, 0 /* expectedA */),
        ());
diff --git a/map/map_tests/map_tests.pro b/map/map_tests/map_tests.pro
index 1337719c24..3a46cddf32 100644
--- a/map/map_tests/map_tests.pro
+++ b/map/map_tests/map_tests.pro
@@ -38,9 +38,9 @@ SOURCES += \
   address_tests.cpp \
   booking_tests.cpp \
   bookmarks_test.cpp \
+  chart_generator_tests.cpp \
   feature_getters_tests.cpp \
   ge0_parser_tests.cpp \
-  generate_chart_tests.cpp \
   geourl_test.cpp \
   gps_track_collection_test.cpp \
   gps_track_storage_test.cpp \
diff --git a/routing/routing_session.hpp b/routing/routing_session.hpp
index b92fa320df..a15b50a6f0 100644
--- a/routing/routing_session.hpp
+++ b/routing/routing_session.hpp
@@ -148,6 +148,7 @@ public:
   double GetCompletionPercent() const;
 
   void EmitCloseRoutingEvent() const;
+  bool HasRouteAltitudeImpl() const;
 
 private:
   struct DoReadyCallback
@@ -175,8 +176,6 @@ private:
   void RemoveRoute();
   void RemoveRouteImpl();
 
-  bool HasRouteAltitudeImpl() const;
-
 private:
   unique_ptr<AsyncRouter> m_router;
   Route m_route;