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 2014-12-31 16:24:22 +01:00
commit cd21900f68
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
View file

@ -191,9 +191,9 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct
@Override @Override
public void locationUpdate(LatLon l) { public void locationUpdate(LatLon l) {
//location = l;
if (view != null) { if (view != null) {
if (l != null) { if (l != null) {
//location = l;
showCurrentFormat(l); showCurrentFormat(l);
} else { } else {
showCurrentFormat(new LatLon(0, 0)); showCurrentFormat(new LatLon(0, 0));

8
OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java
View file

@ -52,15 +52,13 @@ public class SearchTransportFragment extends SherlockFragment implements SearchA
public static final String SEARCH_LON = SearchActivity.SEARCH_LON; public static final String SEARCH_LON = SearchActivity.SEARCH_LON;
private Button searchTransportLevel; private Button searchTransportLevel;
private TextView searchArea; private TextView searchArea;
private final static int finalZoom = 13; private final static int finalZoom = 13;
private final static int initialZoom = 17; private final static int initialZoom = 17;
private int zoom = initialZoom; private int zoom = initialZoom;
private ProgressBar progress; private ProgressBar progress;
private LatLon lastKnownMapLocation; private LatLon lastKnownMapLocation;
private LatLon destinationLocation; private LatLon destinationLocation;
@ -71,7 +69,6 @@ public class SearchTransportFragment extends SherlockFragment implements SearchA
private OsmandSettings settings; private OsmandSettings settings;
private View view; private View view;
private AsyncTask<?, ?, ?> asyncTask; private AsyncTask<?, ?, ?> asyncTask;
private OsmandApplication getApplication() { private OsmandApplication getApplication() {
return (OsmandApplication) getActivity().getApplication(); return (OsmandApplication) getActivity().getApplication();
@ -140,7 +137,8 @@ public class SearchTransportFragment extends SherlockFragment implements SearchA
double lat = intent.getDoubleExtra(SEARCH_LAT, 0); double lat = intent.getDoubleExtra(SEARCH_LAT, 0);
double lon = intent.getDoubleExtra(SEARCH_LON, 0); double lon = intent.getDoubleExtra(SEARCH_LON, 0);
if(lat != 0 || lon != 0){ if(lat != 0 || lon != 0){
startPoint = new LatLon(lat, lon); //This prevents origin update on this tab when switching to it after origin was changed on previous tab
//startPoint = new LatLon(lat, lon);
} }
} }
if(startPoint == null && getActivity() instanceof SearchActivity){ if(startPoint == null && getActivity() instanceof SearchActivity){