From 292a65761422a70bde3a513253289b33b9ffb3e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Tue, 4 Nov 2025 11:19:24 -0500 Subject: [PATCH] Remove export original route & service exception types feature flags --- .../java/org/mtransit/commons/FeatureFlags.kt | 8 -------- .../java/org/mtransit/commons/GTFSCommons.kt | 16 ++++------------ 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/mtransit/commons/FeatureFlags.kt b/src/main/java/org/mtransit/commons/FeatureFlags.kt index 7041b77..fc5b498 100644 --- a/src/main/java/org/mtransit/commons/FeatureFlags.kt +++ b/src/main/java/org/mtransit/commons/FeatureFlags.kt @@ -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 diff --git a/src/main/java/org/mtransit/commons/GTFSCommons.kt b/src/main/java/org/mtransit/commons/GTFSCommons.kt index 6ae4a83..8227360 100644 --- a/src/main/java/org/mtransit/commons/GTFSCommons.kt +++ b/src/main/java/org/mtransit/commons/GTFSCommons.kt @@ -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 @@ -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 @@ -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