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

added method isCityEmpty for checking streets

Browse source
This commit is contained in:
Chumva 2018-03-26 10:47:37 +03:00
parent 8fd6142a8b
commit befaa12c80
1 changed files with 34 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -103,30 +103,9 @@ public abstract class QuickSearchListFragment extends OsmAndListFragment {
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()) {
ResultMatcher<Street> resultMatcher = new ResultMatcher<Street>() {
boolean isCancelled = false;
@Override
public boolean publish(Street object) {
isCancelled = true;
return true;
}
@Override
public boolean isCancelled() {
return isCancelled;
}
};
try {
sr.file.preloadStreets(c, BinaryMapIndexReader.buildAddressRequest(resultMatcher));
if (c.getStreets().isEmpty()) {
showResult(sr);
return;
}
} catch (IOException e) {
e.printStackTrace();
}
if (isCityEmpty(c, sr)) {
showResult(sr);
return;
}
}
dialogFragment.completeQueryWithObject(sr);
@ -136,6 +115,37 @@ public abstract class QuickSearchListFragment extends OsmAndListFragment {
}
}
public boolean isCityEmpty(City c, SearchResult sr) {
if (c.getStreets().isEmpty()) {
ResultMatcher<Street> resultMatcher = new ResultMatcher<Street>() {
boolean isCancelled = false;
@Override
public boolean publish(Street object) {
isCancelled = true;
return true;
}
@Override
public boolean isCancelled() {
return isCancelled;
}
};
try {
sr.file.preloadStreets(c, BinaryMapIndexReader.buildAddressRequest(resultMatcher));
if (c.getStreets().isEmpty()) {
return true;
} else {
c.unregisterStreet(c.getStreets().get(0));
return false;
}
} catch (IOException e) {
e.printStackTrace();
}
}
return false;
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);