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

Removed obsolete and anyway unused touch exploration mode for map

Browse source 
view.
This commit is contained in:
Igor B. Poretsky 2016-03-31 19:08:34 +03:00
parent 719529d893
commit 9195f3cf9d
2 changed files with 2 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
OsmAnd/src/net/osmand/access/MapExplorer.java
View file

@ -1,119 +0,0 @@
package net.osmand.access;
import android.graphics.PointF;
import android.view.GestureDetector.SimpleOnGestureListener;
import android.view.MotionEvent;
import net.osmand.data.LatLon;
import net.osmand.data.PointDescription;
import net.osmand.data.QuadPoint;
import net.osmand.data.RotatedTileBox;
import net.osmand.plus.R;
import net.osmand.plus.views.ContextMenuLayer.IContextMenuProvider;
import net.osmand.plus.views.OsmandMapTileView;
import java.util.List;
import java.util.Map;
// Provide touch exploration mode for map view
// when scrolling it by gestures is disabled.
//
public class MapExplorer extends SimpleOnGestureListener implements IContextMenuProvider {
private static final float VICINITY_RADIUS = 15;
private OsmandMapTileView mapView;
private SimpleOnGestureListener fallback;
private Map<Object, IContextMenuProvider> selectedObjects = null;
// OnGestureListener specified as a second argument
// will be used when scrolling map by gestures
// is enabled.
public MapExplorer(OsmandMapTileView mapView, SimpleOnGestureListener fallback) {
this.mapView = mapView;
this.fallback = fallback;
}
// OnGestureListener interface implementation.
@Override
public boolean onDown(MotionEvent e) {
return fallback.onDown(e);
}
@Override
public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
return fallback.onFling(e1, e2, velocityX / 3, velocityY / 3);
}
@Override
public void onLongPress(MotionEvent e) {
fallback.onLongPress(e);
}
@Override
public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
return fallback.onScroll(e1, e2, distanceX, distanceY);
}
@Override
public void onShowPress(MotionEvent e) {
fallback.onShowPress(e);
}
@Override
public boolean onSingleTapConfirmed(MotionEvent e) {
return fallback.onSingleTapConfirmed(e);
}
@Override
public boolean onDoubleTap(MotionEvent e) {
return fallback.onDoubleTap(e);
}
// IContextMenuProvider interface implementation.
@Override
public boolean disableSingleTap() {
return false;
}
@Override
public boolean disableLongPressOnMap() {
return false;
}
@Override
public boolean isObjectClickable(Object o) {
return false;
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> objects) {
int radius = (int)(VICINITY_RADIUS * tileBox.getDensity());
final QuadPoint p = tileBox.getCenterPixelPoint();
int dx = (int)Math.abs(point.x - p.x);
int dy = (int)Math.abs(point.y - p.y);
if ((dx < radius) && (dy < radius))
objects.add(this);
}
@Override
public LatLon getObjectLocation(Object o) {
final RotatedTileBox tb = mapView.getCurrentRotatedTileBox();
return tb.getCenterLatLon();
}
@Override
public String getObjectDescription(Object o) {
return mapView.getContext().getString(R.string.i_am_here);
}
@Override
public PointDescription getObjectName(Object o) {
return new PointDescription(PointDescription.POINT_TYPE_MARKER, mapView.getContext().getString(R.string.i_am_here));
}
}

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

@ -33,7 +33,6 @@ import android.widget.Toast;
import net.osmand.PlatformUtil;
import net.osmand.access.AccessibilityActionsProvider;
import net.osmand.access.MapExplorer;
import net.osmand.core.android.MapRendererView;
import net.osmand.data.LatLon;
import net.osmand.data.QuadPoint;
@ -220,7 +219,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
handler = new Handler();
baseHandler = new Handler(application.getResourceManager().getRenderingBufferImageThread().getLooper());
animatedDraggingThread = new AnimateDraggingMapThread(this);
gestureDetector = new GestureDetector(ctx, new MapExplorer(this, new MapTileViewOnGestureListener()));
gestureDetector = new GestureDetector(ctx, new MapTileViewOnGestureListener());
multiTouchSupport = new MultiTouchSupport(ctx, new MapTileViewMultiTouchZoomListener());
doubleTapScaleDetector = new DoubleTapScaleDetector(activity, new MapTileViewMultiTouchZoomListener());
@ -1037,7 +1036,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
@Override
public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
animatedDraggingThread.startDragging(velocityX, velocityY,
animatedDraggingThread.startDragging(velocityX / 3, velocityY / 3,
e1.getX(), e1.getY(), e2.getX(), e2.getY(), true);
return true;
}