From 4dd0377eb81a84145718de1dbbf40064d9890c01 Mon Sep 17 00:00:00 2001
From: Emil Tin <emil@tin.dk>
Date: Tue, 12 Aug 2014 19:36:59 +0200
Subject: [PATCH] fix compilation of tests

---
 Descriptors/DescriptionFactory.cpp           | 3 ++-
 UnitTests/DataStructures/StaticRTreeTest.cpp | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Descriptors/DescriptionFactory.cpp b/Descriptors/DescriptionFactory.cpp
index 4e3412229..ebccf0b2b 100644
--- a/Descriptors/DescriptionFactory.cpp
+++ b/Descriptors/DescriptionFactory.cpp
@@ -59,7 +59,8 @@ void DescriptionFactory::SetEndSegment(const PhantomNode &target,
     target_phantom = target;
     const EdgeWeight segment_duration =
         (traversed_in_reverse ? target.reverse_weight : target.forward_weight);
-<<<<<<< HEAD
+    const TravelMode travel_mode =
+          (traversed_in_reverse ? target.backward_travel_mode : target.travel_mode);
     path_description.emplace_back(target.location,
                                   target.name_id,
                                   segment_duration,
diff --git a/UnitTests/DataStructures/StaticRTreeTest.cpp b/UnitTests/DataStructures/StaticRTreeTest.cpp
index 8e7511daa..f8d86cfab 100644
--- a/UnitTests/DataStructures/StaticRTreeTest.cpp
+++ b/UnitTests/DataStructures/StaticRTreeTest.cpp
@@ -109,7 +109,9 @@ class LinearSearchNN
                                        e.reverse_offset,
                                        e.packed_geometry_id,
                                        nearest,
-                                       e.fwd_segment_position};
+                                       e.fwd_segment_position,
+                                       e.travel_mode,
+                                       e.backward_travel_mode};
                 nearest_edge = e;
             }
         }