Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Make segment data update work without rtree

Browse Source
This commit is contained in:
Patrick Niklaus
2017-03-11 01:56:35 +00:00
committed by Patrick Niklaus
parent cec1f223e9
commit 2df02aa301
2 changed files with 128 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/extractor/segment_data_container.hpp
+49 -13
View File
@@ -63,30 +63,65 @@ template <bool UseShareMemory> class SegmentDataContainerImpl
{
}
// TODO these random access functions can be removed after we implemented #3737
auto &ForwardDuration(const DirectionalGeometryID id, const SegmentOffset offset)
auto GetForwardGeometry(const DirectionalGeometryID id)
{
return fwd_durations[index[id] + 1 + offset];
const auto begin = nodes.begin() + index.at(id);
const auto end = nodes.begin() + index.at(id + 1);
return boost::make_iterator_range(begin, end);
}
auto &ReverseDuration(const DirectionalGeometryID id, const SegmentOffset offset)
auto GetReverseGeometry(const DirectionalGeometryID id)
{
return rev_durations[index[id] + offset];
return boost::adaptors::reverse(GetForwardGeometry(id));
}
auto &ForwardWeight(const DirectionalGeometryID id, const SegmentOffset offset)
auto GetForwardDurations(const DirectionalGeometryID id)
{
return fwd_weights[index[id] + 1 + offset];
const auto begin = fwd_durations.begin() + index.at(id) + 1;
const auto end = fwd_durations.begin() + index.at(id + 1);
return boost::make_iterator_range(begin, end);
}
auto &ReverseWeight(const DirectionalGeometryID id, const SegmentOffset offset)
auto GetReverseDurations(const DirectionalGeometryID id)
{
return rev_weights[index[id] + offset];
const auto begin = rev_durations.begin() + index.at(id);
const auto end = rev_durations.begin() + index.at(id + 1) - 1;
return boost::adaptors::reverse(boost::make_iterator_range(begin, end));
}
auto &ForwardDatasource(const DirectionalGeometryID id, const SegmentOffset offset)
auto GetForwardWeights(const DirectionalGeometryID id)
{
return datasources[index[id] + 1 + offset];
const auto begin = fwd_weights.begin() + index.at(id) + 1;
const auto end = fwd_weights.begin() + index.at(id + 1);
return boost::make_iterator_range(begin, end);
}
auto &ReverseDatasource(const DirectionalGeometryID id, const SegmentOffset offset)
auto GetReverseWeights(const DirectionalGeometryID id)
{
return datasources[index[id] + offset];
const auto begin = rev_weights.begin() + index.at(id);
const auto end = rev_weights.begin() + index.at(id + 1) - 1;
return boost::adaptors::reverse(boost::make_iterator_range(begin, end));
}
auto GetForwardDatasources(const DirectionalGeometryID id)
{
const auto begin = datasources.begin() + index.at(id) + 1;
const auto end = datasources.begin() + index.at(id + 1);
return boost::make_iterator_range(begin, end);
}
auto GetReverseDatasources(const DirectionalGeometryID id)
{
const auto begin = datasources.begin() + index.at(id);
const auto end = datasources.begin() + index.at(id + 1) - 1;
return boost::adaptors::reverse(boost::make_iterator_range(begin, end));
}
auto GetForwardGeometry(const DirectionalGeometryID id) const
@@ -150,6 +185,7 @@ template <bool UseShareMemory> class SegmentDataContainerImpl
return boost::adaptors::reverse(boost::make_iterator_range(begin, end));
}
auto GetNumberOfGeometries() const { return index.size() - 1; }
auto GetNumberOfSegments() const { return fwd_weights.size(); }
friend void