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

BUGFIX 42

Browse source 
git-svn-id: https://osmand.googlecode.com/svn/trunk@462 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-08-17 21:27:15 +00:00
parent 0c7ef8af0a
commit 47b249bb82
2 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd/src/net/osmand/activities/MapActivity.java
View file

@ -184,11 +184,6 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
return MapActivity.this.onTrackballEvent(e); return MapActivity.this.onTrackballEvent(e);
} }
@Override
public boolean onTrackBallPressed() {
contextMenuPoint(mapView.getLatitude(), mapView.getLongitude());
return true;
}
}); });
MapTileDownloader.getInstance().addDownloaderCallback(new IMapDownloaderCallback(){ MapTileDownloader.getInstance().addDownloaderCallback(new IMapDownloaderCallback(){
@Override @Override
@ -767,6 +762,15 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
showAndHideMapPosition(); showAndHideMapPosition();
} }
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
contextMenuPoint(mapView.getLatitude(), mapView.getLongitude());
return true;
}
return false;
}
public void checkExternalStorage(){ public void checkExternalStorage(){
String state = Environment.getExternalStorageState(); String state = Environment.getExternalStorageState();
if(Environment.MEDIA_MOUNTED.equals(state)){ if(Environment.MEDIA_MOUNTED.equals(state)){

26
OsmAnd/src/net/osmand/views/OsmandMapTileView.java
View file

@ -36,7 +36,6 @@ import android.util.AttributeSet;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.FloatMath; import android.util.FloatMath;
import android.view.GestureDetector; import android.view.GestureDetector;
import android.view.KeyEvent;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import android.view.SurfaceView; import android.view.SurfaceView;
@ -54,7 +53,6 @@ public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCall
public interface OnTrackBallListener{ public interface OnTrackBallListener{
public boolean onTrackBallEvent(MotionEvent e); public boolean onTrackBallEvent(MotionEvent e);
public boolean onTrackBallPressed();
} }
public interface OnLongClickListener { public interface OnLongClickListener {
@ -329,12 +327,12 @@ public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCall
//////////////////////////////// DRAWING MAP PART ///////////////////////////////////////////// //////////////////////////////// DRAWING MAP PART /////////////////////////////////////////////
protected void drawEmptyTile(Canvas cvs, float x, float y){ protected void drawEmptyTile(Canvas cvs, float x, float y, float ftileSize){
float tileDiv = (getTileSize() / emptyTileDivisor); float tileDiv = (ftileSize / emptyTileDivisor);
for (int k1 = 0; k1 < emptyTileDivisor; k1++) { for (int k1 = 0; k1 < emptyTileDivisor; k1++) {
for (int k2 = 0; k2 < emptyTileDivisor; k2++) { for (int k2 = 0; k2 < emptyTileDivisor; k2++) {
float xk = x + tileDiv* k1 ; float xk = x + tileDiv * k1;
float yk = y + tileDiv* k2; float yk = y + tileDiv * k2;
if ((k1 + k2) % 2 == 0) { if ((k1 + k2) % 2 == 0) {
cvs.drawRect(xk, yk, xk + tileDiv, yk + tileDiv, paintGrayFill); cvs.drawRect(xk, yk, xk + tileDiv, yk + tileDiv, paintGrayFill);
} else { } else {
@ -484,7 +482,7 @@ public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCall
} }
if(bmp == null){ if(bmp == null){
drawEmptyTile(canvas, (int) x1, (int) y1); drawEmptyTile(canvas, x1, y1, ftileSize);
} else { } else {
int xZoom = ((left + i) % div) * tileSize / div; int xZoom = ((left + i) % div) * tileSize / div;
int yZoom = ((top + j) % div) * tileSize / div;; int yZoom = ((top + j) % div) * tileSize / div;;
@ -567,10 +565,13 @@ public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCall
Bitmap bmp = mgr.getTileImageForMapSync(null, map, request.xTile, request.yTile, request.zoom, false); Bitmap bmp = mgr.getTileImageForMapSync(null, map, request.xTile, request.yTile, request.zoom, false);
float x = (request.xTile - tileX) * getTileSize() + w; float x = (request.xTile - tileX) * getTileSize() + w;
float y = (request.yTile - tileY) * getTileSize() + h; float y = (request.yTile - tileY) * getTileSize() + h;
float tileSize = getTileSize();
if (bmp == null) { if (bmp == null) {
drawEmptyTile(canvas, x, y); drawEmptyTile(canvas, x, y, tileSize);
} else { } else {
canvas.drawBitmap(bmp, x, y, paintBitmap); bitmapToZoom.set(0, 0, getSourceTileSize(), getSourceTileSize());
bitmapToDraw.set(x, y, x + tileSize, y + tileSize);
canvas.drawBitmap(bmp, bitmapToZoom, bitmapToDraw, paintBitmap);
} }
drawOverMap(canvas); drawOverMap(canvas);
} finally { } finally {
@ -689,13 +690,6 @@ public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCall
return true; return true;
} }
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
if(trackBallDelegate != null && keyCode == KeyEvent.KEYCODE_DPAD_CENTER){
return trackBallDelegate.onTrackBallPressed();
}
return super.onKeyUp(keyCode, event);
}
@Override @Override
public boolean onTrackballEvent(MotionEvent event) { public boolean onTrackballEvent(MotionEvent event) {