Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaria Volvenkova <d.volvenkova@corp.mail.ru>2016-07-20 13:30:41 +0300
committerDaria Volvenkova <d.volvenkova@corp.mail.ru>2016-07-20 13:30:41 +0300
commitd068ba8e2b9ce09b4742e04bce764b1ec2bf90e3 (patch)
tree1675ec6bcf42b8ed378d65c54b1b64acaeb0f269 /drape_frontend
parent0c9f7e91dffc93daf3859bfd10456fc0b2e4797c (diff)
Autozoom is enabled by default. Autozoom parameters are tuned.
Diffstat (limited to 'drape_frontend')
-rw-r--r--drape_frontend/animation/interpolators.cpp4
-rw-r--r--drape_frontend/my_position_controller.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/drape_frontend/animation/interpolators.cpp b/drape_frontend/animation/interpolators.cpp
index b7b6234b4e..aa65ef1589 100644
--- a/drape_frontend/animation/interpolators.cpp
+++ b/drape_frontend/animation/interpolators.cpp
@@ -196,8 +196,8 @@ ScaleInterpolator::ScaleInterpolator(double delay, double startScale, double end
// static
double ScaleInterpolator::GetScaleDuration(double startScale, double endScale, bool isAutoZoom)
{
- // Resize 2.0 times should be done for 1.5 seconds in autozoom or for 0.2 seconds in usual case.
- double const kPixelSpeed = isAutoZoom ? (2.0 / 1.5) : (2.0 / 0.2);
+ // Resize 2.0 times should be done for 1.2 seconds in autozoom or for 0.2 seconds in usual case.
+ double const kPixelSpeed = isAutoZoom ? (2.0 / 1.2) : (2.0 / 0.2);
if (startScale > endScale)
swap(startScale, endScale);
diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp
index 52cb3cbfc8..9b4d42fdfa 100644
--- a/drape_frontend/my_position_controller.cpp
+++ b/drape_frontend/my_position_controller.cpp
@@ -73,9 +73,9 @@ double CalculateZoomBySpeed(double speed)
make_pair(20.0, 0.25),
make_pair(40.0, 0.5),
make_pair(60.0, 1.0),
- make_pair(80.0, 1.75),
- make_pair(100.0, 3.5),
- make_pair(120.0, 7.0),
+ make_pair(75.0, 1.75),
+ make_pair(85.0, 3.5),
+ make_pair(90.0, 7.0),
};
double const kDefaultSpeed = 80.0;