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

Fix formatting

Browse source
This commit is contained in:
Victor Shcherb 2016-07-24 23:00:20 +02:00
parent c6fb461244
commit 8c33f5502d
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd/src/net/osmand/plus/search/QuickSearchListFragment.java
View file

@ -8,11 +8,12 @@ import android.view.ViewGroup;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.ListAdapter; import android.widget.ListAdapter;
import android.widget.ListView; import android.widget.ListView;
import net.osmand.data.Amenity; import net.osmand.data.Amenity;
import net.osmand.data.City;
import net.osmand.data.FavouritePoint; import net.osmand.data.FavouritePoint;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
import net.osmand.data.PointDescription; import net.osmand.data.PointDescription;
import net.osmand.data.Street;
import net.osmand.plus.GPXUtilities; import net.osmand.plus.GPXUtilities;
import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
@ -151,8 +152,17 @@ public abstract class QuickSearchListFragment extends OsmAndListFragment {
pointDescription = fav.getPointDescription(); pointDescription = fav.getPointDescription();
break; break;
case HOUSE: case HOUSE:
pointDescription = new PointDescription(PointDescription.POINT_TYPE_ADDRESS, String nm = searchResult.localeName;
QuickSearchListItem.getName(app, searchResult) + ", " + QuickSearchListItem.getTypeName(app, searchResult)); if(searchResult.relatedObject instanceof City) {
nm = ((City)searchResult.relatedObject).getName(searchResult.requiredSearchPhrase.getSettings().getLang(), true) + " " + nm;
} else if(searchResult.relatedObject instanceof Street) {
String s = ((Street)searchResult.relatedObject).getName(searchResult.requiredSearchPhrase.getSettings().getLang(), true);
String c = ((Street)searchResult.relatedObject).getCity().getName(searchResult.requiredSearchPhrase.getSettings().getLang(), true);
nm = s + " " + nm +", " + c;
} else if(searchResult.localeRelatedObjectName != null) {
nm = searchResult.localeRelatedObjectName + " " + nm;
}
pointDescription = new PointDescription(PointDescription.POINT_TYPE_ADDRESS, nm);
break; break;
case LOCATION: case LOCATION:
LatLon latLon = (LatLon) object; LatLon latLon = (LatLon) object;