Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
a922d99
Compat w/ trip updates (status/schedule)
mmathieum Mar 2, 2026
a6a19d4
Merge remote-tracking branch 'origin/master' into mm/gtfs_rt_trip_upd…
mmathieum Mar 4, 2026
bc7365a
wip
mmathieum Mar 4, 2026
d3d9d56
Update src/main/java/org/mtransit/android/commons/provider/gtfs/GtfsR…
mmathieum Mar 5, 2026
5be626d
Update src/main/java/org/mtransit/android/commons/provider/GTFSRealTi…
mmathieum Mar 5, 2026
0758ff8
wip
mmathieum Mar 6, 2026
d0ebb34
clean
mmathieum Mar 6, 2026
751631c
Merge branch 'master' into mm/gtfs_rt_trip_updates
mmathieum Mar 6, 2026
211e766
wip
mmathieum Mar 6, 2026
ebe9fd9
wip
mmathieum Mar 6, 2026
a60907d
wip
mmathieum Mar 6, 2026
0e1fd25
wip
mmathieum Mar 6, 2026
bc070d8
WIP
mmathieum Mar 9, 2026
0ae3b83
wip
mmathieum Mar 9, 2026
2726387
wip
mmathieum Mar 9, 2026
44eb926
wip
mmathieum Mar 9, 2026
c8344ce
Merge remote-tracking branch 'origin/master' into mm/gtfs_rt_trip_upd…
mmathieum Mar 9, 2026
43624e4
wip
mmathieum Mar 9, 2026
e3bc33b
Cleanup discouraged Schedule.Timestamp
mmathieum Mar 9, 2026
363d0ec
cleanup
mmathieum Mar 9, 2026
01cfce9
Merge remote-tracking branch 'origin/master' into mm/gtfs_rt_trip_upd…
mmathieum Mar 10, 2026
ee668ef
post-merge
mmathieum Mar 10, 2026
638cbea
cleanup
mmathieum Mar 10, 2026
d6caeea
wip
mmathieum Mar 10, 2026
6f83528
wip
mmathieum Mar 10, 2026
7b6eacd
Merge branch 'mm/gtfs_rt_trip_updates' of github.com:mtransitapps/com…
mmathieum Mar 11, 2026
fc8fa3b
cleanup
mmathieum Mar 11, 2026
7045645
fix
mmathieum Mar 11, 2026
ebccecc
fix URL
mmathieum Mar 11, 2026
10e17db
wip
mmathieum Mar 11, 2026
5bcefdb
fix
mmathieum Mar 11, 2026
39a6330
cleanup
mmathieum Mar 11, 2026
78a15bb
cleanup
mmathieum Mar 11, 2026
d9a0d68
cleanup
mmathieum Mar 11, 2026
c019149
unit test++
mmathieum Mar 11, 2026
f35f5dc
PR comments
mmathieum Mar 11, 2026
991fede
improvements
mmathieum Mar 11, 2026
b2c378c
wip
mmathieum Mar 11, 2026
2a95ade
Merge remote-tracking branch 'origin/master' into mm/gtfs_rt_trip_upd…
mmathieum Mar 12, 2026
b93ae5e
Add original departure/arrival delay
mmathieum Mar 12, 2026
9cc99b6
Keep real-time GTFS-RT schedule if some schedule timestamp have trips…
mmathieum Mar 12, 2026
550b857
Store no-data when no-real-time to void re-compute + synchronized loc…
mmathieum Mar 12, 2026
fc4fd40
wip
mmathieum Mar 12, 2026
fe2de4d
fix time precision
mmathieum Mar 13, 2026
fa8d4ab
wip
mmathieum Mar 13, 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
21 changes: 21 additions & 0 deletions src/main/java/org/mtransit/android/commons/TimeUtilsK.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.mtransit.android.commons

import kotlin.math.abs
import kotlin.time.Duration
import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.Duration.Companion.nanoseconds
import kotlin.time.Instant
Expand All @@ -27,6 +28,26 @@ fun Long.millisToInstant() = Instant.fromEpochMilliseconds(this)

fun Long.secsToInstant() = Instant.fromEpochSeconds(this)

@Suppress("unused")
fun Int.secsToInstant() = this.toLong().secsToInstant()

fun Instant.toMillis() = this.toEpochMilliseconds()

fun Instant.toSecs() = this.epochSeconds

fun Instant.roundToNearest(interval: Duration): Instant {
val intervalMillis = interval.inWholeMilliseconds
.takeUnless { it == 0L } ?: return this
return ((this.toMillis() + (intervalMillis / 2L)) / intervalMillis * intervalMillis).millisToInstant()
}

fun Instant.floorBy(period: Duration, down: Boolean = true) =
(this % period).let { rem ->
when {
rem == Duration.ZERO -> this
down -> this - rem
else -> this + (period - rem)
}
}

operator fun Instant.rem(period: Duration): Duration = (this.toMillis() % period.inWholeMilliseconds).milliseconds
24 changes: 20 additions & 4 deletions src/main/java/org/mtransit/android/commons/data/POIStatus.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ protected static int getDefaultStatusTextColor(@NonNull Context context) {
private String targetUUID;
@ItemStatusType
private final int type;
private final long lastUpdateInMs;
private final long maxValidityInMs;
private final long readFromSourceAtInMs;
private long lastUpdateInMs;
private long maxValidityInMs;
private long readFromSourceAtInMs;
@Nullable
private final String sourceLabel;
private String sourceLabel;
private final boolean noData;

public POIStatus(
Expand Down Expand Up @@ -181,6 +181,10 @@ public String getSourceLabel() {
return this.sourceLabel;
}

public void setSourceLabel(@Nullable String sourceLabel) {
this.sourceLabel = sourceLabel;
}

@Nullable
private String getExtrasJSONString() {
try {
Expand Down Expand Up @@ -225,11 +229,23 @@ public long getLastUpdateInMs() {
return lastUpdateInMs;
}

public void setLastUpdateInMs(long lastUpdateInMs) {
this.lastUpdateInMs = lastUpdateInMs;
}

public long getMaxValidityInMs() {
return maxValidityInMs;
}

public void setMaxValidityInMs(long maxValidityInMs) {
this.maxValidityInMs = maxValidityInMs;
}

public long getReadFromSourceAtInMs() {
return readFromSourceAtInMs;
}

public void setReadFromSourceAtInMs(long readFromSourceAtInMs) {
this.readFromSourceAtInMs = readFromSourceAtInMs;
}
}
Loading