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-24 20:48:33 +02:00
commit 3d49d718f5
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
View file

@ -1049,7 +1049,8 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
sr.priority = SEARCH_WPT_OBJECT_PRIORITY; sr.priority = SEARCH_WPT_OBJECT_PRIORITY;
sr.objectType = ObjectType.WPT; sr.objectType = ObjectType.WPT;
sr.location = new LatLon(point.getLatitude(), point.getLongitude()); sr.location = new LatLon(point.getLatitude(), point.getLongitude());
sr.localeRelatedObjectName = info.getFileName(); sr.localeRelatedObjectName = app.getRegions().getCountryName(sr.location);
sr.relatedObject = info;
sr.preferredZoom = 17; sr.preferredZoom = 17;
if (phrase.getUnknownSearchWordLength() <= 1 && phrase.isNoSelectedType()) { if (phrase.getUnknownSearchWordLength() <= 1 && phrase.isNoSelectedType()) {
resultMatcher.publish(sr); resultMatcher.publish(sr);

21
OsmAnd/src/net/osmand/plus/search/QuickSearchListItem.java
View file

@ -15,7 +15,6 @@ import net.osmand.osm.AbstractPoiType;
import net.osmand.osm.PoiCategory; import net.osmand.osm.PoiCategory;
import net.osmand.osm.PoiFilter; import net.osmand.osm.PoiFilter;
import net.osmand.osm.PoiType; import net.osmand.osm.PoiType;
import net.osmand.plus.GPXUtilities;
import net.osmand.plus.GPXUtilities.WptPt; import net.osmand.plus.GPXUtilities.WptPt;
import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
@ -23,6 +22,7 @@ import net.osmand.plus.R;
import net.osmand.plus.activities.search.SearchHistoryFragment; import net.osmand.plus.activities.search.SearchHistoryFragment;
import net.osmand.plus.base.FavoriteImageDrawable; import net.osmand.plus.base.FavoriteImageDrawable;
import net.osmand.plus.helpers.SearchHistoryHelper.HistoryEntry; import net.osmand.plus.helpers.SearchHistoryHelper.HistoryEntry;
import net.osmand.plus.myplaces.AvailableGPXFragment.GpxInfo;
import net.osmand.plus.render.RenderingIcons; import net.osmand.plus.render.RenderingIcons;
import net.osmand.search.core.SearchResult; import net.osmand.search.core.SearchResult;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
@ -184,12 +184,11 @@ public class QuickSearchListItem {
return typeStr; return typeStr;
case LOCATION: case LOCATION:
LatLon latLon = (LatLon) searchResult.object; LatLon latLon = (LatLon) searchResult.object;
String locationCountry = app.getRegions().getCountryName(latLon); if (searchResult.localeRelatedObjectName == null) {
if (!Algorithms.isEmpty(locationCountry)) { String locationCountry = app.getRegions().getCountryName(latLon);
return locationCountry; searchResult.localeRelatedObjectName = locationCountry == null ? "" : locationCountry;
} else {
return "";
} }
return searchResult.localeRelatedObjectName;
case FAVORITE: case FAVORITE:
FavouritePoint fav = (FavouritePoint) searchResult.object; FavouritePoint fav = (FavouritePoint) searchResult.object;
return fav.getCategory().length() == 0 ? return fav.getCategory().length() == 0 ?
@ -209,15 +208,15 @@ public class QuickSearchListItem {
case WPT: case WPT:
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
WptPt wpt = (WptPt) searchResult.object; WptPt wpt = (WptPt) searchResult.object;
String wptCountry = app.getRegions().getCountryName(new LatLon(wpt.getLatitude(), wpt.getLongitude())); GpxInfo gpxInfo = (GpxInfo) searchResult.relatedObject;
if (!Algorithms.isEmpty(wptCountry)) {
sb.append(wptCountry);
}
if (!Algorithms.isEmpty(searchResult.localeRelatedObjectName)) { if (!Algorithms.isEmpty(searchResult.localeRelatedObjectName)) {
sb.append(searchResult.localeRelatedObjectName);
}
if (gpxInfo != null && !Algorithms.isEmpty(gpxInfo.getFileName())) {
if (sb.length() > 0) { if (sb.length() > 0) {
sb.append(", "); sb.append(", ");
} }
sb.append(searchResult.localeRelatedObjectName); sb.append(gpxInfo.getFileName());
} }
return sb.toString(); return sb.toString();
case UNKNOWN_NAME_FILTER: case UNKNOWN_NAME_FILTER: