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

Fix #3196

Browse source
This commit is contained in:
Victor Shcherb 2016-11-04 01:13:40 +02:00
parent a72dab0a5e
commit 488ae194ac
1 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
OsmAnd-java/src/net/osmand/search/SearchUICore.java
View file

@ -30,7 +30,9 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.ListIterator;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -68,6 +70,7 @@ public class SearchUICore {
public static class SearchResultCollection { public static class SearchResultCollection {
private List<SearchResult> searchResults; private List<SearchResult> searchResults;
private SearchPhrase phrase; private SearchPhrase phrase;
private static final int DEPTH_TO_CHECK_SAME_SEARCH_RESULTS = 20;
public SearchResultCollection(SearchPhrase phrase) { public SearchResultCollection(SearchPhrase phrase) {
searchResults = new ArrayList<>(); searchResults = new ArrayList<>();
@ -103,8 +106,16 @@ public class SearchUICore {
while(j < addedResults.size()) { while(j < addedResults.size()) {
SearchResult addedResult = addedResults.get(j); SearchResult addedResult = addedResults.get(j);
if(i >= searchResults.size()) { if(i >= searchResults.size()) {
if(searchResults.size() == 0 || int k = 0;
!sameSearchResult(addedResult, searchResults.get(searchResults.size() - 1))) { boolean same = false;
while(searchResults.size() > k && k < DEPTH_TO_CHECK_SAME_SEARCH_RESULTS) {
if(sameSearchResult(addedResult, searchResults.get(searchResults.size() - k))) {
same = true;
break;
}
k++;
}
if(!same) {
searchResults.add(addedResult); searchResults.add(addedResult);
} }
j++; j++;
@ -151,14 +162,24 @@ public class SearchUICore {
} }
private void filterSearchDuplicateResults(List<SearchResult> lst) { private void filterSearchDuplicateResults(List<SearchResult> lst) {
Iterator<SearchResult> it = lst.iterator(); ListIterator<SearchResult> it = lst.listIterator();
SearchResult found = null; LinkedList<SearchResult> lstUnique = new LinkedList<SearchResult>();
while(it.hasNext()) { while(it.hasNext()) {
SearchResult r = it.next(); SearchResult r = it.next();
if(found != null && sameSearchResult(found, r)) { boolean same = false;
for(SearchResult rs : lstUnique) {
same = sameSearchResult(rs, r);
if(same) {
break;
}
}
if(same) {
it.remove(); it.remove();
} else { } else {
found = r; lstUnique.add(r);
if(lstUnique.size() > DEPTH_TO_CHECK_SAME_SEARCH_RESULTS) {
lstUnique.remove(0);
}
} }
} }
} }
@ -187,7 +208,7 @@ public class SearchUICore {
return false; return false;
} }
if (type1.equals("natural")) { if (type1.equals("natural")) {
similarityRadius = 10000; similarityRadius = 50000;
} else if (subType1.equals(subType2)) { } else if (subType1.equals(subType2)) {
if (subType1.contains("cn_ref") || subType1.contains("wn_ref") if (subType1.contains("cn_ref") || subType1.contains("wn_ref")
|| (subType1.startsWith("route_hiking_") && subType1.endsWith("n_poi"))) { || (subType1.startsWith("route_hiking_") && subType1.endsWith("n_poi"))) {