Skip to content

Commit ca1ba48

Browse files
Rename method and change signature
1 parent b15d2e1 commit ca1ba48

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/main/java/com/conveyal/analysis/controllers/RegionalAnalysisController.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.conveyal.r5.analyst.PointSet;
2424
import com.conveyal.r5.analyst.PointSetCache;
2525
import com.conveyal.r5.analyst.cluster.RegionalTask;
26-
import com.conveyal.r5.analyst.scenario.Scenario;
2726
import com.fasterxml.jackson.databind.JsonNode;
2827
import com.google.common.primitives.Ints;
2928
import com.mongodb.QueryBuilder;
@@ -518,7 +517,7 @@ private RegionalAnalysis createRegionalAnalysis (Request req, Response res) thro
518517
var assembler = new MultiOriginAssembler(regionalJob, regionalAnalysis.createResultWriters(task));
519518

520519
// Stored scenario is needed by workers. Must be done ahead of enqueueing the job.
521-
storeScenarioJson(task.graphId, task.scenario);
520+
storeRegionalAnalysisScenarioJson(task);
522521

523522
// Register the regional job with the broker, which will distribute individual tasks to workers and track progress.
524523
broker.enqueueTasksForRegionalJob(regionalJob, assembler);
@@ -534,11 +533,11 @@ private RegionalAnalysis createRegionalAnalysis (Request req, Response res) thro
534533
/**
535534
* Store the regional analysis scenario as JSON for retrieval by the workers.
536535
*/
537-
private void storeScenarioJson(String graphId, Scenario scenario) throws IOException {
538-
String fileName = getScenarioFilename(graphId, scenario.id);
536+
private void storeRegionalAnalysisScenarioJson(RegionalTask task) throws IOException {
537+
String fileName = getScenarioFilename(task.graphId, task.scenario.id);
539538
FileStorageKey fileStorageKey = new FileStorageKey(BUNDLES, fileName);
540539
File localScenario = FileUtils.createScratchFile("json");
541-
JsonUtil.objectMapper.writeValue(localScenario, scenario);
540+
JsonUtil.objectMapper.writeValue(localScenario, task.scenario);
542541
fileStorage.moveIntoStorage(fileStorageKey, localScenario);
543542
}
544543

0 commit comments

Comments
 (0)