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 2017-03-25 21:03:13 +01:00
commit 4739a24ac8
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/src/net/osmand/search/SearchUICore.java
View file

@ -505,7 +505,7 @@ public class SearchUICore {
@Override @Override
public boolean publish(SearchResult object) { public boolean publish(SearchResult object) {
if (!phrase.getNameStringMatcher().matches(object.localeName)) { if (phrase != null && !phrase.getNameStringMatcher().matches(object.localeName)) {
for (String s : object.otherNames) { for (String s : object.otherNames) {
if (phrase.getNameStringMatcher().matches(s)) { if (phrase.getNameStringMatcher().matches(s)) {
object.alternateName = s; object.alternateName = s;

2
OsmAnd-java/src/net/osmand/search/core/SearchPhrase.java
View file

@ -289,7 +289,7 @@ public class SearchPhrase {
} }
public ObjectType[] getSearchTypes() { public ObjectType[] getSearchTypes() {
return settings.getSearchTypes(); return settings == null ? null : settings.getSearchTypes();
} }
public boolean isCustomSearch() { public boolean isCustomSearch() {

2
OsmAnd-java/test/java/net/osmand/search/LocationSearchTest.java
View file

@ -15,7 +15,7 @@ import org.junit.Test;
public class LocationSearchTest { public class LocationSearchTest {
private void search(String string, LatLon latLon) throws IOException { private void search(String string, LatLon latLon) throws IOException {
SearchResultMatcher srm = new SearchUICore.SearchResultMatcher(null, 0, null, 100); SearchResultMatcher srm = new SearchUICore.SearchResultMatcher(null, null, 0, null, 100);
new SearchCoreFactory.SearchLocationAndUrlAPI(). new SearchCoreFactory.SearchLocationAndUrlAPI().
search(new SearchPhrase(null, OsmAndCollator.primaryCollator()).generateNewPhrase(string, null), srm); search(new SearchPhrase(null, OsmAndCollator.primaryCollator()).generateNewPhrase(string, null), srm);
Assert.assertEquals(1, srm.getRequestResults().size()); Assert.assertEquals(1, srm.getRequestResults().size());