From b3091758400792bca57b27de72982d20b4b12814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Thu, 29 Jan 2026 14:14:43 -0500 Subject: [PATCH] Reapply "MSchedule > clear head-sign instead of setting empty string" This reverts commit 1e07710575280df210051ecc639f49beb3682a73. --- .../java/org/mtransit/parser/mt/GenerateMObjectsTask.java | 6 ++---- src/main/java/org/mtransit/parser/mt/data/MSchedule.kt | 6 ++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/mtransit/parser/mt/GenerateMObjectsTask.java b/src/main/java/org/mtransit/parser/mt/GenerateMObjectsTask.java index 297a13b..91edf65 100644 --- a/src/main/java/org/mtransit/parser/mt/GenerateMObjectsTask.java +++ b/src/main/java/org/mtransit/parser/mt/GenerateMObjectsTask.java @@ -803,10 +803,8 @@ private String parseGStopTimes(HashMap mSchedules, stopHeadsign = this.agencyTools.cleanStopHeadSign(gRoute, gTrip, gStopTime, gTrip.getTripHeadsignOrDefault()); mSchedule.setHeadsign(MDirection.HEADSIGN_TYPE_STRING, stopHeadsign); directionStopTimesHeadsign = setDirectionStopTimesHeadsign(directionStopTimesHeadsign, stopHeadsign); - } else { - if (!StringUtils.isBlank(originalDirectionHeadsignValue)) { - mSchedule.setHeadsign(originalDirectionHeadsignType, originalDirectionHeadsignValue); - } + } else if (!StringUtils.isBlank(originalDirectionHeadsignValue)) { + mSchedule.setHeadsign(originalDirectionHeadsignType, originalDirectionHeadsignValue); } mSchedules.put(mSchedule.getUID(), mSchedule); addedMDirectionIdAndGStopIds.put(directionIdStopId, gStopTime.getStopSequence()); diff --git a/src/main/java/org/mtransit/parser/mt/data/MSchedule.kt b/src/main/java/org/mtransit/parser/mt/data/MSchedule.kt index 2ad0007..a35e11d 100644 --- a/src/main/java/org/mtransit/parser/mt/data/MSchedule.kt +++ b/src/main/java/org/mtransit/parser/mt/data/MSchedule.kt @@ -3,7 +3,6 @@ package org.mtransit.parser.mt.data import androidx.annotation.Discouraged import org.mtransit.commons.FeatureFlags import org.mtransit.commons.sql.SQLUtils -import org.mtransit.parser.MTLog import org.mtransit.parser.Pair import org.mtransit.parser.db.SQLUtils.quotes import org.mtransit.parser.db.SQLUtils.quotesEscape @@ -60,7 +59,8 @@ data class MSchedule( if (newHeadsignValue.isNullOrBlank() && newHeadsignType != MDirection.HEADSIGN_TYPE_NO_PICKUP ) { - MTLog.logDebug("Setting '$newHeadsignValue' head-sign! (type:$newHeadsignType)") + clearHeadsign() + return } this.headsignType = newHeadsignType this.headsignValue = newHeadsignValue @@ -137,8 +137,10 @@ data class MSchedule( } else { add(headsignType.takeIf { it >= 0 }?.toString().orEmpty()) if (FeatureFlags.F_SCHEDULE_NO_QUOTES) { + @Suppress("SimplifyBooleanWithConstants") add(headsignValue.orEmpty().toStringIds(FeatureFlags.F_EXPORT_STRINGS || FeatureFlags.F_EXPORT_SCHEDULE_STRINGS)) } else { + @Suppress("SimplifyBooleanWithConstants") add(headsignValue.orEmpty().toStringIds(FeatureFlags.F_EXPORT_STRINGS || FeatureFlags.F_EXPORT_SCHEDULE_STRINGS).quotesEscape()) } }