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-11 16:37:36 +02:00
commit a967f56e05
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,19 +36,16 @@ import net.osmand.util.MapUtils;
public class SearchCoreFactory {
// TODO display more (+)
// TODO fix search bbox (+)
// TODO fix search amenity by type (category/additional)
// TODO streets by city
// TODO search only closest file
// TODO search only closest file (global bbox)
// TODO limit to one file if city/street/village/poi selected
// TODO add location parse
// TODO add url parse (geo)
// TODO amenity by name
// TODO display closest city to villages (and city to street)
// TODO automatically increase radius if nothing found
// TODO buildings interpolation
@ -175,6 +172,7 @@ public class SearchCoreFactory {
sr.file = currentFile[0];
sr.localeName = object.getName(phrase.getSettings().getLang(), true);
sr.otherNames = object.getAllNames(true);
sr.localeOtherName = sr.file.getRegionName();
sr.location = object.getLocation();
sr.priorityDistance = 1;
sr.priority = priority;
@ -185,6 +183,7 @@ public class SearchCoreFactory {
return false;
}
sr.objectType = ObjectType.STREET;
sr.localeOtherName = ((Street)object).getCity().getName(phrase.getSettings().getLang(), true);
} else if (object instanceof City) {
CityType type = ((City)object).getType();
if (type == CityType.CITY || type == CityType.TOWN) {

1
OsmAnd-java/src/net/osmand/search/example/core/SearchResult.java
View file

@ -31,6 +31,7 @@ public class SearchResult {
public LatLon location;
public int preferredZoom = 15;
public String localeName;
public String localeOtherName;
public Collection<String> otherNames;