Use ranges in datafacade instead of vectors
Range type must use immutable references due to a regression in `boost::any_range`. References: https://svn.boost.org/trac10/ticket/10493 https://stackoverflow.com/questions/42427395/boostany-range-with-optimization-level-o2-causes-crash/42427662
This commit is contained in:
Kajari Ghosh
committed by
Patrick Niklaus
Patrick Niklaus
parent
282415bbc1
commit
be123cd72f
+36
-40
@@ -397,16 +397,14 @@ void encodeVectorTile(const DataFacadeBase &facade,
|
||||
const auto &edge = edges[edge_index];
|
||||
|
||||
const auto geometry_id = get_geometry_id(edge);
|
||||
const auto forward_datasource_vector =
|
||||
facade.GetUncompressedForwardDatasources(geometry_id);
|
||||
const auto reverse_datasource_vector =
|
||||
facade.GetUncompressedReverseDatasources(geometry_id);
|
||||
const auto forward_datasource_range = facade.GetUncompressedForwardDatasources(geometry_id);
|
||||
const auto reverse_datasource_range = facade.GetUncompressedReverseDatasources(geometry_id);
|
||||
|
||||
BOOST_ASSERT(edge.fwd_segment_position < forward_datasource_vector.size());
|
||||
const auto forward_datasource = forward_datasource_vector[edge.fwd_segment_position];
|
||||
BOOST_ASSERT(edge.fwd_segment_position < reverse_datasource_vector.size());
|
||||
const auto reverse_datasource = reverse_datasource_vector[reverse_datasource_vector.size() -
|
||||
edge.fwd_segment_position - 1];
|
||||
BOOST_ASSERT(edge.fwd_segment_position < forward_datasource_range.size());
|
||||
const auto forward_datasource = forward_datasource_range[edge.fwd_segment_position];
|
||||
BOOST_ASSERT(edge.fwd_segment_position < reverse_datasource_range.size());
|
||||
const auto reverse_datasource = reverse_datasource_range[reverse_datasource_range.size() -
|
||||
edge.fwd_segment_position - 1];
|
||||
|
||||
// Keep track of the highest datasource seen so that we don't write unnecessary
|
||||
// data to the layer attribute values
|
||||
@@ -453,13 +451,11 @@ void encodeVectorTile(const DataFacadeBase &facade,
|
||||
const double length = osrm::util::coordinate_calculation::haversineDistance(a, b);
|
||||
|
||||
// Weight values
|
||||
const auto forward_weight_vector =
|
||||
facade.GetUncompressedForwardWeights(geometry_id);
|
||||
const auto reverse_weight_vector =
|
||||
facade.GetUncompressedReverseWeights(geometry_id);
|
||||
const auto forward_weight = forward_weight_vector[edge.fwd_segment_position];
|
||||
const auto reverse_weight = reverse_weight_vector[reverse_weight_vector.size() -
|
||||
edge.fwd_segment_position - 1];
|
||||
const auto forward_weight_range = facade.GetUncompressedForwardWeights(geometry_id);
|
||||
const auto reverse_weight_range = facade.GetUncompressedReverseWeights(geometry_id);
|
||||
const auto forward_weight = forward_weight_range[edge.fwd_segment_position];
|
||||
const auto reverse_weight = reverse_weight_range[reverse_weight_range.size() -
|
||||
edge.fwd_segment_position - 1];
|
||||
line_int_index.add(forward_weight);
|
||||
line_int_index.add(reverse_weight);
|
||||
|
||||
@@ -472,14 +468,14 @@ void encodeVectorTile(const DataFacadeBase &facade,
|
||||
line_int_index.add(reverse_rate);
|
||||
|
||||
// Duration values
|
||||
const auto forward_duration_vector =
|
||||
const auto forward_duration_range =
|
||||
facade.GetUncompressedForwardDurations(geometry_id);
|
||||
const auto reverse_duration_vector =
|
||||
const auto reverse_duration_range =
|
||||
facade.GetUncompressedReverseDurations(geometry_id);
|
||||
const auto forward_duration = forward_duration_vector[edge.fwd_segment_position];
|
||||
const auto reverse_duration =
|
||||
reverse_duration_vector[reverse_duration_vector.size() -
|
||||
edge.fwd_segment_position - 1];
|
||||
const auto forward_duration = forward_duration_range[edge.fwd_segment_position];
|
||||
const auto reverse_duration = reverse_duration_range[reverse_duration_range.size() -
|
||||
edge.fwd_segment_position - 1];
|
||||
|
||||
line_int_index.add(forward_duration);
|
||||
line_int_index.add(reverse_duration);
|
||||
}
|
||||
@@ -500,32 +496,32 @@ void encodeVectorTile(const DataFacadeBase &facade,
|
||||
const double length =
|
||||
osrm::util::coordinate_calculation::haversineDistance(a, b);
|
||||
|
||||
const auto forward_weight_vector =
|
||||
const auto forward_weight_range =
|
||||
facade.GetUncompressedForwardWeights(geometry_id);
|
||||
const auto reverse_weight_vector =
|
||||
const auto reverse_weight_range =
|
||||
facade.GetUncompressedReverseWeights(geometry_id);
|
||||
const auto forward_duration_vector =
|
||||
const auto forward_duration_range =
|
||||
facade.GetUncompressedForwardDurations(geometry_id);
|
||||
const auto reverse_duration_vector =
|
||||
const auto reverse_duration_range =
|
||||
facade.GetUncompressedReverseDurations(geometry_id);
|
||||
const auto forward_datasource_vector =
|
||||
const auto forward_datasource_range =
|
||||
facade.GetUncompressedForwardDatasources(geometry_id);
|
||||
const auto reverse_datasource_vector =
|
||||
const auto reverse_datasource_range =
|
||||
facade.GetUncompressedReverseDatasources(geometry_id);
|
||||
const auto forward_weight = forward_weight_vector[edge.fwd_segment_position];
|
||||
const auto reverse_weight =
|
||||
reverse_weight_vector[reverse_weight_vector.size() -
|
||||
edge.fwd_segment_position - 1];
|
||||
const auto forward_duration =
|
||||
forward_duration_vector[edge.fwd_segment_position];
|
||||
const auto forward_weight = forward_weight_range[edge.fwd_segment_position];
|
||||
const auto reverse_weight = reverse_weight_range[reverse_weight_range.size() -
|
||||
edge.fwd_segment_position - 1];
|
||||
|
||||
const auto forward_duration = forward_duration_range[edge.fwd_segment_position];
|
||||
const auto reverse_duration =
|
||||
reverse_duration_vector[reverse_duration_vector.size() -
|
||||
edge.fwd_segment_position - 1];
|
||||
reverse_duration_range[reverse_duration_range.size() -
|
||||
edge.fwd_segment_position - 1];
|
||||
|
||||
const auto forward_datasource_idx =
|
||||
forward_datasource_vector[edge.fwd_segment_position];
|
||||
forward_datasource_range[edge.fwd_segment_position];
|
||||
const auto reverse_datasource_idx =
|
||||
reverse_datasource_vector[reverse_datasource_vector.size() -
|
||||
edge.fwd_segment_position - 1];
|
||||
reverse_datasource_range[reverse_datasource_range.size() -
|
||||
edge.fwd_segment_position - 1];
|
||||
|
||||
const auto component_id = facade.GetComponentID(edge.forward_segment_id.id);
|
||||
const auto name_id = facade.GetNameIndex(edge.forward_segment_id.id);
|
||||
@@ -929,7 +925,7 @@ void encodeVectorTile(const DataFacadeBase &facade,
|
||||
for (auto edgeNodeID : segregated_nodes)
|
||||
{
|
||||
auto const geomIndex = facade.GetGeometryIndex(edgeNodeID);
|
||||
std::vector<NodeID> geometry;
|
||||
DataFacadeBase::NodesIDRangeT geometry;
|
||||
|
||||
if (geomIndex.forward)
|
||||
geometry = facade.GetUncompressedForwardGeometry(geomIndex.id);
|
||||
|
||||
@@ -101,8 +101,8 @@ std::vector<TurnData> generateTurns(const datafacade &facade,
|
||||
// w
|
||||
// uv is the "approach"
|
||||
// vw is the "exit"
|
||||
std::vector<EdgeWeight> approach_weight_vector;
|
||||
std::vector<EdgeWeight> approach_duration_vector;
|
||||
typename datafacade::BaseDataFacade::WeightsRangeT approach_weight_range;
|
||||
typename datafacade::BaseDataFacade::DurationsRangeT approach_duration_range;
|
||||
|
||||
// Look at every node in the directed graph we created
|
||||
for (const auto &startnode : sorted_startnodes)
|
||||
@@ -151,27 +151,26 @@ std::vector<TurnData> generateTurns(const datafacade &facade,
|
||||
if (edge_based_node_info.find(approachedge.edge_based_node_id)
|
||||
->second.is_geometry_forward)
|
||||
{
|
||||
approach_weight_vector = facade.GetUncompressedForwardWeights(
|
||||
approach_weight_range = facade.GetUncompressedForwardWeights(
|
||||
edge_based_node_info.find(approachedge.edge_based_node_id)
|
||||
->second.packed_geometry_id);
|
||||
approach_duration_vector = facade.GetUncompressedForwardDurations(
|
||||
approach_duration_range = facade.GetUncompressedForwardDurations(
|
||||
edge_based_node_info.find(approachedge.edge_based_node_id)
|
||||
->second.packed_geometry_id);
|
||||
}
|
||||
else
|
||||
{
|
||||
approach_weight_vector = facade.GetUncompressedReverseWeights(
|
||||
approach_weight_range = facade.GetUncompressedReverseWeights(
|
||||
edge_based_node_info.find(approachedge.edge_based_node_id)
|
||||
->second.packed_geometry_id);
|
||||
approach_duration_vector = facade.GetUncompressedReverseDurations(
|
||||
approach_duration_range = facade.GetUncompressedReverseDurations(
|
||||
edge_based_node_info.find(approachedge.edge_based_node_id)
|
||||
->second.packed_geometry_id);
|
||||
}
|
||||
const auto sum_node_weight = std::accumulate(approach_weight_vector.begin(),
|
||||
approach_weight_vector.end(),
|
||||
EdgeWeight{0});
|
||||
const auto sum_node_duration = std::accumulate(approach_duration_vector.begin(),
|
||||
approach_duration_vector.end(),
|
||||
const auto sum_node_weight = std::accumulate(
|
||||
approach_weight_range.begin(), approach_weight_range.end(), EdgeWeight{0});
|
||||
const auto sum_node_duration = std::accumulate(approach_duration_range.begin(),
|
||||
approach_duration_range.end(),
|
||||
EdgeWeight{0});
|
||||
|
||||
// The edge.weight is the whole edge weight, which includes the turn
|
||||
|
||||
Reference in New Issue
Block a user