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

Fix search poi

Browse source
This commit is contained in:
Victor Shcherb 2015-04-16 09:33:31 +02:00
parent edb9c7f659
commit 1d35af6cd8
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
View file

@ -107,9 +107,11 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
private boolean searchNearBy = false; private boolean searchNearBy = false;
private net.osmand.Location location = null; private net.osmand.Location location = null;
private net.osmand.Location lastSearchedLocation = null;
private Float heading = null; private Float heading = null;
private SearchAmenityTask currentSearchTask = null; private SearchAmenityTask currentSearchTask = null;
private OsmandApplication app; private OsmandApplication app;
private MenuItem showFilterItem; private MenuItem showFilterItem;
private MenuItem showOnMapItem; private MenuItem showOnMapItem;
@ -461,7 +463,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
public void updateLocation(net.osmand.Location location) { public void updateLocation(net.osmand.Location location) {
boolean handled = false; boolean handled = false;
if (location != null && filter != null) { if (location != null && filter != null) {
net.osmand.Location searchedLocation = currentSearchTask == null ? null : currentSearchTask.getSearchedLocation(); net.osmand.Location searchedLocation = lastSearchedLocation;
if (searchedLocation == null) { if (searchedLocation == null) {
if (!isNameSearch()) { if (!isNameSearch()) {
runNewSearchQuery(location, NEW_SEARCH_INIT); runNewSearchQuery(location, NEW_SEARCH_INIT);
@ -593,16 +595,16 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
private int requestType; private int requestType;
private TLongHashSet existingObjects = null; private TLongHashSet existingObjects = null;
private TLongHashSet updateExisting; private TLongHashSet updateExisting;
private Location location; private Location searchLocation;
public SearchAmenityTask(net.osmand.Location location, int requestType) { public SearchAmenityTask(net.osmand.Location location, int requestType) {
this.location = location; this.searchLocation = location;
this.requestType = requestType; this.requestType = requestType;
} }
net.osmand.Location getSearchedLocation() { net.osmand.Location getSearchedLocation() {
return location ; return searchLocation ;
} }
@Override @Override
@ -644,6 +646,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
} else { } else {
amenityAdapter.setNewModel(result); amenityAdapter.setNewModel(result);
} }
lastSearchedLocation = searchLocation;
} }
@ -656,14 +659,14 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
@Override @Override
protected List<Amenity> doInBackground(Void... params) { protected List<Amenity> doInBackground(Void... params) {
if (location != null) { if (searchLocation != null) {
if (requestType == NEW_SEARCH_INIT) { if (requestType == NEW_SEARCH_INIT) {
return filter.initializeNewSearch(location.getLatitude(), location.getLongitude(), return filter.initializeNewSearch(searchLocation.getLatitude(), searchLocation.getLongitude(),
-1, this); -1, this);
} else if (requestType == SEARCH_FURTHER) { } else if (requestType == SEARCH_FURTHER) {
return filter.searchFurther(location.getLatitude(), location.getLongitude(), this); return filter.searchFurther(searchLocation.getLatitude(), searchLocation.getLongitude(), this);
} else if (requestType == SEARCH_AGAIN) { } else if (requestType == SEARCH_AGAIN) {
return filter.searchAgain(location.getLatitude(), location.getLongitude()); return filter.searchAgain(searchLocation.getLatitude(), searchLocation.getLongitude());
} }
} }
return Collections.emptyList(); return Collections.emptyList();