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

fix small issues

Browse source 
git-svn-id: https://osmand.googlecode.com/svn/trunk@169 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-06-17 18:54:25 +00:00
parent 8b8c7928b2
commit 8e854cf3c4
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
OsmAnd/src/com/osmand/activities/MapActivity.java
View file

@ -123,12 +123,20 @@ public class MapActivity extends Activity implements LocationListener, IMapLocat
@Override @Override
public void onClick(View v) { public void onClick(View v) {
mapView.setZoom(mapView.getZoom() + 1); mapView.setZoom(mapView.getZoom() + 1);
// user can preview map manually switch off auto zoom while user don't press back to location
if(OsmandSettings.isAutoZoomEnabled(MapActivity.this)){
locationChanged(mapView.getLatitude(), mapView.getLongitude(), null);
}
} }
}); });
zoomControls.setOnZoomOutClickListener(new OnClickListener() { zoomControls.setOnZoomOutClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
mapView.setZoom(mapView.getZoom() - 1); mapView.setZoom(mapView.getZoom() - 1);
// user can preview map manually switch off auto zoom while user don't press back to location
if(OsmandSettings.isAutoZoomEnabled(MapActivity.this)){
locationChanged(mapView.getLatitude(), mapView.getLongitude(), null);
}
} }
}); });
backToLocation = (ImageButton)findViewById(R.id.BackToLocation); backToLocation = (ImageButton)findViewById(R.id.BackToLocation);
@ -240,14 +248,13 @@ public class MapActivity extends Activity implements LocationListener, IMapLocat
} }
locationLayer.setLastKnownLocation(location); locationLayer.setLastKnownLocation(location);
if (location != null) { if (location != null) {
if (isMapLinkedToLocation()) {
if(OsmandSettings.isAutoZoomEnabled(this) && location.hasSpeed()){ if(OsmandSettings.isAutoZoomEnabled(this) && location.hasSpeed()){
int z = defineZoomFromSpeed(location.getSpeed()); int z = defineZoomFromSpeed(location.getSpeed(), mapView.getZoom());
if(mapView.getZoom() != z){ if(mapView.getZoom() != z){
mapView.setZoom(z); mapView.setZoom(z);
} }
} }
if (isMapLinkedToLocation()) {
if (location.hasBearing() && OsmandSettings.isRotateMapToBearing(this)) { if (location.hasBearing() && OsmandSettings.isRotateMapToBearing(this)) {
mapView.setRotate(-location.getBearing()); mapView.setRotate(-location.getBearing());
} }
@ -264,13 +271,15 @@ public class MapActivity extends Activity implements LocationListener, IMapLocat
} }
} }
public int defineZoomFromSpeed(float speed){ public int defineZoomFromSpeed(float speed, int currentZoom){
speed *= 3.6; speed *= 3.6;
if(speed < 20){ if(speed < 4){
return currentZoom;
} else if(speed < 20){
return 17; return 17;
} else if(speed < 60){ } else if(speed < 45){
return 16; return 16;
} else if(speed < 120){ } else if(speed < 80){
return 15; return 15;
} }
return 14; return 14;