Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-01-03 18:58:54 +01:00
commit 16044bc62b

View file

@ -169,10 +169,14 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo
LatLon l = new LatLon(lat, lon);
if(!Algorithms.objectEquals(reqSearchPoint, l)){
reqSearchPoint = l;
if (!Algorithms.objectEquals (reqSearchPoint, settings.getLastKnownMapLocation()) {
updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view), false);
} else {
updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " ", true);
}
}
}
}
if(searchPoint == null){
LatLon last = settings.getLastKnownMapLocation();
if(!Algorithms.objectEquals(reqSearchPoint, last)){