From b7c42d47b09d0ad9bf67eaac94a664a32525dbc8 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Tue, 16 Jun 2020 23:30:59 +0200 Subject: [PATCH] Fix #9147 --- .../osmand/search/core/SearchCoreFactory.java | 39 ++++++++++++------- .../test/resources/search/navacerrada.json | 6 +-- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java index e7573cca4f..bf6924c8fc 100644 --- a/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java +++ b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java @@ -140,10 +140,16 @@ public class SearchCoreFactory { protected void subSearchApiOrPublish(SearchPhrase phrase, SearchResultMatcher resultMatcher, SearchResult res, SearchBaseAPI api) throws IOException { + subSearchApiOrPublish(phrase, resultMatcher, res, api, true); + } + + protected void subSearchApiOrPublish(SearchPhrase phrase, SearchResultMatcher resultMatcher, SearchResult res, SearchBaseAPI api, + boolean publish) + throws IOException { phrase.countUnknownWordsMatchMainResult(res); boolean firstUnknownWordMatches = res.firstUnknownWordMatches; List leftUnknownSearchWords = new ArrayList(phrase.getUnknownSearchWords()); - if(res.otherWordsMatch != null) { + if (res.otherWordsMatch != null) { leftUnknownSearchWords.removeAll(res.otherWordsMatch); } SearchResult newParentSearchResult = null; @@ -187,19 +193,23 @@ public class SearchCoreFactory { leftUnknownSearchWords.add(0, phrase.getFirstUnknownSearchWord()); } // publish result to set parentSearchResult before search - if(newParentSearchResult != null) { - SearchResult prev = resultMatcher.setParentSearchResult(newParentSearchResult); - resultMatcher.publish(res); - resultMatcher.setParentSearchResult(prev); - } else { - resultMatcher.publish(res); + if (publish) { + if (newParentSearchResult != null) { + SearchResult prev = resultMatcher.setParentSearchResult(newParentSearchResult); + resultMatcher.publish(res); + resultMatcher.setParentSearchResult(prev); + } else { + resultMatcher.publish(res); + } } if (!leftUnknownSearchWords.isEmpty() && api != null && api.isSearchAvailable(phrase)) { SearchPhrase nphrase = phrase.selectWord(res, leftUnknownSearchWords, phrase.isLastUnknownSearchWordComplete()); - SearchResult prev = resultMatcher.setParentSearchResult(res); + SearchResult prev = resultMatcher.setParentSearchResult(publish ? res : + resultMatcher.getParentSearchResult()); api.search(nphrase, resultMatcher); resultMatcher.setParentSearchResult(prev); } + } @Override @@ -1103,11 +1113,11 @@ public class SearchCoreFactory { res.localeName = object.getName(phrase.getSettings().getLang(), phrase.getSettings().isTransliterate()); res.otherNames = object.getAllNames(true); + boolean pub = true; if (object.getName().startsWith("<")) { // streets related to city - continue; - } - if (phrase.isUnknownSearchWordPresent() + pub = false; + } else if (phrase.isUnknownSearchWordPresent() && !(nm.matches(res.localeName) || nm.matches(res.otherNames))) { continue; } @@ -1119,7 +1129,7 @@ public class SearchCoreFactory { res.priority = SEARCH_STREET_BY_CITY_PRIORITY; //res.priorityDistance = 1; res.objectType = ObjectType.STREET; - subSearchApiOrPublish(phrase, resultMatcher, res, streetsAPI); + subSearchApiOrPublish(phrase, resultMatcher, res, streetsAPI, pub); if (limit++ > LIMIT) { break; } @@ -1227,8 +1237,8 @@ public class SearchCoreFactory { res.file = file; res.priority = priority; res.priorityDistance = 0; - // TOOO phrase.countUnknownWordsMatchMainResult(res); res.firstUnknownWordMatches = startMatch.matches(res.localeName); + // phrase.countUnknownWordsMatchMainResult(res); // same as above res.relatedObject = s; res.localeRelatedObjectName = s.getName(phrase.getSettings().getLang(), phrase.getSettings().isTransliterate()); res.objectType = ObjectType.HOUSE; @@ -1239,6 +1249,7 @@ public class SearchCoreFactory { res.location = b.getLocation(); } res.preferredZoom = 17; + resultMatcher.publish(res); } String streetIntersection = phrase.getUnknownWordToSearch(); @@ -1252,7 +1263,6 @@ public class SearchCoreFactory { || !phrase.isSearchTypeAllowed(ObjectType.STREET_INTERSECTION)) { continue; } - // TOOO phrase.countUnknownWordsMatchMainResult(res); res.otherNames = street.getAllNames(true); res.localeName = street.getName(phrase.getSettings().getLang(), phrase.getSettings().isTransliterate()); res.object = street; @@ -1264,6 +1274,7 @@ public class SearchCoreFactory { res.objectType = ObjectType.STREET_INTERSECTION; res.location = street.getLocation(); res.preferredZoom = 16; + phrase.countUnknownWordsMatchMainResult(res); resultMatcher.publish(res); } } diff --git a/OsmAnd-java/src/test/resources/search/navacerrada.json b/OsmAnd-java/src/test/resources/search/navacerrada.json index 8bf429fc8a..b867103ed5 100644 --- a/OsmAnd-java/src/test/resources/search/navacerrada.json +++ b/OsmAnd-java/src/test/resources/search/navacerrada.json @@ -12,7 +12,8 @@ "phrase": "Calle de las eras 5, Navacerrada", "results": [ "5, Calle de las Eras (Uranización Los Corales), Navacerrada [[6, HOUSE, 0.043, 70.17 km]]", - "Calle de las Eras (Uranización Los Corales), Navacerrada [[5, STREET, 0.310, 70.15 km]]" + "Calle de las Eras (Uranización Los Corales), Navacerrada [[5, STREET, 0.310, 70.15 km]]", + "Calle del Sotillo (Uranización Los Corales), Pasaje de las Eras (Uranización Los Corales), Navacerrada [[5, STREET_INTERSECTION, 0.043, 70.23 km]]" ], "extra-results": [ "5, Calle Navacerrada (Urb. Las Suertes), Las Suertes [[4, HOUSE, 0.430, 60.50 km]]", @@ -31,8 +32,7 @@ "Calle de las Cruces (Residencial Sanabria), Navacerrada [[4, STREET, 0.310, 70.14 km]]", "Calle de las Escuelas, Navacerrada [[4, STREET, 0.310, 70.17 km]]", "Calle de las Huertas (Residencial Sanabria), Navacerrada [[4, STREET, 0.310, 70.18 km]]", - "Calle de la Virgen de las Nieves, Puerto de Navacerrada [[4, STREET, 0.310, 74.59 km]]", - "Calle del Sotillo (Uranización Los Corales), Pasaje de las Eras (Uranización Los Corales), Navacerrada [[4, STREET_INTERSECTION, 0.043, 70.23 km]]" + "Calle de la Virgen de las Nieves, Puerto de Navacerrada [[4, STREET, 0.310, 74.59 km]]" ], "amenities": [ {