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-24 23:20:30 +01:00
commit 6d2d9b1d94
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
View file

@ -433,6 +433,16 @@ public class FavouritesDbHelper {
return cachedFavoritePoints;
}
public List<FavouritePoint> getVisibleFavouritePoints() {
List<FavouritePoint> fp = new ArrayList<>();
for(FavouritePoint p : cachedFavoritePoints) {
if(p.isVisible()) {
fp.add(p);
}
}
return fp;
}
public List<FavoriteGroup> getFavoriteGroups() {
return favoriteGroups;

2
OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
View file

@ -473,7 +473,7 @@ public class WaypointHelper {
if ((type == FAVORITES || all)) {
final List<LocationPointWrapper> array = clearAndGetArray(locationPoints, FAVORITES);
if (showFavorites) {
findLocationPoints(route, FAVORITES, array, app.getFavorites().getFavouritePoints(),
findLocationPoints(route, FAVORITES, array, app.getFavorites().getVisibleFavouritePoints(),
announceFavorites);
sortList(array);
}