Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions src/main/java/org/mtransit/commons/FeatureFlags.kt
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,10 @@ object FeatureFlags {
// const val F_MODULE_AUTO_OPEN = false
const val F_MODULE_AUTO_OPEN = true // WIP

// const val F_EXPORT_ORIGINAL_ROUTE_TYPE = false
// TODO @Deprecated("remove this flag", ReplaceWith("true"))
const val F_EXPORT_ORIGINAL_ROUTE_TYPE = true // WIP

// const val F_USE_ROUTE_TYPE_FILTER = false
// TODO @Deprecated("remove this flag", ReplaceWith("true"))
const val F_USE_ROUTE_TYPE_FILTER = true // WIP

// const val F_EXPORT_SERVICE_EXCEPTION_TYPE = false
// TODO @Deprecated("remove this flag", ReplaceWith("true"))
const val F_EXPORT_SERVICE_EXCEPTION_TYPE = true // WIP

// const val F_AVOID_DATA_CHANGED = false
const val F_AVOID_DATA_CHANGED = true // WIP

Expand Down
16 changes: 4 additions & 12 deletions src/main/java/org/mtransit/commons/GTFSCommons.kt
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ object GTFSCommons {
appendColumn(T_ROUTE_K_LONG_NAME, SQLUtils.TXT)
appendColumn(T_ROUTE_K_COLOR, SQLUtils.TXT)
appendColumn(T_ROUTE_K_ORIGINAL_ID_HASH, SQLUtils.INT)
if (FeatureFlags.F_EXPORT_ORIGINAL_ROUTE_TYPE) {
appendColumn(T_ROUTE_K_TYPE, SQLUtils.INT)
}
appendColumn(T_ROUTE_K_TYPE, SQLUtils.INT)
}.build()

@JvmStatic
Expand All @@ -43,9 +41,7 @@ object GTFSCommons {
appendColumn(T_ROUTE_K_LONG_NAME)
appendColumn(T_ROUTE_K_COLOR)
appendColumn(T_ROUTE_K_ORIGINAL_ID_HASH)
if (FeatureFlags.F_EXPORT_ORIGINAL_ROUTE_TYPE) {
appendColumn(T_ROUTE_K_TYPE)
}
appendColumn(T_ROUTE_K_TYPE)
}.build()

@JvmStatic
Expand Down Expand Up @@ -213,18 +209,14 @@ object GTFSCommons {
val T_SERVICE_DATES_SQL_CREATE = SQLCreateBuilder.getNew(T_SERVICE_DATES).apply {
appendColumn(T_SERVICE_DATES_K_SERVICE_ID, SQLUtils.TXT)
appendColumn(T_SERVICE_DATES_K_DATE, SQLUtils.INT)
if (FeatureFlags.F_EXPORT_SERVICE_EXCEPTION_TYPE) {
appendColumn(T_SERVICE_DATES_K_EXCEPTION_TYPE, SQLUtils.INT)
}
appendColumn(T_SERVICE_DATES_K_EXCEPTION_TYPE, SQLUtils.INT)
}.build()

@JvmStatic
val T_SERVICE_DATES_SQL_INSERT = SQLInsertBuilder.getNew(T_SERVICE_DATES).apply {
appendColumn(T_SERVICE_DATES_K_SERVICE_ID)
appendColumn(T_SERVICE_DATES_K_DATE)
if (FeatureFlags.F_EXPORT_SERVICE_EXCEPTION_TYPE) {
appendColumn(T_SERVICE_DATES_K_EXCEPTION_TYPE)
}
appendColumn(T_SERVICE_DATES_K_EXCEPTION_TYPE)
}.build()

const val EXCEPTION_TYPE_DEFAULT = 0 // default schedule
Expand Down
Loading