Incoperate PR comments

data_structures/hidden_markov_model.hpp

@@ -140,7 +140,7 @@ template <class CandidateLists> struct HiddenMarkovModel
             for (const auto s : osrm::irange<std::size_t>(0u, viterbi[initial_timestamp].size()))
             {
                 viterbi[initial_timestamp][s] =
-                    emission_log_probability(candidates_list[initial_timestamp][s].first);
+                    emission_log_probability(candidates_list[initial_timestamp][s].distance);
                 parents[initial_timestamp][s] = std::make_pair(initial_timestamp, s);
                 pruned[initial_timestamp][s] =
                     viterbi[initial_timestamp][s] < osrm::matching::MINIMAL_LOG_PROB;

data_structures/phantom_node.hpp

@@ -124,6 +124,12 @@ static_assert(sizeof(PhantomNode) == 48, "PhantomNode has more padding then expe
 
 using PhantomNodePair = std::pair<PhantomNode, PhantomNode>;
 
+struct PhantomNodeWithDistance
+{
+    PhantomNode phantom_node;
+    double distance;
+};
+
 struct PhantomNodes
 {
     PhantomNode source_phantom;

data_structures/static_rtree.hpp

@@ -412,7 +412,7 @@ class StaticRTree
                 }
 
                 // store phantom node in result vector
-                results.emplace_back(std::move(current_segment));
+                results.push_back(std::move(current_segment));
 
                 if (!use_segment.first)
                 {
@@ -476,7 +476,7 @@ class StaticRTree
         }
         if (!leaves_stream.good())
         {
-            leaves_stream.clear(std::ios::goodbit);
+          throw osrm::exception("Could not read from leaf file.");
         }
         const uint64_t seek_pos = sizeof(uint64_t) + leaf_id * sizeof(LeafNode);
         leaves_stream.seekg(seek_pos);