From f9eef1f83ba0c9640543e13f2e6867ad2b0de24a Mon Sep 17 00:00:00 2001
From: rachytski <siarhei.rachytski@gmail.com>
Date: Thu, 4 Oct 2012 13:14:48 +0300
Subject: [PATCH] fixes according to code review.

---
 android/jni/com/mapswithme/maps/MWMApplication.cpp | 6 +++---
 anim/segment_interpolation.cpp                     | 7 +++----
 anim/segment_interpolation.hpp                     | 1 -
 map/animator.cpp                                   | 2 +-
 map/location_state.cpp                             | 4 ++--
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/android/jni/com/mapswithme/maps/MWMApplication.cpp b/android/jni/com/mapswithme/maps/MWMApplication.cpp
index e4a2a39fc9..9b615700cd 100644
--- a/android/jni/com/mapswithme/maps/MWMApplication.cpp
+++ b/android/jni/com/mapswithme/maps/MWMApplication.cpp
@@ -62,9 +62,9 @@ extern "C"
                                                            jstring name,
                                                            jboolean defaultVal)
   {
-    bool val = static_cast<bool>(defaultVal);
+    bool val = defaultVal;
     Settings::Get(jni::ToNativeString(env, name), val);
-    return static_cast<jboolean>(val);
+    return val;
   }
 
   JNIEXPORT void JNICALL
@@ -73,7 +73,7 @@ extern "C"
                                                            jstring name,
                                                            jboolean val)
   {
-    bool flag = static_cast<bool>(val);
+    bool flag = val;
     (void)Settings::Set(jni::ToNativeString(env, name), flag);
   }
 
diff --git a/anim/segment_interpolation.cpp b/anim/segment_interpolation.cpp
index a8e5bbca8e..2ab1d3a9bd 100644
--- a/anim/segment_interpolation.cpp
+++ b/anim/segment_interpolation.cpp
@@ -10,9 +10,7 @@ namespace anim
       m_endPt(endPt),
       m_outPt(outPt),
       m_interval(interval)
-  {
-    m_deltaPt = m_endPt - m_startPt;
-  }
+  {}
 
   void SegmentInterpolation::OnStart(double ts)
   {
@@ -33,8 +31,9 @@ namespace anim
       return;
 
     double elapsedSec = ts - m_startTime;
+    m2::PointD deltaPt = m_endPt - m_startPt;
 
-    m_outPt = m_startPt + m_deltaPt * (elapsedSec / m_interval);
+    m_outPt = m_startPt + deltaPt * (elapsedSec / m_interval);
 
     Task::OnStep(ts);
   }
diff --git a/anim/segment_interpolation.hpp b/anim/segment_interpolation.hpp
index 26f22f4934..02e8db6164 100644
--- a/anim/segment_interpolation.hpp
+++ b/anim/segment_interpolation.hpp
@@ -11,7 +11,6 @@ namespace anim
 
     m2::PointD m_startPt;
     m2::PointD m_endPt;
-    m2::PointD m_deltaPt;
     m2::PointD & m_outPt;
     double m_startTime;
     double m_interval;
diff --git a/map/animator.cpp b/map/animator.cpp
index 9deb012d67..2dfd7e89e5 100644
--- a/map/animator.cpp
+++ b/map/animator.cpp
@@ -22,7 +22,7 @@ void Animator::RotateScreen(double startAngle, double endAngle, double duration)
     m_rotateScreenTask->SetEndAngle(endAngle);
   else
   {
-    if (floor(ang::RadToDegree(fabs(ang::GetShortestDistance(startAngle, endAngle)))) > 0)
+    if (fabs(ang::GetShortestDistance(startAngle, endAngle)) > math::pi / 180.0)
     {
       if (m_rotateScreenTask)
       {
diff --git a/map/location_state.cpp b/map/location_state.cpp
index 682862bd41..f34ac9f203 100644
--- a/map/location_state.cpp
+++ b/map/location_state.cpp
@@ -458,8 +458,8 @@ namespace location
         if (my::rounds(ang::RadToDegree(headingDelta)) > 0)
         {
           if (m_headingInterpolation
-           &&!m_headingInterpolation->IsCancelled()
-           &&!m_headingInterpolation->IsEnded())
+          && !m_headingInterpolation->IsCancelled()
+          && !m_headingInterpolation->IsEnded())
           {
             m_headingInterpolation->Unlock();
             m_headingInterpolation->Cancel();