From 137172575d989d4b8d22574f1c641a122338b74a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Mon, 14 Apr 2014 19:31:51 -0400
Subject: [PATCH] account for the angle when zooming

---
 src/map/transform.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/map/transform.cpp b/src/map/transform.cpp
index 7bd06d995..3c9246ada 100644
--- a/src/map/transform.cpp
+++ b/src/map/transform.cpp
@@ -184,23 +184,32 @@ void Transform::setScaleXY(double new_scale, double xn, double yn, double durati
 }
 
 void Transform::setScale(double new_scale, double cx, double cy, double duration) {
+    // Ensure that we don't zoom in further than the maximum allowed.
     if (new_scale < min_scale) {
         new_scale = min_scale;
     } else if (new_scale > max_scale) {
         new_scale = max_scale;
     }
 
+    // Zoom in on the center if we don't have click anchor coordinates.
     if (cx < 0 || cy < 0) {
         cx = width / 2;
         cy = height / 2;
     }
 
+    // Account for the x/y offset from the center (= where the user clicked)
     const double factor = new_scale / scale;
     const double dx = (cx - width / 2) * (1.0 - factor);
     const double dy = (cy - height / 2) * (1.0 - factor);
 
-    double xn = x * factor + dx;
-    double yn = y * factor + dy;
+    // Account for angle
+    const double angle_sin = sin(-angle);
+    const double angle_cos = cos(-angle);
+    const double ax = angle_cos * dx - angle_sin * dy;
+    const double ay = angle_sin * dx + angle_cos * dy;
+
+    const double xn = x * factor + ax;
+    const double yn = y * factor + ay;
 
     setScaleXY(new_scale, xn, yn, duration);
 }