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

#5325 Fixed CI problems

Browse Source
This commit is contained in:
Vsevolod Novikov 2021-02-23 14:46:15 +03:00
parent 4abfeaa09f
commit eb2eeb9bac
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,9 +1,9 @@
# Unreleased # Unreleased
- Changes from 5.24.0 - Changes from 5.24.0
- Features: - Features:
- ADDED: a new `ways` subsection in the `annotations` section containing way IDs along the found path, with sign meaning direction [#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
# 5.24.0 # 5.24.0
- Changes from 5.23.0 - Changes from 5.23.0

2
include/extractor/extractor_callbacks.hpp
View File

@ -70,7 +70,6 @@ class ExtractorCallbacks
ExtractionContainers &external_memory; ExtractionContainers &external_memory;
std::unordered_map<std::string, ClassData> &classes_map; std::unordered_map<std::string, ClassData> &classes_map;
LaneDescriptionMap &lane_description_map; LaneDescriptionMap &lane_description_map;
OSMWayIDMap &osm_way_id_map;
bool fallback_to_duration; bool fallback_to_duration;
bool force_split_edges; bool force_split_edges;
@ -80,7 +79,6 @@ class ExtractorCallbacks
explicit ExtractorCallbacks(ExtractionContainers &extraction_containers, explicit ExtractorCallbacks(ExtractionContainers &extraction_containers,
std::unordered_map<std::string, ClassData> &classes_map, std::unordered_map<std::string, ClassData> &classes_map,
LaneDescriptionMap &lane_description_map, LaneDescriptionMap &lane_description_map,
OSMWayIDMap &osm_way_id_map,
const ProfileProperties &properties); const ProfileProperties &properties);
ExtractorCallbacks(const ExtractorCallbacks &) = delete; ExtractorCallbacks(const ExtractorCallbacks &) = delete;

1
src/extractor/extractor.cpp
View File

@ -429,7 +429,6 @@ Extractor::ParseOSMData(ScriptingEnvironment &scripting_environment,
std::make_unique<ExtractorCallbacks>(extraction_containers, std::make_unique<ExtractorCallbacks>(extraction_containers,
classes_map, classes_map,
turn_lane_map, turn_lane_map,
osm_way_id_map,
scripting_environment.GetProfileProperties()); scripting_environment.GetProfileProperties());
// get list of supported relation types // get list of supported relation types

3
src/extractor/extractor_callbacks.cpp
View File

@ -29,10 +29,9 @@ namespace extractor
ExtractorCallbacks::ExtractorCallbacks(ExtractionContainers &extraction_containers_, ExtractorCallbacks::ExtractorCallbacks(ExtractionContainers &extraction_containers_,
std::unordered_map<std::string, ClassData> &classes_map, std::unordered_map<std::string, ClassData> &classes_map,
LaneDescriptionMap &lane_description_map, LaneDescriptionMap &lane_description_map,
OSMWayIDMap &osm_way_id_map,
const ProfileProperties &properties) const ProfileProperties &properties)
: external_memory(extraction_containers_), classes_map(classes_map), : external_memory(extraction_containers_), classes_map(classes_map),
lane_description_map(lane_description_map), osm_way_id_map(osm_way_id_map), lane_description_map(lane_description_map),
fallback_to_duration(properties.fallback_to_duration), fallback_to_duration(properties.fallback_to_duration),
force_split_edges(properties.force_split_edges) force_split_edges(properties.force_split_edges)
{ {

5
unit_tests/engine/offline_facade.cpp
View File

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

3
unit_tests/mocks/mock_datafacade.hpp
View File

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