23
23
import com .conveyal .r5 .analyst .PointSet ;
24
24
import com .conveyal .r5 .analyst .PointSetCache ;
25
25
import com .conveyal .r5 .analyst .cluster .RegionalTask ;
26
- import com .conveyal .r5 .analyst .scenario .Scenario ;
27
26
import com .fasterxml .jackson .databind .JsonNode ;
28
27
import com .google .common .primitives .Ints ;
29
28
import com .mongodb .QueryBuilder ;
@@ -518,7 +517,7 @@ private RegionalAnalysis createRegionalAnalysis (Request req, Response res) thro
518
517
var assembler = new MultiOriginAssembler (regionalJob , regionalAnalysis .createResultWriters (task ));
519
518
520
519
// Stored scenario is needed by workers. Must be done ahead of enqueueing the job.
521
- storeScenarioJson (task . graphId , task . scenario );
520
+ storeRegionalAnalysisScenarioJson (task );
522
521
523
522
// Register the regional job with the broker, which will distribute individual tasks to workers and track progress.
524
523
broker .enqueueTasksForRegionalJob (regionalJob , assembler );
@@ -534,11 +533,11 @@ private RegionalAnalysis createRegionalAnalysis (Request req, Response res) thro
534
533
/**
535
534
* Store the regional analysis scenario as JSON for retrieval by the workers.
536
535
*/
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 );
539
538
FileStorageKey fileStorageKey = new FileStorageKey (BUNDLES , fileName );
540
539
File localScenario = FileUtils .createScratchFile ("json" );
541
- JsonUtil .objectMapper .writeValue (localScenario , scenario );
540
+ JsonUtil .objectMapper .writeValue (localScenario , task . scenario );
542
541
fileStorage .moveIntoStorage (fileStorageKey , localScenario );
543
542
}
544
543
0 commit comments