refactor: optimisation around stoptimes

- moved stoptime related functionality into new core:data:stoptime module
  - will feature all the different realtime stoptime sources to be
      integrated later
- create proper database schema for future migrations
- deduplicate trips into stoppingpatterns, since many trips share the
  exact same stopping pattern
  - stoptimes are now linked to stoppingpatterns instead
  - stoppingpattern ids are generated from a hash composed of all stoptimes
- stoptimes now use deltas for arrival time to save space

core/data/build.gradle.kts

@@ -27,6 +27,7 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             implementation(projects.core)
+            api(projects.core.data.stoptime)
         }
     }
 }

core/data/client/src/commonMain/kotlin/moe/lava/banksia/core/data/ClientDataDiModule.kt

@@ -10,16 +10,12 @@ import kotlinx.serialization.json.Json
 import moe.lava.banksia.core.Constants
 import moe.lava.banksia.core.data.repositories.ClientRouteRepository
 import moe.lava.banksia.core.data.repositories.ClientStopRepository
-import moe.lava.banksia.core.data.repositories.ClientStopTimeRepository
 import moe.lava.banksia.core.data.repositories.RouteRepository
 import moe.lava.banksia.core.data.repositories.StopRepository
-import moe.lava.banksia.core.data.repositories.StopTimeRepository
 import moe.lava.banksia.core.data.sources.route.RouteLocalDataSource
 import moe.lava.banksia.core.data.sources.route.RouteRemoteDataSource
 import moe.lava.banksia.core.data.sources.stop.StopLocalDataSource
 import moe.lava.banksia.core.data.sources.stop.StopRemoteDataSource
-import moe.lava.banksia.core.data.sources.stoptime.StopTimeLocalDataSource
-import moe.lava.banksia.core.data.sources.stoptime.StopTimeRemoteDataSource
 import moe.lava.banksia.core.sqld.sqldDiModule
 import moe.lava.banksia.core.util.log
 import moe.lava.banksia.data.ptv.PtvService
@@ -29,6 +25,7 @@ import org.koin.dsl.module
 
 val clientDataDiModule = module {
     includes(sqldDiModule)
+    includes(stopTimeDataDiModule)
 
     // HTTP Clients
     singleOf(::PtvService)
@@ -56,11 +53,8 @@ val clientDataDiModule = module {
     singleOf(::RouteRemoteDataSource)
     singleOf(::StopLocalDataSource)
     singleOf(::StopRemoteDataSource)
-    singleOf(::StopTimeLocalDataSource)
-    singleOf(::StopTimeRemoteDataSource)
 
     // Repositories
     singleOf(::ClientRouteRepository) bind RouteRepository::class
     singleOf(::ClientStopRepository) bind StopRepository::class
-    singleOf(::ClientStopTimeRepository) bind StopTimeRepository::class
 }

core/data/client/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/ClientStopTimeRepository.kt

@@ -1,16 +0,0 @@
-package moe.lava.banksia.core.data.repositories
-
-import moe.lava.banksia.core.data.sources.stoptime.StopTimeLocalDataSource
-import moe.lava.banksia.core.data.sources.stoptime.StopTimeRemoteDataSource
-import moe.lava.banksia.core.model.StopTimeDated
-
-internal class ClientStopTimeRepository internal constructor(
-    private val local: StopTimeLocalDataSource,
-    private val remote: StopTimeRemoteDataSource,
-) : StopTimeRepository {
-    override suspend fun getForStop(id: String): List<StopTimeDated> {
-        return local
-            .getAtStop(id)
-            .ifEmpty { remote.getAtStop(id) }
-    }
-}

core/data/client/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/trip/TripRemoteDataSource.kt

@@ -1,18 +0,0 @@
-package moe.lava.banksia.core.data.sources.trip
-
-import io.ktor.client.HttpClient
-import kotlinx.datetime.DayOfWeek
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.todayIn
-import moe.lava.banksia.core.model.Trip
-import kotlin.time.Clock
-
-internal class TripRemoteDataSource(
-    private val client: HttpClient,
-) {
-    suspend fun get(
-        day: DayOfWeek? = Clock.System.todayIn(TimeZone.currentSystemDefault()).dayOfWeek,
-    ): List<Trip> {
-        return listOf()
-    }
-}

core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/StopTimeRepository.kt

@@ -1,7 +0,0 @@
-package moe.lava.banksia.core.data.repositories
-
-import moe.lava.banksia.core.model.StopTimeDated
-
-interface StopTimeRepository {
-    suspend fun getForStop(id: String): List<StopTimeDated>
-}

core/data/stoptime/build.gradle.kts

@@ -0,0 +1,60 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    alias(libs.plugins.kotlinMultiplatform)
+    alias(libs.plugins.kotlinSerialization)
+    alias(libs.plugins.androidMultiplatformLibrary)
+    alias(libs.plugins.ksp)
+}
+
+kotlin {
+    android {
+        namespace = "moe.lava.banksia.core.data.stoptime"
+        compileSdk = libs.versions.android.compileSdk.get().toInt()
+
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
+        }
+    }
+
+    compilerOptions {
+        freeCompilerArgs.add("-opt-in=kotlin.time.ExperimentalTime")
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+    }
+
+    iosArm64()
+    iosSimulatorArm64()
+
+    jvm()
+
+    sourceSets {
+        val clientMain by creating {
+            dependsOn(commonMain.get())
+        }
+
+        androidMain.get().dependsOn(clientMain)
+        iosArm64Main.get().dependsOn(clientMain)
+        iosSimulatorArm64Main.get().dependsOn(clientMain)
+
+        androidMain.dependencies {
+            implementation(libs.ktor.client.okhttp)
+        }
+        commonMain.dependencies {
+            implementation(libs.okio)
+            implementation(libs.koin.core)
+            implementation(libs.ktor.client.core)
+            implementation(libs.ktor.client.contentnegotiation)
+            implementation(libs.ktor.serialization.kotlinx.json)
+            implementation(libs.kotlinx.coroutines.core)
+            implementation(libs.kotlinx.datetime)
+            implementation(libs.kotlinx.serialization.json)
+            implementation(libs.kotlinx.serialization.protobuf)
+
+            implementation(projects.core)
+            implementation(projects.core.sqld)
+        }
+        iosMain.dependencies {
+            implementation(libs.ktor.client.darwin)
+        }
+    }
+}

