xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ViewController: allow rotation around map view center, fix drift (#764)

Browse Source
This commit is contained in:
Stephan Brandt
2020-01-27 12:02:34 +01:00
committed by Emux
parent 2b8326f465
commit 9f280a41c0
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
vtm/src/org/oscim/map/ViewController.java
View File

@@ -1,9 +1,10 @@
/* /*
* Copyright 2014 Hannes Janetzek * Copyright 2014 Hannes Janetzek
* Copyright 2016-2019 devemux86 * Copyright 2016-2020 devemux86
* Copyright 2017 Luca Osten * Copyright 2017 Luca Osten
* Copyright 2018 Izumi Kawashima * Copyright 2018 Izumi Kawashima
* Copyright 2018 Mathieu De Brito * Copyright 2018 Mathieu De Brito
* Copyright 2020 Stephan Brandt
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
* *
@@ -225,18 +226,20 @@ public class ViewController extends Viewport {
public void rotateMap(double radians, float pivotX, float pivotY) { public void rotateMap(double radians, float pivotX, float pivotY) {
ThreadUtils.assertMainThread(); ThreadUtils.assertMainThread();
double rsin = Math.sin(radians);
double rcos = Math.cos(radians);
pivotX -= mWidth * mPivotX;
pivotY -= mHeight * mPivotY;
float x = (float) (pivotX - pivotX * rcos + pivotY * rsin);
float y = (float) (pivotY - pivotX * rsin - pivotY * rcos);
moveMap(x, y);
setRotation(mPos.bearing + Math.toDegrees(radians)); setRotation(mPos.bearing + Math.toDegrees(radians));
if (pivotX != 0 && pivotY != 0) {
double rsin = Math.sin(radians);
double rcos = Math.cos(radians);
pivotX -= mWidth * mPivotX;
pivotY -= mHeight * mPivotY;
float x = (float) (pivotX - pivotX * rcos + pivotY * rsin);
float y = (float) (pivotY - pivotX * rsin - pivotY * rcos);
moveMap(x, y);
}
} }
public void setRotation(double degree) { public void setRotation(double degree) {