1 files changed, 43 insertions, 0 deletions
diff --git a/main/src/cgeo/geocaching/utils/AngleUtils.java b/main/src/cgeo/geocaching/utils/AngleUtils.java
index fdd9a9d..5ab2c75 100644
--- a/main/src/cgeo/geocaching/utils/AngleUtils.java
+++ b/main/src/cgeo/geocaching/utils/AngleUtils.java
@@ -1,7 +1,17 @@
 package cgeo.geocaching.utils;
 
+import cgeo.geocaching.CgeoApplication;
+
+import android.content.Context;
+import android.view.Surface;
+import android.view.WindowManager;
+
 public final class AngleUtils {
 
+    private static class WindowManagerHolder {
+        public static final WindowManager WINDOW_MANAGER = (WindowManager) CgeoApplication.getInstance().getSystemService(Context.WINDOW_SERVICE);
+    }
+
     private AngleUtils() {
         // Do not instantiate
     }
@@ -27,4 +37,37 @@ public final class AngleUtils {
     public static float normalize(final float angle) {
         return (angle >= 0 ? angle : (360 - ((-angle) % 360))) % 360;
     }
+
+    public static int getRotationOffset() {
+        switch (WindowManagerHolder.WINDOW_MANAGER.getDefaultDisplay().getRotation()) {
+            case Surface.ROTATION_90:
+                return 90;
+            case Surface.ROTATION_180:
+                return 180;
+            case Surface.ROTATION_270:
+                return 270;
+            default:
+                return 0;
+        }
+    }
+
+    /**
+     * Take the phone rotation (through a given activity) in account and adjust the direction.
+     *
+     * @param direction the unadjusted direction in degrees, in the [0, 360[ range
+     * @return the adjusted direction in degrees, in the [0, 360[ range
+     */
+    public static float getDirectionNow(final float direction) {
+        return normalize(direction + getRotationOffset());
+    }
+
+    /**
+     * Reverse the phone rotation (through a given activity) in account and adjust the direction.
+     *
+     * @param direction the unadjusted direction in degrees, in the [0, 360[ range
+     * @return the adjusted direction in degrees, in the [0, 360[ range
+     */
+    public static float reverseDirectionNow(final float direction) {
+        return normalize(direction - getRotationOffset());
+    }
 }