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

Merge pull request #5158 from osmandapp/SearchCityWithoutStreets

Browse source 
Search city without streets
This commit is contained in:
Alexander Sytnyk 2018-03-23 14:57:45 +02:00 committed by GitHub
commit ad0d367153
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,7 @@ import net.osmand.search.core.ObjectType;
import net.osmand.search.core.SearchResult; import net.osmand.search.core.SearchResult;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -97,7 +98,22 @@ public abstract class QuickSearchListFragment extends OsmAndListFragment {
showResult(sr); showResult(sr);
} else { } else {
dialogFragment.completeQueryWithObject(item.getSearchResult()); if ((sr.objectType == ObjectType.CITY || sr.objectType == ObjectType.VILLAGE)
&& sr.file != null && sr.object instanceof City) {
City c = (City) sr.object;
if (c.getStreets().isEmpty()) {
try {
sr.file.preloadStreets(c, null);
if (c.getStreets().isEmpty()) {
showResult(sr);
return;
}
} catch (IOException e) {
e.printStackTrace();
}
}
}
dialogFragment.completeQueryWithObject(sr);
} }
} }
} }
@ -198,6 +214,7 @@ public abstract class QuickSearchListFragment extends OsmAndListFragment {
FavouritePoint fav = (FavouritePoint) object; FavouritePoint fav = (FavouritePoint) object;
pointDescription = fav.getPointDescription(); pointDescription = fav.getPointDescription();
break; break;
case VILLAGE:
case CITY: case CITY:
String cityName = searchResult.localeName; String cityName = searchResult.localeName;
String typeNameCity = QuickSearchListItem.getTypeName(app, searchResult); String typeNameCity = QuickSearchListItem.getTypeName(app, searchResult);