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

Merge branch 'master' of ssh://github.com/osmandapp/Osmand into RoutePreparationMenu

Browse source
This commit is contained in:
Chumva 2018-11-26 10:33:00 +02:00
commit b9a6950f02
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -710,10 +710,10 @@ public class SearchCoreFactory {
List<PoiType> additionals = pt.getPoiAdditionals(); List<PoiType> additionals = pt.getPoiAdditionals();
if (additionals != null) { if (additionals != null) {
for (PoiType a : additionals) { for (PoiType a : additionals) {
if (!a.isReference() && !results.contains(a) if (!a.isReference() && !results.contains(a)) {
&& (nm.matches(a.getEnTranslation()) String enTranslation = a.getEnTranslation().toLowerCase();
|| nm.matches(a.getTranslation()) if (!"yes".equals(enTranslation) && !"no".equals(enTranslation)
|| nm.matches(a.getSynonyms()))) { && (nm.matches(enTranslation) || nm.matches(a.getTranslation()) || nm.matches(a.getSynonyms()))) {
results.add(a); results.add(a);
} }
} }
@ -721,6 +721,7 @@ public class SearchCoreFactory {
} }
} }
} }
}
phrase.setUnknownSearchWordPoiTypes(new ArrayList<>(results)); phrase.setUnknownSearchWordPoiTypes(new ArrayList<>(results));
if (resultMatcher != null) { if (resultMatcher != null) {

2
OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
View file

@ -422,7 +422,7 @@ public class SQLiteTileSource implements ITileSource {
if (db == null || db.isReadOnly() || onlyReadonlyAvailable) { if (db == null || db.isReadOnly() || onlyReadonlyAvailable) {
return; return;
} }
db.execSQL("TRUNCATE TABLE tiles"); db.execSQL("DELETE FROM tiles");
} }
/** /**