diff --git a/pom.xml b/pom.xml index bec80e21d..fff59653c 100644 --- a/pom.xml +++ b/pom.xml @@ -272,7 +272,7 @@ com.github.conveyal gtfs-lib - 9bc752d3ef + b657dfe7d7 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 bd50dff8f..671466860 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); + tableWriter.normalizeStopTimesForPattern(patternStop.getKey(), beginWithSequence, false); } } } @@ -406,8 +406,9 @@ private String updateStopTimesFromPatternStops (Request req, Response res) { int patternId = getIdFromRequest(req); try { int beginStopSequence = Integer.parseInt(req.queryParams("stopSequence")); + boolean interpolateStopTimes = Boolean.parseBoolean(req.queryParams("interpolateStopTimes")); JdbcTableWriter tableWriter = new JdbcTableWriter(table, datasource, namespace); - int stopTimesUpdated = tableWriter.normalizeStopTimesForPattern(patternId, beginStopSequence); + int stopTimesUpdated = tableWriter.normalizeStopTimesForPattern(patternId, beginStopSequence, interpolateStopTimes); return SparkUtils.formatJSON("updateResult", stopTimesUpdated + " stop times updated."); } catch (Exception e) { logMessageAndHalt(req, 400, "Error normalizing stop times", e);