fix(grid-dual-access): properly trigger with flag

conveyal · Mar 18, 2024 · 3d60412 · 3d60412
1 parent 81e0151
commit 3d60412
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/com/conveyal/r5/analyst/TravelTimeReducer.java b/src/main/java/com/conveyal/r5/analyst/TravelTimeReducer.java
@@ -145,7 +145,7 @@ public TravelTimeReducer (AnalysisWorkerTask task, TransportNetwork network) {
         if (task.includePathResults) {
             pathResult = new PathResult(task, network.transitLayer);
         }
-        if (task.includeTemporalDensity || task.flags.contains("gridDualAccess")) {
+        if (task.includeTemporalDensity || task.hasFlag("gridDualAccess")) {
             temporalDensityResult = new TemporalDensityResult(task);
         }
 

diff --git a/src/main/java/com/conveyal/r5/analyst/cluster/AnalysisWorkerTask.java b/src/main/java/com/conveyal/r5/analyst/cluster/AnalysisWorkerTask.java
@@ -323,4 +323,8 @@ public void validateCutoffsMinutes () {
         }
     }
 
+    public boolean hasFlag (String flag) {
+        return this.flags != null && this.flags.contains(flag);
+    }
+
 }
diff --git a/src/main/java/com/conveyal/r5/analyst/cluster/RegionalWorkResult.java b/src/main/java/com/conveyal/r5/analyst/cluster/RegionalWorkResult.java
@@ -63,7 +63,13 @@ public RegionalWorkResult(OneOriginResult result, RegionalTask task) {
         this.jobId = task.jobId;
         this.taskId = task.taskId;
         this.travelTimeValues = result.travelTimes == null ? null : result.travelTimes.values;
-        this.accessibilityValues = result.accessibility == null ? null : result.density.fakeDualAccess(task);
+        if (result.accessibility == null) {
+            this.accessibilityValues = null;
+        } else if (task.flags.contains("gridDualAccess")) {
+            this.accessibilityValues = result.density.fakeDualAccess(task);
+        } else {
+            this.accessibilityValues = result.accessibility.getIntValues();
+        }
         this.pathResult = result.paths == null ? null : result.paths.summarizeIterations(PathResult.Stat.MINIMUM);
         this.opportunitiesPerMinute = result.density == null ? null : result.density.opportunitiesPerMinute;
         // TODO checkTravelTimeInvariants, checkAccessibilityInvariants to verify that values are monotonically increasing
-Original file line number
+Diff line change
@@ Expand Up / @@ -323,4 +323,8 @@ public void validateCutoffsMinutes () { @@
             }
         }
+        public boolean hasFlag (String flag) {
+            return this.flags != null && this.flags.contains(flag);
+        }
     }