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

Rotate map when bearing is not allowed

Browse source
This commit is contained in:
Victor Shcherb 2012-06-30 13:38:53 +02:00
parent 3dc5b81acf
commit c06b390993
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -18,6 +18,7 @@ import net.osmand.data.MapTileDownloader.DownloadRequest;
import net.osmand.data.MapTileDownloader.IMapDownloaderCallback; import net.osmand.data.MapTileDownloader.IMapDownloaderCallback;
import net.osmand.map.IMapLocationListener; import net.osmand.map.IMapLocationListener;
import net.osmand.osm.LatLon; import net.osmand.osm.LatLon;
import net.osmand.osm.MapUtils;
import net.osmand.plus.BusyIndicator; import net.osmand.plus.BusyIndicator;
import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.FavouritesDbHelper; import net.osmand.plus.FavouritesDbHelper;
@ -105,7 +106,7 @@ public class MapActivity extends AccessibleActivity implements IMapLocationListe
private static final int LONG_KEYPRESS_DELAY = 500; private static final int LONG_KEYPRESS_DELAY = 500;
private long lastTimeAutoZooming = 0; private long lastTimeAutoZooming = 0;
private long lastTimeSensorRotation = 0;
private long lastTimeGPSLocationFixed = 0; private long lastTimeGPSLocationFixed = 0;
/** Called when the activity is first created. */ /** Called when the activity is first created. */
@ -119,6 +120,7 @@ public class MapActivity extends AccessibleActivity implements IMapLocationListe
private RoutingHelper routingHelper; private RoutingHelper routingHelper;
private boolean sensorRegistered = false; private boolean sensorRegistered = false;
private float previousSensorValue = 0;
// Notification status // Notification status
private NotificationManager mNotificationManager; private NotificationManager mNotificationManager;
@ -676,15 +678,16 @@ public class MapActivity extends AccessibleActivity implements IMapLocationListe
private void registerUnregisterSensor(Location location){ private void registerUnregisterSensor(Location location, boolean overruleRegister){
boolean currentShowingAngle = settings.SHOW_VIEW_ANGLE.get(); boolean currentShowingAngle = settings.SHOW_VIEW_ANGLE.get();
int currentMapRotation = settings.ROTATE_MAP.get(); int currentMapRotation = settings.ROTATE_MAP.get();
boolean show = (currentShowingAngle && location != null) || currentMapRotation == OsmandSettings.ROTATE_MAP_COMPASS; boolean show = overruleRegister || (currentShowingAngle && location != null) || currentMapRotation == OsmandSettings.ROTATE_MAP_COMPASS;
// show point view only if gps enabled // show point view only if gps enabled
if (sensorRegistered && !show) { if (sensorRegistered && !show) {
Log.d(LogUtil.TAG, "Disable sensor"); //$NON-NLS-1$ Log.d(LogUtil.TAG, "Disable sensor"); //$NON-NLS-1$
((SensorManager) getSystemService(SENSOR_SERVICE)).unregisterListener(this); ((SensorManager) getSystemService(SENSOR_SERVICE)).unregisterListener(this);
sensorRegistered = false; sensorRegistered = false;
previousSensorValue = 0;
mapLayers.getLocationLayer().setHeading(null); mapLayers.getLocationLayer().setHeading(null);
} else if (!sensorRegistered && show) { } else if (!sensorRegistered && show) {
Log.d(LogUtil.TAG, "Enable sensor"); //$NON-NLS-1$ Log.d(LogUtil.TAG, "Enable sensor"); //$NON-NLS-1$
@ -769,8 +772,9 @@ public class MapActivity extends AccessibleActivity implements IMapLocationListe
updateSpeedBearing(location); updateSpeedBearing(location);
} }
boolean enableSensorNavigation = routingHelper.isFollowingMode() && location != null?
registerUnregisterSensor(location); location.hasBearing() : false;
registerUnregisterSensor(location, enableSensorNavigation);
if(routingHelper.isFollowingMode()){ if(routingHelper.isFollowingMode()){
if(location == null || !location.hasAccuracy() || location.getAccuracy() < ACCURACY_FOR_GPX_AND_ROUTING) { if(location == null || !location.hasAccuracy() || location.getAccuracy() < ACCURACY_FOR_GPX_AND_ROUTING) {
@ -803,11 +807,11 @@ public class MapActivity extends AccessibleActivity implements IMapLocationListe
navigationInfo.setLocation(location); navigationInfo.setLocation(location);
if (location != null) { if (location != null) {
long now = System.currentTimeMillis();
if (isMapLinkedToLocation()) { if (isMapLinkedToLocation()) {
if(settings.AUTO_ZOOM_MAP.get() && location.hasSpeed()){ if(settings.AUTO_ZOOM_MAP.get() && location.hasSpeed()){
int z = defineZoomFromSpeed(location.getSpeed(), mapView.getZoom()); int z = defineZoomFromSpeed(location.getSpeed(), mapView.getZoom());
if(mapView.getZoom() != z && !mapView.mapIsAnimating()){ if(mapView.getZoom() != z && !mapView.mapIsAnimating()){
long now = System.currentTimeMillis();
// prevent ui hysteresis (check time interval for autozoom) // prevent ui hysteresis (check time interval for autozoom)
if(Math.abs(mapView.getZoom() - z) > 1 || (now - lastTimeAutoZooming) > 6500){ if(Math.abs(mapView.getZoom() - z) > 1 || (now - lastTimeAutoZooming) > 6500){
lastTimeAutoZooming = now; lastTimeAutoZooming = now;
@ -818,8 +822,14 @@ public class MapActivity extends AccessibleActivity implements IMapLocationListe
int currentMapRotation = settings.ROTATE_MAP.get(); int currentMapRotation = settings.ROTATE_MAP.get();
if (location.hasBearing() && currentMapRotation == OsmandSettings.ROTATE_MAP_BEARING) { if (location.hasBearing() && currentMapRotation == OsmandSettings.ROTATE_MAP_BEARING) {
mapView.setRotate(-location.getBearing()); mapView.setRotate(-location.getBearing());
} else if(!location.hasBearing() && routingHelper.isFollowingMode()
&& currentMapRotation == OsmandSettings.ROTATE_MAP_BEARING) {
if (Math.abs(MapUtils.degreesDiff(mapView.getRotate(), -previousSensorValue)) > 15
&& now - lastTimeSensorRotation > 1500) {
lastTimeSensorRotation = now;
mapView.setRotate(-previousSensorValue);
}
} }
mapView.setLatLon(location.getLatitude(), location.getLongitude());
} else { } else {
if(!mapLayers.getMapInfoLayer().getBackToLocation().isEnabled()){ if(!mapLayers.getMapInfoLayer().getBackToLocation().isEnabled()){
mapLayers.getMapInfoLayer().getBackToLocation().setEnabled(true); mapLayers.getMapInfoLayer().getBackToLocation().setEnabled(true);
@ -1019,7 +1029,7 @@ public class MapActivity extends AccessibleActivity implements IMapLocationListe
} }
routingHelper.setAppMode(settings.getApplicationMode()); routingHelper.setAppMode(settings.getApplicationMode());
mapView.setMapPosition(settings.POSITION_ON_MAP.get()); mapView.setMapPosition(settings.POSITION_ON_MAP.get());
registerUnregisterSensor(getLastKnownLocation()); registerUnregisterSensor(getLastKnownLocation(), false);
mapLayers.getMapInfoLayer().applyTheme(); mapLayers.getMapInfoLayer().applyTheme();
mapLayers.updateLayers(mapView); mapLayers.updateLayers(mapView);
@ -1034,7 +1044,7 @@ public class MapActivity extends AccessibleActivity implements IMapLocationListe
vl = (vl + 1) % 3; vl = (vl + 1) % 3;
} }
settings.ROTATE_MAP.set(vl); settings.ROTATE_MAP.set(vl);
registerUnregisterSensor(getLastKnownLocation()); registerUnregisterSensor(getLastKnownLocation(), false);
if(settings.ROTATE_MAP.get() != OsmandSettings.ROTATE_MAP_COMPASS){ if(settings.ROTATE_MAP.get() != OsmandSettings.ROTATE_MAP_COMPASS){
mapView.setRotate(0); mapView.setRotate(0);
} }
@ -1128,8 +1138,11 @@ public class MapActivity extends AccessibleActivity implements IMapLocationListe
if(currentScreenOrientation == 1){ if(currentScreenOrientation == 1){
val += 90; val += 90;
} }
previousSensorValue = val;
if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_COMPASS) { if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_COMPASS) {
mapView.setRotate(-val); if(Math.abs(MapUtils.degreesDiff(mapView.getRotate(), -val)) > 5) {
mapView.setRotate(-val);
}
} }
if(settings.SHOW_VIEW_ANGLE.get().booleanValue()){ if(settings.SHOW_VIEW_ANGLE.get().booleanValue()){
if(mapLayers.getLocationLayer().getHeading() == null || Math.abs(mapLayers.getLocationLayer().getHeading() - val) > 10){ if(mapLayers.getLocationLayer().getHeading() == null || Math.abs(mapLayers.getLocationLayer().getHeading() - val) > 10){