AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

fixes according to code review.

Browse source
This commit is contained in:
rachytski 2012-10-04 13:14:48 +03:00 • committed by Alex Zolotarev
parent 2d7685e56b
commit f9eef1f83b
5 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/jni/com/mapswithme/maps/MWMApplication.cpp
View file

@ -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);
}

7
anim/segment_interpolation.cpp
View file

@ -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);
}

1
anim/segment_interpolation.hpp
View file

@ -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;

2
map/animator.cpp
View file

@ -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)
{

4
map/location_state.cpp
View file

@ -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();