Improved gestures (#249) #253

vtm-android/src/org/oscim/android/MapView.java

@@ -21,13 +21,11 @@ import android.content.Context;
 import android.opengl.GLSurfaceView;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
-import android.view.GestureDetector;
 
 import org.oscim.android.canvas.AndroidGraphics;
 import org.oscim.android.gl.AndroidGL;
 import org.oscim.android.gl.GlConfigChooser;
 import org.oscim.android.input.AndroidMotionEvent;
-import org.oscim.android.input.GestureHandler;
 import org.oscim.backend.CanvasAdapter;
 import org.oscim.backend.GLAdapter;
 import org.oscim.map.Map;
@@ -53,7 +51,6 @@ public class MapView extends GLSurfaceView {
     }
 
     protected final AndroidMap mMap;
-    protected final GestureDetector mGestureDetector;
     protected final AndroidMotionEvent mMotionEvent;
 
     public MapView(Context context) {
@@ -94,10 +91,6 @@ public class MapView extends GLSurfaceView {
         mMap.clearMap();
         mMap.updateMap(false);
 
-        GestureHandler gestureHandler = new GestureHandler(mMap);
-        mGestureDetector = new GestureDetector(context, gestureHandler);
-        mGestureDetector.setOnDoubleTapListener(gestureHandler);
-
         mMotionEvent = new AndroidMotionEvent();
     }
 
@@ -116,14 +109,11 @@ public class MapView extends GLSurfaceView {
     @SuppressLint("ClickableViewAccessibility")
     @Override
     public boolean onTouchEvent(android.view.MotionEvent motionEvent) {
-
         if (!isClickable())
             return false;
 
-        if (mGestureDetector.onTouchEvent(motionEvent))
-            return true;
-
         mMap.input.fire(null, mMotionEvent.wrap(motionEvent));
+        mMotionEvent.recycle();
         return true;
     }
 

vtm-android/src/org/oscim/android/input/AndroidMotionEvent.java

@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Hannes Janetzek
+ * Copyright 2016 Andrey Novikov
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -20,10 +21,10 @@ import org.oscim.event.MotionEvent;
 
 public class AndroidMotionEvent extends MotionEvent {
 
-    android.view.MotionEvent mEvent;
+    private android.view.MotionEvent mEvent;
 
     public MotionEvent wrap(android.view.MotionEvent e) {
-        mEvent = e;
+        mEvent = android.view.MotionEvent.obtain(e);
         return this;
     }
 
@@ -57,6 +58,16 @@ public class AndroidMotionEvent extends MotionEvent {
         return mEvent.getPointerCount();
     }
 
+    @Override
+    public MotionEvent copy() {
+        return new AndroidMotionEvent().wrap(mEvent);
+    }
+
+    @Override
+    public void recycle() {
+        mEvent.recycle();
+    }
+
     @Override
     public long getTime() {
         return mEvent.getEventTime();

vtm-android/src/org/oscim/android/input/GestureHandler.java

@@ -1,97 +0,0 @@
-/*
- * Copyright 2013 Hannes Janetzek
- * Copyright 2016 devemux86
- *
- * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.oscim.android.input;
-
-import android.view.GestureDetector.OnDoubleTapListener;
-import android.view.GestureDetector.OnGestureListener;
-import android.view.MotionEvent;
-
-import org.oscim.event.Gesture;
-import org.oscim.map.Map;
-
-public class GestureHandler implements OnGestureListener, OnDoubleTapListener {
-    private final AndroidMotionEvent mMotionEvent;
-    private final Map mMap;
-
-    // Quick scale (double tap + swipe)
-    protected boolean quickScale;
-
-    public GestureHandler(Map map) {
-        mMotionEvent = new AndroidMotionEvent();
-        mMap = map;
-    }
-
-    /* OnGestureListener */
-
-    @Override
-    public boolean onSingleTapUp(MotionEvent e) {
-        return false;
-    }
-
-    @Override
-    public void onShowPress(MotionEvent e) {
-    }
-
-    @Override
-    public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-        return false;
-    }
-
-    @Override
-    public void onLongPress(MotionEvent e) {
-        // Quick scale (no long press)
-        if (quickScale)
-            return;
-
-        mMap.handleGesture(Gesture.LONG_PRESS, mMotionEvent.wrap(e));
-    }
-
-    @Override
-    public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-        return false;
-    }
-
-    @Override
-    public boolean onDown(MotionEvent e) {
-        quickScale = false;
-
-        return mMap.handleGesture(Gesture.PRESS, mMotionEvent.wrap(e));
-    }
-
-    /* OnDoubleTapListener */
-
-    @Override
-    public boolean onSingleTapConfirmed(MotionEvent e) {
-        return mMap.handleGesture(Gesture.TAP, mMotionEvent.wrap(e));
-    }
-
-    @Override
-    public boolean onDoubleTapEvent(MotionEvent e) {
-        int action = e.getActionMasked();
-
-        // Quick scale
-        quickScale = (action == MotionEvent.ACTION_MOVE);
-
-        return false;
-    }
-
-    @Override
-    public boolean onDoubleTap(MotionEvent e) {
-        return mMap.handleGesture(Gesture.DOUBLE_TAP, mMotionEvent.wrap(e));
-    }
-}