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

Merge pull request #6191 from osmandapp/TransportBadgesImprovements

Browse source 
Transport badges improvements
This commit is contained in:
vshcherb 2018-10-18 15:57:31 +02:00 committed by GitHub
commit b8a4acc4cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -688,6 +688,19 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
return filteredRoutes; return filteredRoutes;
} }
private List<TransportStopRoute> filterNearbyTransportRoutes(List<TransportStopRoute> routes, List<TransportStopRoute> filterFromRoutes) {
if (filterFromRoutes == null) {
return routes;
}
List<TransportStopRoute> filteredRoutes = new ArrayList<>();
for (TransportStopRoute route : routes) {
if (!containsRef(filterFromRoutes, route.route)) {
filteredRoutes.add(route);
}
}
return filteredRoutes;
}
private boolean containsRef(List<TransportStopRoute> routes, TransportRoute transportRoute) { private boolean containsRef(List<TransportStopRoute> routes, TransportRoute transportRoute) {
for (TransportStopRoute route : routes) { for (TransportStopRoute route : routes) {
if (route.route.getRef().equals(transportRoute.getRef())) { if (route.route.getRef().equals(transportRoute.getRef())) {
@ -1297,7 +1310,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
updateLocalRoutesBadges(localFilteredTransportStopRoutes, localColumnsPerRow); updateLocalRoutesBadges(localFilteredTransportStopRoutes, localColumnsPerRow);
} }
if (nearbyTransportStopRoutes != null) { if (nearbyTransportStopRoutes != null) {
updateNearbyRoutesBadges(maxLocalRows, filterTransportRoutes(nearbyTransportStopRoutes)); updateNearbyRoutesBadges(maxLocalRows, filterNearbyTransportRoutes(nearbyTransportStopRoutes, localTransportStopRoutes));
} }
transportBadgesCreated = true; transportBadgesCreated = true;
} }