Skip to content

Add "last trip stop" #136

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
mmathieum merged 2 commits into from
Mar 4, 2026
Merged

Add "last trip stop" #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
378497e
Add "last trip stop"
mmathieum Mar 4, 2026
edb58e3
fix
mmathieum Mar 4, 2026
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
4 changes: 2 additions & 2 deletions app-android/src/main/java/org/mtransit/android/ui/map/MapViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import org.mtransit.android.ui.view.common.MediatorLiveData4
import org.mtransit.android.ui.view.common.MediatorLiveData3
import org.mtransit.android.ui.view.common.getLiveDataDistinct
import org.mtransit.android.ui.view.map.MTMapIconDef
import org.mtransit.android.ui.view.map.MTMapIconsProvider.iconDefForRotation
import org.mtransit.android.ui.view.map.MTMapIconsProvider.getIconDefForRotation
import org.mtransit.android.ui.view.map.MTPOIMarker
import org.mtransit.android.util.containsEntirely
import javax.inject.Inject
Expand Down Expand Up @@ -348,7 +348,7 @@ class MapViewModel @Inject constructor(
extra = (poim.poi as? RouteDirectionStop)?.route?.shortestName
uuid = poim.poi.uuid
authority = poim.poi.authority
iconDef = rotation.iconDefForRotation
iconDef = getIconDefForRotation(rotation, poim.poi)
color = poim.getColor(dataSourcesRepository)
secondaryColor = agency.colorInt
clusterItems[positionTrunc] = clusterItems[positionTrunc]?.apply {
Expand Down
2 changes: 1 addition & 1 deletion app-android/src/main/java/org/mtransit/android/ui/view/MapViewController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ private Collection<MTPOIMarker> createPOIMarkers(MapMarkerProvider markerProvide
zIndex = uuid.equals(mapViewController.focusedOnUUID) ? MAP_MARKER_Z_INDEX_STOP_FOCUSED_ON
: MAP_MARKER_Z_INDEX_STOPS_OTHER;
iconDef = uuid.equals(mapViewController.focusedOnUUID) ? MTMapIconsProvider.getSelectedDefaultIconDef()
: MTMapIconsProvider.getIconDefForRotation(rotation);
: MTMapIconsProvider.getIconDefForRotation(rotation, poim.poi);
MTPOIMarker currentItem = clusterItems.get(positionTrunc);
if (currentItem == null) {
currentItem = new MTPOIMarker(position, name, agencyShortName, extra, iconDef, color, secondaryColor, alpha, rotation, zIndex, uuid, authority);
Expand Down
15 changes: 13 additions & 2 deletions app-android/src/main/java/org/mtransit/android/ui/view/map/MTMapIconsProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
package org.mtransit.android.ui.view.map

import org.mtransit.android.R
import org.mtransit.android.commons.data.POI
import org.mtransit.android.commons.data.RouteDirectionStop
import org.mtransit.android.commons.dp
import org.mtransit.android.data.DataSourceType
import org.mtransit.commons.FeatureFlags

object MTMapIconsProvider {

Expand Down Expand Up @@ -46,8 +49,16 @@ object MTMapIconsProvider {
//@formatter:on

@JvmStatic
val Float?.iconDefForRotation: MTMapIconDef
get() = if (this != null) arrowIconDef else defaultIconDef
fun getIconDefForRotation(rotation: Float?, poi: POI): MTMapIconDef {
@Suppress("SimplifyBooleanWithConstants")
if (FeatureFlags.F_EXPORT_DIRECTION_STOP_LAST
&& poi is RouteDirectionStop
&& poi.isAlwaysLastTripStop
) {
return defaultIconDef
}
return if (rotation != null) arrowIconDef else defaultIconDef
}

@JvmStatic
val DataSourceType?.vehicleIconDef: MTMapIconDef
Expand Down
Loading