Add events for scale / rotate / tilt by user (#256)

mapsforge · Nov 28, 2016 · 7765309 · 7765309
1 parent 5f53465
commit 7765309
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/vtm/src/org/oscim/layers/MapEventLayer.java b/vtm/src/org/oscim/layers/MapEventLayer.java
@@ -2,6 +2,7 @@
  * Copyright 2013 Hannes Janetzek
  * Copyright 2016 devemux86
  * Copyright 2016 Andrey Novikov
+ * Copyright 2016 Longri
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -404,6 +405,15 @@ private void onActionMove(MotionEvent e) {
         mPrevY2 = y2;
 
         mMap.updateMap(true);
+
+        if (mMap.viewport().getMapPosition(mapPosition)) {
+            if (mDoScale)
+                mMap.events.fire(Map.SCALE_EVENT, mapPosition);
+            if (mDoRotate)
+                mMap.events.fire(Map.ROTATE_EVENT, mapPosition);
+            if (mDoTilt)
+                mMap.events.fire(Map.TILT_EVENT, mapPosition);
+        }
     }
 
     private void updateMulti(MotionEvent e) {

diff --git a/vtm/src/org/oscim/layers/MapEventLayer2.java b/vtm/src/org/oscim/layers/MapEventLayer2.java
@@ -2,6 +2,7 @@
  * Copyright 2013 Hannes Janetzek
  * Copyright 2016 devemux86
  * Copyright 2016 Andrey Novikov
+ * Copyright 2016 Longri
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -498,6 +499,15 @@ private void onActionMove(MotionEvent e) {
         mPrevY2 = y2;
 
         mMap.updateMap(true);
+
+        if (mMap.viewport().getMapPosition(mapPosition)) {
+            if (mDoScale)
+                mMap.events.fire(Map.SCALE_EVENT, mapPosition);
+            if (mDoRotate)
+                mMap.events.fire(Map.ROTATE_EVENT, mapPosition);
+            if (mDoTilt)
+                mMap.events.fire(Map.TILT_EVENT, mapPosition);
+        }
     }
 
     private void updateMulti(MotionEvent e) {

diff --git a/vtm/src/org/oscim/map/Map.java b/vtm/src/org/oscim/map/Map.java
@@ -3,6 +3,7 @@
  * Copyright 2016 Andrey Novikov
  * Copyright 2016 Stephan Leuschner
  * Copyright 2016 devemux86
+ * Copyright 2016 Longri
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -85,6 +86,21 @@ public interface InputListener extends EventListener {
      */
     public static final Event MOVE_EVENT = new Event();
 
+    /**
+     * UpdateListener event. Map was scaled by user.
+     */
+    public static final Event SCALE_EVENT = new Event();
+
+    /**
+     * UpdateListener event. Map was rotated by user.
+     */
+    public static final Event ROTATE_EVENT = new Event();
+
+    /**
+     * UpdateListener event. Map was tilted by user.
+     */
+    public static final Event TILT_EVENT = new Event();
+
     /**
      * UpdateLister event. Delivered on main-thread when updateMap() was called
      * and no CLEAR_EVENT or POSITION_EVENT was triggered.