Project-OSRM#5325 Fixed CI problems

nnseva · Feb 23, 2021 · eb2eeb9 · eb2eeb9
1 parent 4abfeaa
commit eb2eeb9
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,9 @@
 # Unreleased
   - Changes from 5.24.0
     - 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:
-      - 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
   - Changes from 5.23.0

diff --git a/include/extractor/extractor_callbacks.hpp b/include/extractor/extractor_callbacks.hpp
@@ -70,7 +70,6 @@ class ExtractorCallbacks
     ExtractionContainers &external_memory;
     std::unordered_map<std::string, ClassData> &classes_map;
     LaneDescriptionMap &lane_description_map;
-    OSMWayIDMap &osm_way_id_map;
     bool fallback_to_duration;
     bool force_split_edges;
 
@@ -80,7 +79,6 @@ class ExtractorCallbacks
     explicit ExtractorCallbacks(ExtractionContainers &extraction_containers,
                                 std::unordered_map<std::string, ClassData> &classes_map,
                                 LaneDescriptionMap &lane_description_map,
-                                OSMWayIDMap &osm_way_id_map,
                                 const ProfileProperties &properties);
 
     ExtractorCallbacks(const ExtractorCallbacks &) = delete;

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

diff --git a/src/extractor/extractor_callbacks.cpp b/src/extractor/extractor_callbacks.cpp
@@ -29,10 +29,9 @@ namespace extractor
 ExtractorCallbacks::ExtractorCallbacks(ExtractionContainers &extraction_containers_,
                                        std::unordered_map<std::string, ClassData> &classes_map,
                                        LaneDescriptionMap &lane_description_map,
-                                       OSMWayIDMap &osm_way_id_map,
                                        const ProfileProperties &properties)
     : 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),
       force_split_edges(properties.force_split_edges)
 {

diff --git a/unit_tests/engine/offline_facade.cpp b/unit_tests/engine/offline_facade.cpp
@@ -171,9 +171,10 @@ class ContiguousInternalMemoryDataFacade<routing_algorithms::offline::Algorithm>
         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

diff --git a/unit_tests/mocks/mock_datafacade.hpp b/unit_tests/mocks/mock_datafacade.hpp
@@ -72,7 +72,8 @@ class MockBaseDataFacade : public engine::datafacade::BaseDataFacade
     }
     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
     {