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

fix #5062

Browse source
This commit is contained in:
Chumva 2018-05-10 17:43:53 +03:00
parent 91ae929e5d
commit d005f38e88
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
View file

@ -1208,7 +1208,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
public boolean searchFinished(SearchPhrase phrase) { public boolean searchFinished(SearchPhrase phrase) {
SearchResultCollection res = getResultCollection(); SearchResultCollection res = getResultCollection();
if (SearchUICore.isDebugMode()) { if (SearchUICore.isDebugMode()) {
LOG.info("UI >> Nearest cities found: " + (res != null ? res.getCurrentSearchResults().size() : 0)); LOG.info("UI >> Nearest cities found: " + getSearchResultCollectionFormattedSize(res));
} }
final OsmandSettings settings = app.getSettings(); final OsmandSettings settings = app.getSettings();
@ -1665,11 +1665,11 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
boolean append = getResultCollection() != null; boolean append = getResultCollection() != null;
if (append) { if (append) {
if (SearchUICore.isDebugMode()) { if (SearchUICore.isDebugMode()) {
LOG.info("UI >> Appending API results <" + phrase + "> API=<" + searchApi + "> Result collection=" + getResultCollection().getCurrentSearchResults().size()); LOG.info("UI >> Appending API results <" + phrase + "> API=<" + searchApi + "> Result collection=" + getSearchResultCollectionFormattedSize(getResultCollection()));
} }
getResultCollection().addSearchResults(apiResults, true, true); getResultCollection().addSearchResults(apiResults, true, true);
if (SearchUICore.isDebugMode()) { if (SearchUICore.isDebugMode()) {
LOG.info("UI >> API results appended <" + phrase + "> API=<" + searchApi + "> Result collection=" + getResultCollection().getCurrentSearchResults().size()); LOG.info("UI >> API results appended <" + phrase + "> API=<" + searchApi + "> Result collection=" + getSearchResultCollectionFormattedSize(getResultCollection()));
} }
} else { } else {
if (SearchUICore.isDebugMode()) { if (SearchUICore.isDebugMode()) {
@ -1679,14 +1679,14 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
resCollection.addSearchResults(apiResults, true, true); resCollection.addSearchResults(apiResults, true, true);
setResultCollection(resCollection); setResultCollection(resCollection);
if (SearchUICore.isDebugMode()) { if (SearchUICore.isDebugMode()) {
LOG.info("UI >> API results assigned <" + phrase + "> API=<" + searchApi + "> Result collection=" + getResultCollection().getCurrentSearchResults().size()); LOG.info("UI >> API results assigned <" + phrase + "> API=<" + searchApi + "> Result collection=" + getSearchResultCollectionFormattedSize(getResultCollection()));
} }
} }
if (!hasRegionCollection && resultListener != null) { if (!hasRegionCollection && resultListener != null) {
resultListener.publish(getResultCollection(), append); resultListener.publish(getResultCollection(), append);
} }
if (SearchUICore.isDebugMode()) { if (SearchUICore.isDebugMode()) {
LOG.info("UI >> API results shown <" + phrase + "> API=<" + searchApi + "> Results=" + getResultCollection().getCurrentSearchResults().size()); LOG.info("UI >> API results shown <" + phrase + "> API=<" + searchApi + "> Results=" + getSearchResultCollectionFormattedSize(getResultCollection()));
} }
} }
} }
@ -1702,27 +1702,27 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
public void run() { public void run() {
if (!paused && !cancelPrev) { if (!paused && !cancelPrev) {
if (SearchUICore.isDebugMode()) { if (SearchUICore.isDebugMode()) {
LOG.info("UI >> Showing region results <" + phrase + "> Region=<" + region.getFile().getName() + "> Results=" + regionResultCollection.getCurrentSearchResults().size()); LOG.info("UI >> Showing region results <" + phrase + "> Region=<" + region.getFile().getName() + "> Results=" + getSearchResultCollectionFormattedSize(regionResultCollection));
} }
if (getResultCollection() != null) { if (getResultCollection() != null) {
if (SearchUICore.isDebugMode()) { if (SearchUICore.isDebugMode()) {
LOG.info("UI >> Combining region results <" + phrase + "> Region=<" + region.getFile().getName() + "> Result collection=" + getResultCollection().getCurrentSearchResults().size()); LOG.info("UI >> Combining region results <" + phrase + "> Region=<" + region.getFile().getName() + "> Result collection=" + getSearchResultCollectionFormattedSize(getResultCollection()));
} }
SearchResultCollection resCollection = SearchResultCollection resCollection =
getResultCollection().combineWithCollection(regionResultCollection, true, true); getResultCollection().combineWithCollection(regionResultCollection, true, true);
if (SearchUICore.isDebugMode()) { if (SearchUICore.isDebugMode()) {
LOG.info("UI >> Region results combined <" + phrase + "> Region=<" + region.getFile().getName() + "> Result collection=" + resCollection.getCurrentSearchResults().size()); LOG.info("UI >> Region results combined <" + phrase + "> Region=<" + region.getFile().getName() + "> Result collection=" + getSearchResultCollectionFormattedSize(resCollection));
} }
if (resultListener != null) { if (resultListener != null) {
resultListener.publish(resCollection, true); resultListener.publish(resCollection, true);
} }
if (SearchUICore.isDebugMode()) { if (SearchUICore.isDebugMode()) {
LOG.info("UI >> Region results shown <" + phrase + "> Region=<" + region.getFile().getName() + "> Results=" + resCollection.getCurrentSearchResults().size()); LOG.info("UI >> Region results shown <" + phrase + "> Region=<" + region.getFile().getName() + "> Results=" + getSearchResultCollectionFormattedSize(resCollection));
} }
} else if (resultListener != null) { } else if (resultListener != null) {
resultListener.publish(regionResultCollection, false); resultListener.publish(regionResultCollection, false);
if (SearchUICore.isDebugMode()) { if (SearchUICore.isDebugMode()) {
LOG.info("UI >> Region results shown <" + phrase + "> Region=<" + region.getFile().getName() + "> Results=" + regionResultCollection.getCurrentSearchResults().size()); LOG.info("UI >> Region results shown <" + phrase + "> Region=<" + region.getFile().getName() + "> Results=" + getSearchResultCollectionFormattedSize(regionResultCollection));
} }
} }
} }
@ -1730,6 +1730,10 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
}); });
} }
private String getSearchResultCollectionFormattedSize(@Nullable SearchResultCollection resultCollection) {
return resultCollection != null ? String.valueOf(resultCollection.getCurrentSearchResults().size()) : "empty";
}
public void completeQueryWithObject(SearchResult sr) { public void completeQueryWithObject(SearchResult sr) {
if (sr.object instanceof PoiType && ((PoiType) sr.object).isAdditional()) { if (sr.object instanceof PoiType && ((PoiType) sr.object).isAdditional()) {
PoiType additional = (PoiType) sr.object; PoiType additional = (PoiType) sr.object;