Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

experiment with moveable zoom centerPoint (4)

Browse source
This commit is contained in:
sonora 2016-12-30 12:10:05 +01:00
parent 68b5c0d24e
commit cfc16c1de2
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
View file

@ -1028,6 +1028,8 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
PointF updatedCenterPoint = multiTouchSupport.getCenterPoint(); PointF updatedCenterPoint = multiTouchSupport.getCenterPoint();
calc.setLatLonCenter(initialViewport.getLatLonFromPixel(updatedCenterPoint.x, updatedCenterPoint.y).getLatitude(), calc.setLatLonCenter(initialViewport.getLatLonFromPixel(updatedCenterPoint.x, updatedCenterPoint.y).getLatitude(),
initialViewport.getLatLonFromPixel(updatedCenterPoint.x, updatedCenterPoint.y).getLongitude()); initialViewport.getLatLonFromPixel(updatedCenterPoint.x, updatedCenterPoint.y).getLongitude());
currentViewport.setLatLonCenter(initialViewport.getLatLonFromPixel(updatedCenterPoint.x, updatedCenterPoint.y).getLatitude(),
initialViewport.getLatLonFromPixel(updatedCenterPoint.x, updatedCenterPoint.y).getLongitude());
float calcRotate = calc.getRotate() + angle; float calcRotate = calc.getRotate() + angle;
calc.setRotate(calcRotate); calc.setRotate(calcRotate);
@ -1037,12 +1039,8 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
//final QuadPoint cp = initialViewport.getCenterPixelPoint(); //final QuadPoint cp = initialViewport.getCenterPixelPoint();
//float dx = cp.x - initialMultiTouchCenterPoint.x; //float dx = cp.x - initialMultiTouchCenterPoint.x;
//float dy = cp.y - initialMultiTouchCenterPoint.y; //float dy = cp.y - initialMultiTouchCenterPoint.y;
//final LatLon r = calc.getLatLonFromPixel(cp.x + dx, cp.y + dy);
final QuadPoint cp = getCurrentRotatedTileBox().copy().getCenterPixelPoint(); //setLatLon(r.getLatitude(), r.getLongitude());
float dx = cp.x - updatedCenterPoint.x;
float dy = cp.y - updatedCenterPoint.y;
final LatLon r = calc.getLatLonFromPixel(cp.x + dx, cp.y + dy);
setLatLon(r.getLatitude(), r.getLongitude());
int baseZoom = initialViewport.getZoom(); int baseZoom = initialViewport.getZoom();
while (initialViewport.getZoomFloatPart() + dz > 1 && isZoomingAllowed(baseZoom, dz)) { while (initialViewport.getZoomFloatPart() + dz > 1 && isZoomingAllowed(baseZoom, dz)) {