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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-07-20 19:56:36 +02:00
commit 1be0d395eb
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd-java/src/net/osmand/binary/BinaryMapPoiReaderAdapter.java
View file

@ -546,11 +546,13 @@ public class BinaryMapPoiReaderAdapter {
break;
}
}
Map<String, String> lt = am.getAdditionalInfo();
for (Entry<String, String> e : lt.entrySet()) {
matches = matcher.matches(e.getValue());
if (matches) {
break;
if (!matches) {
Map<String, String> lt = am.getAdditionalInfo();
for (Entry<String, String> e : lt.entrySet()) {
matches = matcher.matches(e.getValue());
if (matches) {
break;
}
}
}
}

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

@ -47,14 +47,6 @@ import com.jwetherell.openmap.common.UTMPoint;
public class SearchCoreFactory {
// TODO add full text search with comma correct order
// TODO MED add full text search without comma and different word order
// TODO exclude duplicate streets/cities/pois...
// UI edit in the middle (with words and comma)?
// UI support poi additional select type and search
// UI display results momentarily
// UI automatically increase radius if nothing found (log radius search)
//////////////// CONSTANTS //////////