Skip to content

Schedule > clear head-sign instead of setting empty string #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmathieum merged 2 commits into from
Feb 3, 2026
Merged

Schedule > clear head-sign instead of setting empty string #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b309175
Reapply "MSchedule > clear head-sign instead of setting empty string"
mmathieum Jan 29, 2026
a9ebe6c
Merge branch 'master' into mm/mschedule_no_empty_string_headsigns
mmathieum Feb 3, 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
6 changes: 2 additions & 4 deletions src/main/java/org/mtransit/parser/mt/GenerateMObjectsTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,10 +803,8 @@ private String parseGStopTimes(HashMap<String, MSchedule> 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());
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/org/mtransit/parser/mt/data/MSchedule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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())
}
}
Expand Down
Loading