diff --git a/pom.xml b/pom.xml index b4785f2e8..b1f10ac04 100644 --- a/pom.xml +++ b/pom.xml @@ -272,7 +272,7 @@ com.github.ibi-group gtfs-lib - 10ef4e07485b9860b3c75fa7ac300775afe6b994 + bf392d854df302f323a6c23d90660637c1abf4a1 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);