Merge pull request osmandapp#19797 from osmandapp/fix_19715_PT_Olimpi…

…iska Add nearest stop for Olympiiska bus stop
KnollFrank · May 9, 2024 · 76c4d07 · 76c4d07
2 parents 6d8720e + 12e63ae
commit 76c4d07
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -1482,7 +1482,7 @@ private void updateNearbyRoutesBadges(int maxLocalRows, List<TransportStopRoute>
 		boolean moreLocalItems = localRoutesMoreTv.getVisibility() == View.VISIBLE;
 		if (maxLocalRows <= 5 && !moreLocalItems && nearbyRoutesSize > 0) {
 			String nearInDistance = getString(R.string.transport_nearby_routes) + " "
-					+ OsmAndFormatter.getFormattedDistance(TransportStopController.SHOW_STOPS_RADIUS_METERS, app) + ":";
+					+ OsmAndFormatter.getFormattedDistance(TransportStopController.SHOW_STOPS_RADIUS_METERS_UI, app) + ":";
 			nearbyRoutesWithinTv.setText(nearInDistance);
 			int minBadgeWidth = getMinBadgeWidth(nearbyTransportStopRoutes);
 			int nearbyColumnsPerRow = getRoutesBadgesColumnsPerRow(nearInDistance, minBadgeWidth);

diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java
@@ -508,7 +508,7 @@ protected void buildTopInternal(View view) {
 		}
 		if (showNearbyTransportRoutes()) {
 			CollapsableView collapsableView = getCollapsableTransportStopRoutesView(view.getContext(), false, true);
-			String routesWithingDistance = app.getString(R.string.transport_nearby_routes_within) + " " + OsmAndFormatter.getFormattedDistance(TransportStopController.SHOW_STOPS_RADIUS_METERS, app);
+			String routesWithingDistance = app.getString(R.string.transport_nearby_routes_within) + " " + OsmAndFormatter.getFormattedDistance(TransportStopController.SHOW_STOPS_RADIUS_METERS_UI, app);
 			buildRow(view, 0, null, routesWithingDistance, 0, true, collapsableView,
 					false, 0, false, null, true);
 		}

diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController.java
@@ -31,17 +31,19 @@
 
 public class TransportStopController extends MenuController {
 
-	public static final int SHOW_STOPS_RADIUS_METERS = 150;
+	public static final int SHOW_STOPS_RADIUS_METERS_UI = 150;
+	public static final int SHOW_STOPS_RADIUS_METERS = SHOW_STOPS_RADIUS_METERS_UI * 6 / 5;
 	public static final int SHOW_SUBWAY_STOPS_FROM_ENTRANCES_RADIUS_METERS = 400;
+	public static final int MAX_DISTANCE_BETWEEN_AMENITY_AND_LOCAL_STOPS = 20;
 
 	private TransportStop transportStop;
 	private final List<TransportStopRoute> routesNearby = new ArrayList<>();
 	private final List<TransportStopRoute> routesOnTheSameExit = new ArrayList<>();
 	private TransportStopType topType;
 
 	public TransportStopController(@NonNull MapActivity mapActivity,
-								   @NonNull PointDescription pointDescription,
-								   @NonNull TransportStop transportStop) {
+	                               @NonNull PointDescription pointDescription,
+	                               @NonNull TransportStop transportStop) {
 		super(new TransportStopMenuBuilder(mapActivity, transportStop), pointDescription, mapActivity);
 		this.transportStop = transportStop;
 		processRoutes();
@@ -100,7 +102,12 @@ public boolean displayDistanceDirection() {
 	@NonNull
 	@Override
 	public String getNameStr() {
-		return transportStop.getName(getPreferredMapLang(), isTransliterateNames());
+		Amenity amenity = transportStop.getAmenity();
+		if (amenity == null) {
+			return transportStop.getName(getPreferredMapLang(), isTransliterateNames());
+		} else {
+			return amenity.getName(getPreferredMapLang(), isTransliterateNames());
+		}
 	}
 
 	@NonNull
@@ -131,9 +138,11 @@ private void processTransportStop(List<TransportStopRoute> routesOnTheSameExit,
 			ArrayList<TransportStop> nearbyTransportStops = new ArrayList<>(transportStop.getNearbyTransportStops());
 
 			addTransportStopRoutes(app, transportStopsSameExit, routesOnTheSameExit, useEnglishNames);
-			addTransportStopRoutes(app, nearbyTransportStops, routesNearby, useEnglishNames);
-
 			sortTransportStopRoutes(routesOnTheSameExit);
+			if (topType == null && !Algorithms.isEmpty(routesOnTheSameExit)) {
+				topType = routesOnTheSameExit.get(0).type;
+			}
+			addTransportStopRoutes(app, nearbyTransportStops, routesNearby, useEnglishNames);
 			sortTransportStopRoutes(routesNearby);
 		}
 	}
@@ -256,6 +265,7 @@ public static TransportStop findBestTransportStopForAmenity(OsmandApplication ap
 				stop.setTransportStopAggregated(stopAggregated);
 				String stopName = stop.getName().toLowerCase();
 				if (((stopName.contains(amenityName) || amenityName.contains(stopName))
+						&& MapUtils.getDistance(stop.getLocation(), loc) < MAX_DISTANCE_BETWEEN_AMENITY_AND_LOCAL_STOPS
 						&& (nearestStop == null
 						|| nearestStop.getLocation().equals(stop.getLocation())))
 						|| stop.getLocation().equals(loc)) {