core/data/stoptime/src/clientMain/kotlin/moe/lava/banksia/core/data/StopTimeDataDiModule.client.kt

@@ -0,0 +1,11 @@
+package moe.lava.banksia.core.data
+
+import moe.lava.banksia.core.data.repositories.StopTimeRepository
+import moe.lava.banksia.core.data.sources.stoptime.StopTimeRemoteDataSource
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.module
+
+internal actual val platformModule = module {
+    singleOf(::StopTimeRepository)
+    singleOf(::StopTimeRemoteDataSource)
+}

core/data/stoptime/src/clientMain/kotlin/moe/lava/banksia/core/data/repositories/StopTimeRepository.client.kt

@@ -0,0 +1,19 @@
+package moe.lava.banksia.core.data.repositories
+
+import kotlinx.coroutines.flow.flow
+import kotlinx.datetime.LocalDate
+import moe.lava.banksia.core.data.sources.stoptime.StopTimeLocalDataSource
+import moe.lava.banksia.core.data.sources.stoptime.StopTimeRemoteDataSource
+
+actual class StopTimeRepository internal constructor(
+    private val local: StopTimeLocalDataSource,
+    private val remote: StopTimeRemoteDataSource,
+) {
+    actual suspend fun getForStop(id: String, date: LocalDate) = flow {
+        emit(local.getAtStop(id, date))
+
+        remote.getAtStop(id, date)
+            .takeIf { it.isNotEmpty() }
+            ?.let { emit(it) }
+    }
+}

core/data/stoptime/src/clientMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeRemoteDataSource.kt

@@ -7,7 +7,7 @@ import io.ktor.client.request.parameter
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.todayIn
-import moe.lava.banksia.core.model.StopTimeDated
+import moe.lava.banksia.core.model.StopTime
 import kotlin.time.Clock
 
 internal class StopTimeRemoteDataSource(
@@ -16,21 +16,9 @@ internal class StopTimeRemoteDataSource(
     suspend fun getAtStop(
         stopId: String,
         date: LocalDate? = Clock.System.todayIn(TimeZone.currentSystemDefault()),
-    ): List<StopTimeDated> {
+    ): List<StopTime.Dated> {
         return client.get("stoptimes/by_stop/${stopId}") {
             parameter("date", date)
-        }.body<List<StopTimeDated>>()
+        }.body<List<StopTime.Dated>>()
     }
-
-    /*suspend fun get(
-        stop: String? = null,
-        trip: String? = null,
-        day: DayOfWeek? = Clock.System.todayIn(TimeZone.currentSystemDefault()).dayOfWeek,
-    ): List<StopTime> {
-        return client.get("stoptimes") {
-            stop?.let { parameter("stop", it) }
-            trip?.let { parameter("trip", it) }
-            day?.let { parameter("day", it) }
-        }.body<List<StopTime>>()
-    }*/
 }

core/data/stoptime/src/commonMain/kotlin/moe/lava/banksia/core/data/StopTimeDataDiModule.kt

@@ -0,0 +1,13 @@
+package moe.lava.banksia.core.data
+
+import moe.lava.banksia.core.data.sources.stoptime.StopTimeLocalDataSource
+import org.koin.core.module.Module
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.module
+
+internal expect val platformModule: Module;
+
+val stopTimeDataDiModule = module {
+    includes(platformModule)
+    singleOf(::StopTimeLocalDataSource)
+}

core/data/stoptime/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/StopTimeRepository.kt

@@ -0,0 +1,15 @@
+package moe.lava.banksia.core.data.repositories
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.datetime.LocalDate
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.todayIn
+import moe.lava.banksia.core.model.StopTime
+import kotlin.time.Clock
+
+expect class StopTimeRepository {
+    suspend fun getForStop(
+        id: String,
+        date: LocalDate = Clock.System.todayIn(TimeZone.currentSystemDefault()),
+    ): Flow<List<StopTime.Dated>>
+}

core/data/stoptime/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeLocalDataSource.kt

