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

Add small fixes

Browse source
This commit is contained in:
Alexander Sytnyk 2017-07-03 15:24:46 +03:00
parent f6de5a6436
commit 0b666b1009
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/views/DoubleTapScaleDetector.java
View file

@ -53,7 +53,7 @@ public class DoubleTapScaleDetector {
} }
public boolean onTouchEvent(MotionEvent event) { public boolean onTouchEvent(MotionEvent event) {
if (event.getPointerCount() != 1) { if (event.getPointerCount() != 1 || !view.mapGestureAllowed(OsmandMapLayer.MapGestureType.DOUBLE_TAP_ZOOM_CHANGE)) {
resetEvents(); resetEvents();
mIsDoubleTapping = false; mIsDoubleTapping = false;
mScrolling = false; mScrolling = false;

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

@ -338,7 +338,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
this.wasZoomInMultiTouch = wasZoomInMultiTouch; this.wasZoomInMultiTouch = wasZoomInMultiTouch;
} }
private boolean mapGestureAllowed(OsmandMapLayer.MapGestureType type) { public boolean mapGestureAllowed(OsmandMapLayer.MapGestureType type) {
for (OsmandMapLayer layer : layers) { for (OsmandMapLayer layer : layers) {
if (!layer.isMapGestureAllowed(type)) { if (!layer.isMapGestureAllowed(type)) {
return false; return false;
@ -1027,9 +1027,6 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
@Override @Override
public void onZoomEnded(double relativeToStart) { public void onZoomEnded(double relativeToStart) {
if (!mapGestureAllowed(OsmandMapLayer.MapGestureType.DOUBLE_TAP_ZOOM_CHANGE)) {
return;
}
// 1.5 works better even on dm.density=1 devices // 1.5 works better even on dm.density=1 devices
float dz = (float) ((relativeToStart - 1) * DoubleTapScaleDetector.SCALE_PER_SCREEN); float dz = (float) ((relativeToStart - 1) * DoubleTapScaleDetector.SCALE_PER_SCREEN);
setIntZoom(Math.round(dz) + initialViewport.getZoom()); setIntZoom(Math.round(dz) + initialViewport.getZoom());
@ -1104,9 +1101,6 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
@Override @Override
public void onZooming(double relativeToStart) { public void onZooming(double relativeToStart) {
if (!mapGestureAllowed(OsmandMapLayer.MapGestureType.DOUBLE_TAP_ZOOM_CHANGE)) {
return;
}
double dz = (relativeToStart - 1) * DoubleTapScaleDetector.SCALE_PER_SCREEN; double dz = (relativeToStart - 1) * DoubleTapScaleDetector.SCALE_PER_SCREEN;
changeZoomPosition((float) dz, 0); changeZoomPosition((float) dz, 0);
} }