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

Potential fix of complete full search

Browse source
This commit is contained in:
Victor Shcherb 2021-04-19 20:27:34 +02:00
parent 08baaf7004
commit df3104b032
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
OsmAnd-java/src/main/java/net/osmand/search/core/SearchResult.java
View file

@ -55,10 +55,18 @@ public class SearchResult {
public double getSumPhraseMatchWeight() { public double getSumPhraseMatchWeight() {
// if result is a complete match in the search we prioritize it higher // if result is a complete match in the search we prioritize it higher
int localWordsMatched = alternateName != null ? String name = alternateName != null? alternateName : localeName;
requiredSearchPhrase.countWords(alternateName) : requiredSearchPhrase.countWords(localeName) ; int localWordsMatched = requiredSearchPhrase.countWords(name) ;
boolean match = localWordsMatched <= getSelfWordCount(); boolean match = localWordsMatched <= getSelfWordCount();
double res = ObjectType.getTypeWeight(match ? objectType : null); boolean fullCompleteMatch = false;
double res = 1;
if (match) {
res = ObjectType.getTypeWeight(match ? objectType : null);
fullCompleteMatch = getSelfPhrase().equals(name);
if (fullCompleteMatch) {
res = res * 10;
}
}
if (parentSearchResult != null) { if (parentSearchResult != null) {
res = res + parentSearchResult.getSumPhraseMatchWeight() / MAX_TYPE_WEIGHT; res = res + parentSearchResult.getSumPhraseMatchWeight() / MAX_TYPE_WEIGHT;
} }
@ -80,6 +88,19 @@ public class SearchResult {
return inc; return inc;
} }
private String getSelfPhrase() {
String ph = "";
if (firstUnknownWordMatches) {
ph = requiredSearchPhrase.getFirstUnknownSearchWord();
}
if (otherWordsMatch != null) {
for (String s : otherWordsMatch) {
ph += " " + s;
}
}
return ph;
}
private int getSelfWordCount() { private int getSelfWordCount() {
int inc = 0; int inc = 0;
if (firstUnknownWordMatches) { if (firstUnknownWordMatches) {