pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fixed state when last location == null.

Browse source
This commit is contained in:
vng 2015-04-01 16:00:50 +03:00 • committed by Alex Zolotarev
parent 3c74572021
commit 00bdffaba3
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -324,26 +324,28 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
refreshPreview();
refreshDetails();
final Location loc = LocationHelper.INSTANCE.getLastLocation();
switch (mMapObject.getType())
{
case BOOKMARK:
refreshDistanceToObject(LocationHelper.INSTANCE.getLastLocation());
refreshDistanceToObject(loc);
refreshBookmarkDetails(true);
refreshButtons(false);
break;
case POI:
case ADDITIONAL_LAYER:
refreshDistanceToObject(LocationHelper.INSTANCE.getLastLocation());
refreshDistanceToObject(loc);
refreshBookmarkDetails(false);
refreshButtons(false);
break;
case API_POINT:
refreshDistanceToObject(LocationHelper.INSTANCE.getLastLocation());
refreshDistanceToObject(loc);
refreshBookmarkDetails(false);
refreshButtons(true);
break;
case MY_POSITION:
refreshMyPosition(LocationHelper.INSTANCE.getLastLocation());
refreshMyPosition(loc);
refreshBookmarkDetails(false);
refreshButtons(false);
break;
@ -455,30 +457,34 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
refreshDistanceToObject(l);
}
private void refreshMyPosition(Location myLocation)
private void refreshMyPosition(Location l)
{
final StringBuilder builder = new StringBuilder();
if (myLocation.hasAltitude())
builder.append(Framework.nativeFormatAltitude(myLocation.getAltitude()));
if (myLocation.hasSpeed())
builder.append(" ").
append(Framework.nativeFormatSpeed(myLocation.getSpeed()));
mTvSubtitle.setText(builder.toString());
mTvDistance.setVisibility(View.GONE);
mMapObject.setLat(myLocation.getLatitude());
mMapObject.setLon(myLocation.getLongitude());
if (l == null)
return;
final StringBuilder builder = new StringBuilder();
if (l.hasAltitude())
builder.append(Framework.nativeFormatAltitude(l.getAltitude()));
if (l.hasSpeed())
builder.append(" ").
append(Framework.nativeFormatSpeed(l.getSpeed()));
mTvSubtitle.setText(builder.toString());
mMapObject.setLat(l.getLatitude());
mMapObject.setLon(l.getLongitude());
refreshLatLon();
}
private void refreshDistanceToObject(Location myLocation)
private void refreshDistanceToObject(Location l)
{
if (myLocation != null)
if (l != null)
{
mTvDistance.setVisibility(View.VISIBLE);
final DistanceAndAzimut distanceAndAzimuth = Framework.nativeGetDistanceAndAzimutFromLatLon(mMapObject.getLat(),
mMapObject.getLon(), myLocation.getLatitude(), myLocation.getLongitude(), 0.0);
final DistanceAndAzimut distanceAndAzimuth = Framework.nativeGetDistanceAndAzimutFromLatLon(
mMapObject.getLat(), mMapObject.getLon(),
l.getLatitude(), l.getLongitude(), 0.0);
mTvDistance.setText(distanceAndAzimuth.getDistance());
}
else