Skip to content

Android Auto: add action to sort favorites by distance #19042 #19047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Android Auto: add action to sort favorites by distance #19042 #19047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f4fc5a
Android Auto: add option to sort favorites by distance
ntruchsess Feb 7, 2024
71ef2ca
upgrade car-lib to 1.3.0-rc01
ntruchsess Feb 15, 2024
8087d1e
add sorting as EndHeaderAction, revering settings-screen
ntruchsess Feb 19, 2024
754bb60
Merge branch 'master' into AndroidAutoSortFavoritesByDistance
ntruchsess Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 64 additions & 15 deletions OsmAnd/src/net/osmand/plus/auto/screens/FavoritesScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import androidx.car.app.model.CarIcon;
import androidx.car.app.model.CarLocation;
import androidx.car.app.model.DistanceSpan;
import androidx.car.app.model.Header;
import androidx.car.app.model.ItemList;
import androidx.car.app.model.Metadata;
import androidx.car.app.model.Place;
Expand Down Expand Up @@ -44,6 +45,7 @@

import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;

/**
Expand All @@ -58,6 +60,7 @@ public final class FavoritesScreen extends BaseAndroidAutoScreen {
@Nullable
private FavoriteGroup selectedGroup;
private CompassMode initialCompassMode;
private boolean isLeastRecentyUsedGroup;

public FavoritesScreen(
@NonNull CarContext carContext,
Expand All @@ -66,6 +69,7 @@ public FavoritesScreen(
super(carContext);
this.settingsAction = settingsAction;
selectedGroup = group;
isLeastRecentyUsedGroup = selectedGroup == null;
getLifecycle().addObserver(new DefaultLifecycleObserver() {
@Override
public void onDestroy(@NonNull LifecycleOwner owner) {
Expand Down Expand Up @@ -93,13 +97,26 @@ private FavouritesLayer getFavouritesLayer() {
@NonNull
@Override
public Template onGetTemplate() {
boolean sortFavByDistance = getApp().getSettings().SORT_FAV_BY_DISTANCE.get();
ItemList.Builder listBuilder = new ItemList.Builder();
setupFavorites(listBuilder);
setupFavorites(listBuilder, sortFavByDistance);
return new PlaceListNavigationTemplate.Builder()
.setItemList(listBuilder.build())
.setTitle(getApp().getString(R.string.shared_string_favorites))
.setHeader(new Header.Builder()
.setTitle(getApp().getString(R.string.shared_string_favorites))
.setStartHeaderAction(Action.BACK)
.addEndHeaderAction(new Action.Builder()
.setIcon(new CarIcon.Builder(
IconCompat.createWithResource(getCarContext(), sortFavByDistance ? R.drawable.ic_action_sort_short_to_long : R.drawable.ic_action_sort_date_31))
.build())
.setOnClickListener(() -> {
getApp().getSettings().SORT_FAV_BY_DISTANCE.set(!sortFavByDistance);
invalidate();
})
.build())
.build()
)
.setActionStrip(new ActionStrip.Builder().addAction(createSearchAction()).build())
.setHeaderAction(Action.BACK)
.build();
}

Expand All @@ -108,19 +125,20 @@ protected int getConstraintLimitType() {
return ConstraintManager.CONTENT_LIMIT_TYPE_PLACE_LIST;
}

private void setupFavorites(ItemList.Builder listBuilder) {
private void setupFavorites(ItemList.Builder listBuilder, boolean sortFavByDistance) {
OsmandSettings settings = getApp().getSettings();
List<FavouritePoint> favoritePoints = getFavorites();
int limitedSize = Math.min(favoritePoints.size(), getContentLimit() -1);
LatLon location = getApp().getMapViewTrackingUtilities().getDefaultLocation();
List<FavouritePoint> favoritesPoints = getFavorites();
int favoritesPointsSize = favoritesPoints.size();
List<FavouritePoint> limitedFavoritesPoints = favoritesPoints.subList(0, Math.min(favoritesPointsSize, getContentLimit() - 1));
getApp().getOsmandMap().getMapLayers().getFavouritesLayer().setCustomMapObjects(limitedFavoritesPoints);
List<FavoritePointDistance> limitedFavoritePointDistances = toLimitedSortedPointDistanceList(favoritePoints, location, sortFavByDistance, limitedSize);
List<FavouritePoint> limitedFavoritePoints = new ArrayList<>(limitedSize);
QuadRect mapRect = new QuadRect();
if (!Algorithms.isEmpty(limitedFavoritesPoints)) {
OsmandSettings settings = getApp().getSettings();
if (!Algorithms.isEmpty(limitedFavoritePointDistances)) {
initialCompassMode = settings.getCompassMode();
getApp().getMapViewTrackingUtilities().switchCompassModeTo(CompassMode.NORTH_IS_UP);
}
for (FavouritePoint point : limitedFavoritesPoints) {
for (FavoritePointDistance favoritePointDistance : limitedFavoritePointDistances) {
FavouritePoint point = favoritePointDistance.favorite;
double longitude = point.getLongitude();
double latitude = point.getLatitude();
Algorithms.extendRectToContainPoint(mapRect, longitude, latitude);
Expand All @@ -129,10 +147,8 @@ private void setupFavorites(ItemList.Builder listBuilder) {
CarIcon icon = new CarIcon.Builder(IconCompat.createWithBitmap(
AndroidUtils.drawableToBitmap(PointImageUtils.getFromPoint(getApp(), color, false, point)))).build();
String description = point.getSpecialPointType() != null ? point.getDescription() : point.getCategory();
double dist = MapUtils.getDistance(point.getLatitude(), point.getLongitude(),
location.getLatitude(), location.getLongitude());
SpannableString address = new SpannableString(Algorithms.isEmpty(description) ? " " : " • " + description);
DistanceSpan distanceSpan = DistanceSpan.create(TripHelper.getDistance(getApp(), dist));
DistanceSpan distanceSpan = DistanceSpan.create(TripHelper.getDistance(getApp(), favoritePointDistance.distance));
address.setSpan(distanceSpan, 0, 1, SPAN_INCLUSIVE_INCLUSIVE);
listBuilder.addItem(new Row.Builder()
.setTitle(title)
Expand All @@ -142,10 +158,44 @@ private void setupFavorites(ItemList.Builder listBuilder) {
.setMetadata(new Metadata.Builder().setPlace(new Place.Builder(
CarLocation.create(point.getLatitude(), point.getLongitude())).build()).build())
.build());
limitedFavoritePoints.add(point);
}
getApp().getOsmandMap().getMapLayers().getFavouritesLayer().setCustomMapObjects(limitedFavoritePoints);
adjustMapToRect(location, mapRect);
}

private static class FavoritePointDistance {
private final FavouritePoint favorite;
private final double distance;
FavoritePointDistance(FavouritePoint favorite, double dist) {
this.favorite = favorite;
this.distance = dist;
}
}

private static List<FavoritePointDistance> toPointDistanceList(List<FavouritePoint> points, LatLon location) {
List<FavoritePointDistance> returnList = new ArrayList<>(points.size());
for (FavouritePoint point : points) {
returnList.add(new FavoritePointDistance(point, MapUtils.getDistance(point.getLatitude(), point.getLongitude(), location.getLatitude(), location.getLongitude())));
}
return returnList;
};

private List<FavoritePointDistance> toLimitedSortedPointDistanceList(List<FavouritePoint> points, LatLon location, boolean sortByDistance, int limitedSize) {
if (sortByDistance && !isLeastRecentyUsedGroup) {
List<FavoritePointDistance> pointDistances = toPointDistanceList(points, location);
Collections.sort(pointDistances, Comparator.comparingDouble(pointDistance -> pointDistance.distance));
return pointDistances.subList(0, limitedSize);
} else {
Collections.sort(points, (left, right) -> Long.compare(right.getTimestamp(), left.getTimestamp()));
List<FavoritePointDistance> pointDistances = toPointDistanceList(points.subList(0, limitedSize), location);
if (sortByDistance) {
Collections.sort(pointDistances, Comparator.comparingDouble(pointDistance -> pointDistance.distance));
}
return pointDistances;
}
};

private void onClickFavorite(@NonNull FavouritePoint point) {
SearchResult result = new SearchResult();
result.location = new LatLon(point.getLatitude(), point.getLongitude());
Expand All @@ -163,7 +213,6 @@ private List<FavouritePoint> getFavorites() {
} else {
filteredFavorites.addAll(selectedGroup.getPoints());
}
Collections.sort(filteredFavorites, (left, right) -> Long.compare(right.getTimestamp(), left.getTimestamp()));
return filteredFavorites;
}

Expand Down
1 change: 1 addition & 0 deletions OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1641,6 +1641,7 @@ protected boolean setValue(Object prefs, Boolean val) {

public final CommonPreference<String> GRADIENT_PALETTES = new StringPreference(this, "gradient_color_palettes", null).makeGlobal().makeShared();
public final ListStringPreference LAST_USED_FAV_ICONS = (ListStringPreference) new ListStringPreference(this, "last_used_favorite_icons", null, ",").makeShared().makeGlobal();
public final CommonPreference<Boolean> SORT_FAV_BY_DISTANCE = new BooleanPreference(this, "sort_fav_by_distance", false).makeGlobal().makeShared();

public final CommonPreference<Integer> SAVE_TRACK_INTERVAL = new IntPreference(this, "save_track_interval", 5000).makeProfile();

Expand Down