Update search result

OsmAnd-java/src/main/java/net/osmand/search/core/SearchPhrase.java

@@ -1,20 +1,6 @@
 package net.osmand.search.core;
 
-import net.osmand.Collator;
-import net.osmand.CollatorStringMatcher;import net.osmand.OsmAndCollator;
-import net.osmand.CollatorStringMatcher.StringMatcherMode;
-import net.osmand.StringMatcher;
-import net.osmand.binary.BinaryMapIndexReader;
-import net.osmand.binary.BinaryMapIndexReader.SearchRequest;
-import net.osmand.binary.CommonWords;
-import net.osmand.data.LatLon;
-import net.osmand.data.QuadRect;
-import net.osmand.util.Algorithms;
-import net.osmand.util.LocationParser;
-import net.osmand.util.MapUtils;
-
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -26,6 +12,20 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.regex.Pattern;
 
+import net.osmand.Collator;
+import net.osmand.CollatorStringMatcher;
+import net.osmand.CollatorStringMatcher.StringMatcherMode;
+import net.osmand.OsmAndCollator;
+import net.osmand.StringMatcher;
+import net.osmand.binary.BinaryMapIndexReader;
+import net.osmand.binary.BinaryMapIndexReader.SearchRequest;
+import net.osmand.binary.CommonWords;
+import net.osmand.data.LatLon;
+import net.osmand.data.QuadRect;
+import net.osmand.util.Algorithms;
+import net.osmand.util.LocationParser;
+import net.osmand.util.MapUtils;
+
 // Immutable object !
 public class SearchPhrase {
 	public static final String DELIMITER = " ";
@@ -228,7 +228,17 @@ public class SearchPhrase {
 		return sp;
 	}
 	
-	public int countWords(String w) {
+	public static void splitWords(String w, Collection<String> ws) {
+		if (!Algorithms.isEmpty(w)) {
+			String[] wrs = w.split(ALLDELIMITERS);
+			for (int i = 0; i < wrs.length; i++) {
+				String wd = wrs[i].trim();
+				ws.add(wd);
+			}
+		}
+	}
+	
+	public static int countWords(String w) {
 		int cnt = 0;
 		if (!Algorithms.isEmpty(w)) {
 			String[] ws = w.split(ALLDELIMITERS);

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

@@ -1,5 +1,9 @@
 package net.osmand.search.core;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 import net.osmand.binary.BinaryMapIndexReader;
 import net.osmand.data.City;
 import net.osmand.data.LatLon;
@@ -11,8 +15,6 @@ import net.osmand.osm.PoiType;
 import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 
-import java.util.Collection;
-
 public class SearchResult {
 	// search phrase that makes search result valid 
 	public SearchPhrase requiredSearchPhrase;
@@ -42,6 +44,8 @@ public class SearchResult {
 	public Object relatedObject;
 	public double distRelatedObjectName;
 	
+	private double unknownPhraseMatchWeight = 0;
+
 	public SearchResult(SearchPhrase sp) {
 		this.requiredSearchPhrase = sp;
 	}
@@ -49,22 +53,54 @@ public class SearchResult {
 
 	// maximum corresponds to the top entry
 	public double getUnknownPhraseMatchWeight() {
+		if (unknownPhraseMatchWeight != 0) {
+			return unknownPhraseMatchWeight;
+		}
 		// if result is a complete match in the search we prioritize it higher
-		return getSumPhraseMatchWeight() / Math.pow(MAX_TYPE_WEIGHT, getDepth() - 1);
+		double res = getSumPhraseMatchWeight() / Math.pow(MAX_TYPE_WEIGHT, getDepth() - 1);
+		unknownPhraseMatchWeight = res;
+		return res;
 	}
 	
 	public double getSumPhraseMatchWeight() {
 		// if result is a complete match in the search we prioritize it higher
-		int localWordsMatched = alternateName != null ? 
-				requiredSearchPhrase.countWords(alternateName)  : requiredSearchPhrase.countWords(localeName) ;
- 		boolean match = localWordsMatched <= getSelfWordCount();
-		double res = ObjectType.getTypeWeight(match ? objectType : null);
+		String name = alternateName != null ? alternateName : localeName;
+		List<String> localResultNames = new ArrayList<>();
+		SearchPhrase.splitWords(name, localResultNames);
+		List<String> searchPhraseNames = new ArrayList<String>();
+		if (firstUnknownWordMatches) {
+			searchPhraseNames.add(requiredSearchPhrase.getFirstUnknownSearchWord());
+		}
+		if (otherWordsMatch != null) {
+			searchPhraseNames.addAll(otherWordsMatch);
+		}
+		int idxMatchedWord = -1;
+		boolean allWordsMatched = true;
+		for (int i = 0; i < searchPhraseNames.size(); i++) {
+			boolean wordMatched = false;
+			for (int j = idxMatchedWord + 1; j < localResultNames.size(); j++) {
+				int r = requiredSearchPhrase.getCollator().compare(searchPhraseNames.get(i), localResultNames.get(j));
+				if (r == 0) {
+					wordMatched = true;
+					idxMatchedWord = j;
+					break;
+				}
+			}
+			if (!wordMatched) {
+				allWordsMatched = false;
+				break;
+			}
+		}
+		double res = ObjectType.getTypeWeight(allWordsMatched ? objectType : null);
 		if (parentSearchResult != null) {
 			res = res + parentSearchResult.getSumPhraseMatchWeight() / MAX_TYPE_WEIGHT;
 		}
 		return res;
 	}
 	
+	
+
+
 	public int getDepth() {
 		if (parentSearchResult != null) {
 			return 1 + parentSearchResult.getDepth();
@@ -80,6 +116,19 @@ public class SearchResult {
 		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() {
 		int inc = 0;
 		if (firstUnknownWordMatches) {

OsmAnd-java/src/test/java/net/osmand/search/SearchUICoreTest.java

@@ -132,6 +132,10 @@ public class SearchUICoreTest {
 
 			reader = new BinaryMapIndexReader(new RandomAccessFile(obfFile.getPath(), "r"), obfFile);
 		}
+		 boolean disabled = settingsJson.optBoolean("disabled", false);
+		 if (disabled) {
+			 return;
+		 }
 		List<List<String>> results = new ArrayList<>();
 		for (int i = 0; i < phrases.size(); i++) {
 			results.add(new ArrayList<String>());
@@ -191,9 +195,15 @@ public class SearchUICoreTest {
 				if (!Algorithms.stringsEqual(expected, present)) {
 					System.out.println(String.format("Phrase: %s", phrase));
 					System.out.println(String.format("Mismatch for '%s' != '%s'. Result: ", expected, present));
-				}
+					System.out.println("CURRENT RESULTS: ");
 					for (SearchResult r : searchResults) {
 						System.out.println(String.format("\t\"%s\",", formatResult(false, r, phrase)));
+					
+					}
+					System.out.println("EXPECTED : ");
+					for (String r : result) {
+						System.out.println(String.format("\t\"%s\",", r));
+					}
 				}
 				Assert.assertEquals(expected, present);
 			}