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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-01-02 19:26:19 +01:00
commit 9e8f38d3ba
2 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
View file

@ -8,7 +8,6 @@ import java.util.Random;
import net.osmand.Location;
import net.osmand.access.AccessibleAlertBuilder;
import net.osmand.data.LatLon;
import net.osmand.plus.OsmAndAppCustomization;
import net.osmand.plus.OsmAndLocationProvider;
import net.osmand.plus.OsmandApplication;
@ -512,16 +511,15 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca
}
}
//Remove for now to check error
//@Override
//public void updateLocation(LatLon location) {
// for (WeakReference<Fragment> ref : fragList) {
// Fragment f = ref.get();
// if (f instanceof DashFavoritesFragment && !f.isDetached()) {
// ((DashFavoritesFragment) f).updateLocation(location);
// }
// }
//}
@Override
public void updateLocation(Location location) {
for (WeakReference<Fragment> ref : fragList) {
Fragment f = ref.get();
if (f instanceof DashFavoritesFragment && !f.isDetached()) {
((DashFavoritesFragment) f).updateLocation(location);
}
}
}
private OsmAndLocationProvider getLocationProvider() {
return getMyApplication().getLocationProvider();

22
OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
View file

@ -36,8 +36,8 @@ import java.util.List;
*/
public class DashFavoritesFragment extends DashBaseFragment {
public static final String TAG = "DASH_FAVORITES_FRAGMENT";
//private net.osmand.Location location = null;
private LatLon location = null;
private net.osmand.Location location = null;
private LatLon loc = null;
private Float heading = null;
private List<ImageView> arrows = new ArrayList<ImageView>();
List<FavouritePoint> points = new ArrayList<FavouritePoint>();
@ -68,16 +68,16 @@ public class DashFavoritesFragment extends DashBaseFragment {
if (getMyApplication().getFavorites().getFavouritePoints().size() > 0) {
if(!getMyApplication().getSettings().isLastKnownMapLocation()) {
// show first time when application ran
//location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation();
location = new LatLon(getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLatitude(), getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLongitude());
location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation();
loc = new LatLon(getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLatitude(), getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLongitude());
} else {
//location = getLocationProvider().getLastKnownLocation();
location = new LatLon(getLocationProvider().getLastKnownLocation().getLatitude(), getLocationProvider().getLastKnownLocation().getLongitude());
location = getLocationProvider().getLastKnownLocation();
loc = new LatLon(getLocationProvider().getLastKnownLocation().getLatitude(), getLocationProvider().getLastKnownLocation().getLongitude());
}
if (location == null) {
location = getMyApplication().getSettings().getLastKnownMapLocation();
if (loc == null) {
loc = getMyApplication().getSettings().getLastKnownMapLocation();
}
updateLocation(location);
updateLocation(loc);
}
setupFavorites();
}
@ -166,7 +166,7 @@ public class DashFavoritesFragment extends DashBaseFragment {
private void updateArrow(FavouritePoint point, ImageView direction) {
float[] mes = new float[2];
LatLon l = new LatLon(point.getLatitude(), point.getLongitude());
Location.distanceBetween(l.getLatitude(), l.getLongitude(), location.getLatitude(), location.getLongitude(), mes);
Location.distanceBetween(l.getLatitude(), l.getLongitude(), loc.getLatitude(), loc.getLongitude(), mes);
DirectionDrawable draw = new DirectionDrawable(getActivity(), 10, 10, true);
Float h = heading;
float a = h != null ? h : 0;
@ -183,7 +183,7 @@ public class DashFavoritesFragment extends DashBaseFragment {
if (location == null){
return;
}
this.location = location;
this.loc = loc;
updateArrows();
}