From 1d3219489f84f3f774410068aa1080b5cd07386c Mon Sep 17 00:00:00 2001 From: miles-grant-ibi Date: Tue, 28 Apr 2026 11:17:35 -0400 Subject: [PATCH 1/3] support new ignoreNonBlanks feature --- .../datatools/editor/controllers/api/EditorController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/conveyal/datatools/editor/controllers/api/EditorController.java b/src/main/java/com/conveyal/datatools/editor/controllers/api/EditorController.java index 671466860..5eec768a6 100644 --- a/src/main/java/com/conveyal/datatools/editor/controllers/api/EditorController.java +++ b/src/main/java/com/conveyal/datatools/editor/controllers/api/EditorController.java @@ -313,7 +313,7 @@ private String cascadeDeleteStop(Request req, Response res) { int stopSequence = patternStop.getValue(); // Begin with the stop prior to the one deleted, unless at the beginning. int beginWithSequence = (stopSequence != 0) ? stopSequence - 1 : stopSequence; - tableWriter.normalizeStopTimesForPattern(patternStop.getKey(), beginWithSequence, false); + tableWriter.normalizeStopTimesForPattern(patternStop.getKey(), beginWithSequence, false, false); } } } @@ -407,8 +407,9 @@ private String updateStopTimesFromPatternStops (Request req, Response res) { try { int beginStopSequence = Integer.parseInt(req.queryParams("stopSequence")); boolean interpolateStopTimes = Boolean.parseBoolean(req.queryParams("interpolateStopTimes")); + boolean ignoreNonBlankStopTimes = Boolean.parseBoolean(req.queryParams("ignoreNonBlankStopTimes")); JdbcTableWriter tableWriter = new JdbcTableWriter(table, datasource, namespace); - int stopTimesUpdated = tableWriter.normalizeStopTimesForPattern(patternId, beginStopSequence, interpolateStopTimes); + int stopTimesUpdated = tableWriter.normalizeStopTimesForPattern(patternId, beginStopSequence, interpolateStopTimes, ignoreNonBlankStopTimes); return SparkUtils.formatJSON("updateResult", stopTimesUpdated + " stop times updated."); } catch (Exception e) { logMessageAndHalt(req, 400, "Error normalizing stop times", e); From 61edf76b220c5565d69d4d7aae15711c94eda523 Mon Sep 17 00:00:00 2001 From: miles-grant-ibi Date: Mon, 4 May 2026 12:31:55 -0400 Subject: [PATCH 2/3] update gtfs-lib --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b4785f2e8..dacc4d78d 100644 --- a/pom.xml +++ b/pom.xml @@ -272,7 +272,7 @@ com.github.ibi-group gtfs-lib - 10ef4e07485b9860b3c75fa7ac300775afe6b994 + c55925cc3f518a1f2691190612b2642dec2e68ef From 661fe726f9dc300189a2ac2b1e8e2ceeaa46fac6 Mon Sep 17 00:00:00 2001 From: miles-grant-ibi Date: Mon, 4 May 2026 12:35:16 -0400 Subject: [PATCH 3/3] update gtfs-lib --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dacc4d78d..b1f10ac04 100644 --- a/pom.xml +++ b/pom.xml @@ -272,7 +272,7 @@ com.github.ibi-group gtfs-lib - c55925cc3f518a1f2691190612b2642dec2e68ef + bf392d854df302f323a6c23d90660637c1abf4a1