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

#5325 Fixed CI and review

Browse Source
This commit is contained in:
Vsevolod Novikov 2021-02-23 16:08:01 +03:00
parent eb2eeb9bac
commit b1cfc02454
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -3,7 +3,7 @@
- Features: - Features:
- ADDED: a new `ways` subsection in the `annotations` section containing way IDs along the found path, with sign meaning direction [#5325](https://github.com/Project-OSRM/osrm-backend/issues/5325) - ADDED: a new `ways` subsection in the `annotations` section containing way IDs along the found path, with sign meaning direction [#5325](https://github.com/Project-OSRM/osrm-backend/issues/5325)
- API: - API:
- FIXED: item type for `nodes` section of the `annotations` flatbuffers output format - FIXED: item type for `nodes` section of the `annotations` flatbuffers output format [#5970](https://github.com/Project-OSRM/osrm-backend/issues/5970)
# 5.24.0 # 5.24.0
- Changes from 5.23.0 - Changes from 5.23.0

2
include/engine/guidance/assemble_geometry.hpp
View File

@ -56,11 +56,9 @@ inline LegGeometry assembleGeometry(const datafacade::BaseDataFacade &facade,
reversed_source ? source_node.reverse_segment_id.id : source_node.forward_segment_id.id; reversed_source ? source_node.reverse_segment_id.id : source_node.forward_segment_id.id;
const auto source_geometry_id = facade.GetGeometryIndex(source_node_id).id; const auto source_geometry_id = facade.GetGeometryIndex(source_node_id).id;
const auto source_geometry = facade.GetUncompressedForwardGeometry(source_geometry_id); const auto source_geometry = facade.GetUncompressedForwardGeometry(source_geometry_id);
// const auto source_osm_way_ids = facade.GetUncompressedForwardWayIDs(source_geometry_id);
geometry.osm_node_ids.push_back( geometry.osm_node_ids.push_back(
facade.GetOSMNodeIDOfNode(source_geometry(source_segment_start_coordinate))); facade.GetOSMNodeIDOfNode(source_geometry(source_segment_start_coordinate)));
// geometry.osm_way_ids.push_back(source_osm_way_ids(source_segment_start_coordinate)));
auto cumulative_distance = 0.; auto cumulative_distance = 0.;
auto current_distance = 0.; auto current_distance = 0.;

4
unit_tests/engine/offline_facade.cpp
View File

@ -173,8 +173,8 @@ class ContiguousInternalMemoryDataFacade<routing_algorithms::offline::Algorithm>
OSMWayReverseRange GetUncompressedReverseWayIDs(const EdgeID id) const override OSMWayReverseRange GetUncompressedReverseWayIDs(const EdgeID id) const override
{ {
return boost::adaptors::reverse( return boost::adaptors::reverse(boost::adaptors::transform(GetUncompressedForwardWayIDs(id),
boost::adaptors::transform(GetUncompressedForwardWayIDs(id), std::negate<OSMWayIDDir>())); std::negate<OSMWayIDDir>()));
} }
TurnPenalty GetWeightPenaltyForEdgeID(const unsigned /*id*/) const override TurnPenalty GetWeightPenaltyForEdgeID(const unsigned /*id*/) const override

4
unit_tests/mocks/mock_datafacade.hpp
View File

@ -72,8 +72,8 @@ class MockBaseDataFacade : public engine::datafacade::BaseDataFacade
} }
OSMWayReverseRange GetUncompressedReverseWayIDs(const EdgeID id) const override OSMWayReverseRange GetUncompressedReverseWayIDs(const EdgeID id) const override
{ {
return boost::adaptors::reverse( return boost::adaptors::reverse(boost::adaptors::transform(GetUncompressedForwardWayIDs(id),
boost::adaptors::transform(GetUncompressedForwardWayIDs(id), std::negate<OSMWayIDDir>())); std::negate<OSMWayIDDir>()));
} }
WeightForwardRange GetUncompressedForwardWeights(const EdgeID /* id */) const override WeightForwardRange GetUncompressedForwardWeights(const EdgeID /* id */) const override
{ {