xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use EventDispatcher for Input- and Map-Events

Browse Source
This commit is contained in:
Hannes Janetzek
2014-02-14 14:50:19 +01:00
parent 940a753b41
commit e15163bb08
13 changed files with 153 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vtm-android/src/org/oscim/android/MapScaleBar.java
View File

@@ -17,12 +17,13 @@ package org.oscim.android;
*/
import java.util.HashMap;
import java.util.Map;
import org.oscim.android.canvas.AndroidBitmap;
import org.oscim.core.MapPosition;
import org.oscim.core.MercatorProjection;
import org.oscim.event.Event;
import org.oscim.layers.Layer;
import org.oscim.map.Map;
import org.oscim.map.Map.UpdateListener;
import org.oscim.renderer.BitmapRenderer;
@@ -71,7 +72,7 @@ public class MapScaleBar extends Layer implements UpdateListener {
private boolean mRedrawNeeded;
private double mPrevLatitude = -1;
private final double mPrevScale = -1;
private final Map<TextField, String> mTextFields;
private final HashMap<TextField, String> mTextFields;
private final Bitmap mBitmap;
// passed to BitmapRenderer - need to sync on this object.
@@ -102,7 +103,9 @@ public class MapScaleBar extends Layer implements UpdateListener {
}
@Override
public void onMapUpdate(MapPosition mapPosition, boolean changed, boolean clear) {
public void onMapEvent(Event e, MapPosition mapPosition) {
if (e == Map.UPDATE_EVENT)
return;
double latitude = MercatorProjection.toLatitude(mapPosition.y);

3
vtm-android/src/org/oscim/android/MapView.java
View File

@@ -152,8 +152,7 @@ public class MapView extends RelativeLayout {
if (mGestureDetector.onTouchEvent(motionEvent))
return true;
mMap.handleMotionEvent(mMotionEvent.wrap(motionEvent));
mMap.input.fire(null, mMotionEvent.wrap(motionEvent));
return true;
}