Merge pull request #24 from hove-io/reapply_commits

vgeof-hove · web-flow · commit d42791ad2def · 2025-11-06T15:58:40.000+01:00
Reapply commits
diff --git a/src/thor/timedistancebssmatrix.cc b/src/thor/timedistancebssmatrix.cc
@@ -463,7 +463,7 @@ bool TimeDistanceBSSMatrix::UpdateDestinations(
     // Subtract the partial remaining cost and distance along the edge.
     float remainder = dest_edge->second;
     Cost newcost = pred.cost() - (pedestrian_costing_->EdgeCost(edge, tile) * remainder);
-    if (newcost.cost < dest.best_cost.cost) {
+    if (newcost.cost > 0 && newcost.cost < dest.best_cost.cost) {
       dest.best_cost = newcost;
       dest.distance = pred.path_distance() - (edge->length() * remainder);
     }
diff --git a/src/thor/timedistancematrix.cc b/src/thor/timedistancematrix.cc
@@ -518,7 +518,7 @@ bool TimeDistanceMatrix::UpdateDestinations(
     float remainder = dest_edge->second;
     Cost newcost =
         pred.cost() - (costing_->EdgeCost(edge, tile, time_info, flow_sources) * remainder);
-    if (newcost.cost < dest.best_cost.cost) {
+    if (newcost.cost > 0 && newcost.cost < dest.best_cost.cost) {
       dest.best_cost = newcost;
       dest.distance = pred.path_distance() - (edge->length() * remainder);
     }

Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@ bool TimeDistanceBSSMatrix::UpdateDestinations(`
`463`	`463`	`// Subtract the partial remaining cost and distance along the edge.`
`464`	`464`	`float remainder = dest_edge->second;`
`465`	`465`	`Cost newcost = pred.cost() - (pedestrian_costing_->EdgeCost(edge, tile) * remainder);`
`466`		`- if (newcost.cost < dest.best_cost.cost) {`
	`466`	`+ if (newcost.cost > 0 && newcost.cost < dest.best_cost.cost) {`
`467`	`467`	`dest.best_cost = newcost;`
`468`	`468`	`dest.distance = pred.path_distance() - (edge->length() * remainder);`
`469`	`469`	`}`
Original file line number	Diff line number	Diff line change
`@@ -518,7 +518,7 @@ bool TimeDistanceMatrix::UpdateDestinations(`
`518`	`518`	`float remainder = dest_edge->second;`
`519`	`519`	`Cost newcost =`
`520`	`520`	`pred.cost() - (costing_->EdgeCost(edge, tile, time_info, flow_sources) * remainder);`
`521`		`- if (newcost.cost < dest.best_cost.cost) {`
	`521`	`+ if (newcost.cost > 0 && newcost.cost < dest.best_cost.cost) {`
`522`	`522`	`dest.best_cost = newcost;`
`523`	`523`	`dest.distance = pred.path_distance() - (edge->length() * remainder);`
`524`	`524`	`}`