Skip to content

Update MapRouteProgressChangeListener to be aware of route visibility #1482

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

Merged
merged 1 commit into from
Oct 31, 2018
Merged

Update MapRouteProgressChangeListener to be aware of route visibility #1482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions ...va/com/mapbox/services/android/navigation/ui/v5/route/MapRouteProgressChangeListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,28 @@
class MapRouteProgressChangeListener implements ProgressChangeListener {

private final NavigationMapRoute mapRoute;
private boolean isVisible = true;

MapRouteProgressChangeListener(NavigationMapRoute mapRoute) {
this.mapRoute = mapRoute;
}

@Override
public void onProgressChange(Location location, RouteProgress routeProgress) {
if (!isVisible) {
return;
}
DirectionsRoute currentRoute = routeProgress.directionsRoute();
List<DirectionsRoute> directionsRoutes = mapRoute.retrieveDirectionsRoutes();
int primaryRouteIndex = mapRoute.retrievePrimaryRouteIndex();
addNewRoute(currentRoute, directionsRoutes, primaryRouteIndex);
mapRoute.addUpcomingManeuverArrow(routeProgress);
}

void updateVisibility(boolean isVisible) {
this.isVisible = isVisible;
}

private void addNewRoute(DirectionsRoute currentRoute, List<DirectionsRoute> directionsRoutes,
int primaryRouteIndex) {
if (isANewRoute(currentRoute, directionsRoutes, primaryRouteIndex)) {
Expand Down
6 changes: 4 additions & 2 deletions .../src/main/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRoute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public class NavigationMapRoute implements MapView.OnMapChangedListener,
private GeoJsonSource arrowHeadGeoJsonSource;
private Feature arrowShaftGeoJsonFeature = Feature.fromGeometry(Point.fromLngLat(0, 0));
private Feature arrowHeadGeoJsonFeature = Feature.fromGeometry(Point.fromLngLat(0, 0));
private ProgressChangeListener progressChangeListener = new MapRouteProgressChangeListener(this);
private MapRouteProgressChangeListener progressChangeListener = new MapRouteProgressChangeListener(this);

/**
* Construct an instance of {@link NavigationMapRoute}.
Expand Down Expand Up @@ -413,12 +413,14 @@ private void drawRoutes() {
addRouteShieldLayer(layerIds.get(layerIds.size() - 2), sourceId, index);
addRouteLayer(layerIds.get(layerIds.size() - 1), sourceId, index);
}
progressChangeListener.updateVisibility(true);
}

private void clearRoutes() {
removeLayerIds();
updateArrowLayersVisibilityTo(false);
clearRouteListData();
updateArrowLayersVisibilityTo(false);
progressChangeListener.updateVisibility(false);
}

private void generateFeatureCollectionList(List<DirectionsRoute> directionsRoutes) {
Expand Down