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

Fix #3533 Add street intersections to the end of the list

Browse source
This commit is contained in:
Victor Shcherb 2017-03-08 15:34:18 +01:00
parent 076c22f5d4
commit 151a790f7d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java
View file

@ -925,7 +925,7 @@ public class SearchCoreFactory {
res.preferredZoom = 17; res.preferredZoom = 17;
resultMatcher.publish(res); resultMatcher.publish(res);
} }
if(!Algorithms.isEmpty(lw) && !Character.isDigit(lw.charAt(0))) { if(Algorithms.isEmpty(lw) || !Character.isDigit(lw.charAt(0))) {
for(Street street : s.getIntersectedStreets()) { for(Street street : s.getIntersectedStreets()) {
SearchResult res = new SearchResult(phrase); SearchResult res = new SearchResult(phrase);
if(!sm.matches(street.getName()) && !sm.matches(street.getAllNames(true))) { if(!sm.matches(street.getName()) && !sm.matches(street.getAllNames(true))) {
@ -936,6 +936,7 @@ public class SearchCoreFactory {
res.object = street; res.object = street;
res.file = file; res.file = file;
res.relatedObject = s; res.relatedObject = s;
res.priority = priority + 1;
res.localeRelatedObjectName = s.getName(phrase.getSettings().getLang(), phrase.getSettings().isTransliterate()); res.localeRelatedObjectName = s.getName(phrase.getSettings().getLang(), phrase.getSettings().isTransliterate());
res.priorityDistance = 0; res.priorityDistance = 0;
res.objectType = ObjectType.STREET_INTERSECTION; res.objectType = ObjectType.STREET_INTERSECTION;