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-22 14:26:17 +02:00
commit 7b6ab3c2ee
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
OsmAnd-java/src/net/osmand/map/OsmandRegions.java
View file

@ -261,6 +261,27 @@ public class OsmandRegions {
}
return result;
}
public String getCountryName(LatLon ll) {
double lat = ll.getLatitude();
double lon = ll.getLongitude();
int y = MapUtils.get31TileNumberY(lat);
int x = MapUtils.get31TileNumberX(lon);
try {
List<BinaryMapDataObject> list = query(x, y);
for(BinaryMapDataObject o : list) {
if(contain(o, x, y)) {
String name = mapIndexFields.get(mapIndexFields.nameType, o);
if(name != null) {
return name;
}
}
}
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
public List<BinaryMapDataObject> query(final int tile31x, final int tile31y) throws IOException {
@ -513,7 +534,6 @@ public class OsmandRegions {
mapIndexFields.roadSignsType = object.getMapIndex().getRule(FIELD_ROAD_SIGNS, null);
mapIndexFields.wikiLinkType = object.getMapIndex().getRule(FIELD_WIKI_LINK, null);
mapIndexFields.populationType = object.getMapIndex().getRule(FIELD_POPULATION, null);
mapIndexFields.nameType = object.getMapIndex().getRule(FIELD_NAME, null);
}
}

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

@ -191,7 +191,7 @@ public class SearchUICore {
});
return quickRes;
}
private void searchInBackground(final SearchPhrase phrase, SearchResultMatcher matcher) {
for (SearchWord sw : phrase.getWords()) {
if(sw.getResult() != null && sw.getResult().file != null) {