@@ -4,23 +4,19 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
 import kotlinx.coroutines.withContext
 import kotlinx.datetime.LocalDate
-import kotlinx.datetime.TimeZone
+import moe.lava.banksia.core.model.StopTime
-import kotlinx.datetime.todayIn
-import moe.lava.banksia.core.model.StopTimeDated
 import moe.lava.banksia.core.model.atDate
 import moe.lava.banksia.core.sqld.StopTimeQueries
 import moe.lava.banksia.core.sqld.mappers.asModel
 import moe.lava.banksia.core.util.serialise
-import kotlin.time.Clock
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
 
-internal class StopTimeLocalDataSource(
+internal class StopTimeLocalDataSource : KoinComponent {
-    private val queries: StopTimeQueries,
+    private val queries get() = get<StopTimeQueries>()
-) {
+
-    suspend fun getAtStop(
+    suspend fun getAtStop(stopId: String, date: LocalDate): List<StopTime.Dated> {
-        stopId: String,
+        return withContext(context = Dispatchers.IO) {
-        date: LocalDate = Clock.System.todayIn(TimeZone.currentSystemDefault()),
-    ): List<StopTimeDated> {
-        return withContext(Dispatchers.IO) {
             queries
                 .getForStopDated(
                     listOf(date.dayOfWeek).serialise().toLong(),
@@ -29,7 +25,7 @@ internal class StopTimeLocalDataSource(
                 )
                 .executeAsList()
                 .map { it.asModel().atDate(date) }
-                .sortedBy { it.departureTime }
+                .sortedBy { it.time.departure }
         }
     }
 }

core/data/stoptime/src/jvmMain/kotlin/moe/lava/banksia/core/data/StopTimeDataDiModule.jvm.kt

@@ -0,0 +1,9 @@
+package moe.lava.banksia.core.data
+
+import moe.lava.banksia.core.data.repositories.StopTimeRepository
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.module
+
+internal actual val platformModule = module {
+    singleOf(::StopTimeRepository)
+}

core/data/stoptime/src/jvmMain/kotlin/moe/lava/banksia/core/data/repositories/StopTimeRepository.jvm.kt

@@ -0,0 +1,13 @@
+package moe.lava.banksia.core.data.repositories
+
+import kotlinx.coroutines.flow.flow
+import kotlinx.datetime.LocalDate
+import moe.lava.banksia.core.data.sources.stoptime.StopTimeLocalDataSource
+
+actual class StopTimeRepository internal constructor(
+    private val local: StopTimeLocalDataSource,
+) {
+    actual suspend fun getForStop(id: String, date: LocalDate) = flow {
+        emit(local.getAtStop(id, date))
+    }
+}

core/sqld/build.gradle.kts

@@ -47,6 +47,7 @@ sqldelight {
     databases {
         register("BanksiaDatabase") {
             packageName.set("moe.lava.banksia.core.sqld")
+            schemaOutputDirectory.set(file("src/commonMain/sqldelight/schema"))
         }
     }
 }

core/sqld/src/androidMain/kotlin/moe/lava/banksia/core/sqld/DatabaseManager.android.kt

@@ -5,10 +5,10 @@ import app.cash.sqldelight.driver.android.AndroidSqliteDriver
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 
-actual class DatabaseManager actual constructor() : KoinComponent {
+actual class DatabaseManager : KoinComponent {
     actual val database by lazy {
         val ctx = get<Context>().applicationContext
-        val driver = AndroidSqliteDriver(BanksiaDatabase.Schema, ctx, "timetable.db")
+        val driver = AndroidSqliteDriver(BanksiaDatabase.Schema, ctx, "${DBNAME}.db")
         BanksiaDatabase(driver)
     }
 }

core/sqld/src/commonMain/kotlin/moe/lava/banksia/core/sqld/DatabaseManager.kt

@@ -1,7 +1,7 @@
 package moe.lava.banksia.core.sqld
 
-import org.koin.core.component.KoinComponent
+internal const val DBNAME = "timetable"
 
-expect class DatabaseManager() : KoinComponent {
+expect class DatabaseManager() {
     val database: BanksiaDatabase
 }

core/sqld/src/commonMain/kotlin/moe/lava/banksia/core/sqld/SqldDiModule.kt

@@ -11,6 +11,7 @@ val sqldDiModule = module {
     factory { get<BanksiaDatabase>().serviceExceptionQueries }
     factory { get<BanksiaDatabase>().shapeQueries }
     factory { get<BanksiaDatabase>().stopQueries }
+    factory { get<BanksiaDatabase>().stoppingPatternQueries }
     factory { get<BanksiaDatabase>().stopTimeQueries }
     factory { get<BanksiaDatabase>().tripQueries }
 }

core/sqld/src/commonMain/kotlin/moe/lava/banksia/core/sqld/mappers/StopTime.kt

@@ -3,23 +3,25 @@ package moe.lava.banksia.core.sqld.mappers
 import moe.lava.banksia.core.model.FutureTime
 import moe.lava.banksia.core.model.FutureTime.Companion.asInt
 import moe.lava.banksia.core.model.StopTime
+import moe.lava.banksia.core.model.TimeType
 import moe.lava.banksia.core.sqld.StopTime as DbStopTime
 
 fun DbStopTime.asModel() = StopTime(
-    tripId = tripId,
+    patternId = patternId,
     stopId = stopId,
-    arrivalTime = FutureTime.fromInt(arrivalTime.toInt()),
+    time = TimeType.Undated(
-    departureTime = FutureTime.fromInt(departureTime.toInt()),
+        arrival = FutureTime.fromInt((departureTime + arrivalDelta).toInt()),
-    headsign = null,
+        departure = FutureTime.fromInt(departureTime.toInt()),
+    ),
     pickupType = pickupType.toInt(),
     dropOffType = dropOffType.toInt(),
 )
 
-fun StopTime.asDb() = DbStopTime(
+fun StopTime.Undated.asDb() = DbStopTime(
-    tripId = tripId,
+    patternId = patternId,
     stopId = stopId,
-    arrivalTime = arrivalTime.asInt().toLong(),
+    arrivalDelta = (time.arrival.asInt() - time.departure.asInt()).toLong(),
-    departureTime = departureTime.asInt().toLong(),
+    departureTime = time.departure.asInt().toLong(),
     pickupType = pickupType.toLong(),
     dropOffType = dropOffType.toLong(),
 )

core/sqld/src/commonMain/kotlin/moe/lava/banksia/core/sqld/mappers/StoppingPattern.kt

@@ -0,0 +1,22 @@
+package moe.lava.banksia.core.sqld.mappers
+
+import moe.lava.banksia.core.model.StopTime
+import moe.lava.banksia.core.model.StoppingPattern
+import moe.lava.banksia.core.sqld.StoppingPattern as DbStoppingPattern
+
+fun DbStoppingPattern.asModel(stoptimes: List<StopTime.Undated>) = StoppingPattern.Undated(
+    id = id,
+    routeId = routeId,
+    shapeId = shapeId,
+    headsign = headsign,
+    wheelchairAccessible = wheelchairAccessible == 1L,
+    stoptimes = stoptimes,
+)
+
+fun StoppingPattern.Undated.asDb() = DbStoppingPattern(
+    id = id,
+    routeId = routeId,
+    shapeId = shapeId,
+    headsign = headsign,
+    wheelchairAccessible = if (wheelchairAccessible) 1L else 0L,
+)

core/sqld/src/commonMain/kotlin/moe/lava/banksia/core/sqld/mappers/Trip.kt

@@ -1,32 +1,27 @@
 package moe.lava.banksia.core.sqld.mappers
 
 import moe.lava.banksia.core.model.Service
+import moe.lava.banksia.core.model.StoppingPattern
 import moe.lava.banksia.core.model.Trip
 import moe.lava.banksia.core.sqld.Trip as DbTrip
 
-fun DbTrip.asModel(service: Service): Trip {
+fun DbTrip.asModel(pattern: StoppingPattern.Undated, service: Service): Trip.Undated {
     if (serviceId != service.id) {
         throw IllegalArgumentException("trip and service id mismatch (${serviceId} != ${service.id})")
     }
     return Trip(
-        id = id,
+        id = gtfsId,
-        routeId = routeId,
+        pattern = pattern,
         service = service,
-        shapeId = shapeId,
+        directionId = directionId.toInt(),
-        tripHeadsign = tripHeadsign,
+        blockId = blockId.toString(),
-        directionId = directionId,
-        blockId = blockId,
-        wheelchairAccessible = wheelchairAccessible == 1L
     )
 }
 
-fun Trip.asDb() = DbTrip(
+fun Trip.Undated.asDb() = DbTrip(
-    id = id,
+    gtfsId = id,
-    routeId = routeId,
+    patternId = pattern.id,
     serviceId = service.id,
-    shapeId = shapeId,
+    directionId = directionId.toLong(),
-    tripHeadsign = tripHeadsign,
+    blockId = blockId?.toLong(),
-    directionId = directionId,
-    blockId = blockId,
-    wheelchairAccessible = if (wheelchairAccessible) 1L else 0L
 )

core/sqld/src/commonMain/sqldelight/moe/lava/banksia/core/sqld/Stop.sq

@@ -15,7 +15,7 @@ getAll:
 SELECT * FROM Stop;
 
 getAllParentless:
-SELECT * FROM Stop WHERE platformCode IS NULL AND parent IS NULL;
+SELECT * FROM Stop WHERE platformCode IS NOT NULL AND parent IS NULL;
 
 get:
 SELECT * FROM Stop WHERE id == ?;
@@ -32,8 +32,8 @@ UPDATE Stop SET parent = ? WHERE id IN ?;
 getByRoute:
 SELECT Stop.* FROM Stop
 INNER JOIN StopTime ON StopTime.stopId == Stop.id
-INNER JOIN Trip ON Trip.id == StopTime.tripId
+INNER JOIN StoppingPattern ON StoppingPattern.id == StopTime.patternId
-WHERE Trip.routeId == :id
+WHERE StoppingPattern.routeId == :id
 GROUP BY Stop.id;
 
 -- I vibecoded this, sorry
@@ -41,8 +41,8 @@ getParentsByRoute:
 WITH RECURSIVE Tree AS (
     SELECT Stop.* FROM Stop
     INNER JOIN StopTime ON StopTime.stopId == Stop.id
-    INNER JOIN Trip ON Trip.id == StopTime.tripId
+    INNER JOIN StoppingPattern ON StoppingPattern.id == StopTime.patternId
-    WHERE Trip.routeId == :id
+    WHERE StoppingPattern.routeId == :id
     GROUP BY Stop.id
 
     UNION ALL

core/sqld/src/commonMain/sqldelight/moe/lava/banksia/core/sqld/StopTime.sq

@@ -1,11 +1,11 @@
 CREATE TABLE StopTime (
-    tripId TEXT NOT NULL REFERENCES Trip (id),
+    patternId INTEGER NOT NULL REFERENCES StoppingPattern (id),
     stopId TEXT NOT NULL REFERENCES Stop (id),
-    arrivalTime INTEGER NOT NULL,
+    arrivalDelta INTEGER NOT NULL,
     departureTime INTEGER NOT NULL,
     pickupType INTEGER NOT NULL,
     dropOffType INTEGER NOT NULL,
-    PRIMARY KEY (tripId, stopId)
+    PRIMARY KEY (patternId, stopId)
 ) WITHOUT ROWID;
 
 CREATE INDEX idx_StopTime_stopId ON StopTime (stopId);
@@ -16,8 +16,9 @@ INSERT OR REPLACE INTO StopTime VALUES ?;
 getForStopDated:
 SELECT DISTINCT StopTime.* FROM StopTime
 INNER JOIN Service ON Service.days & :days = :days AND :date BETWEEN Service.start AND Service.`end`
-INNER JOIN Trip ON Trip.serviceId == Service.id
 LEFT JOIN ServiceException ON ServiceException.serviceId == Service.id AND ServiceException.date == :date
-WHERE StopTime.tripId == Trip.id
+INNER JOIN Trip ON Trip.serviceId == Service.id
+INNER JOIN StoppingPattern ON StoppingPattern.id == Trip.patternId
+WHERE StopTime.patternId == StoppingPattern.id
     AND StopTime.stopId IN (SELECT Stop.id FROM Stop WHERE Stop.parent == :stopId OR Stop.id == :stopId)
     AND ServiceException.type IS NULL;

core/sqld/src/commonMain/sqldelight/moe/lava/banksia/core/sqld/StoppingPattern.sq

@@ -0,0 +1,10 @@
+CREATE TABLE StoppingPattern (
+    id INTEGER PRIMARY KEY NOT NULL,
+    routeId TEXT NOT NULL REFERENCES Route (id),
+    shapeId TEXT NOT NULL REFERENCES Shape (id),
+    headsign TEXT NOT NULL,
+    wheelchairAccessible INTEGER NOT NULL
+);
+
+insert:
+INSERT OR REPLACE INTO StoppingPattern VALUES ?;

core/sqld/src/commonMain/sqldelight/moe/lava/banksia/core/sqld/Trip.sq

@@ -1,14 +1,12 @@
 CREATE TABLE Trip (
-    id TEXT PRIMARY KEY NOT NULL,
+    gtfsId TEXT PRIMARY KEY NOT NULL,
-    routeId TEXT NOT NULL REFERENCES Route (id),
+    patternId INTEGER NOT NULL REFERENCES StoppingPattern (id),
     serviceId TEXT NOT NULL REFERENCES Service (id),
-    shapeId TEXT NOT NULL REFERENCES Shape (id),
+    blockId INTEGER,
-    tripHeadsign TEXT NOT NULL,
+    directionId INTEGER NOT NULL
-    directionId TEXT NOT NULL,
-    blockId TEXT,
-    wheelchairAccessible INTEGER NOT NULL
 );
 
+CREATE INDEX idx_Trip_patternId ON Trip (patternId);
 CREATE INDEX idx_Trip_serviceId ON Trip (serviceId);
 
 insert:

core/sqld/src/iosMain/kotlin/moe/lava/banksia/core/sqld/DatabaseManager.ios.kt

@@ -1,10 +1,11 @@
 package moe.lava.banksia.core.sqld
 
 import app.cash.sqldelight.driver.native.NativeSqliteDriver
+import org.koin.core.component.KoinComponent
 
-actual class DatabaseManager actual constructor() : org.koin.core.component.KoinComponent {
+actual class DatabaseManager : KoinComponent {
     actual val database by lazy {
-        val driver = NativeSqliteDriver(BanksiaDatabase.Schema, "timetable.db")
+        val driver = NativeSqliteDriver(BanksiaDatabase.Schema, "${DBNAME}.db")
         BanksiaDatabase(driver)
     }
 }

core/sqld/src/jvmMain/kotlin/moe/lava/banksia/core/sqld/DatabaseManager.jvm.kt

@@ -11,9 +11,7 @@ import java.io.File
 import java.util.Properties
 import kotlin.system.exitProcess
 
-private const val DBNAME = "timetable"
+actual class DatabaseManager : KoinComponent {
-
-actual class DatabaseManager actual constructor() : KoinComponent {
     private var driver = connect()
     actual val database get() = BanksiaDatabase(driver)
 

core/src/commonMain/kotlin/moe/lava/banksia/core/model/StopTime.kt

@@ -1,14 +1,43 @@
 package moe.lava.banksia.core.model
 
+import kotlinx.datetime.LocalDate
+import kotlinx.datetime.LocalDateTime
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class StopTime(
+data class StopTime<T: TimeType>(
-    val tripId: String,
+    val patternId: Long,
     val stopId: String,
-    val arrivalTime: FutureTime,
+    val time: T,
-    val departureTime: FutureTime,
-    val headsign: String?,
     val pickupType: Int,
     val dropOffType: Int,
+) {
+    typealias Dated = StopTime<TimeType.Dated>
+    typealias Undated = StopTime<TimeType.Undated>
+}
+
+@Serializable
+sealed class TimeType {
+    @Serializable
+    data class Undated(
+        val arrival: FutureTime,
+        val departure: FutureTime,
+    ) : TimeType()
+
+    @Serializable
+    data class Dated(
+        val arrival: LocalDateTime,
+        val departure: LocalDateTime,
+    ) : TimeType()
+}
+
+fun StopTime<TimeType.Undated>.atDate(date: LocalDate) = StopTime(
+    patternId = patternId,
+    stopId = stopId,
+    time = TimeType.Dated(
+        arrival = time.arrival.atDate(date),
+        departure = time.departure.atDate(date),
+    ),
+    pickupType = pickupType,
+    dropOffType = dropOffType,
 )

core/src/commonMain/kotlin/moe/lava/banksia/core/model/StopTimeDated.kt

@@ -1,26 +0,0 @@
-package moe.lava.banksia.core.model
-
-import kotlinx.datetime.LocalDate
-import kotlinx.datetime.LocalDateTime
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class StopTimeDated(
-    val tripId: String,
-    val stopId: String,
-    val arrivalTime: LocalDateTime,
-    val departureTime: LocalDateTime,
-    val headsign: String?,
-    val pickupType: Int,
-    val dropOffType: Int,
-)
-
-fun StopTime.atDate(date: LocalDate) = StopTimeDated(
-    tripId = tripId,
-    stopId = stopId,
-    arrivalTime = arrivalTime.atDate(date),
-    departureTime = departureTime.atDate(date),
-    headsign = headsign,
-    pickupType = pickupType,
-    dropOffType = dropOffType,
-)

core/src/commonMain/kotlin/moe/lava/banksia/core/model/StoppingPattern.kt

@@ -0,0 +1,16 @@
+package moe.lava.banksia.core.model
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class StoppingPattern<T: TimeType>(
+    val id: Long,
+    val routeId: String,
+    val shapeId: String,
+    val headsign: String,
+    val wheelchairAccessible: Boolean,
+    val stoptimes: List<StopTime<T>>,
+) {
+    typealias Dated = StoppingPattern<TimeType.Dated>
+    typealias Undated = StoppingPattern<TimeType.Undated>
+}

core/src/commonMain/kotlin/moe/lava/banksia/core/model/Trip.kt

@@ -3,13 +3,13 @@ package moe.lava.banksia.core.model
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class Trip(
+data class Trip<T: TimeType>(
     val id: String,
-    val routeId: String,
+    val pattern: StoppingPattern<T>,
     val service: Service,
-    val shapeId: String,
+    val directionId: Int,
-    val tripHeadsign: String,
-    val directionId: String,
     val blockId: String?,
-    val wheelchairAccessible: Boolean,
+) {
-)
+    typealias Dated = Trip<TimeType.Dated>
+    typealias Undated = Trip<TimeType.Undated>
+}

server/gtfs/src/main/kotlin/moe/lava/banksia/server/gtfs/GtfsParser.kt

@@ -18,6 +18,7 @@ import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.modules.EmptySerializersModule
 import kotlinx.serialization.serializer
 import moe.lava.banksia.core.Constants
+import moe.lava.banksia.core.model.FutureTime.Companion.asInt
 import moe.lava.banksia.core.model.Route
 import moe.lava.banksia.core.model.RouteType
 import moe.lava.banksia.core.model.Service
@@ -25,6 +26,8 @@ import moe.lava.banksia.core.model.ServiceException
 import moe.lava.banksia.core.model.Shape
 import moe.lava.banksia.core.model.Stop
 import moe.lava.banksia.core.model.StopTime
+import moe.lava.banksia.core.model.StoppingPattern
+import moe.lava.banksia.core.model.TimeType
 import moe.lava.banksia.core.model.Trip
 import moe.lava.banksia.core.util.Point
 import moe.lava.banksia.server.gtfs.structures.GtfsRoute
@@ -35,6 +38,8 @@ import moe.lava.banksia.server.gtfs.structures.GtfsStop
 import moe.lava.banksia.server.gtfs.structures.GtfsStopTime
 import moe.lava.banksia.server.gtfs.structures.GtfsTrip
 import java.io.File
+import java.nio.ByteBuffer
+import java.security.MessageDigest
 import java.util.zip.ZipFile
 import kotlin.time.ExperimentalTime
 
@@ -46,8 +51,7 @@ sealed class GtfsData {
     data class ServiceExceptionChunk(val exceptions: List<ServiceException>) : GtfsData()
     data class ShapeChunk(val shapes: List<Shape>) : GtfsData()
     data class StopChunk(val stops: List<Stop>) : GtfsData()
-    data class StopTimeChunk(val stopTimes: List<StopTime>) : GtfsData()
+    data class TripChunk(val trips: List<Trip.Undated>) : GtfsData()
-    data class TripChunk(val trips: List<Trip>) : GtfsData()
 }
 
 class GtfsParser(
@@ -129,7 +133,6 @@ class GtfsParser(
             .filter { it.name == "trips.txt" }
             .flatMap { fd ->
                 parseTrips(fd, services)
-                    .also { emit(GtfsData.TripChunk(it)) }
             }
             .associateBy { it.id }
 
@@ -137,13 +140,53 @@ class GtfsParser(
             .filter { it.name == "stop_times.txt" }
             .forEach { fd ->
                 log.info("parsing stop times for ${fd.parent}...")
-                parseStopTimes(fd, trips) { seq ->
+                parseStopTimes(fd) { seq ->
-                    seq.chunked(1000000)
+                    val times = ArrayList<Pair<String, StopTime.Undated>>(1000100)
-                        .forEach { emit(GtfsData.StopTimeChunk(it)) }
+                    seq.forEach { pair ->
+                        val (_, stoptime) = pair
+                        if (times.size > 1000000 && stoptime.patternId == 1L) {
+                            emit(GtfsData.TripChunk(processStoptimes(trips, times)))
+                            times.clear()
+                        }
+
+                        times.add(pair)
+                    }
+                    emit(GtfsData.TripChunk(processStoptimes(trips, times)))
                 }
             }
     }
 
+    private fun hashCalc(headsign: String, stops: List<StopTime.Undated>): Long {
+        val inst = MessageDigest.getInstance("SHA-256")
+        inst.update(headsign.toByteArray())
+        stops.forEach {
+            inst.update(it.stopId.toByteArray())
+            val dint = it.time.departure.asInt()
+            inst.update((dint).toByte())
+            inst.update((dint shr 8).toByte())
+            val aint = it.time.arrival.asInt()
+            inst.update((aint).toByte())
+            inst.update((aint shr 8).toByte())
+        }
+
+        val buf = inst.digest().slice(0..7).toByteArray()
+        buf[0] = 0
+        buf[1] = 0
+        return ByteBuffer.wrap(buf).long
+    }
+
+    private fun processStoptimes(trips: Map<String, Trip.Undated>, times: ArrayList<Pair<String, StopTime.Undated>>) =
+        times.groupBy { it.first }
+            .map { (tripId, pairs) ->
+                val trip = trips[tripId]!!
+                val stoptimes = pairs.map { it.second }
+                val hash = hashCalc(trip.pattern.headsign, stoptimes)
+                trip.copy(pattern = trip.pattern.copy(
+                    id = hash,
+                    stoptimes = stoptimes.map { it.copy(patternId = hash) }
+                ))
+            }
+
     private fun parseRoutes(fd: File) =
         fd.parseCsv<GtfsRoute>()
             .map { with(it) {
@@ -180,16 +223,17 @@ class GtfsParser(
                 )
             } }
 
-    private inline fun parseStopTimes(fd: File, trips: Map<String, Trip>, block: (Sequence<StopTime>) -> Unit) =
+    private inline fun parseStopTimes(fd: File, block: (Sequence<Pair<String, StopTime.Undated>>) -> Unit) =
         fd.parseCsvSequence<GtfsStopTime> { seq ->
             seq
                 .map { with(it) {
-                    StopTime(
+                    it.trip_id to StopTime(
-                        tripId = trip_id,
+                        patternId = stop_sequence,
                         stopId = stop_id,
-                        arrivalTime = GtfsStopTime.parseGtfsTime(arrival_time),
+                        time = TimeType.Undated(
-                        departureTime = GtfsStopTime.parseGtfsTime(departure_time),
+                            arrival = GtfsStopTime.parseGtfsTime(arrival_time),
-                        headsign = stop_headsign.ifEmpty { trips[trip_id]!!.tripHeadsign },
+                            departure = GtfsStopTime.parseGtfsTime(departure_time),
+                        ),
                         pickupType = pickup_type,
                         dropOffType = drop_off_type,
                     )
@@ -230,15 +274,19 @@ class GtfsParser(
     private fun parseTrips(fd: File, services: Map<String, Service>) =
         fd.parseCsv<GtfsTrip>()
             .map { with(it) {
-                Trip(
+                Trip.Undated(
                     id = trip_id,
+                    pattern = StoppingPattern(
+                        id = 0,
                         routeId = route_id,
-                    service = services["${fd.parentFile.name}_${service_id}"]!!,
                         shapeId = shape_id,
-                    tripHeadsign = trip_headsign,
+                        headsign = trip_headsign,
-                    directionId = direction_id,
-                    blockId = block_id.ifEmpty { null },
                         wheelchairAccessible = wheelchair_accessible == "1",
+                        stoptimes = listOf()
+                    ),
+                    service = services["${fd.parentFile.name}_${service_id}"]!!,
+                    directionId = direction_id.toInt(),
+                    blockId = block_id.ifEmpty { null },
                 )
             } }
 

server/gtfs/src/main/kotlin/moe/lava/banksia/server/gtfs/structures/GtfsStopTime.kt

@@ -10,7 +10,7 @@ internal data class GtfsStopTime(
     val arrival_time: String,
     val departure_time: String,
     val stop_id: String,
-    val stop_sequence: Int,
+    val stop_sequence: Long,
     val stop_headsign: String,
     val pickup_type: Int,
     val drop_off_type: Int,

server/src/main/kotlin/moe/lava/banksia/server/Application.kt

@@ -151,7 +151,7 @@ fun Application.module() {
                     )
                     .executeAsList()
                     .map { it.asModel().atDate(date) }
-                    .sortedBy { it.departureTime }
+                    .sortedBy { it.time.departure }
             }
             call.respond(times)
         }

server/src/main/kotlin/moe/lava/banksia/server/GtfsImporter.kt

@@ -6,7 +6,6 @@ import moe.lava.banksia.core.model.Service
 import moe.lava.banksia.core.model.ServiceException
 import moe.lava.banksia.core.model.Shape
 import moe.lava.banksia.core.model.Stop
-import moe.lava.banksia.core.model.StopTime
 import moe.lava.banksia.core.model.Trip
 import moe.lava.banksia.core.sqld.DatabaseManager
 import moe.lava.banksia.core.sqld.mappers.asDb
@@ -30,7 +29,6 @@ class GtfsImporter(
                 is GtfsData.ServiceExceptionChunk -> database.addServiceExceptions(chunk.exceptions)
                 is GtfsData.ShapeChunk -> database.addShapes(chunk.shapes)
                 is GtfsData.StopChunk -> database.addStops(chunk.stops)
-                is GtfsData.StopTimeChunk -> database.addStopTimes(chunk.stopTimes)
                 is GtfsData.TripChunk -> database.addTrips(chunk.trips)
             }
         }
@@ -101,21 +99,15 @@ class GtfsImporter(
         log.info("done")
     }
 
-    private fun Database.addStopTimes(stopTimes: List<StopTime>) {
+    private fun Database.addTrips(trips: List<Trip.Undated>) {
-        log.info("inserting ${stopTimes.size} stoptimes...")
-        stopTimeQueries.transaction {
-            stopTimes.forEach {
-                stopTimeQueries.insert(it.asDb())
-            }
-        }
-        log.info("done")
-    }
-
-    private fun Database.addTrips(trips: List<Trip>) {
         log.info("inserting ${trips.size} trips...")
-        tripQueries.transaction {
+        transaction {
-            trips.forEach {
+            trips.forEach { trip ->
-                tripQueries.insert(it.asDb())
+                stoppingPatternQueries.insert(trip.pattern.asDb())
+                trip.pattern.stoptimes.forEach { stoptime ->
+                    stopTimeQueries.insert(stoptime.asDb())
+                }
+                tripQueries.insert(trip.asDb())
             }
         }
         log.info("done")

server/src/main/resources/logback.xml

@@ -14,7 +14,7 @@
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
-    <root level="trace">
+    <root level="debug">
         <appender-ref ref="FILE"/>
         <appender-ref ref="STDOUT"/>
     </root>

settings.gradle.kts

@@ -39,6 +39,7 @@ include(":core")
 include(":core:data")
 include(":core:data:client")
 include(":core:data:server")
+include(":core:data:stoptime")
 include(":core:sqld")
 include(":ui")
 include(":ui:maps")

ui/src/commonMain/kotlin/moe/lava/banksia/ui/screens/map/MapScreenViewModel.kt

@@ -231,13 +231,16 @@ class MapScreenViewModel(
             )
         }
 
-        val departures = stopTimeRepository.getForStop(id)
+        stopTimeRepository.getForStop(id)
-            .filter { !it.headsign.isNullOrBlank() }
+            .onEach { stoptimes ->
-            .groupBy { it.headsign!! }
+                val departures = stoptimes
+//                    .filter { !it.headsign.isNullOrBlank() }
+//                    .groupBy { it.headsign!! }
+                    .groupBy { it.stopId } // TODO: Placeholder
                     .map { (headsign, stopTimes) ->
                         val now = Clock.System.now()
                         val times = stopTimes
-                    .map { it.arrivalTime.toInstant(TimeZone.currentSystemDefault()) }
+                            .map { it.time.arrival.toInstant(TimeZone.currentSystemDefault()) }
                             .filter { it >= (now - 1.minutes) }
                             .joinToString(" | ") {
                                 val diff = (it - now).inWholeMinutes.coerceAtLeast(0)
@@ -249,6 +252,7 @@ class MapScreenViewModel(
                             }
                         StopInfoPanelState.Departure(headsign, times)
                     }
+
                 iInfoState.update {
                     if (it !is StopInfoPanelState)
                         it
@@ -256,6 +260,8 @@ class MapScreenViewModel(
                         it.copy(departures = departures)
                 }
             }
+            .launchIn(viewModelScope)
+    }
 
     /*private suspend fun buildPolylines(route: PtvRoute) {
         val routeWithGeo = if (route.geopath.isEmpty())