even more reformatting

- rename variable with short name
- fix inverted logic
- rename members in SpeedProfile

.gitignore

@@ -38,6 +38,7 @@ Thumbs.db
 /build/
 /Util/FingerPrint.cpp
 /Util/GitDescription.cpp
+/cmake/postinst
 
 # Eclipse related files #
 #########################
@@ -79,6 +80,7 @@ stxxl.errlog
 /osrm-prepare
 /osrm-unlock-all
 /osrm-cli
+/osrm-check-hsgr
 /nohup.out
 
 # Sandbox folder #

.travis.yml

@@ -8,7 +8,7 @@ install:
  - sudo add-apt-repository -y ppa:boost-latest/ppa
  - sudo apt-get update >/dev/null
  - sudo apt-get -q install libprotoc-dev libprotobuf7 libprotobuf-dev libosmpbf-dev libbz2-dev libstxxl-dev libstxxl1 libxml2-dev libzip-dev lua5.1 liblua5.1-0-dev rubygems libtbb-dev
- - sudo apt-get -q install g++-4.7
+ - sudo apt-get -q install g++-4.8
  - sudo apt-get install libboost1.54-all-dev
  #luabind
  - curl https://gist.githubusercontent.com/DennisOSRM/f2eb7b948e6fe1ae319e/raw/install-luabind.sh | sudo bash
@@ -23,6 +23,7 @@ before_script:
  - cmake .. $CMAKEOPTIONS
 script:
  - make -j 2
+ - make -j 2 tests
  - cd ..
  - cucumber -p verify
 after_script:
@@ -36,8 +37,8 @@ cache:
 - bundler
 - apt
 env:
- - CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++-4.7" OSRM_PORT=5000 OSRM_TIMEOUT=60
- - CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=g++-4.7" OSRM_PORT=5010 OSRM_TIMEOUT=60
+ - CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++-4.8" OSRM_PORT=5000 OSRM_TIMEOUT=60
+ - CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=g++-4.8" OSRM_PORT=5010 OSRM_TIMEOUT=60
 notifications:
  irc:
   channels:

Algorithms/DouglasPeucker.cpp

@@ -29,7 +29,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "DouglasPeucker.h"
 #include "../DataStructures/SegmentInformation.h"
-#include "../Util/SimpleLogger.h"
 
 #include <boost/assert.hpp>
 

Algorithms/ExtractRouteNames.h

@@ -54,7 +54,7 @@ template <class DataFacadeT, class SegmentT> struct ExtractRouteNames
 
         for (const SegmentT &segment : segment_list)
         {
-            if (segment.name_id != blocked_name_id && segment.length > result_segment.length)
+            if (segment.name_id != blocked_name_id && segment.length > result_segment.length && segment.name_id != 0)
             {
                 result_segment = segment;
             }
@@ -111,7 +111,7 @@ template <class DataFacadeT, class SegmentT> struct ExtractRouteNames
                   shortest_path_set_difference.end(),
                   length_comperator);
         shortest_segment_2 =
-            PickNextLongestSegment(shortest_path_set_difference, shortest_path_segments[0].name_id);
+            PickNextLongestSegment(shortest_path_set_difference, shortest_segment_1.name_id);
 
         // compute the set difference (for alternative path) depending on names between shortest and
         // alternative
@@ -138,7 +138,7 @@ template <class DataFacadeT, class SegmentT> struct ExtractRouteNames
         if (!alternative_path_segments.empty())
         {
             alternative_segment_2 = PickNextLongestSegment(alternative_path_set_difference,
-                                                       alternative_path_segments[0].name_id);
+                                                       alternative_segment_1.name_id);
         }
 
         // move the segments into the order in which they occur.

Algorithms/PolylineCompressor.cpp

@@ -76,17 +76,13 @@ JSON::String PolylineCompressor::printEncodedString(const std::vector<SegmentInf
     std::vector<int> delta_numbers;
     if (!polyline.empty())
     {
-        FixedPointCoordinate last_coordinate = polyline[0].location;
-        delta_numbers.emplace_back(last_coordinate.lat);
-        delta_numbers.emplace_back(last_coordinate.lon);
-        // iterate after skipping the first, already handled, segment
-        for (auto it = ++polyline.cbegin(); it != polyline.cend(); ++it)
+        FixedPointCoordinate last_coordinate = {0, 0};
+        for (const auto &segment : polyline)
         {
-            const auto &segment = *it;
             if (segment.necessary)
             {
-                int lat_diff = segment.location.lat - last_coordinate.lat;
-                int lon_diff = segment.location.lon - last_coordinate.lon;
+                const int lat_diff = segment.location.lat - last_coordinate.lat;
+                const int lon_diff = segment.location.lon - last_coordinate.lon;
                 delta_numbers.emplace_back(lat_diff);
                 delta_numbers.emplace_back(lon_diff);
                 last_coordinate = segment.location;

Algorithms/StronglyConnectedComponents.h

@@ -34,18 +34,22 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../DataStructures/ImportEdge.h"
 #include "../DataStructures/QueryNode.h"
 #include "../DataStructures/Percent.h"
+#include "../DataStructures/Range.h"
 #include "../DataStructures/Restriction.h"
 #include "../DataStructures/TurnInstructions.h"
 
 #include "../Util/OSRMException.h"
 #include "../Util/SimpleLogger.h"
 #include "../Util/StdHashExtensions.h"
+#include "../Util/TimingUtil.h"
 
 #include <osrm/Coordinate.h>
 
 #include <boost/assert.hpp>
 #include <boost/filesystem.hpp>
 
+#include <tbb/parallel_sort.h>
+
 #ifdef __APPLE__
 #include <gdal.h>
 #include <ogrsf_frmts.h>
@@ -67,7 +71,7 @@ class TarjanSCC
   private:
     struct TarjanNode
     {
-        TarjanNode() : index(UINT_MAX), low_link(UINT_MAX), on_stack(false) {}
+        TarjanNode() : index(SPECIAL_NODEID), low_link(SPECIAL_NODEID), on_stack(false) {}
         unsigned index;
         unsigned low_link;
         bool on_stack;
@@ -75,13 +79,10 @@ class TarjanSCC
 
     struct TarjanEdgeData
     {
+        TarjanEdgeData() : distance(INVALID_EDGE_WEIGHT), name_id(INVALID_NAMEID) {}
+        TarjanEdgeData(int distance, unsigned name_id) : distance(distance), name_id(name_id) {}
         int distance;
-        unsigned name_id : 31;
-        bool shortcut : 1;
-        short type;
-        bool forward : 1;
-        bool backward : 1;
-        bool reversedEdge : 1;
+        unsigned name_id;
     };
 
     struct TarjanStackFrame
@@ -94,15 +95,15 @@ class TarjanSCC
     typedef DynamicGraph<TarjanEdgeData> TarjanDynamicGraph;
     typedef TarjanDynamicGraph::InputEdge TarjanEdge;
     typedef std::pair<NodeID, NodeID> RestrictionSource;
-    typedef std::pair<NodeID, bool> restriction_target;
-    typedef std::vector<restriction_target> EmanatingRestrictionsVector;
+    typedef std::pair<NodeID, bool> RestrictionTarget;
+    typedef std::vector<RestrictionTarget> EmanatingRestrictionsVector;
     typedef std::unordered_map<RestrictionSource, unsigned> RestrictionMap;
 
     std::vector<NodeInfo> m_coordinate_list;
     std::vector<EmanatingRestrictionsVector> m_restriction_bucket_list;
     std::shared_ptr<TarjanDynamicGraph> m_node_based_graph;
-    std::unordered_set<NodeID> m_barrier_node_list;
-    std::unordered_set<NodeID> m_traffic_light_list;
+    std::unordered_set<NodeID> barrier_node_list;
+    std::unordered_set<NodeID> traffic_light_list;
     unsigned m_restriction_counter;
     RestrictionMap m_restriction_map;
 
@@ -115,18 +116,18 @@ class TarjanSCC
               std::vector<NodeInfo> &nI)
         : m_coordinate_list(nI), m_restriction_counter(irs.size())
     {
+        TIMER_START(SCC_LOAD);
         for (const TurnRestriction &restriction : irs)
         {
-            std::pair<NodeID, NodeID> restrictionSource = {restriction.fromNode,
-                                                           restriction.viaNode};
-            unsigned index;
-            RestrictionMap::iterator restriction_iterator =
-                m_restriction_map.find(restrictionSource);
+            std::pair<NodeID, NodeID> restriction_source = {restriction.fromNode,
+                                                            restriction.viaNode};
+            unsigned index = 0;
+            const auto restriction_iterator = m_restriction_map.find(restriction_source);
             if (restriction_iterator == m_restriction_map.end())
             {
                 index = m_restriction_bucket_list.size();
                 m_restriction_bucket_list.resize(index + 1);
-                m_restriction_map.emplace(restrictionSource, index);
+                m_restriction_map.emplace(restriction_source, index);
             }
             else
             {
@@ -147,8 +148,8 @@ class TarjanSCC
                 .emplace_back(restriction.toNode, restriction.flags.isOnly);
         }
 
-        m_barrier_node_list.insert(bn.begin(), bn.end());
-        m_traffic_light_list.insert(tl.begin(), tl.end());
+        barrier_node_list.insert(bn.begin(), bn.end());
+        traffic_light_list.insert(tl.begin(), tl.end());
 
         DeallocatingVector<TarjanEdge> edge_list;
         for (const NodeBasedEdge &input_edge : input_edges)
@@ -158,50 +159,37 @@ class TarjanSCC
                 continue;
             }
 
-            TarjanEdge edge;
             if (input_edge.forward)
             {
-                edge.source = input_edge.source;
-                edge.target = input_edge.target;
-                edge.data.forward = input_edge.forward;
-                edge.data.backward = input_edge.backward;
+                edge_list.emplace_back(input_edge.source,
+                                       input_edge.target,
+                                       (std::max)((int)input_edge.weight, 1),
+                                       input_edge.name_id);
             }
-            else
+            if (input_edge.backward)
             {
-                edge.source = input_edge.target;
-                edge.target = input_edge.source;
-                edge.data.backward = input_edge.forward;
-                edge.data.forward = input_edge.backward;
-            }
-
-            edge.data.distance = (std::max)((int)input_edge.weight, 1);
-            BOOST_ASSERT(edge.data.distance > 0);
-            edge.data.shortcut = false;
-            edge.data.name_id = input_edge.name_id;
-            edge.data.type = input_edge.type;
-            edge.data.reversedEdge = false;
-            edge_list.push_back(edge);
-            if (edge.data.backward)
-            {
-                std::swap(edge.source, edge.target);
-                edge.data.forward = input_edge.backward;
-                edge.data.backward = input_edge.forward;
-                edge.data.reversedEdge = true;
-                edge_list.push_back(edge);
+                edge_list.emplace_back(input_edge.target,
+                                       input_edge.source,
+                                       (std::max)((int)input_edge.weight, 1),
+                                       input_edge.name_id);
             }
         }
+        input_edges.clear();
         input_edges.shrink_to_fit();
         BOOST_ASSERT_MSG(0 == input_edges.size() && 0 == input_edges.capacity(),
                          "input edge vector not properly deallocated");
 
-        std::sort(edge_list.begin(), edge_list.end());
+        tbb::parallel_sort(edge_list.begin(), edge_list.end());
         m_node_based_graph = std::make_shared<TarjanDynamicGraph>(number_of_nodes, edge_list);
+        TIMER_STOP(SCC_LOAD);
+        SimpleLogger().Write() << "Loading data into SCC took " << TIMER_MSEC(SCC_LOAD)/1000. << "s";
     }
 
     ~TarjanSCC() { m_node_based_graph.reset(); }
 
     void Run()
     {
+        TIMER_START(SCC_RUN_SETUP);
         // remove files from previous run if exist
         DeleteFileIfExists("component.dbf");
         DeleteFileIfExists("component.shx");
@@ -225,42 +213,56 @@ class TarjanSCC
             throw OSRMException("Creation of output file failed");
         }
 
-        OGRLayer *poLayer = poDS->CreateLayer("component", nullptr, wkbLineString, nullptr);
+        OGRSpatialReference *poSRS = new OGRSpatialReference();
+        poSRS->importFromEPSG(4326);
+
+        OGRLayer *poLayer = poDS->CreateLayer("component", poSRS, wkbLineString, nullptr);
 
         if (nullptr == poLayer)
         {
             throw OSRMException("Layer creation failed.");
         }
+        TIMER_STOP(SCC_RUN_SETUP);
+        SimpleLogger().Write() << "shapefile setup took " << TIMER_MSEC(SCC_RUN_SETUP)/1000. << "s";
 
+        TIMER_START(SCC_RUN);
         // The following is a hack to distinguish between stuff that happens
         // before the recursive call and stuff that happens after
-        std::stack<std::pair<bool, TarjanStackFrame>> recursion_stack;
+        std::stack<TarjanStackFrame> recursion_stack;
         // true = stuff before, false = stuff after call
         std::stack<NodeID> tarjan_stack;
-        std::vector<unsigned> components_index(m_node_based_graph->GetNumberOfNodes(), UINT_MAX);
+        std::vector<unsigned> components_index(m_node_based_graph->GetNumberOfNodes(),
+                                               SPECIAL_NODEID);
         std::vector<NodeID> component_size_vector;
         std::vector<TarjanNode> tarjan_node_list(m_node_based_graph->GetNumberOfNodes());
         unsigned component_index = 0, size_of_current_component = 0;
         int index = 0;
-        NodeID last_node = m_node_based_graph->GetNumberOfNodes();
-        for (NodeID node = 0; node < last_node; ++node)
+        const NodeID last_node = m_node_based_graph->GetNumberOfNodes();
+        std::vector<bool> processing_node_before_recursion(m_node_based_graph->GetNumberOfNodes(), true);
+        for(const NodeID node : osrm::irange(0u, last_node))
         {
-            if (UINT_MAX == components_index[node])
+            if (SPECIAL_NODEID == components_index[node])
             {
-                recursion_stack.emplace(true, TarjanStackFrame(node, node));
+                recursion_stack.emplace(TarjanStackFrame(node, node));
             }
 
             while (!recursion_stack.empty())
             {
-                const bool before_recursion = recursion_stack.top().first;
-                TarjanStackFrame currentFrame = recursion_stack.top().second;
-                NodeID v = currentFrame.v;
+                TarjanStackFrame currentFrame = recursion_stack.top();
+                const NodeID v = currentFrame.v;
                 recursion_stack.pop();
+                const bool before_recursion = processing_node_before_recursion[v];
+
+                if (before_recursion && tarjan_node_list[v].index != UINT_MAX)
+                {
+                    continue;
+                }
 
                 if (before_recursion)
                 {
                     // Mark frame to handle tail of recursion
-                    recursion_stack.emplace(false, currentFrame);
+                    recursion_stack.emplace(currentFrame);
+                    processing_node_before_recursion[v] = false;
 
                     // Mark essential information for SCC
                     tarjan_node_list[v].index = index;
@@ -270,13 +272,13 @@ class TarjanSCC
                     ++index;
 
                     // Traverse outgoing edges
-                    for (auto e2 : m_node_based_graph->GetAdjacentEdgeRange(v))
+                    for (const auto current_edge : m_node_based_graph->GetAdjacentEdgeRange(v))
                     {
                         const TarjanDynamicGraph::NodeIterator vprime =
-                            m_node_based_graph->GetTarget(e2);
-                        if (UINT_MAX == tarjan_node_list[vprime].index)
+                            m_node_based_graph->GetTarget(current_edge);
+                        if (SPECIAL_NODEID == tarjan_node_list[vprime].index)
                         {
-                            recursion_stack.emplace(true, TarjanStackFrame(vprime, v));
+                            recursion_stack.emplace(TarjanStackFrame(vprime, v));
                         }
                         else
                         {
@@ -290,6 +292,7 @@ class TarjanSCC
                 }
                 else
                 {
+                    processing_node_before_recursion[v] = true;
                     tarjan_node_list[currentFrame.parent].low_link =
                         std::min(tarjan_node_list[currentFrame.parent].low_link,
                                  tarjan_node_list[v].low_link);
@@ -322,53 +325,60 @@ class TarjanSCC
             }
         }
 
+        TIMER_STOP(SCC_RUN);
+        SimpleLogger().Write() << "SCC run took: " << TIMER_MSEC(SCC_RUN)/1000. << "s";
         SimpleLogger().Write() << "identified: " << component_size_vector.size()
                                << " many components, marking small components";
 
-        unsigned size_one_counter = std::count_if(component_size_vector.begin(),
-                                                  component_size_vector.end(),
-                                                  [] (unsigned value) { return 1 == value;});
+        TIMER_START(SCC_OUTPUT);
+
+        const unsigned size_one_counter = std::count_if(component_size_vector.begin(),
+                                                        component_size_vector.end(),
+                                                        [](unsigned value)
+                                                        {
+            return 1 == value;
+        });
 
         SimpleLogger().Write() << "identified " << size_one_counter << " SCCs of size 1";
 
         uint64_t total_network_distance = 0;
         p.reinit(m_node_based_graph->GetNumberOfNodes());
-        NodeID last_u_node = m_node_based_graph->GetNumberOfNodes();
-        for (NodeID u = 0; u < last_u_node; ++u)
+        // const NodeID last_u_node = m_node_based_graph->GetNumberOfNodes();
+        for (const NodeID source : osrm::irange(0u, last_node))
         {
             p.printIncrement();
-            for (auto e1 : m_node_based_graph->GetAdjacentEdgeRange(u))
+            for (const auto current_edge : m_node_based_graph->GetAdjacentEdgeRange(source))
             {
-                if (!m_node_based_graph->GetEdgeData(e1).reversedEdge)
-                {
-                    continue;
-                }
-                const TarjanDynamicGraph::NodeIterator v = m_node_based_graph->GetTarget(e1);
+                const TarjanDynamicGraph::NodeIterator target =
+                    m_node_based_graph->GetTarget(current_edge);
 
-                total_network_distance +=
-                    100 * FixedPointCoordinate::ApproximateDistance(m_coordinate_list[u].lat,
-                                                                    m_coordinate_list[u].lon,
-                                                                    m_coordinate_list[v].lat,
-                                                                    m_coordinate_list[v].lon);
-
-                if (SHRT_MAX != m_node_based_graph->GetEdgeData(e1).type)
+                if (source < target ||
+                    m_node_based_graph->EndEdges(target) ==
+                        m_node_based_graph->FindEdge(target, source))
                 {
-                    BOOST_ASSERT(e1 != UINT_MAX);
-                    BOOST_ASSERT(u != UINT_MAX);
-                    BOOST_ASSERT(v != UINT_MAX);
+                    total_network_distance +=
+                        100 * FixedPointCoordinate::ApproximateEuclideanDistance(
+                                  m_coordinate_list[source].lat,
+                                  m_coordinate_list[source].lon,
+                                  m_coordinate_list[target].lat,
+                                  m_coordinate_list[target].lon);
+
+                    BOOST_ASSERT(current_edge != SPECIAL_EDGEID);
+                    BOOST_ASSERT(source != SPECIAL_NODEID);
+                    BOOST_ASSERT(target != SPECIAL_NODEID);
 
                     const unsigned size_of_containing_component =
-                        std::min(component_size_vector[components_index[u]],
-                                 component_size_vector[components_index[v]]);
+                        std::min(component_size_vector[components_index[source]],
+                                 component_size_vector[components_index[target]]);
 
                     // edges that end on bollard nodes may actually be in two distinct components
                     if (size_of_containing_component < 10)
                     {
                         OGRLineString lineString;
-                        lineString.addPoint(m_coordinate_list[u].lon / COORDINATE_PRECISION,
-                                            m_coordinate_list[u].lat / COORDINATE_PRECISION);
-                        lineString.addPoint(m_coordinate_list[v].lon / COORDINATE_PRECISION,
-                                            m_coordinate_list[v].lat / COORDINATE_PRECISION);
+                        lineString.addPoint(m_coordinate_list[source].lon / COORDINATE_PRECISION,
+                                            m_coordinate_list[source].lat / COORDINATE_PRECISION);
+                        lineString.addPoint(m_coordinate_list[target].lon / COORDINATE_PRECISION,
+                                            m_coordinate_list[target].lat / COORDINATE_PRECISION);
 
                         OGRFeature *poFeature = OGRFeature::CreateFeature(poLayer->GetLayerDefn());
 
@@ -383,24 +393,27 @@ class TarjanSCC
             }
         }
         OGRDataSource::DestroyDataSource(poDS);
-        std::vector<NodeID>().swap(component_size_vector);
+        component_size_vector.clear();
+        component_size_vector.shrink_to_fit();
         BOOST_ASSERT_MSG(0 == component_size_vector.size() && 0 == component_size_vector.capacity(),
                          "component_size_vector not properly deallocated");
 
-        std::vector<NodeID>().swap(components_index);
+        components_index.clear();
+        components_index.shrink_to_fit();
         BOOST_ASSERT_MSG(0 == components_index.size() && 0 == components_index.capacity(),
-                         "icomponents_index not properly deallocated");
+                         "components_index not properly deallocated");
+        TIMER_STOP(SCC_OUTPUT);
+        SimpleLogger().Write() << "generating output took: " << TIMER_MSEC(SCC_OUTPUT)/1000. << "s";
 
-        SimpleLogger().Write() << "total network distance: " << (uint64_t)total_network_distance /
-                                                                    100 / 1000. << " km";
+        SimpleLogger().Write() << "total network distance: "
+                               << (uint64_t)total_network_distance / 100 / 1000. << " km";
     }
 
   private:
     unsigned CheckForEmanatingIsOnlyTurn(const NodeID u, const NodeID v) const
     {
         std::pair<NodeID, NodeID> restriction_source = {u, v};
-        RestrictionMap::const_iterator restriction_iterator =
-            m_restriction_map.find(restriction_source);
+        const auto restriction_iterator = m_restriction_map.find(restriction_source);
         if (restriction_iterator != m_restriction_map.end())
         {
             const unsigned index = restriction_iterator->second;
@@ -412,19 +425,18 @@ class TarjanSCC
                 }
             }
         }
-        return UINT_MAX;
+        return SPECIAL_NODEID;
     }
 
     bool CheckIfTurnIsRestricted(const NodeID u, const NodeID v, const NodeID w) const
     {
         // only add an edge if turn is not a U-turn except it is the end of dead-end street.
         std::pair<NodeID, NodeID> restriction_source = {u, v};
-        RestrictionMap::const_iterator restriction_iterator =
-            m_restriction_map.find(restriction_source);
+        const auto restriction_iterator = m_restriction_map.find(restriction_source);
         if (restriction_iterator != m_restriction_map.end())
         {
             const unsigned index = restriction_iterator->second;
-            for (const restriction_target &restriction_target : m_restriction_bucket_list.at(index))
+            for (const RestrictionTarget &restriction_target : m_restriction_bucket_list.at(index))
             {
                 if (w == restriction_target.first)
                 {

Benchmarks/StaticRTreeBench.cpp

@@ -0,0 +1,118 @@
+#include "../DataStructures/OriginalEdgeData.h"
+#include "../DataStructures/QueryNode.h"
+#include "../DataStructures/SharedMemoryVectorWrapper.h"
+#include "../DataStructures/StaticRTree.h"
+#include "../Util/BoostFileSystemFix.h"
+#include "../DataStructures/EdgeBasedNode.h"
+
+#include <osrm/Coordinate.h>
+
+#include <random>
+
+// Choosen by a fair W20 dice roll (this value is completely arbitrary)
+constexpr unsigned RANDOM_SEED = 13;
+constexpr int32_t WORLD_MIN_LAT = -90*COORDINATE_PRECISION;
+constexpr int32_t WORLD_MAX_LAT = 90*COORDINATE_PRECISION;
+constexpr int32_t WORLD_MIN_LON = -180*COORDINATE_PRECISION;
+constexpr int32_t WORLD_MAX_LON = 180*COORDINATE_PRECISION;
+
+typedef EdgeBasedNode RTreeLeaf;
+typedef std::shared_ptr<std::vector<FixedPointCoordinate>> FixedPointCoordinateListPtr;
+typedef StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, false>::vector, false> BenchStaticRTree;
+
+FixedPointCoordinateListPtr LoadCoordinates(const boost::filesystem::path& nodes_file)
+{
+    boost::filesystem::ifstream nodes_input_stream(nodes_file, std::ios::binary);
+
+    NodeInfo current_node;
+    unsigned number_of_coordinates = 0;
+    nodes_input_stream.read((char *)&number_of_coordinates, sizeof(unsigned));
+    auto coords = std::make_shared<std::vector<FixedPointCoordinate>>(number_of_coordinates);
+    for (unsigned i = 0; i < number_of_coordinates; ++i)
+    {
+        nodes_input_stream.read((char *)&current_node, sizeof(NodeInfo));
+        coords->at(i) = FixedPointCoordinate(current_node.lat, current_node.lon);
+        BOOST_ASSERT((std::abs(coords->at(i).lat) >> 30) == 0);
+        BOOST_ASSERT((std::abs(coords->at(i).lon) >> 30) == 0);
+    }
+    nodes_input_stream.close();
+    return coords;
+}
+
+void Benchmark(BenchStaticRTree& rtree, unsigned num_queries)
+{
+    std::mt19937 g(RANDOM_SEED);
+    std::uniform_int_distribution<> lat_udist(WORLD_MIN_LAT, WORLD_MAX_LAT);
+    std::uniform_int_distribution<> lon_udist(WORLD_MIN_LON, WORLD_MAX_LON);
+    std::vector<FixedPointCoordinate> queries;
+    for (unsigned i = 0; i < num_queries; i++)
+    {
+        queries.emplace_back(
+            FixedPointCoordinate(lat_udist(g), lon_udist(g))
+        );
+    }
+
+    const unsigned num_results = 5;
+    std::cout << "#### IncrementalFindPhantomNodeForCoordinate : " << num_results << " phantom nodes" << std::endl;
+
+    TIMER_START(query_phantom);
+    std::vector<PhantomNode> resulting_phantom_node_vector;
+    for (const auto& q : queries)
+    {
+        resulting_phantom_node_vector.clear();
+        rtree.IncrementalFindPhantomNodeForCoordinate(q, resulting_phantom_node_vector, 3, num_results);
+        resulting_phantom_node_vector.clear();
+        rtree.IncrementalFindPhantomNodeForCoordinate(q, resulting_phantom_node_vector, 17, num_results);
+    }
+    TIMER_STOP(query_phantom);
+
+    std::cout << "Took " << TIMER_MSEC(query_phantom) << " msec for " << num_queries << " queries." << std::endl;
+    std::cout << TIMER_MSEC(query_phantom)/((double) num_queries) << " msec/query." << std::endl;
+
+    std::cout << "#### LocateClosestEndPointForCoordinate" << std::endl;
+
+    TIMER_START(query_endpoint);
+    FixedPointCoordinate result;
+    for (const auto& q : queries)
+    {
+        rtree.LocateClosestEndPointForCoordinate(q, result, 3);
+    }
+    TIMER_STOP(query_endpoint);
+
+    std::cout << "Took " << TIMER_MSEC(query_endpoint) << " msec for " << num_queries << " queries." << std::endl;
+    std::cout << TIMER_MSEC(query_endpoint)/((double) num_queries) << " msec/query." << std::endl;
+
+    std::cout << "#### FindPhantomNodeForCoordinate" << std::endl;
+
+    TIMER_START(query_phantomnode);
+    for (const auto& q : queries)
+    {
+        PhantomNode phantom;
+        rtree.FindPhantomNodeForCoordinate(q, phantom, 3);
+    }
+    TIMER_STOP(query_phantomnode);
+
+    std::cout << "Took " << TIMER_MSEC(query_phantomnode) << " msec for " << num_queries << " queries." << std::endl;
+    std::cout << TIMER_MSEC(query_phantomnode)/((double) num_queries) << " msec/query." << std::endl;
+}
+
+int main(int argc, char** argv)
+{
+    if (argc < 4)
+    {
+        std::cout << "./rtree-bench file.ramIndex file.fileIndx file.nodes" << std::endl;
+        return 1;
+    }
+
+    const char* ramPath  = argv[1];
+    const char* filePath = argv[2];
+    const char* nodesPath = argv[3];
+
+    auto coords = LoadCoordinates(nodesPath);
+
+    BenchStaticRTree rtree(ramPath, filePath, coords);
+
+    Benchmark(rtree, 10000);
+
+    return 0;
+}

CMakeLists.txt

@@ -1,4 +1,11 @@
 cmake_minimum_required(VERSION 2.8)
+
+if( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE )
+  message(FATAL_ERROR "In-source builds are not allowed.
+Please create a directory and run cmake from there, passing the path to this source directory as the last argument.
+This process created the file `CMakeCache.txt' and the directory `CMakeFiles'. Please delete them.")
+endif()
+
 project(OSRM)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 include(CheckCXXCompilerFlag)
@@ -20,7 +27,8 @@ if (WIN32 AND MSVC_VERSION LESS 1800)
   message(FATAL_ERROR "Building with Microsoft compiler needs Visual Studio 2013 or later (Express version works too)")
 endif()
 
-OPTION(WITH_TOOLS "Build ORSM tools" OFF)
+OPTION(WITH_TOOLS "Build OSRM tools" OFF)
+OPTION(BUILD_TOOLS "Build OSRM tools" OFF)
 
 include_directories(${CMAKE_SOURCE_DIR}/Include/)
 
@@ -33,8 +41,10 @@ add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/Util/FingerPrint.cpp FingerPrint.c
   VERBATIM)
 
 add_custom_target(FingerPrintConfigure DEPENDS ${CMAKE_SOURCE_DIR}/Util/FingerPrint.cpp)
+add_custom_target(tests DEPENDS datastructure-tests)
+add_custom_target(benchmarks DEPENDS rtree-bench)
 
-set(BOOST_COMPONENTS date_time filesystem iostreams program_options regex system thread)
+set(BOOST_COMPONENTS date_time filesystem iostreams program_options regex system thread unit_test_framework)
 
 configure_file(
   ${CMAKE_SOURCE_DIR}/Util/GitDescription.cpp.in
@@ -57,6 +67,7 @@ file(GLOB CoordinateGlob DataStructures/Coordinate.cpp)
 file(GLOB AlgorithmGlob Algorithms/*.cpp)
 file(GLOB HttpGlob Server/Http/*.cpp)
 file(GLOB LibOSRMGlob Library/*.cpp)
+file(GLOB DataStructureTestsGlob UnitTests/DataStructures/*.cpp DataStructures/HilbertValue.cpp)
 
 set(
   OSRMSources
@@ -76,6 +87,12 @@ add_dependencies(FINGERPRINT FingerPrintConfigure)
 add_executable(osrm-routed routed.cpp ${ServerGlob})
 add_executable(osrm-datastore datastore.cpp)
 
+# Unit tests
+add_executable(datastructure-tests EXCLUDE_FROM_ALL UnitTests/datastructure_tests.cpp ${DataStructureTestsGlob})
+
+# Benchmarks
+add_executable(rtree-bench EXCLUDE_FROM_ALL Benchmarks/StaticRTreeBench.cpp)
+
 # Check the release mode
 if(NOT CMAKE_BUILD_TYPE MATCHES Debug)
   set(CMAKE_BUILD_TYPE Release)
@@ -106,6 +123,10 @@ if(CMAKE_BUILD_TYPE MATCHES Release)
   endif (HAS_LTO_FLAG)
 endif()
 
+if (NOT WIN32)
+add_definitions(-DBOOST_TEST_DYN_LINK)
+endif()
+
 # Configuring compilers
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   # using Clang
@@ -117,7 +138,6 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     add_definitions(-DM_PI=3.141592653589793238462643383) # define M_PI
     add_definitions(-DWIN32)
     SET(OPTIONAL_SOCKET_LIBS ws2_32 wsock32)
-    SET(OPTIONAL_OMP_LIB gomp)
   endif()
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
   # using Intel C++
@@ -182,11 +202,16 @@ target_link_libraries(osrm-extract ${Boost_LIBRARIES} FINGERPRINT GITDESCRIPTION
 target_link_libraries(osrm-prepare ${Boost_LIBRARIES} FINGERPRINT GITDESCRIPTION COORDLIB IMPORT)
 target_link_libraries(osrm-routed ${Boost_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} OSRM FINGERPRINT GITDESCRIPTION)
 target_link_libraries(osrm-datastore ${Boost_LIBRARIES} FINGERPRINT GITDESCRIPTION COORDLIB)
+target_link_libraries(datastructure-tests ${Boost_LIBRARIES} COORDLIB)
+target_link_libraries(rtree-bench ${Boost_LIBRARIES} COORDLIB)
 
 find_package(Threads REQUIRED)
-target_link_libraries(osrm-extract ${CMAKE_THREAD_LIBS_INIT} ${OPTIONAL_OMP_LIB})
+target_link_libraries(osrm-extract ${CMAKE_THREAD_LIBS_INIT})
 target_link_libraries(osrm-datastore ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(osrm-prepare ${CMAKE_THREAD_LIBS_INIT})
 target_link_libraries(OSRM ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(datastructure-tests ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(rtree-bench ${CMAKE_THREAD_LIBS_INIT})
 
 find_package(TBB REQUIRED)
 if(WIN32 AND CMAKE_BUILD_TYPE MATCHES Debug)
@@ -196,6 +221,8 @@ target_link_libraries(osrm-datastore ${TBB_LIBRARIES})
 target_link_libraries(osrm-extract ${TBB_LIBRARIES})
 target_link_libraries(osrm-prepare ${TBB_LIBRARIES})
 target_link_libraries(osrm-routed ${TBB_LIBRARIES})
+target_link_libraries(datastructure-tests ${TBB_LIBRARIES})
+target_link_libraries(rtree-bench ${TBB_LIBRARIES})
 include_directories(${TBB_INCLUDE_DIR})
 
 find_package(Lua52)
@@ -253,7 +280,7 @@ include_directories(${ZLIB_INCLUDE_DIRS})
 target_link_libraries(osrm-extract ${ZLIB_LIBRARY})
 target_link_libraries(osrm-routed ${ZLIB_LIBRARY})
 
-if(WITH_TOOLS)
+if(WITH_TOOLS OR BUILD_TOOLS)
   message(STATUS "Activating OSRM internal tools")
   find_package(GDAL)
   if(GDAL_FOUND)
@@ -263,6 +290,7 @@ if(WITH_TOOLS)
     target_link_libraries(
       osrm-components
       ${GDAL_LIBRARIES} ${Boost_LIBRARIES} FINGERPRINT GITDESCRIPTION COORDLIB)
+    install(TARGETS osrm-components DESTINATION bin)
   else()
     message(FATAL_ERROR "libgdal and/or development headers not found")
   endif()
@@ -276,6 +304,13 @@ if(WITH_TOOLS)
   if(UNIX AND NOT APPLE)
     target_link_libraries(osrm-unlock-all rt)
   endif()
+  add_executable(osrm-check-hsgr Tools/check-hsgr.cpp)
+  target_link_libraries(osrm-check-hsgr ${Boost_LIBRARIES} GITDESCRIPTION FINGERPRINT)
+
+  install(TARGETS osrm-cli DESTINATION bin)
+  install(TARGETS osrm-io-benchmark DESTINATION bin)
+  install(TARGETS osrm-unlock-all DESTINATION bin)
+  install(TARGETS osrm-check-hsgr DESTINATION bin)
 endif()
 
 file(GLOB InstallGlob Include/osrm/*.h Library/OSRM.h)
@@ -305,3 +340,8 @@ endforeach ()
 
 configure_file(${CMAKE_SOURCE_DIR}/cmake/pkgconfig.in libosrm.pc @ONLY)
 install(FILES ${PROJECT_BINARY_DIR}/libosrm.pc DESTINATION lib/pkgconfig)
+
+if(BUILD_DEBIAN_PACKAGE)
+  include(CPackDebianConfig)
+  include(CPack)
+endif()

Contractor/Contractor.h

@@ -28,19 +28,23 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef CONTRACTOR_H
 #define CONTRACTOR_H
 
-#include "TemporaryStorage.h"
 #include "../DataStructures/BinaryHeap.h"
 #include "../DataStructures/DeallocatingVector.h"
 #include "../DataStructures/DynamicGraph.h"
 #include "../DataStructures/Percent.h"
+#include "../DataStructures/QueryEdge.h"
+#include "../DataStructures/Range.h"
 #include "../DataStructures/XORFastHash.h"
 #include "../DataStructures/XORFastHashStorage.h"
 #include "../Util/SimpleLogger.h"
 #include "../Util/StringUtil.h"
 #include "../Util/TimingUtil.h"
+#include "../typedefs.h"
 
 #include <boost/assert.hpp>
 
+#include <stxxl/vector>
+
 #include <tbb/enumerable_thread_specific.h>
 #include <tbb/parallel_for.h>
 #include <tbb/parallel_sort.h>
@@ -60,15 +64,15 @@ class Contractor
               is_original_via_node_ID(false)
         {
         }
-        ContractorEdgeData(unsigned _distance,
-                           unsigned _originalEdges,
-                           unsigned _id,
-                           bool _shortcut,
-                           bool _forward,
-                           bool _backward)
-            : distance(_distance), id(_id),
-              originalEdges(std::min((unsigned)1 << 28, _originalEdges)), shortcut(_shortcut),
-              forward(_forward), backward(_backward), is_original_via_node_ID(false)
+        ContractorEdgeData(unsigned distance,
+                           unsigned original_edges,
+                           unsigned id,
+                           bool shortcut,
+                           bool forward,
+                           bool backward)
+            : distance(distance), id(id),
+              originalEdges(std::min((unsigned)1 << 28, original_edges)), shortcut(shortcut),
+              forward(forward), backward(backward), is_original_via_node_ID(false)
         {
         }
         unsigned distance;
@@ -156,41 +160,38 @@ class Contractor
     {
         std::vector<ContractorEdge> edges;
         edges.reserve(input_edge_list.size() * 2);
-        temp_edge_counter = 0;
 
-        auto diter = input_edge_list.dbegin();
-        auto dend = input_edge_list.dend();
-
-        ContractorEdge new_edge;
-        while (diter != dend)
+        const auto dend = input_edge_list.dend();
+        for (auto diter = input_edge_list.dbegin(); diter != dend; ++diter)
         {
-            new_edge.source = diter->source;
-            new_edge.target = diter->target;
-            new_edge.data = { static_cast<unsigned int>(std::max(diter->weight, 1)),
-                              1,
-                              diter->edge_id,
-                              false,
-                              diter->forward,
-                              diter->backward};
-
-            BOOST_ASSERT_MSG(new_edge.data.distance > 0, "edge distance < 1");
+            BOOST_ASSERT_MSG(static_cast<unsigned int>(std::max(diter->weight, 1)) > 0, "edge distance < 1");
 #ifndef NDEBUG
-            if (new_edge.data.distance > 24 * 60 * 60 * 10)
+            if (static_cast<unsigned int>(std::max(diter->weight, 1)) > 24 * 60 * 60 * 10)
             {
                 SimpleLogger().Write(logWARNING) << "Edge weight large -> "
-                                                 << new_edge.data.distance;
+                                                 << static_cast<unsigned int>(std::max(diter->weight, 1));
             }
 #endif
-            edges.push_back(new_edge);
-            std::swap(new_edge.source, new_edge.target);
-            new_edge.data.forward = diter->backward;
-            new_edge.data.backward = diter->forward;
-            edges.push_back(new_edge);
-            ++diter;
+            edges.emplace_back(diter->source, diter->target,
+                static_cast<unsigned int>(std::max(diter->weight, 1)),
+                1,
+                diter->edge_id,
+                false,
+                diter->forward ? true : false,
+                diter->backward ? true : false);
+
+            edges.emplace_back(diter->target, diter->source,
+                static_cast<unsigned int>(std::max(diter->weight, 1)),
+                1,
+                diter->edge_id,
+                false,
+                diter->backward ? true : false,
+                diter->forward ? true : false);
         }
         // clear input vector
-        edges.shrink_to_fit();
         input_edge_list.clear();
+        edges.shrink_to_fit();
+
         tbb::parallel_sort(edges.begin(), edges.end());
         NodeID edge = 0;
         for (NodeID i = 0; i < edges.size();)
@@ -201,7 +202,7 @@ class Contractor
             // remove eigenloops
             if (source == target)
             {
-                i++;
+                ++i;
                 continue;
             }
             ContractorEdge forward_edge;
@@ -280,13 +281,10 @@ class Contractor
         //            << "); via: " << contractor_graph->GetEdgeData(i).via;
         //        }
 
-        // Create temporary file
-
-        edge_storage_slot = TemporaryStorage::GetInstance().AllocateSlot();
         std::cout << "contractor finished initalization" << std::endl;
     }
 
-    ~Contractor() { TemporaryStorage::GetInstance().DeallocateSlot(edge_storage_slot); }
+    ~Contractor() { }
 
     void Run()
     {
@@ -362,7 +360,7 @@ class Contractor
 
                 // build forward and backward renumbering map and remap ids in remaining_nodes and
                 // Priorities.
-                for (unsigned new_node_id = 0; new_node_id < remaining_nodes.size(); ++new_node_id)
+                for (const auto new_node_id : osrm::irange<std::size_t>(0, remaining_nodes.size()))
                 {
                     // create renumbering maps in both directions
                     orig_node_id_to_new_id_map[new_node_id] = remaining_nodes[new_node_id].id;
@@ -371,9 +369,8 @@ class Contractor
                         node_priorities[remaining_nodes[new_node_id].id];
                     remaining_nodes[new_node_id].id = new_node_id;
                 }
-                TemporaryStorage &temporary_storage = TemporaryStorage::GetInstance();
                 // walk over all nodes
-                for (unsigned i = 0; i < contractor_graph->GetNumberOfNodes(); ++i)
+                for (const auto i : osrm::irange<std::size_t>(0, contractor_graph->GetNumberOfNodes()))
                 {
                     const NodeID source = i;
                     for (auto current_edge : contractor_graph->GetAdjacentEdgeRange(source))
@@ -381,26 +378,20 @@ class Contractor
                         ContractorGraph::EdgeData &data =
                             contractor_graph->GetEdgeData(current_edge);
                         const NodeID target = contractor_graph->GetTarget(current_edge);
-                        if (UINT_MAX == new_node_id_from_orig_id_map[i])
+                        if (SPECIAL_NODEID == new_node_id_from_orig_id_map[i])
                         {
-                            // Save edges of this node w/o renumbering.
-                            temporary_storage.WriteToSlot(
-                                edge_storage_slot, (char *)&source, sizeof(NodeID));
-                            temporary_storage.WriteToSlot(
-                                edge_storage_slot, (char *)&target, sizeof(NodeID));
-                            temporary_storage.WriteToSlot(edge_storage_slot,
-                                                          (char *)&data,
-                                                          sizeof(ContractorGraph::EdgeData));
-                            ++temp_edge_counter;
+                            external_edge_list.push_back({source, target, data});
                         }
                         else
                         {
                             // node is not yet contracted.
                             // add (renumbered) outgoing edges to new DynamicGraph.
-                            ContractorEdge new_edge;
-                            new_edge.source = new_node_id_from_orig_id_map[source];
-                            new_edge.target = new_node_id_from_orig_id_map[target];
-                            new_edge.data = data;
+                            ContractorEdge new_edge = {
+                                new_node_id_from_orig_id_map[source],
+                                new_node_id_from_orig_id_map[target],
+                                data
+                            };
+
                             new_edge.data.is_original_via_node_ID = true;
                             BOOST_ASSERT_MSG(UINT_MAX != new_node_id_from_orig_id_map[source],
                                              "new source id not resolveable");
@@ -569,7 +560,7 @@ class Contractor
         if (contractor_graph->GetNumberOfNodes())
         {
             Edge new_edge;
-            for (NodeID node = 0; node < number_of_nodes; ++node)
+            for (const auto node : osrm::irange(0u, number_of_nodes))
             {
                 p.printStatus(node);
                 for (auto edge : contractor_graph->GetAdjacentEdgeRange(node))
@@ -611,29 +602,9 @@ class Contractor
         orig_node_id_to_new_id_map.shrink_to_fit();
 
         BOOST_ASSERT(0 == orig_node_id_to_new_id_map.capacity());
-        TemporaryStorage &temporary_storage = TemporaryStorage::GetInstance();
-        // loads edges of graph before renumbering, no need for further numbering action.
-        NodeID source;
-        NodeID target;
-        ContractorGraph::EdgeData data;
 
-        Edge restored_edge;
-        for (unsigned i = 0; i < temp_edge_counter; ++i)
-        {
-            temporary_storage.ReadFromSlot(edge_storage_slot, (char *)&source, sizeof(NodeID));
-            temporary_storage.ReadFromSlot(edge_storage_slot, (char *)&target, sizeof(NodeID));
-            temporary_storage.ReadFromSlot(
-                edge_storage_slot, (char *)&data, sizeof(ContractorGraph::EdgeData));
-            restored_edge.source = source;
-            restored_edge.target = target;
-            restored_edge.data.distance = data.distance;
-            restored_edge.data.shortcut = data.shortcut;
-            restored_edge.data.id = data.id;
-            restored_edge.data.forward = data.forward;
-            restored_edge.data.backward = data.backward;
-            edges.push_back(restored_edge);
-        }
-        temporary_storage.DeallocateSlot(edge_storage_slot);
+        edges.append(external_edge_list.begin(), external_edge_list.end());
+        external_edge_list.clear();
     }
 
   private:
@@ -648,7 +619,7 @@ class Contractor
 
         int nodes = 0;
         unsigned number_of_targets_found = 0;
-        while (heap.Size() > 0)
+        while (!heap.Empty())
         {
             const NodeID node = heap.DeleteMin();
             const int distance = heap.GetKey(node);
@@ -658,12 +629,12 @@ class Contractor
             {
                 return;
             }
-            // Destination settled?
             if (distance > max_distance)
             {
                 return;
             }
 
+            // Destination settled?
             if (heap.GetData(node).target)
             {
                 ++number_of_targets_found;
@@ -731,7 +702,7 @@ class Contractor
 
     template <bool RUNSIMULATION>
     inline bool
-    ContractNode(ContractorThreadData *data, NodeID node, ContractionStats *stats = nullptr)
+    ContractNode(ContractorThreadData *data, const NodeID node, ContractionStats *stats = nullptr)
     {
         ContractorHeap &heap = data->heap;
         int inserted_edges_size = data->inserted_edges.size();
@@ -803,21 +774,19 @@ class Contractor
                     }
                     else
                     {
-                        ContractorEdge new_edge;
-                        new_edge.source = source;
-                        new_edge.target = target;
-                        new_edge.data =
-                            ContractorEdgeData(path_distance,
-                                               out_data.originalEdges + in_data.originalEdges,
-                                               node /*, 0, in_data.turnInstruction*/,
-                                               true,
-                                               true,
-                                               false);
-                        inserted_edges.push_back(new_edge);
-                        std::swap(new_edge.source, new_edge.target);
-                        new_edge.data.forward = false;
-                        new_edge.data.backward = true;
-                        inserted_edges.push_back(new_edge);
+                        inserted_edges.emplace_back(source, target, path_distance,
+                                                    out_data.originalEdges + in_data.originalEdges,
+                                                    node,
+                                                    true,
+                                                    true,
+                                                    false);
+
+                        inserted_edges.emplace_back(target, source, path_distance,
+                                                    out_data.originalEdges + in_data.originalEdges,
+                                                    node,
+                                                    true,
+                                                    false,
+                                                    true);
                     }
                 }
             }
@@ -879,7 +848,7 @@ class Contractor
         std::sort(neighbours.begin(), neighbours.end());
         neighbours.resize(std::unique(neighbours.begin(), neighbours.end()) - neighbours.begin());
 
-        for (int i = 0, e = (int)neighbours.size(); i < e; ++i)
+        for (const auto i : osrm::irange<std::size_t>(0, neighbours.size()))
         {
             contractor_graph->DeleteEdgesTo(neighbours[i], node);
         }
@@ -917,7 +886,7 @@ class Contractor
     }
 
     inline bool IsNodeIndependent(
-        const std::vector<float> &priorities /*, const std::vector< NodePriorityData >& node_data*/,
+        const std::vector<float> &priorities,
         ContractorThreadData *const data,
         NodeID node) const
     {
@@ -963,7 +932,7 @@ class Contractor
                     continue;
                 }
                 const float target_priority = priorities[target];
-                assert(target_priority >= 0);
+                BOOST_ASSERT(target_priority >= 0);
                 // found a neighbour with lower priority?
                 if (priority > target_priority)
                 {
@@ -983,8 +952,8 @@ class Contractor
     // This bias function takes up 22 assembly instructions in total on X86
     inline bool bias(const NodeID a, const NodeID b) const
     {
-        unsigned short hasha = fast_hash(a);
-        unsigned short hashb = fast_hash(b);
+        const unsigned short hasha = fast_hash(a);
+        const unsigned short hashb = fast_hash(b);
 
         // The compiler optimizes that to conditional register flags but without branching
         // statements!
@@ -997,8 +966,7 @@ class Contractor
 
     std::shared_ptr<ContractorGraph> contractor_graph;
     std::vector<ContractorGraph::InputEdge> contracted_edge_list;
-    unsigned edge_storage_slot;
-    uint64_t temp_edge_counter;
+    stxxl::vector<QueryEdge> external_edge_list;
     std::vector<NodeID> orig_node_id_to_new_id_map;
     XORFastHash fast_hash;
 };

Contractor/EdgeBasedGraphFactory.cpp

@@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "EdgeBasedGraphFactory.h"
 #include "../Algorithms/BFSComponentExplorer.h"
 #include "../DataStructures/Percent.h"
+#include "../DataStructures/Range.h"
 #include "../Util/ComputeAngle.h"
 #include "../Util/LuaUtil.h"
 #include "../Util/SimpleLogger.h"
@@ -77,33 +78,29 @@ void EdgeBasedGraphFactory::GetEdgeBasedNodes(std::vector<EdgeBasedNode> &nodes)
 }
 
 void
-EdgeBasedGraphFactory::InsertEdgeBasedNode(NodeID u, NodeID v, EdgeID e1, bool belongs_to_tiny_cc)
+EdgeBasedGraphFactory::InsertEdgeBasedNode(const NodeID node_u, const NodeID node_v, const bool belongs_to_tiny_cc)
 {
     // merge edges together into one EdgeBasedNode
-    BOOST_ASSERT(u != SPECIAL_NODEID);
-    BOOST_ASSERT(v != SPECIAL_NODEID);
-    BOOST_ASSERT(e1 != SPECIAL_EDGEID);
+    BOOST_ASSERT(node_u != SPECIAL_NODEID);
+    BOOST_ASSERT(node_v != SPECIAL_NODEID);
 
-#ifndef NDEBUG
     // find forward edge id and
-    const EdgeID e1b = m_node_based_graph->FindEdge(u, v);
-    BOOST_ASSERT(e1 == e1b);
-#endif
-
+    const EdgeID e1 = m_node_based_graph->FindEdge(node_u, node_v);
     BOOST_ASSERT(e1 != SPECIAL_EDGEID);
+
     const EdgeData &forward_data = m_node_based_graph->GetEdgeData(e1);
 
     // find reverse edge id and
-    const EdgeID e2 = m_node_based_graph->FindEdge(v, u);
+    const EdgeID e2 = m_node_based_graph->FindEdge(node_v, node_u);
 
 #ifndef NDEBUG
-    if (e2 == m_node_based_graph->EndEdges(v))
+    if (e2 == m_node_based_graph->EndEdges(node_v))
     {
-        SimpleLogger().Write(logWARNING) << "Did not find edge (" << v << "," << u << ")";
+        SimpleLogger().Write(logWARNING) << "Did not find edge (" << node_v << "," << node_u << ")";
     }
 #endif
     BOOST_ASSERT(e2 != SPECIAL_EDGEID);
-    BOOST_ASSERT(e2 < m_node_based_graph->EndEdges(v));
+    BOOST_ASSERT(e2 < m_node_based_graph->EndEdges(node_v));
     const EdgeData &reverse_data = m_node_based_graph->GetEdgeData(e2);
 
     if (forward_data.edgeBasedNodeID == SPECIAL_NODEID &&
@@ -125,6 +122,8 @@ EdgeBasedGraphFactory::InsertEdgeBasedNode(NodeID u, NodeID v, EdgeID e1, bool b
             m_geometry_compressor.GetBucketReference(e2);
         BOOST_ASSERT(forward_geometry.size() == reverse_geometry.size());
         BOOST_ASSERT(0 != forward_geometry.size());
+        const unsigned geometry_size = forward_geometry.size();
+        BOOST_ASSERT(geometry_size > 1);
 
         // reconstruct bidirectional edge with individual weights and put each into the NN index
 
@@ -135,7 +134,7 @@ EdgeBasedGraphFactory::InsertEdgeBasedNode(NodeID u, NodeID v, EdgeID e1, bool b
         // TODO: move to lambda function with C++11
         int temp_sum = 0;
 
-        for (unsigned i = 0; i < forward_geometry.size(); ++i)
+        for (const auto i : osrm::irange(0u, geometry_size))
         {
             forward_dist_prefix_sum[i] = temp_sum;
             temp_sum += forward_geometry[i].second;
@@ -144,20 +143,16 @@ EdgeBasedGraphFactory::InsertEdgeBasedNode(NodeID u, NodeID v, EdgeID e1, bool b
         }
 
         temp_sum = 0;
-        for (unsigned i = 0; i < reverse_geometry.size(); ++i)
+        for (const auto i : osrm::irange(0u, geometry_size))
         {
             temp_sum += reverse_geometry[reverse_geometry.size() - 1 - i].second;
             reverse_dist_prefix_sum[i] = reverse_data.distance - temp_sum;
-            BOOST_ASSERT(reverse_data.distance >= temp_sum);
+            // BOOST_ASSERT(reverse_data.distance >= temp_sum);
         }
 
-        BOOST_ASSERT(forward_geometry.size() == reverse_geometry.size());
+        NodeID current_edge_source_coordinate_id = node_u;
 
-        const unsigned geometry_size = forward_geometry.size();
-        BOOST_ASSERT(geometry_size > 1);
-        NodeID current_edge_source_coordinate_id = u;
-
-        if (forward_data.edgeBasedNodeID != SPECIAL_NODEID)
+        if (SPECIAL_NODEID != forward_data.edgeBasedNodeID)
         {
             max_id = std::max(forward_data.edgeBasedNodeID, max_id);
         }
@@ -167,7 +162,7 @@ EdgeBasedGraphFactory::InsertEdgeBasedNode(NodeID u, NodeID v, EdgeID e1, bool b
         }
 
         // traverse arrays from start and end respectively
-        for (unsigned i = 0; i < geometry_size; ++i)
+        for (const auto i : osrm::irange(0u, geometry_size))
         {
             BOOST_ASSERT(current_edge_source_coordinate_id ==
                          reverse_geometry[geometry_size - 1 - i].first);
@@ -191,14 +186,14 @@ EdgeBasedGraphFactory::InsertEdgeBasedNode(NodeID u, NodeID v, EdgeID e1, bool b
 
             BOOST_ASSERT(m_edge_based_node_list.back().IsCompressed());
 
-            BOOST_ASSERT(u != m_edge_based_node_list.back().u ||
-                         v != m_edge_based_node_list.back().v);
+            BOOST_ASSERT(node_u != m_edge_based_node_list.back().u ||
+                         node_v != m_edge_based_node_list.back().v);
 
-            BOOST_ASSERT(u != m_edge_based_node_list.back().v ||
-                         v != m_edge_based_node_list.back().u);
+            BOOST_ASSERT(node_u != m_edge_based_node_list.back().v ||
+                         node_v != m_edge_based_node_list.back().u);
         }
 
-        BOOST_ASSERT(current_edge_source_coordinate_id == v);
+        BOOST_ASSERT(current_edge_source_coordinate_id == node_v);
         BOOST_ASSERT(m_edge_based_node_list.back().IsCompressed());
     }
     else
@@ -225,18 +220,18 @@ EdgeBasedGraphFactory::InsertEdgeBasedNode(NodeID u, NodeID v, EdgeID e1, bool b
         BOOST_ASSERT(forward_data.edgeBasedNodeID != SPECIAL_NODEID ||
                      reverse_data.edgeBasedNodeID != SPECIAL_NODEID);
 
-        m_edge_based_node_list.emplace_back(EdgeBasedNode(forward_data.edgeBasedNodeID,
-                                                          reverse_data.edgeBasedNodeID,
-                                                          u,
-                                                          v,
-                                                          forward_data.nameID,
-                                                          forward_data.distance,
-                                                          reverse_data.distance,
-                                                          0,
-                                                          0,
-                                                          SPECIAL_EDGEID,
-                                                          0,
-                                                          belongs_to_tiny_cc));
+        m_edge_based_node_list.emplace_back(forward_data.edgeBasedNodeID,
+                                            reverse_data.edgeBasedNodeID,
+                                            node_u,
+                                            node_v,
+                                            forward_data.nameID,
+                                            forward_data.distance,
+                                            reverse_data.distance,
+                                            0,
+                                            0,
+                                            SPECIAL_EDGEID,
+                                            0,
+                                            belongs_to_tiny_cc);
         BOOST_ASSERT(!m_edge_based_node_list.back().IsCompressed());
     }
 }
@@ -289,61 +284,61 @@ void EdgeBasedGraphFactory::CompressGeometry()
     const unsigned original_number_of_nodes = m_node_based_graph->GetNumberOfNodes();
     const unsigned original_number_of_edges = m_node_based_graph->GetNumberOfEdges();
 
-    Percent p(original_number_of_nodes);
+    Percent progress(original_number_of_nodes);
     unsigned removed_node_count = 0;
 
-    for (NodeID v = 0; v < original_number_of_nodes; ++v)
+    for (const NodeID node_v : osrm::irange(0u, original_number_of_nodes))
     {
-        p.printStatus(v);
+        progress.printStatus(node_v);
 
         // only contract degree 2 vertices
-        if (2 != m_node_based_graph->GetOutDegree(v))
+        if (2 != m_node_based_graph->GetOutDegree(node_v))
         {
             continue;
         }
 
         // don't contract barrier node
-        if (m_barrier_nodes.end() != m_barrier_nodes.find(v))
+        if (m_barrier_nodes.end() != m_barrier_nodes.find(node_v))
         {
             continue;
         }
 
         // check if v is a via node for a turn restriction, i.e. a 'directed' barrier node
-        if (m_restriction_map->IsViaNode(v))
+        if (m_restriction_map->IsViaNode(node_v))
         {
             continue;
         }
 
         const bool reverse_edge_order =
-            !(m_node_based_graph->GetEdgeData(m_node_based_graph->BeginEdges(v)).forward);
-        const EdgeID forward_e2 = m_node_based_graph->BeginEdges(v) + reverse_edge_order;
+            !(m_node_based_graph->GetEdgeData(m_node_based_graph->BeginEdges(node_v)).forward);
+        const EdgeID forward_e2 = m_node_based_graph->BeginEdges(node_v) + reverse_edge_order;
         BOOST_ASSERT(SPECIAL_EDGEID != forward_e2);
-        const EdgeID reverse_e2 = m_node_based_graph->BeginEdges(v) + 1 - reverse_edge_order;
+        const EdgeID reverse_e2 = m_node_based_graph->BeginEdges(node_v) + 1 - reverse_edge_order;
         BOOST_ASSERT(SPECIAL_EDGEID != reverse_e2);
 
         const EdgeData &fwd_edge_data2 = m_node_based_graph->GetEdgeData(forward_e2);
         const EdgeData &rev_edge_data2 = m_node_based_graph->GetEdgeData(reverse_e2);
 
-        const NodeID w = m_node_based_graph->GetTarget(forward_e2);
-        BOOST_ASSERT(SPECIAL_NODEID != w);
-        BOOST_ASSERT(v != w);
-        const NodeID u = m_node_based_graph->GetTarget(reverse_e2);
-        BOOST_ASSERT(SPECIAL_NODEID != u);
-        BOOST_ASSERT(u != v);
+        const NodeID node_w = m_node_based_graph->GetTarget(forward_e2);
+        BOOST_ASSERT(SPECIAL_NODEID != node_w);
+        BOOST_ASSERT(node_v != node_w);
+        const NodeID node_u = m_node_based_graph->GetTarget(reverse_e2);
+        BOOST_ASSERT(SPECIAL_NODEID != node_u);
+        BOOST_ASSERT(node_u != node_v);
 
-        const EdgeID forward_e1 = m_node_based_graph->FindEdge(u, v);
-        BOOST_ASSERT(m_node_based_graph->EndEdges(u) != forward_e1);
+        const EdgeID forward_e1 = m_node_based_graph->FindEdge(node_u, node_v);
+        BOOST_ASSERT(m_node_based_graph->EndEdges(node_u) != forward_e1);
         BOOST_ASSERT(SPECIAL_EDGEID != forward_e1);
-        BOOST_ASSERT(v == m_node_based_graph->GetTarget(forward_e1));
-        const EdgeID reverse_e1 = m_node_based_graph->FindEdge(w, v);
+        BOOST_ASSERT(node_v == m_node_based_graph->GetTarget(forward_e1));
+        const EdgeID reverse_e1 = m_node_based_graph->FindEdge(node_w, node_v);
         BOOST_ASSERT(SPECIAL_EDGEID != reverse_e1);
-        BOOST_ASSERT(v == m_node_based_graph->GetTarget(reverse_e1));
+        BOOST_ASSERT(node_v == m_node_based_graph->GetTarget(reverse_e1));
 
         const EdgeData &fwd_edge_data1 = m_node_based_graph->GetEdgeData(forward_e1);
         const EdgeData &rev_edge_data1 = m_node_based_graph->GetEdgeData(reverse_e1);
 
-        if ((m_node_based_graph->FindEdge(u, w) != m_node_based_graph->EndEdges(u)) ||
-            (m_node_based_graph->FindEdge(w, u) != m_node_based_graph->EndEdges(w)))
+        if ((m_node_based_graph->FindEdge(node_u, node_w) != m_node_based_graph->EndEdges(node_u)) ||
+            (m_node_based_graph->FindEdge(node_w, node_u) != m_node_based_graph->EndEdges(node_w)))
         {
             continue;
         }
@@ -366,7 +361,7 @@ void EdgeBasedGraphFactory::CompressGeometry()
             BOOST_ASSERT(0 != forward_weight2);
 
             const bool add_traffic_signal_penalty =
-                (m_traffic_lights.find(v) != m_traffic_lights.end());
+                (m_traffic_lights.find(node_v) != m_traffic_lights.end());
 
             // add weight of e2's to e1
             m_node_based_graph->GetEdgeData(forward_e1).distance += fwd_edge_data2.distance;
@@ -374,43 +369,43 @@ void EdgeBasedGraphFactory::CompressGeometry()
             if (add_traffic_signal_penalty)
             {
                 m_node_based_graph->GetEdgeData(forward_e1).distance +=
-                    speed_profile.trafficSignalPenalty;
+                    speed_profile.traffic_signal_penalty;
                 m_node_based_graph->GetEdgeData(reverse_e1).distance +=
-                    speed_profile.trafficSignalPenalty;
+                    speed_profile.traffic_signal_penalty;
             }
 
             // extend e1's to targets of e2's
-            m_node_based_graph->SetTarget(forward_e1, w);
-            m_node_based_graph->SetTarget(reverse_e1, u);
+            m_node_based_graph->SetTarget(forward_e1, node_w);
+            m_node_based_graph->SetTarget(reverse_e1, node_u);
 
             // remove e2's (if bidir, otherwise only one)
-            m_node_based_graph->DeleteEdge(v, forward_e2);
-            m_node_based_graph->DeleteEdge(v, reverse_e2);
+            m_node_based_graph->DeleteEdge(node_v, forward_e2);
+            m_node_based_graph->DeleteEdge(node_v, reverse_e2);
 
             // update any involved turn restrictions
-            m_restriction_map->FixupStartingTurnRestriction(u, v, w);
-            m_restriction_map->FixupArrivingTurnRestriction(u, v, w);
+            m_restriction_map->FixupStartingTurnRestriction(node_u, node_v, node_w);
+            m_restriction_map->FixupArrivingTurnRestriction(node_u, node_v, node_w);
 
-            m_restriction_map->FixupStartingTurnRestriction(w, v, u);
-            m_restriction_map->FixupArrivingTurnRestriction(w, v, u);
+            m_restriction_map->FixupStartingTurnRestriction(node_w, node_v, node_u);
+            m_restriction_map->FixupArrivingTurnRestriction(node_w, node_v, node_u);
 
             // store compressed geometry in container
             m_geometry_compressor.CompressEdge(
                 forward_e1,
                 forward_e2,
-                v,
-                w,
+                node_v,
+                node_w,
                 forward_weight1 +
-                    (add_traffic_signal_penalty ? speed_profile.trafficSignalPenalty : 0),
+                    (add_traffic_signal_penalty ? speed_profile.traffic_signal_penalty : 0),
                 forward_weight2);
             m_geometry_compressor.CompressEdge(
                 reverse_e1,
                 reverse_e2,
-                v,
-                u,
+                node_v,
+                node_u,
                 reverse_weight1,
                 reverse_weight2 +
-                    (add_traffic_signal_penalty ? speed_profile.trafficSignalPenalty : 0));
+                    (add_traffic_signal_penalty ? speed_profile.traffic_signal_penalty : 0));
             ++removed_node_count;
 
             BOOST_ASSERT(m_node_based_graph->GetEdgeData(forward_e1).nameID ==
@@ -422,7 +417,8 @@ void EdgeBasedGraphFactory::CompressGeometry()
 
     unsigned new_node_count = 0;
     unsigned new_edge_count = 0;
-    for (unsigned i = 0; i < m_node_based_graph->GetNumberOfNodes(); ++i)
+
+    for(const auto i : osrm::irange(0u, m_node_based_graph->GetNumberOfNodes()))
     {
         if (m_node_based_graph->GetOutDegree(i) > 0)
         {
@@ -482,21 +478,17 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedNodes()
                            << " many components";
     SimpleLogger().Write() << "generating edge-expanded nodes";
 
-    Percent p(m_node_based_graph->GetNumberOfNodes());
+    Percent progress(m_node_based_graph->GetNumberOfNodes());
 
     // loop over all edges and generate new set of nodes
     for (NodeID u = 0, end = m_node_based_graph->GetNumberOfNodes(); u < end; ++u)
     {
         BOOST_ASSERT(u != SPECIAL_NODEID);
         BOOST_ASSERT(u < m_node_based_graph->GetNumberOfNodes());
-        p.printIncrement();
+        progress.printStatus(u);
         for (EdgeID e1 : m_node_based_graph->GetAdjacentEdgeRange(u))
         {
             const EdgeData &edge_data = m_node_based_graph->GetEdgeData(e1);
-            if (edge_data.edgeBasedNodeID == SPECIAL_NODEID)
-            {
-                // continue;
-            }
             BOOST_ASSERT(e1 != SPECIAL_EDGEID);
             const NodeID v = m_node_based_graph->GetTarget(e1);
 
@@ -516,7 +508,14 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedNodes()
                                                         component_explorer.GetComponentSize(v));
 
             const bool component_is_tiny = (size_of_component < 1000);
-            InsertEdgeBasedNode(u, v, e1, component_is_tiny);
+            if (edge_data.edgeBasedNodeID == SPECIAL_NODEID)
+            {
+                InsertEdgeBasedNode(v, u, component_is_tiny);
+            }
+            else
+            {
+                InsertEdgeBasedNode(u, v, component_is_tiny);
+            }
         }
     }
 
@@ -552,11 +551,12 @@ EdgeBasedGraphFactory::GenerateEdgeExpandedEdges(const std::string &original_edg
     unsigned skipped_barrier_turns_counter = 0;
     unsigned compressed = 0;
 
-    Percent p(m_node_based_graph->GetNumberOfNodes());
+    Percent progress(m_node_based_graph->GetNumberOfNodes());
 
     for (NodeID u = 0, end = m_node_based_graph->GetNumberOfNodes(); u < end; ++u)
     {
-        for (EdgeID e1 : m_node_based_graph->GetAdjacentEdgeRange(u))
+        progress.printStatus(u);
+        for (const EdgeID e1 : m_node_based_graph->GetAdjacentEdgeRange(u))
         {
             if (!m_node_based_graph->GetEdgeData(e1).forward)
             {
@@ -625,7 +625,7 @@ EdgeBasedGraphFactory::GenerateEdgeExpandedEdges(const std::string &original_edg
                 unsigned distance = edge_data1.distance;
                 if (m_traffic_lights.find(v) != m_traffic_lights.end())
                 {
-                    distance += speed_profile.trafficSignalPenalty;
+                    distance += speed_profile.traffic_signal_penalty;
                 }
                 const double angle = GetAngleBetweenThreeFixedPointCoordinates(
                 m_node_info_list[u], m_node_info_list[v], m_node_info_list[w]);
@@ -633,7 +633,7 @@ EdgeBasedGraphFactory::GenerateEdgeExpandedEdges(const std::string &original_edg
                 TurnInstruction turn_instruction = AnalyzeTurn(u, v, w, angle);
                 if (turn_instruction == TurnInstruction::UTurn)
                 {
-                    distance += speed_profile.uTurnPenalty;
+                    distance += speed_profile.u_turn_penalty;
                 }
                 distance += turn_penalty;
 
@@ -668,7 +668,6 @@ EdgeBasedGraphFactory::GenerateEdgeExpandedEdges(const std::string &original_edg
                                                                   false));
             }
         }
-        p.printIncrement();
     }
     FlushVectorToStream(edge_data_file, original_edge_data_vector);
 
@@ -702,19 +701,19 @@ int EdgeBasedGraphFactory::GetTurnPenalty(double angle, lua_State *lua_state) co
     return 0;
 }
 
-TurnInstruction EdgeBasedGraphFactory::AnalyzeTurn(const NodeID u,
-                                                   const NodeID v,
-                                                   const NodeID w,
-                                                   double angle)
+TurnInstruction EdgeBasedGraphFactory::AnalyzeTurn(const NodeID node_u,
+                                                   const NodeID node_v,
+                                                   const NodeID node_w,
+                                                   const double angle)
     const
 {
-    if (u == w)
+    if (node_u == node_w)
     {
         return TurnInstruction::UTurn;
     }
 
-    const EdgeID edge1 = m_node_based_graph->FindEdge(u, v);
-    const EdgeID edge2 = m_node_based_graph->FindEdge(v, w);
+    const EdgeID edge1 = m_node_based_graph->FindEdge(node_u, node_v);
+    const EdgeID edge2 = m_node_based_graph->FindEdge(node_v, node_w);
 
     const EdgeData &data1 = m_node_based_graph->GetEdgeData(edge1);
     const EdgeData &data2 = m_node_based_graph->GetEdgeData(edge2);
@@ -732,7 +731,7 @@ TurnInstruction EdgeBasedGraphFactory::AnalyzeTurn(const NodeID u,
     if (data1.roundabout && data2.roundabout)
     {
         // Is a turn possible? If yes, we stay on the roundabout!
-        if (1 == m_node_based_graph->GetDirectedOutDegree(v))
+        if (1 == m_node_based_graph->GetDirectedOutDegree(node_v))
         {
             // No turn possible.
             return TurnInstruction::NoTurn;
@@ -760,11 +759,7 @@ TurnInstruction EdgeBasedGraphFactory::AnalyzeTurn(const NodeID u,
     {
         // TODO: Here we should also do a small graph exploration to check for
         //      more complex situations
-        if (0 != data1.nameID)
-        {
-            return TurnInstruction::NoTurn;
-        }
-        else if (m_node_based_graph->GetOutDegree(v) <= 2)
+        if (0 != data1.nameID || m_node_based_graph->GetOutDegree(node_v) <= 2)
         {
             return TurnInstruction::NoTurn;
         }

Contractor/EdgeBasedGraphFactory.h

@@ -74,7 +74,7 @@ class EdgeBasedGraphFactory
 
     void GetEdgeBasedNodes(std::vector<EdgeBasedNode> &nodes);
 
-    TurnInstruction AnalyzeTurn(const NodeID u, const NodeID v, const NodeID w, double angle) const;
+    TurnInstruction AnalyzeTurn(const NodeID u, const NodeID v, const NodeID w, const double angle) const;
 
     int GetTurnPenalty(double angle, lua_State *lua_state) const;
 
@@ -83,12 +83,12 @@ class EdgeBasedGraphFactory
     struct SpeedProfileProperties
     {
         SpeedProfileProperties()
-            : trafficSignalPenalty(0), uTurnPenalty(0), has_turn_penalty_function(false)
+            : traffic_signal_penalty(0), u_turn_penalty(0), has_turn_penalty_function(false)
         {
         }
 
-        int trafficSignalPenalty;
-        int uTurnPenalty;
+        int traffic_signal_penalty;
+        int u_turn_penalty;
         bool has_turn_penalty_function;
     } speed_profile;
 
@@ -115,12 +115,12 @@ class EdgeBasedGraphFactory
     void GenerateEdgeExpandedEdges(const std::string &original_edge_data_filename,
                                    lua_State *lua_state);
 
-    void InsertEdgeBasedNode(NodeID u, NodeID v, EdgeID e1, bool belongsToTinyComponent);
+    void InsertEdgeBasedNode(const NodeID u, const NodeID v, const bool belongsToTinyComponent);
 
     void FlushVectorToStream(std::ofstream &edge_data_file,
                              std::vector<OriginalEdgeData> &original_edge_data_vector) const;
 
-    unsigned max_id;
+    NodeID max_id;
 };
 
 #endif /* EDGEBASEDGRAPHFACTORY_H_ */

Contractor/Prepare.cpp

@@ -0,0 +1,563 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "Prepare.h"
+
+#include "Contractor.h"
+
+#include "../Algorithms/IteratorBasedCRC32.h"
+#include "../DataStructures/BinaryHeap.h"
+#include "../DataStructures/DeallocatingVector.h"
+#include "../DataStructures/Range.h"
+#include "../DataStructures/StaticRTree.h"
+#include "../DataStructures/RestrictionMap.h"
+
+#include "../Util/GitDescription.h"
+#include "../Util/LuaUtil.h"
+#include "../Util/OSRMException.h"
+#include "../Util/SimpleLogger.h"
+#include "../Util/StringUtil.h"
+#include "../Util/TimingUtil.h"
+#include "../typedefs.h"
+
+#include <boost/filesystem/fstream.hpp>
+#include <boost/program_options.hpp>
+
+#include <tbb/task_scheduler_init.h>
+#include <tbb/parallel_sort.h>
+
+#include <chrono>
+#include <memory>
+#include <string>
+#include <thread>
+#include <vector>
+
+Prepare::Prepare() : requested_num_threads(1) {}
+
+Prepare::~Prepare() {}
+
+int Prepare::Process(int argc, char *argv[])
+{
+    LogPolicy::GetInstance().Unmute();
+    TIMER_START(preparing);
+    TIMER_START(expansion);
+
+    if (!ParseArguments(argc, argv))
+    {
+        return 0;
+    }
+    if (!boost::filesystem::is_regular_file(input_path))
+    {
+        SimpleLogger().Write(logWARNING) << "Input file " << input_path.string() << " not found!";
+        return 1;
+    }
+
+    if (!boost::filesystem::is_regular_file(profile_path))
+    {
+        SimpleLogger().Write(logWARNING) << "Profile " << profile_path.string() << " not found!";
+        return 1;
+    }
+
+    if (1 > requested_num_threads)
+    {
+        SimpleLogger().Write(logWARNING) << "Number of threads must be 1 or larger";
+        return 1;
+    }
+
+    const unsigned recommended_num_threads = tbb::task_scheduler_init::default_num_threads();
+
+    SimpleLogger().Write() << "Input file: " << input_path.filename().string();
+    SimpleLogger().Write() << "Restrictions file: " << restrictions_path.filename().string();
+    SimpleLogger().Write() << "Profile: " << profile_path.filename().string();
+    SimpleLogger().Write() << "Threads: " << requested_num_threads;
+    if (recommended_num_threads != requested_num_threads)
+    {
+        SimpleLogger().Write(logWARNING) << "The recommended number of threads is "
+                                         << recommended_num_threads
+                                         << "! This setting may have performance side-effects.";
+    }
+
+    tbb::task_scheduler_init init(requested_num_threads);
+
+    LogPolicy::GetInstance().Unmute();
+
+    FingerPrint fingerprint_orig;
+    CheckRestrictionsFile(fingerprint_orig);
+
+    boost::filesystem::ifstream input_stream(input_path, std::ios::in | std::ios::binary);
+
+    node_filename = input_path.string() + ".nodes";
+    edge_out = input_path.string() + ".edges";
+    geometry_filename = input_path.string() + ".geometry";
+    graph_out = input_path.string() + ".hsgr";
+    rtree_nodes_path = input_path.string() + ".ramIndex";
+    rtree_leafs_path = input_path.string() + ".fileIndex";
+
+    /*** Setup Scripting Environment ***/
+    // Create a new lua state
+    lua_State *lua_state = luaL_newstate();
+
+    // Connect LuaBind to this lua state
+    luabind::open(lua_state);
+
+    EdgeBasedGraphFactory::SpeedProfileProperties speed_profile;
+
+    if (!SetupScriptingEnvironment(lua_state, speed_profile))
+    {
+        return 1;
+    }
+
+#ifdef WIN32
+#pragma message("Memory consumption on Windows can be higher due to different bit packing")
+#else
+    static_assert(sizeof(ImportEdge) == 20,
+                  "changing ImportEdge type has influence on memory consumption!");
+#endif
+    NodeID number_of_node_based_nodes =
+        readBinaryOSRMGraphFromStream(input_stream,
+                                      edge_list,
+                                      barrier_node_list,
+                                      traffic_light_list,
+                                      &internal_to_external_node_map,
+                                      restriction_list);
+    input_stream.close();
+
+    if (edge_list.empty())
+    {
+        SimpleLogger().Write(logWARNING) << "The input data is empty, exiting.";
+        return 1;
+    }
+
+    SimpleLogger().Write() << restriction_list.size() << " restrictions, "
+                           << barrier_node_list.size() << " bollard nodes, "
+                           << traffic_light_list.size() << " traffic lights";
+
+    std::vector<EdgeBasedNode> node_based_edge_list;
+    unsigned number_of_edge_based_nodes = 0;
+    DeallocatingVector<EdgeBasedEdge> edge_based_edge_list;
+
+    // init node_based_edge_list, edge_based_edge_list by edgeList
+    number_of_edge_based_nodes = BuildEdgeExpandedGraph(lua_state,
+                                                        number_of_node_based_nodes,
+                                                        node_based_edge_list,
+                                                        edge_based_edge_list,
+                                                        speed_profile);
+    lua_close(lua_state);
+
+    TIMER_STOP(expansion);
+
+    BuildRTree(node_based_edge_list);
+
+    IteratorbasedCRC32<std::vector<EdgeBasedNode>> crc32;
+    const unsigned node_based_edge_list_CRC32 =
+        crc32(node_based_edge_list.begin(), node_based_edge_list.end());
+    node_based_edge_list.clear();
+    node_based_edge_list.shrink_to_fit();
+    SimpleLogger().Write() << "CRC32: " << node_based_edge_list_CRC32;
+
+    WriteNodeMapping();
+
+    /***
+     * Contracting the edge-expanded graph
+     */
+
+    SimpleLogger().Write() << "initializing contractor";
+    Contractor *contractor = new Contractor(number_of_edge_based_nodes, edge_based_edge_list);
+
+    TIMER_START(contraction);
+    contractor->Run();
+    TIMER_STOP(contraction);
+
+    SimpleLogger().Write() << "Contraction took " << TIMER_SEC(contraction) << " sec";
+
+    DeallocatingVector<QueryEdge> contracted_edge_list;
+    contractor->GetEdges(contracted_edge_list);
+    delete contractor;
+
+    /***
+     * Sorting contracted edges in a way that the static query graph can read some in in-place.
+     */
+
+    tbb::parallel_sort(contracted_edge_list.begin(), contracted_edge_list.end());
+    const unsigned contracted_edge_count = contracted_edge_list.size();
+    SimpleLogger().Write() << "Serializing compacted graph of " << contracted_edge_count
+                           << " edges";
+
+    boost::filesystem::ofstream hsgr_output_stream(graph_out, std::ios::binary);
+    hsgr_output_stream.write((char *)&fingerprint_orig, sizeof(FingerPrint));
+    const unsigned max_used_node_id = 1 + [&contracted_edge_list]
+    {
+        unsigned tmp_max = 0;
+        for (const QueryEdge &edge : contracted_edge_list)
+        {
+            BOOST_ASSERT(SPECIAL_NODEID != edge.source);
+            BOOST_ASSERT(SPECIAL_NODEID != edge.target);
+            tmp_max = std::max(tmp_max, edge.source);
+            tmp_max = std::max(tmp_max, edge.target);
+        }
+        return tmp_max;
+    }();
+
+    SimpleLogger().Write(logDEBUG) << "input graph has " << number_of_edge_based_nodes << " nodes";
+    SimpleLogger().Write(logDEBUG) << "contracted graph has " << max_used_node_id << " nodes";
+
+    std::vector<StaticGraph<EdgeData>::NodeArrayEntry> node_array;
+    node_array.resize(number_of_edge_based_nodes + 1);
+
+    SimpleLogger().Write() << "Building node array";
+    StaticGraph<EdgeData>::EdgeIterator edge = 0;
+    StaticGraph<EdgeData>::EdgeIterator position = 0;
+    StaticGraph<EdgeData>::EdgeIterator last_edge = edge;
+
+    // initializing 'first_edge'-field of nodes:
+    for (const auto node : osrm::irange(0u, max_used_node_id))
+    {
+        last_edge = edge;
+        while ((edge < contracted_edge_count) && (contracted_edge_list[edge].source == node))
+        {
+            ++edge;
+        }
+        node_array[node].first_edge = position; //=edge
+        position += edge - last_edge;           // remove
+    }
+
+    for (const auto sentinel_counter : osrm::irange<unsigned>(max_used_node_id, node_array.size()))
+    {
+        // sentinel element, guarded against underflow
+        node_array[sentinel_counter].first_edge = contracted_edge_count;
+    }
+
+    SimpleLogger().Write() << "Serializing node array";
+
+    const unsigned node_array_size = node_array.size();
+    // serialize crc32, aka checksum
+    hsgr_output_stream.write((char *)&node_based_edge_list_CRC32, sizeof(unsigned));
+    // serialize number of nodes
+    hsgr_output_stream.write((char *)&node_array_size, sizeof(unsigned));
+    // serialize number of edges
+    hsgr_output_stream.write((char *)&contracted_edge_count, sizeof(unsigned));
+    // serialize all nodes
+    if (node_array_size > 0)
+    {
+        hsgr_output_stream.write((char *)&node_array[0],
+                                 sizeof(StaticGraph<EdgeData>::NodeArrayEntry) * node_array_size);
+    }
+    // serialize all edges
+
+    SimpleLogger().Write() << "Building edge array";
+    edge = 0;
+    int number_of_used_edges = 0;
+
+    StaticGraph<EdgeData>::EdgeArrayEntry current_edge;
+    for (const auto edge : osrm::irange<std::size_t>(0, contracted_edge_list.size()))
+    {
+        // no eigen loops
+        BOOST_ASSERT(contracted_edge_list[edge].source != contracted_edge_list[edge].target);
+        current_edge.target = contracted_edge_list[edge].target;
+        current_edge.data = contracted_edge_list[edge].data;
+
+        // every target needs to be valid
+        BOOST_ASSERT(current_edge.target < max_used_node_id);
+#ifndef NDEBUG
+        if (current_edge.data.distance <= 0)
+        {
+            SimpleLogger().Write(logWARNING) << "Edge: " << edge
+                                             << ",source: " << contracted_edge_list[edge].source
+                                             << ", target: " << contracted_edge_list[edge].target
+                                             << ", dist: " << current_edge.data.distance;
+
+            SimpleLogger().Write(logWARNING) << "Failed at adjacency list of node "
+                                             << contracted_edge_list[edge].source << "/"
+                                             << node_array.size() - 1;
+            return 1;
+        }
+#endif
+        hsgr_output_stream.write((char *)&current_edge,
+                                 sizeof(StaticGraph<EdgeData>::EdgeArrayEntry));
+
+        ++number_of_used_edges;
+    }
+    hsgr_output_stream.close();
+
+    TIMER_STOP(preparing);
+
+    SimpleLogger().Write() << "Preprocessing : " << TIMER_SEC(preparing) << " seconds";
+    SimpleLogger().Write() << "Expansion  : " << (number_of_node_based_nodes / TIMER_SEC(expansion))
+                           << " nodes/sec and "
+                           << (number_of_edge_based_nodes / TIMER_SEC(expansion)) << " edges/sec";
+
+    SimpleLogger().Write() << "Contraction: "
+                           << (number_of_edge_based_nodes / TIMER_SEC(contraction))
+                           << " nodes/sec and " << number_of_used_edges / TIMER_SEC(contraction)
+                           << " edges/sec";
+
+    node_array.clear();
+    SimpleLogger().Write() << "finished preprocessing";
+
+    return 0;
+}
+
+/**
+ \brief Parses command line arguments
+ \param argc count of arguments
+ \param argv array of arguments
+ \param result [out] value for exit return value
+ \return true if everything is ok, false if need to terminate execution
+*/
+bool Prepare::ParseArguments(int argc, char *argv[])
+{
+    // declare a group of options that will be allowed only on command line
+    boost::program_options::options_description generic_options("Options");
+    generic_options.add_options()("version,v", "Show version")("help,h", "Show this help message")(
+        "config,c",
+        boost::program_options::value<boost::filesystem::path>(&config_file_path)
+            ->default_value("contractor.ini"),
+        "Path to a configuration file.");
+
+    // declare a group of options that will be allowed both on command line and in config file
+    boost::program_options::options_description config_options("Configuration");
+    config_options.add_options()(
+        "restrictions,r",
+        boost::program_options::value<boost::filesystem::path>(&restrictions_path),
+        "Restrictions file in .osrm.restrictions format")(
+        "profile,p",
+        boost::program_options::value<boost::filesystem::path>(&profile_path)
+            ->default_value("profile.lua"),
+        "Path to LUA routing profile")(
+        "threads,t",
+        boost::program_options::value<unsigned int>(&requested_num_threads)
+            ->default_value(tbb::task_scheduler_init::default_num_threads()),
+        "Number of threads to use");
+
+    // hidden options, will be allowed both on command line and in config file, but will not be
+    // shown to the user
+    boost::program_options::options_description hidden_options("Hidden options");
+    hidden_options.add_options()(
+        "input,i",
+        boost::program_options::value<boost::filesystem::path>(&input_path),
+        "Input file in .osm, .osm.bz2 or .osm.pbf format");
+
+    // positional option
+    boost::program_options::positional_options_description positional_options;
+    positional_options.add("input", 1);
+
+    // combine above options for parsing
+    boost::program_options::options_description cmdline_options;
+    cmdline_options.add(generic_options).add(config_options).add(hidden_options);
+
+    boost::program_options::options_description config_file_options;
+    config_file_options.add(config_options).add(hidden_options);
+
+    boost::program_options::options_description visible_options(
+        "Usage: " + boost::filesystem::basename(argv[0]) + " <input.osrm> [options]");
+    visible_options.add(generic_options).add(config_options);
+
+    // parse command line options
+    boost::program_options::variables_map option_variables;
+    boost::program_options::store(boost::program_options::command_line_parser(argc, argv)
+                                      .options(cmdline_options)
+                                      .positional(positional_options)
+                                      .run(),
+                                  option_variables);
+
+    if (option_variables.count("version"))
+    {
+        SimpleLogger().Write() << g_GIT_DESCRIPTION;
+        return false;
+    }
+
+    if (option_variables.count("help"))
+    {
+        SimpleLogger().Write() << "\n" << visible_options;
+        return false;
+    }
+
+    boost::program_options::notify(option_variables);
+
+    if (!option_variables.count("restrictions"))
+    {
+        restrictions_path = std::string(input_path.string() + ".restrictions");
+    }
+
+    if (!option_variables.count("input"))
+    {
+        SimpleLogger().Write() << "\n" << visible_options;
+        return false;
+    }
+
+    return true;
+}
+
+/**
+ \brief Loads and checks file UUIDs
+*/
+void Prepare::CheckRestrictionsFile(FingerPrint &fingerprint_orig)
+{
+    boost::filesystem::ifstream restriction_stream(restrictions_path, std::ios::binary);
+    FingerPrint fingerprint_loaded;
+    unsigned number_of_usable_restrictions = 0;
+    restriction_stream.read((char *)&fingerprint_loaded, sizeof(FingerPrint));
+    if (!fingerprint_loaded.TestPrepare(fingerprint_orig))
+    {
+        SimpleLogger().Write(logWARNING) << ".restrictions was prepared with different build.\n"
+                                            "Reprocess to get rid of this warning.";
+    }
+
+    restriction_stream.read((char *)&number_of_usable_restrictions, sizeof(unsigned));
+    restriction_list.resize(number_of_usable_restrictions);
+    if (number_of_usable_restrictions > 0)
+    {
+        restriction_stream.read((char *)&(restriction_list[0]),
+                                number_of_usable_restrictions * sizeof(TurnRestriction));
+    }
+    restriction_stream.close();
+}
+
+/**
+    \brief Setups scripting environment (lua-scripting)
+    Also initializes speed profile.
+*/
+bool
+Prepare::SetupScriptingEnvironment(lua_State *lua_state,
+                                   EdgeBasedGraphFactory::SpeedProfileProperties &speed_profile)
+{
+    // open utility libraries string library;
+    luaL_openlibs(lua_state);
+
+    // adjust lua load path
+    luaAddScriptFolderToLoadPath(lua_state, profile_path.string().c_str());
+
+    // Now call our function in a lua script
+    if (0 != luaL_dofile(lua_state, profile_path.string().c_str()))
+    {
+        std::cerr << lua_tostring(lua_state, -1) << " occured in scripting block" << std::endl;
+        return false;
+    }
+
+    if (0 != luaL_dostring(lua_state, "return traffic_signal_penalty\n"))
+    {
+        std::cerr << lua_tostring(lua_state, -1) << " occured in scripting block" << std::endl;
+        return false;
+    }
+    speed_profile.traffic_signal_penalty = 10 * lua_tointeger(lua_state, -1);
+    SimpleLogger().Write(logDEBUG)
+        << "traffic_signal_penalty: " << speed_profile.traffic_signal_penalty;
+
+    if (0 != luaL_dostring(lua_state, "return u_turn_penalty\n"))
+    {
+        std::cerr << lua_tostring(lua_state, -1) << " occured in scripting block" << std::endl;
+        return false;
+    }
+
+    speed_profile.u_turn_penalty = 10 * lua_tointeger(lua_state, -1);
+    speed_profile.has_turn_penalty_function = lua_function_exists(lua_state, "turn_function");
+
+    return true;
+}
+
+/**
+ \brief Building an edge-expanded graph from node-based input and turn restrictions
+*/
+std::size_t Prepare::BuildEdgeExpandedGraph(lua_State *lua_state,
+                                     NodeID number_of_node_based_nodes,
+                                     std::vector<EdgeBasedNode> &node_based_edge_list,
+                                     DeallocatingVector<EdgeBasedEdge> &edge_based_edge_list,
+                                     EdgeBasedGraphFactory::SpeedProfileProperties &speed_profile)
+{
+    SimpleLogger().Write() << "Generating edge-expanded graph representation";
+    std::shared_ptr<NodeBasedDynamicGraph> node_based_graph =
+        NodeBasedDynamicGraphFromImportEdges(number_of_node_based_nodes, edge_list);
+    std::unique_ptr<RestrictionMap> restriction_map =
+        std::unique_ptr<RestrictionMap>(new RestrictionMap(node_based_graph, restriction_list));
+    std::shared_ptr<EdgeBasedGraphFactory> edge_based_graph_factory =
+        std::make_shared<EdgeBasedGraphFactory>(node_based_graph,
+                                                std::move(restriction_map),
+                                                barrier_node_list,
+                                                traffic_light_list,
+                                                internal_to_external_node_map,
+                                                speed_profile);
+    edge_list.clear();
+    edge_list.shrink_to_fit();
+
+    edge_based_graph_factory->Run(edge_out, geometry_filename, lua_state);
+
+    restriction_list.clear();
+    restriction_list.shrink_to_fit();
+    barrier_node_list.clear();
+    barrier_node_list.shrink_to_fit();
+    traffic_light_list.clear();
+    traffic_light_list.shrink_to_fit();
+
+    const std::size_t number_of_edge_based_nodes = edge_based_graph_factory->GetNumberOfEdgeBasedNodes();
+
+    BOOST_ASSERT(number_of_edge_based_nodes != std::numeric_limits<unsigned>::max());
+#ifndef WIN32
+    static_assert(sizeof(EdgeBasedEdge) == 16,
+                  "changing ImportEdge type has influence on memory consumption!");
+#endif
+
+    edge_based_graph_factory->GetEdgeBasedEdges(edge_based_edge_list);
+    edge_based_graph_factory->GetEdgeBasedNodes(node_based_edge_list);
+
+    edge_based_graph_factory.reset();
+    node_based_graph.reset();
+
+    return number_of_edge_based_nodes;
+}
+
+/**
+  \brief Writing info on original (node-based) nodes
+ */
+void Prepare::WriteNodeMapping()
+{
+    SimpleLogger().Write() << "writing node map ...";
+    boost::filesystem::ofstream node_stream(node_filename, std::ios::binary);
+    const unsigned size_of_mapping = internal_to_external_node_map.size();
+    node_stream.write((char *)&size_of_mapping, sizeof(unsigned));
+    if (size_of_mapping > 0)
+    {
+        node_stream.write((char *)&(internal_to_external_node_map[0]),
+                          size_of_mapping * sizeof(NodeInfo));
+    }
+    node_stream.close();
+    internal_to_external_node_map.clear();
+    internal_to_external_node_map.shrink_to_fit();
+}
+
+/**
+    \brief Building rtree-based nearest-neighbor data structure
+
+    Saves info to files: '.ramIndex' and '.fileIndex'.
+ */
+void Prepare::BuildRTree(std::vector<EdgeBasedNode> &node_based_edge_list)
+{
+    SimpleLogger().Write() << "building r-tree ...";
+    StaticRTree<EdgeBasedNode>(node_based_edge_list,
+                               rtree_nodes_path.c_str(),
+                               rtree_leafs_path.c_str(),
+                               internal_to_external_node_map);
+}

Contractor/Prepare.h

@@ -0,0 +1,67 @@
+#ifndef PREPARE_H
+#define PREPARE_H
+
+#include "EdgeBasedGraphFactory.h"
+#include "../DataStructures/QueryEdge.h"
+#include "../DataStructures/StaticGraph.h"
+#include "../Util/GraphLoader.h"
+
+#include <boost/filesystem.hpp>
+
+#include <luabind/luabind.hpp>
+
+#include <vector>
+
+/**
+    \brief class of 'prepare' utility.
+ */
+class Prepare
+{
+  public:
+    typedef QueryEdge::EdgeData EdgeData;
+    typedef DynamicGraph<EdgeData>::InputEdge InputEdge;
+    typedef StaticGraph<EdgeData>::InputEdge StaticEdge;
+
+    explicit Prepare();
+    Prepare(const Prepare &) = delete;
+    ~Prepare();
+
+    int Process(int argc, char *argv[]);
+
+  protected:
+    bool ParseArguments(int argc, char *argv[]);
+    void CheckRestrictionsFile(FingerPrint &fingerprint_orig);
+    bool SetupScriptingEnvironment(lua_State *myLuaState,
+                                   EdgeBasedGraphFactory::SpeedProfileProperties &speed_profile);
+    std::size_t BuildEdgeExpandedGraph(lua_State *myLuaState,
+                                       NodeID nodeBasedNodeNumber,
+                                       std::vector<EdgeBasedNode> &nodeBasedEdgeList,
+                                       DeallocatingVector<EdgeBasedEdge> &edgeBasedEdgeList,
+                                       EdgeBasedGraphFactory::SpeedProfileProperties &speed_profile);
+    void WriteNodeMapping();
+    void BuildRTree(std::vector<EdgeBasedNode> &node_based_edge_list);
+
+  private:
+    std::vector<NodeInfo> internal_to_external_node_map;
+    std::vector<TurnRestriction> restriction_list;
+    std::vector<NodeID> barrier_node_list;
+    std::vector<NodeID> traffic_light_list;
+    std::vector<ImportEdge> edge_list;
+
+    unsigned requested_num_threads;
+    boost::filesystem::path config_file_path;
+    boost::filesystem::path input_path;
+    boost::filesystem::path restrictions_path;
+    boost::filesystem::path preinfo_path;
+    boost::filesystem::path profile_path;
+
+    std::string node_filename;
+    std::string edge_out;
+    std::string info_out;
+    std::string geometry_filename;
+    std::string graph_out;
+    std::string rtree_nodes_path;
+    std::string rtree_leafs_path;
+};
+
+#endif // PREPARE_H

Contractor/TemporaryStorage.cpp

@@ -1,172 +0,0 @@
-/*
-
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list
-of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this
-list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-#include "TemporaryStorage.h"
-
-StreamData::StreamData()
-    : write_mode(true),
-      temp_path(boost::filesystem::unique_path(temp_directory / TemporaryFilePattern)),
-      temp_file(new boost::filesystem::fstream(
-          temp_path, std::ios::in | std::ios::out | std::ios::trunc | std::ios::binary)),
-      readWriteMutex(std::make_shared<boost::mutex>())
-{
-    if (temp_file->fail())
-    {
-        throw OSRMException("temporary file could not be created");
-    }
-}
-
-TemporaryStorage::TemporaryStorage() { temp_directory = boost::filesystem::temp_directory_path(); }
-
-TemporaryStorage &TemporaryStorage::GetInstance()
-{
-    static TemporaryStorage static_instance;
-    return static_instance;
-}
-
-TemporaryStorage::~TemporaryStorage() { RemoveAll(); }
-
-void TemporaryStorage::RemoveAll()
-{
-    boost::mutex::scoped_lock lock(mutex);
-    for (unsigned slot_id = 0; slot_id < stream_data_list.size(); ++slot_id)
-    {
-        DeallocateSlot(slot_id);
-    }
-    stream_data_list.clear();
-}
-
-int TemporaryStorage::AllocateSlot()
-{
-    boost::mutex::scoped_lock lock(mutex);
-    try { stream_data_list.push_back(StreamData()); }
-    catch (boost::filesystem::filesystem_error &e) { Abort(e); }
-    CheckIfTemporaryDeviceFull();
-    return stream_data_list.size() - 1;
-}
-
-void TemporaryStorage::DeallocateSlot(const int slot_id)
-{
-    try
-    {
-        StreamData &data = stream_data_list[slot_id];
-        boost::mutex::scoped_lock lock(*data.readWriteMutex);
-        if (!boost::filesystem::exists(data.temp_path))
-        {
-            return;
-        }
-        if (data.temp_file->is_open())
-        {
-            data.temp_file->close();
-        }
-
-        boost::filesystem::remove(data.temp_path);
-    }
-    catch (boost::filesystem::filesystem_error &e) { Abort(e); }
-}
-
-void TemporaryStorage::WriteToSlot(const int slot_id, char *pointer, const std::size_t size)
-{
-    try
-    {
-        StreamData &data = stream_data_list[slot_id];
-        BOOST_ASSERT(data.write_mode);
-
-        boost::mutex::scoped_lock lock(*data.readWriteMutex);
-        BOOST_ASSERT_MSG(data.write_mode, "Writing after first read is not allowed");
-        if (1073741824 < data.buffer.size())
-        {
-            data.temp_file->write(&data.buffer[0], data.buffer.size());
-            // data.temp_file->write(pointer, size);
-            data.buffer.clear();
-            CheckIfTemporaryDeviceFull();
-        }
-        data.buffer.insert(data.buffer.end(), pointer, pointer + size);
-    }
-    catch (boost::filesystem::filesystem_error &e) { Abort(e); }
-}
-void TemporaryStorage::ReadFromSlot(const int slot_id, char *pointer, const std::size_t size)
-{
-    try
-    {
-        StreamData &data = stream_data_list[slot_id];
-        boost::mutex::scoped_lock lock(*data.readWriteMutex);
-        if (data.write_mode)
-        {
-            data.write_mode = false;
-            data.temp_file->write(&data.buffer[0], data.buffer.size());
-            data.buffer.clear();
-            data.temp_file->seekg(data.temp_file->beg);
-            BOOST_ASSERT(data.temp_file->beg == data.temp_file->tellg());
-        }
-        BOOST_ASSERT(!data.write_mode);
-        data.temp_file->read(pointer, size);
-    }
-    catch (boost::filesystem::filesystem_error &error) { Abort(error); }
-}
-
-uint64_t TemporaryStorage::GetFreeBytesOnTemporaryDevice()
-{
-    uint64_t value = -1;
-    try
-    {
-        boost::filesystem::path path = boost::filesystem::temp_directory_path();
-        boost::filesystem::space_info space_info = boost::filesystem::space(path);
-        value = space_info.free;
-    }
-    catch (boost::filesystem::filesystem_error &error) { Abort(error); }
-    return value;
-}
-
-void TemporaryStorage::CheckIfTemporaryDeviceFull()
-{
-    boost::filesystem::path path = boost::filesystem::temp_directory_path();
-    boost::filesystem::space_info space_info = boost::filesystem::space(path);
-    if ((1024 * 1024) > space_info.free)
-    {
-        throw OSRMException("temporary device is full");
-    }
-}
-
-boost::filesystem::fstream::pos_type TemporaryStorage::Tell(const int slot_id)
-{
-    boost::filesystem::fstream::pos_type position;
-    try
-    {
-        StreamData &data = stream_data_list[slot_id];
-        boost::mutex::scoped_lock lock(*data.readWriteMutex);
-        position = data.temp_file->tellp();
-    }
-    catch (boost::filesystem::filesystem_error &e) { Abort(e); }
-    return position;
-}
-
-void TemporaryStorage::Abort(const boost::filesystem::filesystem_error &error)
-{
-    RemoveAll();
-    throw OSRMException(error.what());
-}

Contractor/TemporaryStorage.h

@@ -1,96 +0,0 @@
-/*
-
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list
-of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this
-list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-#ifndef TEMPORARYSTORAGE_H_
-#define TEMPORARYSTORAGE_H_
-
-#include "../Util/BoostFileSystemFix.h"
-#include "../Util/OSRMException.h"
-#include "../Util/SimpleLogger.h"
-#include "../typedefs.h"
-
-#include <boost/assert.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
-#include <boost/thread/mutex.hpp>
-
-#include <cstdint>
-
-#include <vector>
-#include <fstream>
-#include <memory>
-
-struct StreamData
-{
-    bool write_mode;
-    boost::filesystem::path temp_path;
-    std::shared_ptr<boost::filesystem::fstream> temp_file;
-    std::shared_ptr<boost::mutex> readWriteMutex;
-    std::vector<char> buffer;
-
-    StreamData();
-};
-
-// This class implements a singleton file storage for temporary data.
-// temporary slots can be accessed by other objects through an int
-// On deallocation every slot gets deallocated
-//
-// Access is sequential, which means, that there is no random access
-// -> Data is written in first phase and reread in second.
-
-static boost::filesystem::path temp_directory;
-static std::string TemporaryFilePattern("OSRM-%%%%-%%%%-%%%%");
-class TemporaryStorage
-{
-  public:
-    static TemporaryStorage &GetInstance();
-    virtual ~TemporaryStorage();
-
-    int AllocateSlot();
-    void DeallocateSlot(const int slot_id);
-    void WriteToSlot(const int slot_id, char *pointer, const std::size_t size);
-    void ReadFromSlot(const int slot_id, char *pointer, const std::size_t size);
-    // returns the number of free bytes
-    uint64_t GetFreeBytesOnTemporaryDevice();
-    boost::filesystem::fstream::pos_type Tell(const int slot_id);
-    void RemoveAll();
-
-  private:
-    TemporaryStorage();
-    TemporaryStorage(TemporaryStorage const &) {};
-
-    TemporaryStorage &operator=(TemporaryStorage const &) { return *this; }
-
-    void Abort(const boost::filesystem::filesystem_error &e);
-    void CheckIfTemporaryDeviceFull();
-
-    // vector of file streams that is used to store temporary data
-    boost::mutex mutex;
-    std::vector<StreamData> stream_data_list;
-};
-
-#endif /* TEMPORARYSTORAGE_H_ */

DataStructures/BinaryHeap.h

@@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <type_traits>
 #include <unordered_map>
 #include <vector>
+#include <cstring>
 
 template <typename NodeID, typename Key> class ArrayStorage
 {

DataStructures/Coordinate.cpp

@@ -27,7 +27,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <osrm/Coordinate.h>
 #include "../Util/MercatorUtil.h"
+#ifndef NDEBUG
 #include "../Util/SimpleLogger.h"
+#endif
 #include "../Util/StringUtil.h"
 
 #include <boost/assert.hpp>
@@ -159,10 +161,10 @@ FixedPointCoordinate::ComputePerpendicularDistance(const FixedPointCoordinate &s
     // initialize values
     const float x_value = lat2y(point.lat / COORDINATE_PRECISION);
     const float y_value = point.lon / COORDINATE_PRECISION;
-    const float a = lat2y(source_coordinate.lat / COORDINATE_PRECISION);
-    const float b = source_coordinate.lon / COORDINATE_PRECISION;
-    const float c = lat2y(target_coordinate.lat / COORDINATE_PRECISION);
-    const float d = target_coordinate.lon / COORDINATE_PRECISION;
+    float a = lat2y(source_coordinate.lat / COORDINATE_PRECISION);
+    float b = source_coordinate.lon / COORDINATE_PRECISION;
+    float c = lat2y(target_coordinate.lat / COORDINATE_PRECISION);
+    float d = target_coordinate.lon / COORDINATE_PRECISION;
     float p, q;
     if (std::abs(a - c) > std::numeric_limits<float>::epsilon())
     {
@@ -178,15 +180,35 @@ FixedPointCoordinate::ComputePerpendicularDistance(const FixedPointCoordinate &s
         q = y_value;
     }
 
-    float nY = (d * p - c * q) / (a * d - b * c);
-    // discretize the result to coordinate precision. it's a hack!
-    if (std::abs(nY) < (1.f / COORDINATE_PRECISION))
+    float ratio;
+    bool inverse_ratio = false;
+
+    // straight line segment on equator
+    if (std::abs(c) < std::numeric_limits<float>::epsilon() && std::abs(a) < std::numeric_limits<float>::epsilon())
     {
-        nY = 0.f;
+        ratio = (q - b) / (d - b);
+    }
+    else
+    {
+        if (std::abs(c) < std::numeric_limits<float>::epsilon())
+        {
+            // swap start/end
+            std::swap(a, c);
+            std::swap(b, d);
+            inverse_ratio = true;
+        }
+
+        float nY = (d * p - c * q) / (a * d - b * c);
+        // discretize the result to coordinate precision. it's a hack!
+        if (std::abs(nY) < (1.f / COORDINATE_PRECISION))
+        {
+            nY = 0.f;
+        }
+
+        // compute ratio
+        ratio = (p - nY * a) / c;
     }
 
-    // compute ratio
-    float ratio = (p - nY * a) / c;
     if (std::isnan(ratio))
     {
         ratio = (target_coordinate == point ? 1.f : 0.f);
@@ -200,6 +222,12 @@ FixedPointCoordinate::ComputePerpendicularDistance(const FixedPointCoordinate &s
         ratio = 1.f;
     }
 
+    // we need to do this, if we switched start/end coordinates
+    if (inverse_ratio)
+    {
+        ratio = 1.0f - ratio;
+    }
+
     //compute the nearest location
     FixedPointCoordinate nearest_location;
     BOOST_ASSERT(!std::isnan(ratio));
@@ -216,6 +244,7 @@ FixedPointCoordinate::ComputePerpendicularDistance(const FixedPointCoordinate &s
         nearest_location.lat = static_cast<int>(y2lat(p) * COORDINATE_PRECISION);
         nearest_location.lon = static_cast<int>(q * COORDINATE_PRECISION);
     }
+
     BOOST_ASSERT(nearest_location.isValid());
     return FixedPointCoordinate::ApproximateEuclideanDistance(point, nearest_location);
 }

DataStructures/DeallocatingVector.h

@@ -28,250 +28,154 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef DEALLOCATINGVECTOR_H_
 #define DEALLOCATINGVECTOR_H_
 
-#include <boost/assert.hpp>
-#include <cstring>
+#include "Range.h"
+
+#include <boost/iterator/iterator_facade.hpp>
+
+#include <utility>
 #include <vector>
 
-template <typename ElementT,
-          std::size_t bucketSizeC = 8388608 / sizeof(ElementT),
-          bool DeallocateC = false>
-class DeallocatingVectorIterator : public std::iterator<std::random_access_iterator_tag, ElementT>
+template <typename ElementT> struct DeallocatingVectorIteratorState
 {
-  protected:
-    class DeallocatingVectorIteratorState
-    {
-      private:
-        // make constructors explicit, so we do not mix random access and deallocation iterators.
-        DeallocatingVectorIteratorState();
-
-      public:
-        explicit DeallocatingVectorIteratorState(const DeallocatingVectorIteratorState &r)
-            : index(r.index), bucket_list(r.bucket_list)
-        {
-        }
-        explicit DeallocatingVectorIteratorState(const std::size_t idx,
-                                                 std::vector<ElementT *> &input_list)
-            : index(idx), bucket_list(input_list)
-        {
-        }
-        std::size_t index;
-        std::vector<ElementT *> &bucket_list;
-
-        inline bool operator!=(const DeallocatingVectorIteratorState &other)
-        {
-            return index != other.index;
-        }
-
-        inline bool operator==(const DeallocatingVectorIteratorState &other)
-        {
-            return index == other.index;
-        }
-
-        bool operator<(const DeallocatingVectorIteratorState &other) const
-        {
-            return index < other.index;
-        }
-
-        bool operator>(const DeallocatingVectorIteratorState &other) const
-        {
-            return index > other.index;
-        }
-
-        bool operator>=(const DeallocatingVectorIteratorState &other) const
-        {
-            return index >= other.index;
-        }
-
-        // This is a hack to make assignment operator possible with reference member
-        inline DeallocatingVectorIteratorState &operator=(const DeallocatingVectorIteratorState &a)
-        {
-            if (this != &a)
-            {
-                this->DeallocatingVectorIteratorState::
-                    ~DeallocatingVectorIteratorState();        // explicit non-virtual destructor
-                new (this) DeallocatingVectorIteratorState(a); // placement new
-            }
-            return *this;
-        }
-    };
-
-    DeallocatingVectorIteratorState current_state;
-
-  public:
-    typedef std::random_access_iterator_tag iterator_category;
-    typedef typename std::iterator<std::random_access_iterator_tag, ElementT>::value_type
-    value_type;
-    typedef typename std::iterator<std::random_access_iterator_tag, ElementT>::difference_type
-    difference_type;
-    typedef typename std::iterator<std::random_access_iterator_tag, ElementT>::reference reference;
-    typedef typename std::iterator<std::random_access_iterator_tag, ElementT>::pointer pointer;
-
-    DeallocatingVectorIterator() {}
-
-    template <typename T2>
-    explicit DeallocatingVectorIterator(const DeallocatingVectorIterator<T2> &r)
-        : current_state(r.current_state)
+    DeallocatingVectorIteratorState() : index(-1), bucket_list(nullptr) {}
+    explicit DeallocatingVectorIteratorState(const DeallocatingVectorIteratorState &r)
+        : index(r.index), bucket_list(r.bucket_list)
     {
     }
-
-    DeallocatingVectorIterator(std::size_t idx, std::vector<ElementT *> &input_list)
-        : current_state(idx, input_list)
+    explicit DeallocatingVectorIteratorState(const std::size_t idx,
+                                             std::vector<ElementT *> *input_list)
+        : index(idx), bucket_list(input_list)
     {
     }
-    explicit DeallocatingVectorIterator(const DeallocatingVectorIteratorState &r) : current_state(r) {}
+    std::size_t index;
+    std::vector<ElementT *> *bucket_list;
 
-    template <typename T2>
-    DeallocatingVectorIterator &operator=(const DeallocatingVectorIterator<T2> &r)
+    inline DeallocatingVectorIteratorState &operator=(const DeallocatingVectorIteratorState &other)
     {
-        if (DeallocateC)
-        {
-            BOOST_ASSERT(false);
-        }
-        current_state = r.current_state;
+        index = other.index;
+        bucket_list = other.bucket_list;
         return *this;
     }
-
-    inline DeallocatingVectorIterator &operator++()
-    { // prefix
-        ++current_state.index;
-        return *this;
-    }
-
-    inline DeallocatingVectorIterator &operator--()
-    { // prefix
-        if (DeallocateC)
-        {
-            BOOST_ASSERT(false);
-        }
-        --current_state.index;
-        return *this;
-    }
-
-    inline DeallocatingVectorIterator operator++(int)
-    { // postfix
-        DeallocatingVectorIteratorState my_state(current_state);
-        current_state.index++;
-        return DeallocatingVectorIterator(my_state);
-    }
-    inline DeallocatingVectorIterator operator--(int)
-    { // postfix
-        if (DeallocateC)
-        {
-            BOOST_ASSERT(false);
-        }
-        DeallocatingVectorIteratorState my_state(current_state);
-        current_state.index--;
-        return DeallocatingVectorIterator(my_state);
-    }
-
-    inline DeallocatingVectorIterator operator+(const difference_type &n) const
-    {
-        DeallocatingVectorIteratorState my_state(current_state);
-        my_state.index += n;
-        return DeallocatingVectorIterator(my_state);
-    }
-
-    inline DeallocatingVectorIterator &operator+=(const difference_type &n)
-    {
-        current_state.index += n;
-        return *this;
-    }
-
-    inline DeallocatingVectorIterator operator-(const difference_type &n) const
-    {
-        if (DeallocateC)
-        {
-            BOOST_ASSERT(false);
-        }
-        DeallocatingVectorIteratorState my_state(current_state);
-        my_state.index -= n;
-        return DeallocatingVectorIterator(my_state);
-    }
-
-    inline DeallocatingVectorIterator &operator-=(const difference_type &n) const
-    {
-        if (DeallocateC)
-        {
-            BOOST_ASSERT(false);
-        }
-        current_state.index -= n;
-        return *this;
-    }
-
-    inline reference operator*() const
-    {
-        std::size_t current_bucket = current_state.index / bucketSizeC;
-        std::size_t current_index = current_state.index % bucketSizeC;
-        return (current_state.bucket_list[current_bucket][current_index]);
-    }
-
-    inline pointer operator->() const
-    {
-        std::size_t current_bucket = current_state.index / bucketSizeC;
-        std::size_t current_index = current_state.index % bucketSizeC;
-        return &(current_state.bucket_list[current_bucket][current_index]);
-    }
-
-    inline bool operator!=(const DeallocatingVectorIterator &other)
-    {
-        return current_state != other.current_state;
-    }
-
-    inline bool operator==(const DeallocatingVectorIterator &other)
-    {
-        return current_state == other.current_state;
-    }
-
-    inline bool operator<(const DeallocatingVectorIterator &other) const
-    {
-        return current_state < other.current_state;
-    }
-
-    inline bool operator>(const DeallocatingVectorIterator &other) const
-    {
-        return current_state > other.current_state;
-    }
-
-    inline bool operator>=(const DeallocatingVectorIterator &other) const
-    {
-        return current_state >= other.current_state;
-    }
-
-    difference_type operator-(const DeallocatingVectorIterator &other)
-    {
-        if (DeallocateC)
-        {
-            BOOST_ASSERT(false);
-        }
-        return current_state.index - other.current_state.index;
-    }
 };
 
-template <typename ElementT, std::size_t bucketSizeC = 8388608 / sizeof(ElementT)>
+template <typename ElementT, std::size_t ELEMENTS_PER_BLOCK>
+class DeallocatingVectorIterator
+    : public boost::iterator_facade<DeallocatingVectorIterator<ElementT, ELEMENTS_PER_BLOCK>,
+                                    ElementT,
+                                    std::random_access_iterator_tag>
+{
+    DeallocatingVectorIteratorState<ElementT> current_state;
+
+  public:
+    DeallocatingVectorIterator() {}
+    DeallocatingVectorIterator(std::size_t idx, std::vector<ElementT *> *input_list)
+        : current_state(idx, input_list)
+    {
+    }
+
+    friend class boost::iterator_core_access;
+
+    void advance(std::size_t n) { current_state.index += n; }
+
+    void increment() { advance(1); }
+
+    void decrement() { advance(-1); }
+
+    bool equal(DeallocatingVectorIterator const &other) const
+    {
+        return current_state.index == other.current_state.index;
+    }
+
+    std::ptrdiff_t distance_to(DeallocatingVectorIterator const &other) const
+    {
+        // it is important to implement it 'other minus this'. otherwise sorting breaks
+        return other.current_state.index - current_state.index;
+    }
+
+    ElementT &dereference() const
+    {
+        const std::size_t current_bucket = current_state.index / ELEMENTS_PER_BLOCK;
+        const std::size_t current_index = current_state.index % ELEMENTS_PER_BLOCK;
+        return (current_state.bucket_list->at(current_bucket)[current_index]);
+    }
+
+    ElementT &operator[](const std::size_t index) const
+    {
+        const std::size_t current_bucket = (index + current_state.index) / ELEMENTS_PER_BLOCK;
+        const std::size_t current_index = (index + current_state.index) % ELEMENTS_PER_BLOCK;
+        return (current_state.bucket_list->at(current_bucket)[current_index]);
+    }
+};
+
+template <typename ElementT, std::size_t ELEMENTS_PER_BLOCK>
+class DeallocatingVectorRemoveIterator
+    : public boost::iterator_facade<DeallocatingVectorRemoveIterator<ElementT, ELEMENTS_PER_BLOCK>,
+                                    ElementT,
+                                    boost::forward_traversal_tag>
+{
+    DeallocatingVectorIteratorState<ElementT> current_state;
+
+  public:
+    DeallocatingVectorRemoveIterator(std::size_t idx, std::vector<ElementT *> *input_list)
+        : current_state(idx, input_list)
+    {
+    }
+
+    friend class boost::iterator_core_access;
+
+    void increment()
+    {
+        const std::size_t old_bucket = current_state.index / ELEMENTS_PER_BLOCK;
+
+        ++current_state.index;
+        const std::size_t new_bucket = current_state.index / ELEMENTS_PER_BLOCK;
+        if (old_bucket != new_bucket)
+        {
+            // delete old bucket entry
+            if (nullptr != current_state.bucket_list->at(old_bucket))
+            {
+                delete[] current_state.bucket_list->at(old_bucket);
+                current_state.bucket_list->at(old_bucket) = nullptr;
+            }
+        }
+    }
+
+    bool equal(DeallocatingVectorRemoveIterator const &other) const
+    {
+        return current_state.index == other.current_state.index;
+    }
+
+    std::ptrdiff_t distance_to(DeallocatingVectorRemoveIterator const &other) const
+    {
+        return other.current_state.index - current_state.index;
+    }
+
+    ElementT &dereference() const
+    {
+        const std::size_t current_bucket = current_state.index / ELEMENTS_PER_BLOCK;
+        const std::size_t current_index = current_state.index % ELEMENTS_PER_BLOCK;
+        return (current_state.bucket_list->at(current_bucket)[current_index]);
+    }
+};
+
+template <typename ElementT, std::size_t ELEMENTS_PER_BLOCK = 8388608 / sizeof(ElementT)>
 class DeallocatingVector
 {
-  private:
     std::size_t current_size;
     std::vector<ElementT *> bucket_list;
 
   public:
-    typedef ElementT value_type;
-    typedef DeallocatingVectorIterator<ElementT, bucketSizeC, false> iterator;
-    typedef DeallocatingVectorIterator<ElementT, bucketSizeC, false> const_iterator;
+    typedef DeallocatingVectorIterator<ElementT, ELEMENTS_PER_BLOCK> iterator;
+    typedef DeallocatingVectorIterator<ElementT, ELEMENTS_PER_BLOCK> const_iterator;
 
-    // this iterator deallocates all buckets that have been visited. Iterators to visited objects
-    // become invalid.
-    typedef DeallocatingVectorIterator<ElementT, bucketSizeC, true> deallocation_iterator;
+    // this forward-only iterator deallocates all buckets that have been visited
+    typedef DeallocatingVectorRemoveIterator<ElementT, ELEMENTS_PER_BLOCK> deallocation_iterator;
 
-    DeallocatingVector() : current_size(0)
-    {
-        // initial bucket
-        bucket_list.emplace_back(new ElementT[bucketSizeC]);
-    }
+    DeallocatingVector() : current_size(0) { bucket_list.emplace_back(new ElementT[ELEMENTS_PER_BLOCK]); }
 
     ~DeallocatingVector() { clear(); }
 
-    inline void swap(DeallocatingVector<ElementT, bucketSizeC> &other)
+    inline void swap(DeallocatingVector<ElementT, ELEMENTS_PER_BLOCK> &other)
     {
         std::swap(current_size, other.current_size);
         bucket_list.swap(other.bucket_list);
@@ -280,16 +184,15 @@ class DeallocatingVector
     inline void clear()
     {
         // Delete[]'ing ptr's to all Buckets
-        for (unsigned i = 0; i < bucket_list.size(); ++i)
+        for (auto bucket : bucket_list)
         {
-            if (nullptr != bucket_list[i])
+            if (nullptr != bucket)
             {
-                delete[] bucket_list[i];
-                bucket_list[i] = nullptr;
+                delete[] bucket;
+                bucket = nullptr;
             }
         }
-        // Removing all ptrs from vector
-        std::vector<ElementT *>().swap(bucket_list);
+        bucket_list.clear(); bucket_list.shrink_to_fit();
         current_size = 0;
     }
 
@@ -298,104 +201,113 @@ class DeallocatingVector
         const std::size_t current_capacity = capacity();
         if (current_size == current_capacity)
         {
-            bucket_list.push_back(new ElementT[bucketSizeC]);
+            bucket_list.push_back(new ElementT[ELEMENTS_PER_BLOCK]);
         }
 
-        std::size_t current_index = size() % bucketSizeC;
+        std::size_t current_index = size() % ELEMENTS_PER_BLOCK;
         bucket_list.back()[current_index] = element;
         ++current_size;
     }
 
-    inline void emplace_back(const ElementT &&element)
+    template <typename... Ts> inline void emplace_back(Ts &&... element)
     {
         const std::size_t current_capacity = capacity();
         if (current_size == current_capacity)
         {
-            bucket_list.push_back(new ElementT[bucketSizeC]);
+            bucket_list.push_back(new ElementT[ELEMENTS_PER_BLOCK]);
         }
 
-        const std::size_t current_index = size() % bucketSizeC;
-        bucket_list.back()[current_index] = element;
+        const std::size_t current_index = size() % ELEMENTS_PER_BLOCK;
+        bucket_list.back()[current_index] = ElementT(std::forward<Ts>(element)...);
         ++current_size;
     }
 
-    inline void reserve(const std::size_t) const
-    {
-        // don't do anything
-    }
+    inline void reserve(const std::size_t) const { /* don't do anything */ }
 
     inline void resize(const std::size_t new_size)
     {
-        if (new_size > current_size)
+        if (new_size >= current_size)
         {
             while (capacity() < new_size)
             {
-                bucket_list.push_back(new ElementT[bucketSizeC]);
+                bucket_list.push_back(new ElementT[ELEMENTS_PER_BLOCK]);
             }
-            current_size = new_size;
         }
-        if (new_size < current_size)
-        {
-            const std::size_t number_of_necessary_buckets = 1 + (new_size / bucketSizeC);
-
-            for (std::size_t i = number_of_necessary_buckets; i < bucket_list.size(); ++i)
+        else
+        {   // down-size
+            const std::size_t number_of_necessary_buckets = 1 + (new_size / ELEMENTS_PER_BLOCK);
+            for (const auto bucket_index : osrm::irange(number_of_necessary_buckets, bucket_list.size()))
             {
-                delete[] bucket_list[i];
+                if (nullptr != bucket_list[bucket_index])
+                {
+                    delete[] bucket_list[bucket_index];
+                }
             }
             bucket_list.resize(number_of_necessary_buckets);
-            current_size = new_size;
         }
+        current_size = new_size;
     }
 
     inline std::size_t size() const { return current_size; }
 
-    inline std::size_t capacity() const { return bucket_list.size() * bucketSizeC; }
+    inline std::size_t capacity() const { return bucket_list.size() * ELEMENTS_PER_BLOCK; }
 
-    inline iterator begin() { return iterator(static_cast<std::size_t>(0), bucket_list); }
+    inline iterator begin() { return iterator(static_cast<std::size_t>(0), &bucket_list); }
 
-    inline iterator end() { return iterator(size(), bucket_list); }
+    inline iterator end() { return iterator(size(), &bucket_list); }
 
     inline deallocation_iterator dbegin()
     {
-        return deallocation_iterator(static_cast<std::size_t>(0), bucket_list);
+        return deallocation_iterator(static_cast<std::size_t>(0), &bucket_list);
     }
 
-    inline deallocation_iterator dend() { return deallocation_iterator(size(), bucket_list); }
+    inline deallocation_iterator dend() { return deallocation_iterator(size(), &bucket_list); }
 
     inline const_iterator begin() const
     {
-        return const_iterator(static_cast<std::size_t>(0), bucket_list);
+        return const_iterator(static_cast<std::size_t>(0), &bucket_list);
     }
 
-    inline const_iterator end() const { return const_iterator(size(), bucket_list); }
+    inline const_iterator end() const { return const_iterator(size(), &bucket_list); }
 
     inline ElementT &operator[](const std::size_t index)
     {
-        std::size_t _bucket = index / bucketSizeC;
-        std::size_t _index = index % bucketSizeC;
+        const std::size_t _bucket = index / ELEMENTS_PER_BLOCK;
+        const std::size_t _index = index % ELEMENTS_PER_BLOCK;
         return (bucket_list[_bucket][_index]);
     }
 
     const inline ElementT &operator[](const std::size_t index) const
     {
-        std::size_t _bucket = index / bucketSizeC;
-        std::size_t _index = index % bucketSizeC;
+        const std::size_t _bucket = index / ELEMENTS_PER_BLOCK;
+        const std::size_t _index = index % ELEMENTS_PER_BLOCK;
         return (bucket_list[_bucket][_index]);
     }
 
     inline ElementT &back()
     {
-        std::size_t _bucket = current_size / bucketSizeC;
-        std::size_t _index = current_size % bucketSizeC;
+        const std::size_t _bucket = current_size / ELEMENTS_PER_BLOCK;
+        const std::size_t _index = current_size % ELEMENTS_PER_BLOCK;
         return (bucket_list[_bucket][_index]);
     }
 
     const inline ElementT &back() const
     {
-        std::size_t _bucket = current_size / bucketSizeC;
-        std::size_t _index = current_size % bucketSizeC;
+        const std::size_t _bucket = current_size / ELEMENTS_PER_BLOCK;
+        const std::size_t _index = current_size % ELEMENTS_PER_BLOCK;
         return (bucket_list[_bucket][_index]);
     }
+
+    template<class InputIterator>
+    const inline void append(InputIterator first, const InputIterator last)
+    {
+        InputIterator position = first;
+        while (position != last)
+        {
+            push_back(*position);
+            ++position;
+        }
+    }
 };
 
 #endif /* DEALLOCATINGVECTOR_H_ */

DataStructures/DynamicGraph.h

@@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef DYNAMICGRAPH_H
 #define DYNAMICGRAPH_H
 
-#include "../DataStructures/DeallocatingVector.h"
+#include "DeallocatingVector.h"
+#include "Range.h"
 
 #include <boost/assert.hpp>
-#include <boost/range/irange.hpp>
 
 #include <cstdint>
 
@@ -43,10 +43,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 template <typename EdgeDataT> class DynamicGraph
 {
   public:
-    typedef decltype(boost::irange(0u,0u)) EdgeRange;
     typedef EdgeDataT EdgeData;
     typedef unsigned NodeIterator;
     typedef unsigned EdgeIterator;
+    typedef osrm::range<EdgeIterator> EdgeRange;
 
     class InputEdge
     {
@@ -54,57 +54,62 @@ template <typename EdgeDataT> class DynamicGraph
         NodeIterator source;
         NodeIterator target;
         EdgeDataT data;
+
+        InputEdge() : source(std::numeric_limits<NodeIterator>::max()), target(std::numeric_limits<NodeIterator>::max()) { }
+
+        template<typename... Ts>
+        InputEdge(NodeIterator source, NodeIterator target, Ts &&...data) : source(source), target(target), data(std::forward<Ts>(data)...) { }
+
         bool operator<(const InputEdge &right) const
         {
             if (source != right.source)
+            {
                 return source < right.source;
+            }
             return target < right.target;
         }
     };
 
     // Constructs an empty graph with a given number of nodes.
-    explicit DynamicGraph(int32_t nodes) : m_numNodes(nodes), m_numEdges(0)
+    explicit DynamicGraph(int32_t nodes) : number_of_nodes(nodes), number_of_edges(0)
     {
-        m_nodes.reserve(m_numNodes);
-        m_nodes.resize(m_numNodes);
+        node_list.reserve(number_of_nodes);
+        node_list.resize(number_of_nodes);
 
-        m_edges.reserve(m_numNodes * 1.1);
-        m_edges.resize(m_numNodes);
+        edge_list.reserve(number_of_nodes * 1.1);
+        edge_list.resize(number_of_nodes);
     }
 
     template <class ContainerT> DynamicGraph(const int32_t nodes, const ContainerT &graph)
     {
-        m_numNodes = nodes;
-        m_numEdges = (EdgeIterator)graph.size();
-        m_nodes.reserve(m_numNodes + 1);
-        m_nodes.resize(m_numNodes + 1);
+        number_of_nodes = nodes;
+        number_of_edges = (EdgeIterator)graph.size();
+        node_list.reserve(number_of_nodes + 1);
+        node_list.resize(number_of_nodes + 1);
         EdgeIterator edge = 0;
         EdgeIterator position = 0;
-        for (NodeIterator node = 0; node < m_numNodes; ++node)
+        for (const auto node : osrm::irange(0u, number_of_nodes))
         {
             EdgeIterator lastEdge = edge;
-            while (edge < m_numEdges && graph[edge].source == node)
+            while (edge < number_of_edges && graph[edge].source == node)
             {
                 ++edge;
             }
-            m_nodes[node].firstEdge = position;
-            m_nodes[node].edges = edge - lastEdge;
-            position += m_nodes[node].edges;
+            node_list[node].firstEdge = position;
+            node_list[node].edges = edge - lastEdge;
+            position += node_list[node].edges;
         }
-        m_nodes.back().firstEdge = position;
-        m_edges.reserve(static_cast<std::size_t>(position * 1.1));
-        m_edges.resize(position);
+        node_list.back().firstEdge = position;
+        edge_list.reserve((std::size_t)edge_list.size() * 1.1);
+        edge_list.resize(position);
         edge = 0;
-        for (NodeIterator node = 0; node < m_numNodes; ++node)
+        for (const auto node : osrm::irange(0u, number_of_nodes))
         {
-            for (EdgeIterator i = m_nodes[node].firstEdge,
-                              e = m_nodes[node].firstEdge + m_nodes[node].edges;
-                 i != e;
-                 ++i)
+            for (const auto i : osrm::irange(node_list[node].firstEdge,
+                                              node_list[node].firstEdge + node_list[node].edges))
             {
-                m_edges[i].target = graph[edge].target;
-                m_edges[i].data = graph[edge].data;
-                BOOST_ASSERT_MSG(graph[edge].data.distance > 0, "edge distance invalid");
+                edge_list[i].target = graph[edge].target;
+                edge_list[i].data = graph[edge].data;
                 ++edge;
             }
         }
@@ -112,16 +117,16 @@ template <typename EdgeDataT> class DynamicGraph
 
     ~DynamicGraph() {}
 
-    unsigned GetNumberOfNodes() const { return m_numNodes; }
+    unsigned GetNumberOfNodes() const { return number_of_nodes; }
 
-    unsigned GetNumberOfEdges() const { return m_numEdges; }
+    unsigned GetNumberOfEdges() const { return number_of_edges; }
 
-    unsigned GetOutDegree(const NodeIterator n) const { return m_nodes[n].edges; }
+    unsigned GetOutDegree(const NodeIterator n) const { return node_list[n].edges; }
 
     unsigned GetDirectedOutDegree(const NodeIterator n) const
     {
         unsigned degree = 0;
-        for(EdgeIterator edge = BeginEdges(n); edge < EndEdges(n); ++edge)
+        for (const auto edge : osrm::irange(BeginEdges(n), EndEdges(n)))
         {
             if (GetEdgeData(edge).forward)
             {
@@ -131,66 +136,76 @@ template <typename EdgeDataT> class DynamicGraph
         return degree;
     }
 
-    NodeIterator GetTarget(const EdgeIterator e) const { return NodeIterator(m_edges[e].target); }
+    NodeIterator GetTarget(const EdgeIterator e) const { return NodeIterator(edge_list[e].target); }
 
-    void SetTarget(const EdgeIterator e, const NodeIterator n) { m_edges[e].target = n; }
+    void SetTarget(const EdgeIterator e, const NodeIterator n) { edge_list[e].target = n; }
 
-    EdgeDataT &GetEdgeData(const EdgeIterator e) { return m_edges[e].data; }
+    EdgeDataT &GetEdgeData(const EdgeIterator e) { return edge_list[e].data; }
 
-    const EdgeDataT &GetEdgeData(const EdgeIterator e) const { return m_edges[e].data; }
+    const EdgeDataT &GetEdgeData(const EdgeIterator e) const { return edge_list[e].data; }
 
     EdgeIterator BeginEdges(const NodeIterator n) const
     {
-        return EdgeIterator(m_nodes[n].firstEdge);
+        return EdgeIterator(node_list[n].firstEdge);
     }
 
     EdgeIterator EndEdges(const NodeIterator n) const
     {
-        return EdgeIterator(m_nodes[n].firstEdge + m_nodes[n].edges);
+        return EdgeIterator(node_list[n].firstEdge + node_list[n].edges);
     }
 
     EdgeRange GetAdjacentEdgeRange(const NodeIterator node) const
     {
-        return boost::irange(BeginEdges(node), EndEdges(node));
+        return osrm::irange(BeginEdges(node), EndEdges(node));
+    }
+
+    NodeIterator InsertNode()
+    {
+        node_list.emplace_back(node_list.back());
+        number_of_nodes += 1;
+
+        return number_of_nodes;
     }
 
     // adds an edge. Invalidates edge iterators for the source node
     EdgeIterator InsertEdge(const NodeIterator from, const NodeIterator to, const EdgeDataT &data)
     {
-        Node &node = m_nodes[from];
+        Node &node = node_list[from];
         EdgeIterator newFirstEdge = node.edges + node.firstEdge;
-        if (newFirstEdge >= m_edges.size() || !isDummy(newFirstEdge))
+        if (newFirstEdge >= edge_list.size() || !isDummy(newFirstEdge))
         {
             if (node.firstEdge != 0 && isDummy(node.firstEdge - 1))
             {
                 node.firstEdge--;
-                m_edges[node.firstEdge] = m_edges[node.firstEdge + node.edges];
+                edge_list[node.firstEdge] = edge_list[node.firstEdge + node.edges];
             }
             else
             {
-                EdgeIterator newFirstEdge = (EdgeIterator)m_edges.size();
+                EdgeIterator newFirstEdge = (EdgeIterator)edge_list.size();
                 unsigned newSize = node.edges * 1.1 + 2;
-                EdgeIterator requiredCapacity = newSize + m_edges.size();
-                EdgeIterator oldCapacity = m_edges.capacity();
+                EdgeIterator requiredCapacity = newSize + edge_list.size();
+                EdgeIterator oldCapacity = edge_list.capacity();
                 if (requiredCapacity >= oldCapacity)
                 {
-                    m_edges.reserve(requiredCapacity * 1.1);
+                    edge_list.reserve(requiredCapacity * 1.1);
                 }
-                m_edges.resize(m_edges.size() + newSize);
-                for (EdgeIterator i = 0; i < node.edges; ++i)
+                edge_list.resize(edge_list.size() + newSize);
+                for (const auto i : osrm::irange(0u, node.edges))
                 {
-                    m_edges[newFirstEdge + i] = m_edges[node.firstEdge + i];
+                    edge_list[newFirstEdge + i] = edge_list[node.firstEdge + i];
                     makeDummy(node.firstEdge + i);
                 }
-                for (EdgeIterator i = node.edges + 1; i < newSize; ++i)
+                for (const auto i : osrm::irange(node.edges + 1, newSize))
+                {
                     makeDummy(newFirstEdge + i);
+                }
                 node.firstEdge = newFirstEdge;
             }
         }
-        Edge &edge = m_edges[node.firstEdge + node.edges];
+        Edge &edge = edge_list[node.firstEdge + node.edges];
         edge.target = to;
         edge.data = data;
-        ++m_numEdges;
+        ++number_of_edges;
         ++node.edges;
         return EdgeIterator(node.firstEdge + node.edges);
     }
@@ -198,14 +213,14 @@ template <typename EdgeDataT> class DynamicGraph
     // removes an edge. Invalidates edge iterators for the source node
     void DeleteEdge(const NodeIterator source, const EdgeIterator e)
     {
-        Node &node = m_nodes[source];
-        --m_numEdges;
+        Node &node = node_list[source];
+        --number_of_edges;
         --node.edges;
         BOOST_ASSERT(std::numeric_limits<unsigned>::max() != node.edges);
         const unsigned last = node.firstEdge + node.edges;
         BOOST_ASSERT(std::numeric_limits<unsigned>::max() != last);
         // swap with last edge
-        m_edges[e] = m_edges[last];
+        edge_list[e] = edge_list[last];
         makeDummy(last);
     }
 
@@ -215,19 +230,19 @@ template <typename EdgeDataT> class DynamicGraph
         int32_t deleted = 0;
         for (EdgeIterator i = BeginEdges(source), iend = EndEdges(source); i < iend - deleted; ++i)
         {
-            if (m_edges[i].target == target)
+            if (edge_list[i].target == target)
             {
                 do
                 {
                     deleted++;
-                    m_edges[i] = m_edges[iend - deleted];
+                    edge_list[i] = edge_list[iend - deleted];
                     makeDummy(iend - deleted);
-                } while (i < iend - deleted && m_edges[i].target == target);
+                } while (i < iend - deleted && edge_list[i].target == target);
             }
         }
 
-        m_numEdges -= deleted;
-        m_nodes[source].edges -= deleted;
+        number_of_edges -= deleted;
+        node_list[source].edges -= deleted;
 
         return deleted;
     }
@@ -235,9 +250,9 @@ template <typename EdgeDataT> class DynamicGraph
     // searches for a specific edge
     EdgeIterator FindEdge(const NodeIterator from, const NodeIterator to) const
     {
-        for (EdgeIterator i = BeginEdges(from), iend = EndEdges(from); i != iend; ++i)
+        for (const auto i : osrm::irange(BeginEdges(from), EndEdges(from)))
         {
-            if (to == m_edges[i].target)
+            if (to == edge_list[i].target)
             {
                 return i;
             }
@@ -248,12 +263,12 @@ template <typename EdgeDataT> class DynamicGraph
   protected:
     bool isDummy(const EdgeIterator edge) const
     {
-        return m_edges[edge].target == (std::numeric_limits<NodeIterator>::max)();
+        return edge_list[edge].target == (std::numeric_limits<NodeIterator>::max)();
     }
 
     void makeDummy(const EdgeIterator edge)
     {
-        m_edges[edge].target = (std::numeric_limits<NodeIterator>::max)();
+        edge_list[edge].target = (std::numeric_limits<NodeIterator>::max)();
     }
 
     struct Node
@@ -270,11 +285,11 @@ template <typename EdgeDataT> class DynamicGraph
         EdgeDataT data;
     };
 
-    NodeIterator m_numNodes;
-    std::atomic_uint m_numEdges;
+    NodeIterator number_of_nodes;
+    std::atomic_uint number_of_edges;
 
-    std::vector<Node> m_nodes;
-    DeallocatingVector<Edge> m_edges;
+    std::vector<Node> node_list;
+    DeallocatingVector<Edge> edge_list;
 };
 
 #endif // DYNAMICGRAPH_H

DataStructures/NodeBasedGraph.h

@@ -46,14 +46,20 @@ struct NodeBasedEdgeData
     }
 };
 
+struct SimpleEdgeData
+{
+    SimpleEdgeData() : capacity(0) {}
+    EdgeWeight capacity;
+};
+
 typedef DynamicGraph<NodeBasedEdgeData> NodeBasedDynamicGraph;
+typedef DynamicGraph<SimpleEdgeData> SimpleNodeBasedDynamicGraph;
 
 // Factory method to create NodeBasedDynamicGraph from ImportEdges
 inline std::shared_ptr<NodeBasedDynamicGraph>
 NodeBasedDynamicGraphFromImportEdges(int number_of_nodes, std::vector<ImportEdge> &input_edge_list)
 {
     static_assert(sizeof(NodeBasedEdgeData) == 16, "changing node based edge data size changes memory consumption");
-    // tbb::parallel_sort(input_edge_list.begin(), input_edge_list.end());
 
     DeallocatingVector<NodeBasedDynamicGraph::InputEdge> edges_list;
     NodeBasedDynamicGraph::InputEdge edge;
@@ -100,7 +106,7 @@ NodeBasedDynamicGraphFromImportEdges(int number_of_nodes, std::vector<ImportEdge
     }
 
     // remove duplicate edges
-    std::sort(edges_list.begin(), edges_list.end());
+    tbb::parallel_sort(edges_list.begin(), edges_list.end());
     NodeID edge_count = 0;
     for (NodeID i = 0; i < edges_list.size(); )
     {
@@ -163,4 +169,77 @@ NodeBasedDynamicGraphFromImportEdges(int number_of_nodes, std::vector<ImportEdge
     return graph;
 }
 
+template<class SimpleEdgeT>
+inline std::shared_ptr<SimpleNodeBasedDynamicGraph>
+SimpleNodeBasedDynamicGraphFromEdges(int number_of_nodes, std::vector<SimpleEdgeT> &input_edge_list)
+{
+    static_assert(sizeof(NodeBasedEdgeData) == 16, "changing node based edge data size changes memory consumption");
+    tbb::parallel_sort(input_edge_list.begin(), input_edge_list.end());
+
+    DeallocatingVector<SimpleNodeBasedDynamicGraph::InputEdge> edges_list;
+    SimpleNodeBasedDynamicGraph::InputEdge edge;
+    edge.data.capacity = 1;
+    for (const SimpleEdgeT &import_edge : input_edge_list)
+    {
+        if (import_edge.source == import_edge.target)
+        {
+            continue;
+        }
+        edge.source = import_edge.source;
+        edge.target = import_edge.target;
+        edges_list.push_back(edge);
+        std::swap(edge.source, edge.target);
+        edges_list.push_back(edge);
+    }
+
+     // remove duplicate edges
+    tbb::parallel_sort(edges_list.begin(), edges_list.end());
+    NodeID edge_count = 0;
+    for (NodeID i = 0; i < edges_list.size(); )
+    {
+        const NodeID source = edges_list[i].source;
+        const NodeID target = edges_list[i].target;
+        // remove eigenloops
+        if (source == target)
+        {
+            i++;
+            continue;
+        }
+        SimpleNodeBasedDynamicGraph::InputEdge forward_edge;
+        SimpleNodeBasedDynamicGraph::InputEdge reverse_edge;
+        forward_edge = reverse_edge = edges_list[i];
+        forward_edge.data.capacity = reverse_edge.data.capacity = INVALID_EDGE_WEIGHT;
+        // remove parallel edges
+        while (i < edges_list.size() && edges_list[i].source == source && edges_list[i].target == target)
+        {
+            forward_edge.data.capacity = std::min(edges_list[i].data.capacity, forward_edge.data.capacity);
+            reverse_edge.data.capacity = std::min(edges_list[i].data.capacity, reverse_edge.data.capacity);
+            ++i;
+        }
+        // merge edges (s,t) and (t,s) into bidirectional edge
+        if (forward_edge.data.capacity == reverse_edge.data.capacity)
+        {
+            if ((int)forward_edge.data.capacity != INVALID_EDGE_WEIGHT)
+            {
+                edges_list[edge_count++] = forward_edge;
+            }
+        }
+        else
+        { // insert seperate edges
+            if (((int)forward_edge.data.capacity) != INVALID_EDGE_WEIGHT)
+            {
+                edges_list[edge_count++] = forward_edge;
+            }
+            if ((int)reverse_edge.data.capacity != INVALID_EDGE_WEIGHT)
+            {
+                edges_list[edge_count++] = reverse_edge;
+            }
+        }
+    }
+    SimpleLogger().Write() << "merged " << edges_list.size() - edge_count << " edges out of " << edges_list.size();
+
+    auto graph = std::make_shared<SimpleNodeBasedDynamicGraph>(number_of_nodes, edges_list);
+    return graph;
+}
+
 #endif // __NODE_BASED_GRAPH_H__

DataStructures/QueryEdge.h

@@ -36,6 +36,16 @@ struct QueryEdge
     NodeID target;
     struct EdgeData
     {
+        EdgeData() : id(0), shortcut(false), distance(0), forward(false), backward(false) {}
+
+        template <class OtherT> EdgeData(const OtherT &other)
+        {
+            distance = other.distance;
+            shortcut = other.shortcut;
+            id = other.id;
+            forward = other.forward;
+            backward = other.backward;
+        }
         NodeID id : 31;
         bool shortcut : 1;
         int distance : 30;
@@ -43,6 +53,13 @@ struct QueryEdge
         bool backward : 1;
     } data;
 
+    QueryEdge() : source(SPECIAL_NODEID), target(SPECIAL_NODEID) {}
+
+    QueryEdge(NodeID source, NodeID target, EdgeData data)
+        : source(source), target(target), data(data)
+    {
+    }
+
     bool operator<(const QueryEdge &right) const
     {
         if (source != right.source)

DataStructures/Range.h

@@ -0,0 +1,67 @@
+/*
+
+Copyright (c) 2013,2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef RANGE_H
+#define RANGE_H
+
+#include <type_traits>
+
+namespace osrm
+{
+
+template <typename Integer> class range
+{
+  private:
+    Integer last;
+    Integer iter;
+
+  public:
+    range(Integer start, Integer end) : last(end), iter(start)
+    {
+        static_assert(std::is_integral<Integer>::value, "range type must be integral");
+    }
+
+    // Iterable functions
+    const range &begin() const { return *this; }
+    const range &end() const { return *this; }
+    Integer front() const { return iter; }
+    Integer back() const { return last - 1; }
+
+    // Iterator functions
+    bool operator!=(const range &) const { return iter < last; }
+    void operator++() { ++iter; }
+    Integer operator*() const { return iter; }
+};
+
+// convenience function to construct an integer range with type deduction
+template <typename Integer> range<Integer> irange(Integer first, Integer last)
+{
+    return range<Integer>(first, last);
+}
+}
+
+#endif // RANGE_H

DataStructures/RangeTable.h

@@ -1,11 +1,10 @@
 #ifndef __RANGE_TABLE_H__
 #define __RANGE_TABLE_H__
 
+#include "Range.h"
 #include "SharedMemoryFactory.h"
 #include "SharedMemoryVectorWrapper.h"
 
-#include <boost/range/irange.hpp>
-
 #include <fstream>
 #include <vector>
 #include <array>
@@ -40,7 +39,7 @@ public:
     typedef std::array<unsigned char, BLOCK_SIZE> BlockT;
     typedef typename ShM<BlockT, USE_SHARED_MEMORY>::vector   BlockContainerT;
     typedef typename ShM<unsigned, USE_SHARED_MEMORY>::vector OffsetContainerT;
-    typedef decltype(boost::irange(0u,0u))                    RangeT;
+    typedef osrm::range<unsigned>                            RangeT;
 
     friend std::ostream& operator<< <>(std::ostream &out, const RangeTable &table);
     friend std::istream& operator>> <>(std::istream &in, RangeTable &table);
@@ -117,7 +116,8 @@ public:
         {
             // the last value is used as sentinel
             block_offsets.push_back(lengths_prefix_sum);
-            block_idx = (block_idx + 1) % BLOCK_SIZE;
+            block_idx = 1;
+            last_length = 0;
         }
 
         while (0 != block_idx)
@@ -166,7 +166,7 @@ public:
         BOOST_ASSERT(begin_idx < sum_lengths && end_idx <= sum_lengths);
         BOOST_ASSERT(begin_idx <= end_idx);
 
-        return boost::irange(begin_idx, end_idx);
+        return osrm::irange(begin_idx, end_idx);
     }
 private:
 

DataStructures/RawRouteData.h

@@ -69,6 +69,11 @@ struct RawRouteData
     int shortest_path_length;
     int alternative_path_length;
 
+    bool is_via_leg(const std::size_t leg) const
+    {
+        return (leg != unpacked_path_segments.size() - 1);
+    }
+
     RawRouteData()
         : check_sum(SPECIAL_NODEID),
           shortest_path_length(INVALID_EDGE_WEIGHT),

DataStructures/RestrictionMap.cpp

@@ -96,9 +96,8 @@ void RestrictionMap::FixupArrivingTurnRestriction(const NodeID node_u,
     std::vector<NodeID> predecessors;
     for (const EdgeID current_edge_id : m_graph->GetAdjacentEdgeRange(node_u))
     {
-        const EdgeData &edge_data = m_graph->GetEdgeData(current_edge_id);
         const NodeID target = m_graph->GetTarget(current_edge_id);
-        if (edge_data.backward && (node_v != target))
+        if (node_v != target)
         {
             predecessors.push_back(target);
         }
@@ -163,11 +162,11 @@ NodeID RestrictionMap::CheckForEmanatingIsOnlyTurn(const NodeID node_u, const No
         return SPECIAL_NODEID;
     }
 
-    auto restriction_iter = m_restriction_map.find({node_u, node_v});
+    const auto restriction_iter = m_restriction_map.find({node_u, node_v});
     if (restriction_iter != m_restriction_map.end())
     {
         const unsigned index = restriction_iter->second;
-        auto &bucket = m_restriction_bucket_list.at(index);
+        const auto &bucket = m_restriction_bucket_list.at(index);
         for (const RestrictionTarget &restriction_target : bucket)
         {
             if (restriction_target.is_only)
@@ -184,8 +183,6 @@ bool RestrictionMap::CheckIfTurnIsRestricted(const NodeID node_u,
                                              const NodeID node_v,
                                              const NodeID node_w) const
 {
-    // return false;
-
     BOOST_ASSERT(node_u != SPECIAL_NODEID);
     BOOST_ASSERT(node_v != SPECIAL_NODEID);
     BOOST_ASSERT(node_w != SPECIAL_NODEID);
@@ -195,7 +192,7 @@ bool RestrictionMap::CheckIfTurnIsRestricted(const NodeID node_u,
         return false;
     }
 
-    auto restriction_iter = m_restriction_map.find({node_u, node_v});
+    const auto restriction_iter = m_restriction_map.find({node_u, node_v});
     if (restriction_iter != m_restriction_map.end())
     {
         const unsigned index = restriction_iter->second;

DataStructures/RestrictionMap.h

@@ -103,7 +103,7 @@ class RestrictionMap
     NodeID CheckForEmanatingIsOnlyTurn(const NodeID u, const NodeID v) const;
     bool CheckIfTurnIsRestricted(const NodeID u, const NodeID v, const NodeID w) const;
     bool IsViaNode(const NodeID node) const;
-    unsigned size()
+    std::size_t size()
     {
         return m_count;
     }
@@ -113,7 +113,7 @@ class RestrictionMap
     typedef std::vector<RestrictionTarget> EmanatingRestrictionsVector;
     typedef NodeBasedDynamicGraph::EdgeData EdgeData;
 
-    unsigned m_count;
+    std::size_t m_count;
     std::shared_ptr<NodeBasedDynamicGraph> m_graph;
     //! index -> list of (target, isOnly)
     std::vector<EmanatingRestrictionsVector> m_restriction_bucket_list;

DataStructures/RouteParameters.cpp

@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 RouteParameters::RouteParameters()
     : zoom_level(18), print_instructions(false), alternate_route(true), geometry(true),
-      compression(true), deprecatedAPI(false), check_sum(-1)
+      compression(true), deprecatedAPI(false), uturn_default(false), check_sum(-1)
 {
 }
 
@@ -47,6 +47,26 @@ void RouteParameters::setZoomLevel(const short level)
 
 void RouteParameters::setAlternateRouteFlag(const bool flag) { alternate_route = flag; }
 
+void RouteParameters::setUTurn(const bool flag)
+{
+    uturns.resize(coordinates.size(), uturn_default);
+    if (!uturns.empty())
+    {
+        uturns.back() = flag;
+    }
+}
+
+void RouteParameters::setAllUTurns(const bool flag)
+{
+    // if the flag flips the default, then we erase everything.
+    if (flag)
+    {
+        uturn_default = flag;
+        uturns.clear();
+        uturns.resize(coordinates.size(), uturn_default);
+    }
+}
+
 void RouteParameters::setDeprecatedAPIFlag(const std::string &) { deprecatedAPI = true; }
 
 void RouteParameters::setChecksum(const unsigned sum) { check_sum = sum; }

DataStructures/StaticGraph.h

@@ -28,33 +28,38 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef STATIC_GRAPH_H
 #define STATIC_GRAPH_H
 
-#include "../DataStructures/Percent.h"
-#include "../DataStructures/SharedMemoryVectorWrapper.h"
+#include "Percent.h"
+#include "Range.h"
+#include "SharedMemoryVectorWrapper.h"
 #include "../Util/SimpleLogger.h"
 #include "../typedefs.h"
 
 #include <boost/assert.hpp>
-#include <boost/range/irange.hpp>
 
 #include <tbb/parallel_sort.h>
 
 #include <algorithm>
 #include <limits>
+#include <utility>
 #include <vector>
 
 template <typename EdgeDataT, bool UseSharedMemory = false> class StaticGraph
 {
   public:
-    typedef decltype(boost::irange(0u,0u)) EdgeRange;
     typedef NodeID NodeIterator;
     typedef NodeID EdgeIterator;
     typedef EdgeDataT EdgeData;
+    typedef osrm::range<EdgeIterator> EdgeRange;
+
     class InputEdge
     {
       public:
-        EdgeDataT data;
         NodeIterator source;
         NodeIterator target;
+        EdgeDataT data;
+
+        template<typename... Ts>
+        InputEdge(NodeIterator source, NodeIterator target, Ts &&...data) : source(source), target(target), data(std::forward<Ts>(data)...) { }
         bool operator<(const InputEdge &right) const
         {
             if (source != right.source)
@@ -79,7 +84,7 @@ template <typename EdgeDataT, bool UseSharedMemory = false> class StaticGraph
 
     EdgeRange GetAdjacentEdgeRange(const NodeID node) const
     {
-        return boost::irange(BeginEdges(node), EndEdges(node));
+        return osrm::irange(BeginEdges(node), EndEdges(node));
     }
 
     StaticGraph(const int nodes, std::vector<InputEdge> &graph)
@@ -90,7 +95,7 @@ template <typename EdgeDataT, bool UseSharedMemory = false> class StaticGraph
         node_array.resize(number_of_nodes + 1);
         EdgeIterator edge = 0;
         EdgeIterator position = 0;
-        for (NodeIterator node = 0; node <= number_of_nodes; ++node)
+        for (const auto node : osrm::irange(0u, number_of_nodes+1))
         {
             EdgeIterator last_edge = edge;
             while (edge < number_of_edges && graph[edge].source == node)
@@ -102,7 +107,7 @@ template <typename EdgeDataT, bool UseSharedMemory = false> class StaticGraph
         }
         edge_array.resize(position); //(edge)
         edge = 0;
-        for (NodeIterator node = 0; node < number_of_nodes; ++node)
+        for (const auto node : osrm::irange(0u, number_of_nodes))
         {
             EdgeIterator e = node_array[node + 1].first_edge;
             for (EdgeIterator i = node_array[node].first_edge; i != e; ++i)
@@ -123,46 +128,13 @@ template <typename EdgeDataT, bool UseSharedMemory = false> class StaticGraph
 
         node_array.swap(nodes);
         edge_array.swap(edges);
-
-#ifndef NDEBUG
-        Percent p(GetNumberOfNodes());
-        for (unsigned u = 0; u < GetNumberOfNodes(); ++u)
-        {
-            for (auto eid : GetAdjacentEdgeRange(u))
-            {
-                const EdgeData &data = GetEdgeData(eid);
-                if (!data.shortcut)
-                {
-                    continue;
-                }
-                const unsigned v = GetTarget(eid);
-                const EdgeID first_edge_id = FindEdgeInEitherDirection(u, data.id);
-                if (SPECIAL_EDGEID == first_edge_id)
-                {
-                    SimpleLogger().Write(logWARNING) << "cannot find first segment of edge ("
-                                                     << u << "," << data.id << "," << v
-                                                     << "), eid: " << eid;
-                    BOOST_ASSERT(false);
-                }
-                const EdgeID second_edge_id = FindEdgeInEitherDirection(data.id, v);
-                if (SPECIAL_EDGEID == second_edge_id)
-                {
-                    SimpleLogger().Write(logWARNING) << "cannot find second segment of edge ("
-                                                     << u << "," << data.id << "," << v
-                                                     << "), eid: " << eid;
-                    BOOST_ASSERT(false);
-                }
-            }
-            p.printIncrement();
-        }
-#endif
     }
 
-    unsigned GetNumberOfNodes() const { return number_of_nodes -1; }
+    unsigned GetNumberOfNodes() const { return number_of_nodes; }
 
     unsigned GetNumberOfEdges() const { return number_of_edges; }
 
-    unsigned GetOutDegree(const NodeIterator n) const { return BeginEdges(n) - EndEdges(n) - 1; }
+    unsigned GetOutDegree(const NodeIterator n) const { return EndEdges(n) - BeginEdges(n); }
 
     inline NodeIterator GetTarget(const EdgeIterator e) const
     {

DataStructures/StaticRTree.h

@@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "SharedMemoryVectorWrapper.h"
 
 #include "../Util/MercatorUtil.h"
+#include "../Util/NumericUtil.h"
 #include "../Util/OSRMException.h"
 #include "../Util/SimpleLogger.h"
 #include "../Util/TimingUtil.h"
@@ -60,16 +61,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>
 
-// tuning parameters
-const static uint32_t RTREE_BRANCHING_FACTOR = 64;
-const static uint32_t RTREE_LEAF_NODE_SIZE = 1024;
-
-static boost::thread_specific_ptr<boost::filesystem::ifstream> thread_local_rtree_stream;
-
 // Implements a static, i.e. packed, R-tree
 template <class EdgeDataT,
           class CoordinateListT = std::vector<FixedPointCoordinate>,
-          bool UseSharedMemory = false>
+          bool UseSharedMemory = false,
+          uint32_t BRANCHING_FACTOR=64,
+          uint32_t LEAF_NODE_SIZE=1024>
 class StaticRTree
 {
   public:
@@ -80,7 +77,7 @@ class StaticRTree
         int32_t min_lon, max_lon;
         int32_t min_lat, max_lat;
 
-        inline void InitializeMBRectangle(const std::array<EdgeDataT, RTREE_LEAF_NODE_SIZE> &objects,
+        inline void InitializeMBRectangle(const std::array<EdgeDataT, LEAF_NODE_SIZE> &objects,
                                           const uint32_t element_count,
                                           const std::vector<NodeInfo> &coordinate_list)
         {
@@ -147,19 +144,64 @@ class StaticRTree
                 return 0.;
             }
 
+            enum Direction
+            {
+                INVALID    = 0,
+                NORTH      = 1,
+                SOUTH      = 2,
+                EAST       = 4,
+                NORTH_EAST = 5,
+                SOUTH_EAST = 6,
+                WEST       = 8,
+                NORTH_WEST = 9,
+                SOUTH_WEST = 10
+            };
+
+            Direction d = INVALID;
+            if (location.lat > max_lat)
+                d = (Direction) (d | NORTH);
+            else if (location.lat < min_lat)
+                d = (Direction) (d | SOUTH);
+            if (location.lon > max_lon)
+                d = (Direction) (d | EAST);
+            else if (location.lon < min_lon)
+                d = (Direction) (d | WEST);
+
+            BOOST_ASSERT(d != INVALID);
+
             float min_dist = std::numeric_limits<float>::max();
-            min_dist = std::min(min_dist,
-                                FixedPointCoordinate::ApproximateEuclideanDistance(
-                                    location.lat, location.lon, max_lat, min_lon));
-            min_dist = std::min(min_dist,
-                                FixedPointCoordinate::ApproximateEuclideanDistance(
-                                    location.lat, location.lon, max_lat, max_lon));
-            min_dist = std::min(min_dist,
-                                FixedPointCoordinate::ApproximateEuclideanDistance(
-                                    location.lat, location.lon, min_lat, max_lon));
-            min_dist = std::min(min_dist,
-                                FixedPointCoordinate::ApproximateEuclideanDistance(
-                                    location.lat, location.lon, min_lat, min_lon));
+            switch (d)
+            {
+                case NORTH:
+                    min_dist = FixedPointCoordinate::ApproximateEuclideanDistance(location, FixedPointCoordinate(max_lat, location.lon));
+                    break;
+                case SOUTH:
+                    min_dist = FixedPointCoordinate::ApproximateEuclideanDistance(location, FixedPointCoordinate(min_lat, location.lon));
+                    break;
+                case WEST:
+                    min_dist = FixedPointCoordinate::ApproximateEuclideanDistance(location, FixedPointCoordinate(location.lat, min_lon));
+                    break;
+                case EAST:
+                    min_dist = FixedPointCoordinate::ApproximateEuclideanDistance(location, FixedPointCoordinate(location.lat, max_lon));
+                    break;
+                case NORTH_EAST:
+                    min_dist = FixedPointCoordinate::ApproximateEuclideanDistance(location, FixedPointCoordinate(max_lat, max_lon));
+                    break;
+                case NORTH_WEST:
+                    min_dist = FixedPointCoordinate::ApproximateEuclideanDistance(location, FixedPointCoordinate(max_lat, min_lon));
+                    break;
+                case SOUTH_EAST:
+                    min_dist = FixedPointCoordinate::ApproximateEuclideanDistance(location, FixedPointCoordinate(min_lat, max_lon));
+                    break;
+                case SOUTH_WEST:
+                    min_dist = FixedPointCoordinate::ApproximateEuclideanDistance(location, FixedPointCoordinate(min_lat, min_lon));
+                    break;
+                default:
+                    break;
+            }
+
+            BOOST_ASSERT(min_dist != std::numeric_limits<float>::max());
+
             return min_dist;
         }
 
@@ -167,10 +209,10 @@ class StaticRTree
         {
             float min_max_dist = std::numeric_limits<float>::max();
             // Get minmax distance to each of the four sides
-            FixedPointCoordinate upper_left(max_lat, min_lon);
-            FixedPointCoordinate upper_right(max_lat, max_lon);
-            FixedPointCoordinate lower_right(min_lat, max_lon);
-            FixedPointCoordinate lower_left(min_lat, min_lon);
+            const FixedPointCoordinate upper_left(max_lat, min_lon);
+            const FixedPointCoordinate upper_right(max_lat, max_lon);
+            const FixedPointCoordinate lower_right(min_lat, max_lon);
+            const FixedPointCoordinate lower_left(min_lat, min_lon);
 
             min_max_dist = std::min(
                 min_max_dist,
@@ -198,8 +240,8 @@ class StaticRTree
 
         inline bool Contains(const FixedPointCoordinate &location) const
         {
-            const bool lats_contained = (location.lat > min_lat) && (location.lat < max_lat);
-            const bool lons_contained = (location.lon > min_lon) && (location.lon < max_lon);
+            const bool lats_contained = (location.lat >= min_lat) && (location.lat <= max_lat);
+            const bool lons_contained = (location.lon >= min_lon) && (location.lon <= max_lon);
             return lats_contained && lons_contained;
         }
 
@@ -220,7 +262,7 @@ class StaticRTree
         RectangleT minimum_bounding_rectangle;
         uint32_t child_count : 31;
         bool child_is_on_disk : 1;
-        uint32_t children[RTREE_BRANCHING_FACTOR];
+        uint32_t children[BRANCHING_FACTOR];
     };
 
   private:
@@ -244,9 +286,9 @@ class StaticRTree
 
     struct LeafNode
     {
-        LeafNode() : object_count(0) {}
+        LeafNode() : object_count(0), objects() {}
         uint32_t object_count;
-        std::array<EdgeDataT, RTREE_LEAF_NODE_SIZE> objects;
+        std::array<EdgeDataT, LEAF_NODE_SIZE> objects;
     };
 
     struct QueryCandidate
@@ -304,6 +346,7 @@ class StaticRTree
     uint64_t m_element_count;
     const std::string m_leaf_node_filename;
     std::shared_ptr<CoordinateListT> m_coordinate_list;
+    boost::filesystem::ifstream leaves_stream;
 
   public:
     StaticRTree() = delete;
@@ -369,7 +412,7 @@ class StaticRTree
             TreeNode current_node;
             // SimpleLogger().Write() << "reading " << tree_size << " tree nodes in " <<
             // (sizeof(TreeNode)*tree_size) << " bytes";
-            for (uint32_t current_element_index = 0; RTREE_LEAF_NODE_SIZE > current_element_index;
+            for (uint32_t current_element_index = 0; LEAF_NODE_SIZE > current_element_index;
                  ++current_element_index)
             {
                 if (m_element_count > (processed_objects_count + current_element_index))
@@ -406,9 +449,9 @@ class StaticRTree
             while (processed_tree_nodes_in_level < tree_nodes_in_level.size())
             {
                 TreeNode parent_node;
-                // pack RTREE_BRANCHING_FACTOR elements into tree_nodes each
+                // pack BRANCHING_FACTOR elements into tree_nodes each
                 for (uint32_t current_child_node_index = 0;
-                     RTREE_BRANCHING_FACTOR > current_child_node_index;
+                     BRANCHING_FACTOR > current_child_node_index;
                      ++current_child_node_index)
                 {
                     if (processed_tree_nodes_in_level < tree_nodes_in_level.size())
@@ -507,16 +550,15 @@ class StaticRTree
             throw OSRMException("mem index file is empty");
         }
 
-        boost::filesystem::ifstream leaf_node_file(leaf_file, std::ios::binary);
-        leaf_node_file.read((char *)&m_element_count, sizeof(uint64_t));
-        leaf_node_file.close();
+        leaves_stream.open(leaf_file, std::ios::binary);
+        leaves_stream.read((char *)&m_element_count, sizeof(uint64_t));
 
         // SimpleLogger().Write() << tree_size << " nodes in search tree";
         // SimpleLogger().Write() << m_element_count << " elements in leafs";
     }
 
     explicit StaticRTree(TreeNode *tree_node_ptr,
-                         const uint32_t number_of_nodes,
+                         const uint64_t number_of_nodes,
                          const boost::filesystem::path &leaf_file,
                          std::shared_ptr<CoordinateListT> coordinate_list)
         : m_search_tree(tree_node_ptr, number_of_nodes), m_leaf_node_filename(leaf_file.string()),
@@ -532,14 +574,8 @@ class StaticRTree
             throw OSRMException("mem index file is empty");
         }
 
-        boost::filesystem::ifstream leaf_node_file(leaf_file, std::ios::binary);
-        leaf_node_file.read((char *)&m_element_count, sizeof(uint64_t));
-        leaf_node_file.close();
-
-        if (thread_local_rtree_stream.get())
-        {
-            thread_local_rtree_stream->close();
-        }
+        leaves_stream.open(leaf_file, std::ios::binary);
+        leaves_stream.read((char *)&m_element_count, sizeof(uint64_t));
 
         // SimpleLogger().Write() << tree_size << " nodes in search tree";
         // SimpleLogger().Write() << m_element_count << " elements in leafs";
@@ -628,7 +664,7 @@ class StaticRTree
                                             std::vector<PhantomNode> &result_phantom_node_vector,
                                             const unsigned zoom_level,
                                             const unsigned number_of_results,
-                                            const unsigned max_checked_segments = 4*RTREE_LEAF_NODE_SIZE)
+                                            const unsigned max_checked_segments = 4*LEAF_NODE_SIZE)
     {
         // TIMER_START(samet);
         // SimpleLogger().Write(logDEBUG) << "searching for " << number_of_results << " results";
@@ -834,19 +870,172 @@ class StaticRTree
         return !result_phantom_node_vector.empty();
     }
 
+    // implementation of the Hjaltason/Samet query [3], a BFS traversal of the tree
+    bool
+    IncrementalFindPhantomNodeForCoordinateWithDistance(const FixedPointCoordinate &input_coordinate,
+                                                        std::vector<std::pair<PhantomNode, double>> &result_phantom_node_vector,
+                                                        const unsigned zoom_level,
+                                                        const unsigned number_of_results,
+                                                        const unsigned max_checked_segments = 4*LEAF_NODE_SIZE)
+    {
+        std::vector<float> min_found_distances(number_of_results, std::numeric_limits<float>::max());
+
+        unsigned number_of_results_found_in_big_cc = 0;
+        unsigned number_of_results_found_in_tiny_cc = 0;
+
+        unsigned inspected_segments = 0;
+
+        // initialize queue with root element
+        std::priority_queue<IncrementalQueryCandidate> traversal_queue;
+        traversal_queue.emplace(0.f, m_search_tree[0]);
+
+        while (!traversal_queue.empty())
+        {
+            const IncrementalQueryCandidate current_query_node = traversal_queue.top();
+            traversal_queue.pop();
+
+            const float current_min_dist = min_found_distances[number_of_results-1];
+
+            if (current_query_node.min_dist > current_min_dist)
+            {
+                continue;
+            }
+
+            if (current_query_node.RepresentsTreeNode())
+            {
+                const TreeNode & current_tree_node = boost::get<TreeNode>(current_query_node.node);
+                if (current_tree_node.child_is_on_disk)
+                {
+                    LeafNode current_leaf_node;
+                    LoadLeafFromDisk(current_tree_node.children[0], current_leaf_node);
+                    // Add all objects from leaf into queue
+                    for (uint32_t i = 0; i < current_leaf_node.object_count; ++i)
+                    {
+                        const auto &current_edge = current_leaf_node.objects[i];
+                        const float current_perpendicular_distance =
+                            FixedPointCoordinate::ComputePerpendicularDistance(
+                                m_coordinate_list->at(current_edge.u),
+                                m_coordinate_list->at(current_edge.v),
+                                input_coordinate);
+                        // distance must be non-negative
+                        BOOST_ASSERT(0. <= current_perpendicular_distance);
+
+                        if (current_perpendicular_distance < current_min_dist)
+                        {
+                            traversal_queue.emplace(current_perpendicular_distance, current_edge);
+                        }
+                    }
+                }
+                else
+                {
+                    // for each child mbr
+                    for (uint32_t i = 0; i < current_tree_node.child_count; ++i)
+                    {
+                        const int32_t child_id = current_tree_node.children[i];
+                        const TreeNode &child_tree_node = m_search_tree[child_id];
+                        const RectangleT &child_rectangle = child_tree_node.minimum_bounding_rectangle;
+                        const float lower_bound_to_element = child_rectangle.GetMinDist(input_coordinate);
+
+                        // TODO - enough elements found, i.e. nearest distance > maximum distance?
+                        //        ie. some measure of 'confidence of accuracy'
+
+                        // check if it needs to be explored by mindist
+                        if (lower_bound_to_element < current_min_dist)
+                        {
+                            traversal_queue.emplace(lower_bound_to_element, child_tree_node);
+                        }
+                    }
+                    // SimpleLogger().Write(logDEBUG) << "added " << current_tree_node.child_count << " mbrs into queue of " << traversal_queue.size();
+                }
+            }
+            else
+            {
+                ++inspected_segments;
+                // inspecting an actual road segment
+                const EdgeDataT & current_segment = boost::get<EdgeDataT>(current_query_node.node);
+
+                // don't collect too many results from small components
+                if (number_of_results_found_in_big_cc == number_of_results && !current_segment.is_in_tiny_cc)
+                {
+                    continue;
+                }
+
+                // don't collect too many results from big components
+                if (number_of_results_found_in_tiny_cc == number_of_results && current_segment.is_in_tiny_cc)
+                {
+                    continue;
+                }
+
+                // check if it is smaller than what we had before
+                float current_ratio = 0.;
+                FixedPointCoordinate foot_point_coordinate_on_segment;
+                const float current_perpendicular_distance =
+                    FixedPointCoordinate::ComputePerpendicularDistance(
+                        m_coordinate_list->at(current_segment.u),
+                        m_coordinate_list->at(current_segment.v),
+                        input_coordinate,
+                        foot_point_coordinate_on_segment,
+                        current_ratio);
+
+                BOOST_ASSERT(0. <= current_perpendicular_distance);
+
+                if ((current_perpendicular_distance < current_min_dist) &&
+                    !EpsilonCompare(current_perpendicular_distance, current_min_dist))
+                {
+                    // store phantom node in result vector
+                    result_phantom_node_vector.emplace_back(
+                        current_segment.forward_edge_based_node_id,
+                        current_segment.reverse_edge_based_node_id,
+                        current_segment.name_id,
+                        current_segment.forward_weight,
+                        current_segment.reverse_weight,
+                        current_segment.forward_offset,
+                        current_segment.reverse_offset,
+                        current_segment.packed_geometry_id,
+                        foot_point_coordinate_on_segment,
+                        current_segment.fwd_segment_position,
+                        current_perpendicular_distance);
+
+                    // Hack to fix rounding errors and wandering via nodes.
+                    FixUpRoundingIssue(input_coordinate, result_phantom_node_vector.back());
+
+                    // set forward and reverse weights on the phantom node
+                    SetForwardAndReverseWeightsOnPhantomNode(current_segment,
+                                                             result_phantom_node_vector.back());
+
+                    // do we have results only in a small scc
+                    if (current_segment.is_in_tiny_cc)
+                    {
+                        ++number_of_results_found_in_tiny_cc;
+                    }
+                    else
+                    {
+                        // found an element in a large component
+                        min_found_distances[number_of_results_found_in_big_cc] = current_perpendicular_distance;
+                        ++number_of_results_found_in_big_cc;
+                        // SimpleLogger().Write(logDEBUG) << std::setprecision(8) << foot_point_coordinate_on_segment << " at " << current_perpendicular_distance;
+                    }
+                }
+            }
+
+            // TODO add indicator to prune if maxdist > threshold
+            if (number_of_results == number_of_results_found_in_big_cc || inspected_segments >= max_checked_segments)
+            {
+                // SimpleLogger().Write(logDEBUG) << "flushing queue of " << traversal_queue.size() << " elements";
+                // work-around for traversal_queue.clear();
+                traversal_queue = std::priority_queue<IncrementalQueryCandidate>{};
+            }
+        }
+
+        return !result_phantom_node_vector.empty();
+    }
+
+
+
     bool FindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
                                       PhantomNode &result_phantom_node,
                                       const unsigned zoom_level)
     {
-
-        std::vector<PhantomNode> result_phantom_node_vector;
-        IncrementalFindPhantomNodeForCoordinate(input_coordinate, result_phantom_node_vector, zoom_level, 2);
-        // if (!result_phantom_node_vector.empty())
-        // {
-        //     result_phantom_node = result_phantom_node_vector.front();
-        // }
-        // return !result_phantom_node_vector.empty();
-
         const bool ignore_tiny_components = (zoom_level <= 14);
         EdgeDataT nearest_edge;
 
@@ -997,22 +1186,21 @@ class StaticRTree
 
     inline void LoadLeafFromDisk(const uint32_t leaf_id, LeafNode &result_node)
     {
-        if (!thread_local_rtree_stream.get() || !thread_local_rtree_stream->is_open())
+        if (!leaves_stream.is_open())
         {
-            thread_local_rtree_stream.reset(new boost::filesystem::ifstream(
-                m_leaf_node_filename, std::ios::in | std::ios::binary));
+            leaves_stream.open(m_leaf_node_filename, std::ios::in | std::ios::binary);
         }
-        if (!thread_local_rtree_stream->good())
+        if (!leaves_stream.good())
         {
-            thread_local_rtree_stream->clear(std::ios::goodbit);
+            leaves_stream.clear(std::ios::goodbit);
             SimpleLogger().Write(logDEBUG) << "Resetting stale filestream";
         }
         const uint64_t seek_pos = sizeof(uint64_t) + leaf_id * sizeof(LeafNode);
-        thread_local_rtree_stream->seekg(seek_pos);
-        BOOST_ASSERT_MSG(thread_local_rtree_stream->good(),
+        leaves_stream.seekg(seek_pos);
+        BOOST_ASSERT_MSG(leaves_stream.good(),
                          "Seeking to position in leaf file failed.");
-        thread_local_rtree_stream->read((char *)&result_node, sizeof(LeafNode));
-        BOOST_ASSERT_MSG(thread_local_rtree_stream->good(), "Reading from leaf file failed.");
+        leaves_stream.read((char *)&result_node, sizeof(LeafNode));
+        BOOST_ASSERT_MSG(leaves_stream.good(), "Reading from leaf file failed.");
     }
 
     inline bool EdgesAreEquivalent(const FixedPointCoordinate &a,
@@ -1022,11 +1210,6 @@ class StaticRTree
     {
         return (a == b && c == d) || (a == c && b == d) || (a == d && b == c);
     }
-
-    template <typename FloatT> inline bool EpsilonCompare(const FloatT d1, const FloatT d2) const
-    {
-        return (std::abs(d1 - d2) < std::numeric_limits<FloatT>::epsilon());
-    }
 };
 
 //[1] "On Packing R-Trees"; I. Kamel, C. Faloutsos; 1993; DOI: 10.1145/170088.170403

DataStructures/TurnInstructions.h

@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 enum class TurnInstruction : unsigned char
 {
     NoTurn = 0, GoStraight, TurnSlightRight, TurnRight, TurnSharpRight, UTurn,
-    TurnSharpLeft, TurnLeft, TurnSlightLeft, ReachViaPoint, HeadOn, EnterRoundAbout,
+    TurnSharpLeft, TurnLeft, TurnSlightLeft, ReachViaLocation, HeadOn, EnterRoundAbout,
     LeaveRoundAbout, StayOnRoundAbout, StartAtEndOfStreet, ReachedYourDestination,
     EnterAgainstAllowedDirection, LeaveAgainstAllowedDirection,
     InverseAccessRestrictionFlag = 127,

DataStructures/XORFastHash.h

@@ -70,7 +70,7 @@ class XORFastHash
 
     inline unsigned short operator()(const unsigned originalValue) const
     {
-        unsigned short lsb = ((originalValue) & 0xffff);
+        unsigned short lsb = ((originalValue)&0xffff);
         unsigned short msb = (((originalValue) >> 16) & 0xffff);
         return table1[lsb] ^ table2[msb];
     }
@@ -104,7 +104,7 @@ class XORMiniHash
     }
     unsigned char operator()(const unsigned originalValue) const
     {
-        unsigned char byte1 = ((originalValue) & 0xff);
+        unsigned char byte1 = ((originalValue)&0xff);
         unsigned char byte2 = ((originalValue >> 8) & 0xff);
         unsigned char byte3 = ((originalValue >> 16) & 0xff);
         unsigned char byte4 = ((originalValue >> 24) & 0xff);

Descriptors/DescriptionFactory.cpp

@@ -50,13 +50,21 @@ void DescriptionFactory::SetStartSegment(const PhantomNode &source, const bool t
     BOOST_ASSERT(path_description.back().duration == segment_duration);
 }
 
-void DescriptionFactory::SetEndSegment(const PhantomNode &target, const bool traversed_in_reverse)
+void DescriptionFactory::SetEndSegment(const PhantomNode &target,
+                                       const bool traversed_in_reverse,
+                                       const bool is_via_location)
 {
     target_phantom = target;
     const EdgeWeight segment_duration =
         (traversed_in_reverse ? target.reverse_weight : target.forward_weight);
-    path_description.emplace_back(
-        target.location, target.name_id, segment_duration, 0.f, TurnInstruction::NoTurn, true, true);
+    path_description.emplace_back(target.location,
+                                  target.name_id,
+                                  segment_duration,
+                                  0.f,
+                                  is_via_location ? TurnInstruction::ReachViaLocation
+                                                  : TurnInstruction::NoTurn,
+                                  true,
+                                  true);
     BOOST_ASSERT(path_description.back().duration == segment_duration);
 }
 
@@ -72,7 +80,7 @@ void DescriptionFactory::AppendSegment(const FixedPointCoordinate &coordinate,
     path_description.emplace_back(coordinate,
                                   path_point.name_id,
                                   path_point.segment_duration,
-                                  0,
+                                  0.f,
                                   path_point.turn_instruction);
 }
 

Descriptors/DescriptionFactory.h

@@ -80,7 +80,7 @@ class DescriptionFactory
     void AppendSegment(const FixedPointCoordinate &coordinate, const PathData &data);
     void BuildRouteSummary(const double distance, const unsigned time);
     void SetStartSegment(const PhantomNode &start_phantom, const bool traversed_in_reverse);
-    void SetEndSegment(const PhantomNode &start_phantom, const bool traversed_in_reverse);
+    void SetEndSegment(const PhantomNode &start_phantom, const bool traversed_in_reverse, const bool is_via_location = false);
     JSON::Value AppendEncodedPolylineString(const bool return_encoded);
     std::vector<unsigned> const & GetViaIndices() const;
 

Descriptors/JSONDescriptor.h

@@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Algorithms/ObjectToBase64.h"
 #include "../Algorithms/ExtractRouteNames.h"
 #include "../DataStructures/JSONContainer.h"
+#include "../DataStructures/Range.h"
 #include "../DataStructures/SegmentInformation.h"
 #include "../DataStructures/TurnInstructions.h"
 #include "../Util/Azimuth.h"
@@ -75,7 +76,8 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
 
     unsigned DescribeLeg(const std::vector<PathData> route_leg,
                          const PhantomNodes &leg_phantoms,
-                         const bool target_traversed_in_reverse)
+                         const bool target_traversed_in_reverse,
+                         const bool is_via_leg)
     {
         unsigned added_element_count = 0;
         // Get all the coordinates for the computed route
@@ -86,7 +88,7 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
             description_factory.AppendSegment(current_coordinate, path_data);
             ++added_element_count;
         }
-        description_factory.SetEndSegment(leg_phantoms.target_phantom, target_traversed_in_reverse);
+        description_factory.SetEndSegment(leg_phantoms.target_phantom, target_traversed_in_reverse, is_via_leg);
         ++added_element_count;
         BOOST_ASSERT((route_leg.size() + 1) == added_element_count);
         return added_element_count;
@@ -118,14 +120,15 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
         json_result.values["status_message"] = "Found route between points";
 
         // for each unpacked segment add the leg to the description
-        for (unsigned i = 0; i < raw_route.unpacked_path_segments.size(); ++i)
+        for (const auto i : osrm::irange<std::size_t>(0, raw_route.unpacked_path_segments.size()))
         {
 #ifndef NDEBUG
             const int added_segments =
 #endif
-                DescribeLeg(raw_route.unpacked_path_segments[i],
-                            raw_route.segment_end_coordinates[i],
-                            raw_route.target_traversed_in_reverse[i]);
+            DescribeLeg(raw_route.unpacked_path_segments[i],
+                        raw_route.segment_end_coordinates[i],
+                        raw_route.target_traversed_in_reverse[i],
+                        raw_route.is_via_leg(i));
             BOOST_ASSERT(0 < added_segments);
         }
         description_factory.Run(facade, config.zoom_level);
@@ -201,6 +204,7 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
                 current = facade->GetCoordinateOfNode(path_data.node);
                 alternate_description_factory.AppendSegment(current, path_data);
             }
+            alternate_description_factory.SetEndSegment(raw_route.segment_end_coordinates.back().target_phantom, raw_route.alt_source_traversed_in_reverse.back());
             alternate_description_factory.Run(facade, config.zoom_level);
 
             if (config.geometry)
@@ -275,7 +279,7 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
         json_hint_object.values["checksum"] = raw_route.check_sum;
         JSON::Array json_location_hint_array;
         std::string hint;
-        for (unsigned i = 0; i < raw_route.segment_end_coordinates.size(); ++i)
+        for (const auto i : osrm::irange<std::size_t>(0, raw_route.segment_end_coordinates.size()))
         {
             EncodeObjectToBase64(raw_route.segment_end_coordinates[i].source_phantom, hint);
             json_location_hint_array.values.push_back(hint);
@@ -300,7 +304,7 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
     {
         // Segment information has following format:
         //["instruction id","streetname",length,position,time,"length","earth_direction",azimuth]
-        unsigned necessary_segments_running_index = 1;
+        unsigned necessary_segments_running_index = 0;
         round_about.leave_at_exit = 0;
         round_about.name_id = 0;
         std::string temp_dist, temp_length, temp_duration, temp_bearing, temp_instruction;
@@ -344,13 +348,13 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
                     json_instruction_row.values.push_back(necessary_segments_running_index);
                     json_instruction_row.values.push_back(round(segment.duration / 10));
                     json_instruction_row.values.push_back(
-                        UintToString(static_cast<unsigned>(segment.length)) + "m");
+                        UintToString(static_cast<int>(segment.length)) + "m");
                     const double bearing_value = (segment.bearing / 10.) ;
                     json_instruction_row.values.push_back(Azimuth::Get(bearing_value));
                     json_instruction_row.values.push_back(static_cast<unsigned>(round(bearing_value)));
 
                     route_segments_list.emplace_back(
-                        segment.name_id, segment.length, route_segments_list.size());
+                        segment.name_id, static_cast<int>(segment.length), static_cast<unsigned>(route_segments_list.size()));
                     json_instruction_array.values.push_back(json_instruction_row);
                 }
             }
@@ -364,21 +368,17 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
             }
         }
 
-        // TODO: check if this in an invariant
-        if (INVALID_EDGE_WEIGHT != route_length)
-        {
-            JSON::Array json_last_instruction_row;
-            temp_instruction = IntToString(as_integer(TurnInstruction::ReachedYourDestination));
-            json_last_instruction_row.values.push_back(temp_instruction);
-            json_last_instruction_row.values.push_back("");
-            json_last_instruction_row.values.push_back(0);
-            json_last_instruction_row.values.push_back(necessary_segments_running_index - 1);
-            json_last_instruction_row.values.push_back(0);
-            json_last_instruction_row.values.push_back("0m");
-            json_last_instruction_row.values.push_back(Azimuth::Get(0.0));
-            json_last_instruction_row.values.push_back(0.);
-            json_instruction_array.values.push_back(json_last_instruction_row);
-        }
+        JSON::Array json_last_instruction_row;
+        temp_instruction = IntToString(as_integer(TurnInstruction::ReachedYourDestination));
+        json_last_instruction_row.values.push_back(temp_instruction);
+        json_last_instruction_row.values.push_back("");
+        json_last_instruction_row.values.push_back(0);
+        json_last_instruction_row.values.push_back(necessary_segments_running_index - 1);
+        json_last_instruction_row.values.push_back(0);
+        json_last_instruction_row.values.push_back("0m");
+        json_last_instruction_row.values.push_back(Azimuth::Get(0.0));
+        json_last_instruction_row.values.push_back(0.);
+        json_instruction_array.values.push_back(json_last_instruction_row);
     }
 };
 

Extractor/BaseParser.cpp

@@ -53,12 +53,13 @@ void BaseParser::ReadUseRestrictionsSetting()
 {
     if (0 != luaL_dostring(lua_state, "return use_turn_restrictions\n"))
     {
-        throw OSRMException("ERROR occured in scripting block");
+        use_turn_restrictions = false;
     }
-    if (lua_isboolean(lua_state, -1))
+    else if (lua_isboolean(lua_state, -1))
     {
         use_turn_restrictions = lua_toboolean(lua_state, -1);
     }
+
     if (use_turn_restrictions)
     {
         SimpleLogger().Write() << "Using turn restrictions";

Extractor/Extractor.cpp

@@ -0,0 +1,302 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "Extractor.h"
+
+#include "ExtractorCallbacks.h"
+#include "ExtractionContainers.h"
+#include "PBFParser.h"
+#include "ScriptingEnvironment.h"
+#include "XMLParser.h"
+
+#include "../Util/GitDescription.h"
+#include "../Util/OSRMException.h"
+#include "../Util/ProgramOptions.h"
+#include "../Util/SimpleLogger.h"
+#include "../Util/TimingUtil.h"
+#include "../typedefs.h"
+
+#include <boost/program_options.hpp>
+
+#include <tbb/task_scheduler_init.h>
+
+#include <cstdlib>
+
+#include <chrono>
+#include <fstream>
+#include <iostream>
+#include <thread>
+#include <unordered_map>
+
+Extractor::Extractor() : requested_num_threads(0), file_has_pbf_format(false)
+{
+}
+
+Extractor::~Extractor() {}
+
+bool Extractor::ParseArguments(int argc, char *argv[])
+{
+    // declare a group of options that will be allowed only on command line
+    boost::program_options::options_description generic_options("Options");
+    generic_options.add_options()("version,v", "Show version")("help,h", "Show this help message")(
+        "config,c",
+        boost::program_options::value<boost::filesystem::path>(&config_file_path)
+            ->default_value("extractor.ini"),
+        "Path to a configuration file.");
+
+    // declare a group of options that will be allowed both on command line and in config file
+    boost::program_options::options_description config_options("Configuration");
+    config_options.add_options()("profile,p",
+                                 boost::program_options::value<boost::filesystem::path>(
+                                     &profile_path)->default_value("profile.lua"),
+                                 "Path to LUA routing profile")(
+        "threads,t",
+        boost::program_options::value<unsigned int>(&requested_num_threads)
+            ->default_value(tbb::task_scheduler_init::default_num_threads()),
+        "Number of threads to use");
+
+    // hidden options, will be allowed both on command line and in config file, but will not be
+    // shown to the user
+    boost::program_options::options_description hidden_options("Hidden options");
+    hidden_options.add_options()(
+        "input,i",
+        boost::program_options::value<boost::filesystem::path>(&input_path),
+        "Input file in .osm, .osm.bz2 or .osm.pbf format");
+
+    // positional option
+    boost::program_options::positional_options_description positional_options;
+    positional_options.add("input", 1);
+
+    // combine above options for parsing
+    boost::program_options::options_description cmdline_options;
+    cmdline_options.add(generic_options).add(config_options).add(hidden_options);
+
+    boost::program_options::options_description config_file_options;
+    config_file_options.add(config_options).add(hidden_options);
+
+    boost::program_options::options_description visible_options(
+        boost::filesystem::basename(argv[0]) + " <input.osm/.osm.bz2/.osm.pbf> [options]");
+    visible_options.add(generic_options).add(config_options);
+
+    // parse command line options
+    boost::program_options::variables_map option_variables;
+    boost::program_options::store(boost::program_options::command_line_parser(argc, argv)
+                                      .options(cmdline_options)
+                                      .positional(positional_options)
+                                      .run(),
+                                  option_variables);
+
+    if (option_variables.count("version"))
+    {
+        SimpleLogger().Write() << g_GIT_DESCRIPTION;
+        return false;
+    }
+
+    if (option_variables.count("help"))
+    {
+        SimpleLogger().Write() << visible_options;
+        return false;
+    }
+
+    boost::program_options::notify(option_variables);
+
+    // parse config file
+    if (boost::filesystem::is_regular_file(config_file_path))
+    {
+        SimpleLogger().Write() << "Reading options from: " << config_file_path.string();
+        std::string ini_file_contents = ReadIniFileAndLowerContents(config_file_path);
+        std::stringstream config_stream(ini_file_contents);
+        boost::program_options::store(parse_config_file(config_stream, config_file_options),
+                                      option_variables);
+        boost::program_options::notify(option_variables);
+    }
+
+    if (!option_variables.count("input"))
+    {
+        SimpleLogger().Write() << visible_options;
+        return false;
+    }
+
+    return true;
+}
+
+void Extractor::GenerateOutputFilesNames()
+{
+    output_file_name = input_path.string();
+    restriction_file_name = input_path.string();
+    std::string::size_type pos = output_file_name.find(".osm.bz2");
+    if (pos == std::string::npos)
+    {
+        pos = output_file_name.find(".osm.pbf");
+        if (pos != std::string::npos)
+        {
+            file_has_pbf_format = true;
+        }
+        else
+        {
+            pos = output_file_name.find(".osm.xml");
+        }
+    }
+    if (pos == std::string::npos)
+    {
+        pos = output_file_name.find(".pbf");
+        if (pos != std::string::npos)
+        {
+            file_has_pbf_format = true;
+        }
+    }
+    if (pos == std::string::npos)
+    {
+        pos = output_file_name.find(".osm");
+        if (pos == std::string::npos)
+        {
+            output_file_name.append(".osrm");
+            restriction_file_name.append(".osrm.restrictions");
+        }
+        else
+        {
+            output_file_name.replace(pos, 5, ".osrm");
+            restriction_file_name.replace(pos, 5, ".osrm.restrictions");
+        }
+    }
+    else
+    {
+        output_file_name.replace(pos, 8, ".osrm");
+        restriction_file_name.replace(pos, 8, ".osrm.restrictions");
+    }
+}
+
+int Extractor::Run(int argc, char *argv[])
+{
+    try
+    {
+        LogPolicy::GetInstance().Unmute();
+
+        TIMER_START(extracting);
+
+        if (!ParseArguments(argc, argv))
+            return 0;
+
+        if (1 > requested_num_threads)
+        {
+            SimpleLogger().Write(logWARNING) << "Number of threads must be 1 or larger";
+            return 1;
+        }
+
+        if (!boost::filesystem::is_regular_file(input_path))
+        {
+            SimpleLogger().Write(logWARNING) << "Input file " << input_path.string()
+                                             << " not found!";
+            return 1;
+        }
+
+        if (!boost::filesystem::is_regular_file(profile_path))
+        {
+            SimpleLogger().Write(logWARNING) << "Profile " << profile_path.string()
+                                             << " not found!";
+            return 1;
+        }
+
+        const unsigned recommended_num_threads = tbb::task_scheduler_init::default_num_threads();
+
+        SimpleLogger().Write() << "Input file: " << input_path.filename().string();
+        SimpleLogger().Write() << "Profile: " << profile_path.filename().string();
+        SimpleLogger().Write() << "Threads: " << requested_num_threads;
+        if (recommended_num_threads != requested_num_threads)
+        {
+            SimpleLogger().Write(logWARNING) << "The recommended number of threads is "
+                                             << recommended_num_threads
+                                             << "! This setting may have performance side-effects.";
+        }
+
+        tbb::task_scheduler_init init(requested_num_threads);
+
+        /*** Setup Scripting Environment ***/
+        ScriptingEnvironment scripting_environment(profile_path.string().c_str());
+
+        GenerateOutputFilesNames();
+
+        std::unordered_map<std::string, NodeID> string_map;
+        ExtractionContainers extraction_containers;
+
+        string_map[""] = 0;
+        auto extractor_callbacks = new ExtractorCallbacks(extraction_containers, string_map);
+        BaseParser *parser;
+        if (file_has_pbf_format)
+        {
+            parser = new PBFParser(input_path.string().c_str(),
+                                   extractor_callbacks,
+                                   scripting_environment,
+                                   requested_num_threads);
+        }
+        else
+        {
+            parser = new XMLParser(input_path.string().c_str(),
+                                   extractor_callbacks,
+                                   scripting_environment);
+        }
+
+        if (!parser->ReadHeader())
+        {
+            throw OSRMException("Parser not initialized!");
+        }
+
+        SimpleLogger().Write() << "Parsing in progress..";
+        TIMER_START(parsing);
+
+        parser->Parse();
+        delete parser;
+        delete extractor_callbacks;
+
+        TIMER_STOP(parsing);
+        SimpleLogger().Write() << "Parsing finished after " << TIMER_SEC(parsing) << " seconds";
+
+        if (extraction_containers.all_edges_list.empty())
+        {
+            SimpleLogger().Write(logWARNING) << "The input data is empty, exiting.";
+            return 1;
+        }
+
+        extraction_containers.PrepareData(output_file_name, restriction_file_name);
+
+        TIMER_STOP(extracting);
+        SimpleLogger().Write() << "extraction finished after " << TIMER_SEC(extracting) << "s";
+        SimpleLogger().Write() << "To prepare the data for routing, run: "
+                               << "./osrm-prepare " << output_file_name << std::endl;
+    }
+    catch (boost::program_options::too_many_positional_options_error &)
+    {
+        SimpleLogger().Write(logWARNING) << "Only one input file can be specified";
+        return 1;
+    }
+    catch (std::exception &e)
+    {
+        SimpleLogger().Write(logWARNING) << e.what();
+        return 1;
+    }
+    return 0;
+}

Extractor/Extractor.h

@@ -0,0 +1,36 @@
+#ifndef EXTRACTOR_H_
+#define EXTRACTOR_H_
+
+#include <boost/filesystem.hpp>
+
+#include <string>
+
+class ExtractorCallbacks;
+
+/** \brief Class of 'extract' utility. */
+class Extractor
+{
+  protected:
+    unsigned requested_num_threads;
+    boost::filesystem::path config_file_path;
+    boost::filesystem::path input_path;
+    boost::filesystem::path profile_path;
+
+    std::string output_file_name;
+    std::string restriction_file_name;
+    bool file_has_pbf_format;
+
+    /** \brief Parses "extractor's" command line arguments */
+    bool ParseArguments(int argc, char *argv[]);
+
+    /** \brief Parses config file, if present in options */
+    void GenerateOutputFilesNames();
+
+  public:
+    explicit Extractor();
+    Extractor(const Extractor &) = delete;
+    virtual ~Extractor();
+
+    int Run(int argc, char *argv[]);
+};
+#endif /* EXTRACTOR_H_ */

Extractor/ScriptingEnvironment.cpp

@@ -35,6 +35,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Util/SimpleLogger.h"
 #include "../typedefs.h"
 
+#include <sstream>
+
 ScriptingEnvironment::ScriptingEnvironment() {}
 ScriptingEnvironment::ScriptingEnvironment(const char *file_name)
 : file_name(file_name)
@@ -54,54 +56,52 @@ void ScriptingEnvironment::initLuaState(lua_State* lua_state)
     luabind::module(lua_state)[
         luabind::def("print", LUA_print<std::string>),
         luabind::def("durationIsValid", durationIsValid),
-        luabind::def("parseDuration", parseDuration)
+        luabind::def("parseDuration", parseDuration),
+
+        luabind::class_<HashTable<std::string, std::string>>("keyVals")
+        .def("Add", &HashTable<std::string, std::string>::Add)
+        .def("Find", &HashTable<std::string, std::string>::Find)
+        .def("Holds", &HashTable<std::string, std::string>::Holds),
+
+        luabind::class_<ImportNode>("Node")
+        // .def(luabind::constructor<>())
+        .def_readwrite("lat", &ImportNode::lat)
+        .def_readwrite("lon", &ImportNode::lon)
+        .def_readonly("id", &ImportNode::node_id)
+        .def_readwrite("bollard", &ImportNode::bollard)
+        .def_readwrite("traffic_light", &ImportNode::trafficLight)
+        .def_readwrite("tags", &ImportNode::keyVals),
+
+       luabind::class_<ExtractionWay>("Way")
+        // .def(luabind::constructor<>())
+        .def_readonly("id", &ExtractionWay::id)
+        .def_readwrite("name", &ExtractionWay::name)
+        .def_readwrite("speed", &ExtractionWay::speed)
+        .def_readwrite("backward_speed", &ExtractionWay::backward_speed)
+        .def_readwrite("duration", &ExtractionWay::duration)
+        .def_readwrite("type", &ExtractionWay::type)
+        .def_readwrite("access", &ExtractionWay::access)
+        .def_readwrite("roundabout", &ExtractionWay::roundabout)
+        .def_readwrite("is_access_restricted", &ExtractionWay::isAccessRestricted)
+        .def_readwrite("ignore_in_grid", &ExtractionWay::ignoreInGrid)
+        .def_readwrite("tags", &ExtractionWay::keyVals)
+        .def_readwrite("direction", &ExtractionWay::direction)
+        .enum_("constants")[
+            luabind::value("notSure", 0),
+            luabind::value("oneway", 1),
+            luabind::value("bidirectional", 2),
+            luabind::value("opposite", 3)
+        ],
+        luabind::class_<std::vector<std::string>>("vector")
+        .def("Add", static_cast<void (std::vector<std::string>::*)(const std::string &)>(&std::vector<std::string>::push_back))
     ];
 
-    luabind::module(lua_state)[luabind::class_<HashTable<std::string, std::string>>("keyVals")
-                                    .def("Add", &HashTable<std::string, std::string>::Add)
-                                    .def("Find", &HashTable<std::string, std::string>::Find)
-                                    .def("Holds", &HashTable<std::string, std::string>::Holds)];
-
-    luabind::module(lua_state)[luabind::class_<ImportNode>("Node")
-                                    .def(luabind::constructor<>())
-                                    .def_readwrite("lat", &ImportNode::lat)
-                                    .def_readwrite("lon", &ImportNode::lon)
-                                    .def_readonly("id", &ImportNode::node_id)
-                                    .def_readwrite("bollard", &ImportNode::bollard)
-                                    .def_readwrite("traffic_light", &ImportNode::trafficLight)
-                                    .def_readwrite("tags", &ImportNode::keyVals)];
-
-    luabind::module(lua_state)
-        [luabind::class_<ExtractionWay>("Way")
-             .def(luabind::constructor<>())
-             .def_readonly("id", &ExtractionWay::id)
-             .def_readwrite("name", &ExtractionWay::name)
-             .def_readwrite("speed", &ExtractionWay::speed)
-             .def_readwrite("backward_speed", &ExtractionWay::backward_speed)
-             .def_readwrite("duration", &ExtractionWay::duration)
-             .def_readwrite("type", &ExtractionWay::type)
-             .def_readwrite("access", &ExtractionWay::access)
-             .def_readwrite("roundabout", &ExtractionWay::roundabout)
-             .def_readwrite("is_access_restricted", &ExtractionWay::isAccessRestricted)
-             .def_readwrite("ignore_in_grid", &ExtractionWay::ignoreInGrid)
-             .def_readwrite("tags", &ExtractionWay::keyVals)
-             .def_readwrite("direction", &ExtractionWay::direction)
-             .enum_("constants")[
-                 luabind::value("notSure", 0),
-                 luabind::value("oneway", 1),
-                 luabind::value("bidirectional", 2),
-                 luabind::value("opposite", 3)
-             ]];
-
-    // fails on c++11/OS X 10.9
-    luabind::module(lua_state)[luabind::class_<std::vector<std::string>>("vector").def(
-        "Add",
-        static_cast<void (std::vector<std::string>::*)(const std::string &)>(
-            &std::vector<std::string>::push_back))];
-
     if (0 != luaL_dofile(lua_state, file_name.c_str()))
     {
-        throw OSRMException("ERROR occured in scripting block");
+        luabind::object error_msg(luabind::from_stack(lua_state, -1));
+        std::ostringstream error_stream;
+        error_stream << error_msg;
+        throw OSRMException("ERROR occured in profile script:\n" + error_stream.str());
     }
 }
 

Extractor/XMLParser.cpp

@@ -230,9 +230,9 @@ ExtractionWay XMLParser::ReadXMLWay()
         if (depth == child_depth && child_type == 15 &&
             xmlStrEqual(child_name, (const xmlChar *)"way") == 1)
         {
-            xmlChar *node_id = xmlTextReaderGetAttribute(inputReader, (const xmlChar *)"id");
-            way.id = StringToUint((char *)node_id);
-            xmlFree(node_id);
+            xmlChar *way_id = xmlTextReaderGetAttribute(inputReader, (const xmlChar *)"id");
+            way.id = StringToUint((char *)way_id);
+            xmlFree(way_id);
             xmlFree(child_name);
             break;
         }

Include/osrm/Coordinate.h

@@ -28,7 +28,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef FIXED_POINT_COORDINATE_H_
 #define FIXED_POINT_COORDINATE_H_
 
-#include <functional>
 #include <iosfwd> //for std::ostream
 #include <string>
 
@@ -40,7 +39,7 @@ struct FixedPointCoordinate
     int lon;
 
     FixedPointCoordinate();
-    explicit FixedPointCoordinate(int lat, int lon);
+    FixedPointCoordinate(int lat, int lon);
     void Reset();
     bool isSet() const;
     bool isValid() const;
@@ -55,10 +54,8 @@ struct FixedPointCoordinate
     static float ApproximateEuclideanDistance(const FixedPointCoordinate &first_coordinate,
                                               const FixedPointCoordinate &second_coordinate);
 
-    static float ApproximateEuclideanDistance(const int lat1,
-                                              const int lon1,
-                                              const int lat2,
-                                              const int lon2);
+    static float
+    ApproximateEuclideanDistance(const int lat1, const int lon1, const int lat2, const int lon2);
 
     static float ApproximateSquaredEuclideanDistance(const FixedPointCoordinate &first_coordinate,
                                                      const FixedPointCoordinate &second_coordinate);
@@ -81,10 +78,10 @@ struct FixedPointCoordinate
                                               FixedPointCoordinate &nearest_location,
                                               float &ratio);
 
-    static int OrderedPerpendicularDistanceApproximation(const FixedPointCoordinate& segment_source,
-                                                         const FixedPointCoordinate& segment_target,
-                                                         const FixedPointCoordinate& query_location);
-
+    static int
+    OrderedPerpendicularDistanceApproximation(const FixedPointCoordinate &segment_source,
+                                              const FixedPointCoordinate &segment_target,
+                                              const FixedPointCoordinate &query_location);
 
     static float GetBearing(const FixedPointCoordinate &A, const FixedPointCoordinate &B);
 

Include/osrm/RouteParameters.h

@@ -43,6 +43,10 @@ struct RouteParameters
 
     void setAlternateRouteFlag(const bool flag);
 
+    void setUTurn(const bool flag);
+
+    void setAllUTurns(const bool flag);
+
     void setDeprecatedAPIFlag(const std::string &);
 
     void setChecksum(const unsigned check_sum);
@@ -71,12 +75,14 @@ struct RouteParameters
     bool geometry;
     bool compression;
     bool deprecatedAPI;
+    bool uturn_default;
     unsigned check_sum;
     std::string service;
     std::string output_format;
     std::string jsonp_parameter;
     std::string language;
     std::vector<std::string> hints;
+    std::vector<bool> uturns;
     std::vector<FixedPointCoordinate> coordinates;
 };
 

Plugins/ViaRoutePlugin.h

@@ -125,7 +125,7 @@ template <class DataFacadeT> class ViaRoutePlugin : public BasePlugin
         }
         else
         {
-            search_engine_ptr->shortest_path(raw_route.segment_end_coordinates, raw_route);
+            search_engine_ptr->shortest_path(raw_route.segment_end_coordinates, route_parameters.uturns, raw_route);
         }
 
         if (INVALID_EDGE_WEIGHT == raw_route.shortest_path_length)

README.md

@@ -2,7 +2,7 @@
 
 For instructions on how to compile and run OSRM, please consult the Wiki at
 
-https://github.com/DennisOSRM/Project-OSRM/wiki
+https://github.com/Project-OSRM/osrm-backend/wiki
 
 or use our free and daily updated online service at
 
@@ -35,6 +35,7 @@ When using the code in a (scientific) publication, please cite
 
 | build config |  branch | status |
 |:-------------|:--------|:------------|
-| Project OSRM | master  | [![Build Status](https://travis-ci.org/DennisOSRM/Project-OSRM.png?branch=master)](https://travis-ci.org/DennisOSRM/Project-OSRM) |
-| Project OSRM | develop | [![Build Status](https://travis-ci.org/DennisOSRM/Project-OSRM.png?branch=develop)](https://travis-ci.org/DennisOSRM/Project-OSRM) |
+| Linux        | master  | [![Build Status](https://travis-ci.org/Project-OSRM/osrm-backend.png?branch=master)](https://travis-ci.org/DennisOSRM/Project-OSRM) |
+| Lunux        | develop | [![Build Status](https://travis-ci.org/Project-OSRM/osrm-backend.png?branch=develop)](https://travis-ci.org/DennisOSRM/Project-OSRM) |
+| Windows      | master/develop | [![Build status](https://ci.appveyor.com/api/projects/status/4iuo3s9gxprmcjjh)](https://ci.appveyor.com/project/DennisOSRM/osrm-backend) |
 | LUAbind fork | master  | [![Build Status](https://travis-ci.org/DennisOSRM/luabind.png?branch=master)](https://travis-ci.org/DennisOSRM/luabind) |

RoutingAlgorithms/AlternativePathRouting.h

@@ -29,11 +29,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define ALTERNATIVE_PATH_ROUTING_H
 
 #include "BasicRoutingInterface.h"
+#include "../DataStructures/Range.h"
 #include "../DataStructures/SearchEngineData.h"
 
 #include <boost/assert.hpp>
 
 #include <unordered_map>
+#include <unordered_set>
+
 #include <vector>
 
 const double VIAPATH_ALPHA = 0.10;
@@ -96,6 +99,11 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
 
         int upper_bound_to_shortest_path_distance = INVALID_EDGE_WEIGHT;
         NodeID middle_node = SPECIAL_NODEID;
+        EdgeWeight min_edge_offset =
+            std::min(0, -phantom_node_pair.source_phantom.GetForwardWeightPlusOffset());
+        min_edge_offset = std::min(min_edge_offset,
+                                   -phantom_node_pair.source_phantom.GetReverseWeightPlusOffset());
+
         if (phantom_node_pair.source_phantom.forward_node_id != SPECIAL_NODEID)
         {
             // SimpleLogger().Write(logDEBUG) << "fwd-a insert: " <<
@@ -107,8 +115,8 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
         }
         if (phantom_node_pair.source_phantom.reverse_node_id != SPECIAL_NODEID)
         {
-            // SimpleLogger().Write(logDEBUG) << "fwd-b insert: " <<
-            // phantom_node_pair.source_phantom.reverse_node_id << ", w: " <<
+            //     SimpleLogger().Write(logDEBUG) << "fwd-b insert: " <<
+            //     phantom_node_pair.source_phantom.reverse_node_id << ", w: " <<
             // -phantom_node_pair.source_phantom.GetReverseWeightPlusOffset();
             forward_heap1.Insert(phantom_node_pair.source_phantom.reverse_node_id,
                                  -phantom_node_pair.source_phantom.GetReverseWeightPlusOffset(),
@@ -144,7 +152,8 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
                                              &middle_node,
                                              &upper_bound_to_shortest_path_distance,
                                              via_node_candidate_list,
-                                             forward_search_space);
+                                             forward_search_space,
+                                             min_edge_offset);
             }
             if (0 < reverse_heap1.Size())
             {
@@ -153,7 +162,8 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
                                               &middle_node,
                                               &upper_bound_to_shortest_path_distance,
                                               via_node_candidate_list,
-                                              reverse_search_space);
+                                              reverse_search_space,
+                                              min_edge_offset);
             }
         }
 
@@ -170,49 +180,58 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
         super::RetrievePackedPathFromSingleHeap(forward_heap1, middle_node, packed_forward_path);
         super::RetrievePackedPathFromSingleHeap(reverse_heap1, middle_node, packed_reverse_path);
 
+        // this set is is used as an indicator if a node is on the shortest path
+        std::unordered_set<NodeID> nodes_in_path(packed_forward_path.size() +
+                                                 packed_reverse_path.size());
+        nodes_in_path.insert(packed_forward_path.begin(), packed_forward_path.end());
+        nodes_in_path.insert(middle_node);
+        nodes_in_path.insert(packed_reverse_path.begin(), packed_reverse_path.end());
+
         std::unordered_map<NodeID, int> approximated_forward_sharing;
         std::unordered_map<NodeID, int> approximated_reverse_sharing;
 
-        unsigned index_into_forward_path = 0;
         // sweep over search space, compute forward sharing for each current edge (u,v)
         for (const SearchSpaceEdge &current_edge : forward_search_space)
         {
             const NodeID u = current_edge.first;
             const NodeID v = current_edge.second;
-            if ((packed_forward_path.size() < index_into_forward_path) &&
-                (current_edge == forward_search_space[index_into_forward_path]))
+
+            if (nodes_in_path.find(v) != nodes_in_path.end())
             {
-                // current_edge is on shortest path => sharing(u):=queue.GetKey(u);
-                ++index_into_forward_path;
-                approximated_forward_sharing[v] = forward_heap1.GetKey(u);
+                // current_edge is on shortest path => sharing(v):=queue.GetKey(v);
+                approximated_forward_sharing.emplace(v, forward_heap1.GetKey(v));
             }
             else
             {
-                // sharing (s) = sharing (t)
-                approximated_forward_sharing[v] = approximated_forward_sharing[u];
+                // current edge is not on shortest path. Check if we know a value for the other
+                // endpoint
+                const auto sharing_of_u_iterator = approximated_forward_sharing.find(u);
+                if (sharing_of_u_iterator != approximated_forward_sharing.end())
+                {
+                    approximated_forward_sharing.emplace(v, sharing_of_u_iterator->second);
+                }
             }
         }
 
-        unsigned index_into_reverse_path = 0;
         // sweep over search space, compute backward sharing
         for (const SearchSpaceEdge &current_edge : reverse_search_space)
         {
             const NodeID u = current_edge.first;
             const NodeID v = current_edge.second;
-            if ((packed_reverse_path.size() < index_into_reverse_path) &&
-                (current_edge == reverse_search_space[index_into_reverse_path]))
+            if (nodes_in_path.find(v) != nodes_in_path.end())
             {
                 // current_edge is on shortest path => sharing(u):=queue.GetKey(u);
-                ++index_into_reverse_path;
-                approximated_reverse_sharing[v] = reverse_heap1.GetKey(u);
+                approximated_reverse_sharing.emplace(v, reverse_heap1.GetKey(v));
             }
             else
             {
-                // sharing (s) = sharing (t)
-                const auto rev_iterator = approximated_reverse_sharing.find(u);
-                const int rev_sharing =
-                    (rev_iterator != approximated_reverse_sharing.end()) ? rev_iterator->second : 0;
-                approximated_reverse_sharing[v] = rev_sharing;
+                // current edge is not on shortest path. Check if we know a value for the other
+                // endpoint
+                const auto sharing_of_u_iterator = approximated_reverse_sharing.find(u);
+                if (sharing_of_u_iterator != approximated_reverse_sharing.end())
+                {
+                    approximated_reverse_sharing.emplace(v, sharing_of_u_iterator->second);
+                }
             }
         }
 
@@ -251,8 +270,6 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
             }
         }
 
-        // SimpleLogger().Write() << preselected_node_list.size() << " passed preselection";
-
         std::vector<NodeID> &packed_shortest_path = packed_forward_path;
         std::reverse(packed_shortest_path.begin(), packed_shortest_path.end());
         packed_shortest_path.emplace_back(middle_node);
@@ -264,10 +281,13 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
         for (const NodeID node : preselected_node_list)
         {
             int length_of_via_path = 0, sharing_of_via_path = 0;
-            ComputeLengthAndSharingOfViaPath(
-                node, &length_of_via_path, &sharing_of_via_path, packed_shortest_path);
-            const int maximum_allowed_sharing = static_cast<int>(
-                upper_bound_to_shortest_path_distance * VIAPATH_GAMMA);
+            ComputeLengthAndSharingOfViaPath(node,
+                                             &length_of_via_path,
+                                             &sharing_of_via_path,
+                                             packed_shortest_path,
+                                             min_edge_offset);
+            const int maximum_allowed_sharing =
+                static_cast<int>(upper_bound_to_shortest_path_distance * VIAPATH_GAMMA);
             if (sharing_of_via_path <= maximum_allowed_sharing &&
                 length_of_via_path <= upper_bound_to_shortest_path_distance * (1 + VIAPATH_EPSILON))
             {
@@ -289,7 +309,8 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
                                             upper_bound_to_shortest_path_distance,
                                             &length_of_via_path,
                                             &s_v_middle,
-                                            &v_t_middle))
+                                            &v_t_middle,
+                                            min_edge_offset))
             {
                 // select first admissable
                 selected_via_node = candidate.node;
@@ -329,8 +350,8 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
                                         v_t_middle,
                                         packed_alternate_path);
 
-            raw_route_data.alt_source_traversed_in_reverse.push_back(
-                (packed_alternate_path.front() != phantom_node_pair.source_phantom.forward_node_id));
+            raw_route_data.alt_source_traversed_in_reverse.push_back((
+                packed_alternate_path.front() != phantom_node_pair.source_phantom.forward_node_id));
             raw_route_data.alt_target_traversed_in_reverse.push_back(
                 (packed_alternate_path.back() != phantom_node_pair.target_phantom.forward_node_id));
 
@@ -339,7 +360,9 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
                 packed_alternate_path, phantom_node_pair, raw_route_data.unpacked_alternative);
 
             raw_route_data.alternative_path_length = length_of_via_path;
-        } else {
+        }
+        else
+        {
             BOOST_ASSERT(raw_route_data.alternative_path_length == INVALID_EDGE_WEIGHT);
         }
     }
@@ -373,7 +396,8 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
     inline void ComputeLengthAndSharingOfViaPath(const NodeID via_node,
                                                  int *real_length_of_via_path,
                                                  int *sharing_of_via_path,
-                                                 const std::vector<NodeID> &packed_shortest_path)
+                                                 const std::vector<NodeID> &packed_shortest_path,
+                                                 const EdgeWeight min_edge_offset)
     {
         engine_working_data.InitializeOrClearSecondThreadLocalStorage(
             super::facade->GetNumberOfNodes());
@@ -399,6 +423,7 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
                                existing_forward_heap,
                                &s_v_middle,
                                &upper_bound_s_v_path_length,
+                               min_edge_offset,
                                false);
         }
         // compute path <v,..,t> by reusing backward search from node t
@@ -411,6 +436,7 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
                                existing_reverse_heap,
                                &v_t_middle,
                                &upper_bound_of_v_t_path_length,
+                               min_edge_offset,
                                true);
         }
         *real_length_of_via_path = upper_bound_s_v_path_length + upper_bound_of_v_t_path_length;
@@ -428,48 +454,52 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
 
         // partial unpacking, compute sharing
         // First partially unpack s-->v until paths deviate, note length of common path.
-        const unsigned s_v_min_path_size =
+        const int64_t s_v_min_path_size =
             std::min(packed_s_v_path.size(), packed_shortest_path.size()) - 1;
-        for (unsigned i = 0; i < s_v_min_path_size; ++i)
+        for (const int64_t current_node : osrm::irange<int64_t>(0, s_v_min_path_size))
         {
-            if (packed_s_v_path[i] == packed_shortest_path[i] &&
-                packed_s_v_path[i + 1] == packed_shortest_path[i + 1])
+            if (packed_s_v_path[current_node] == packed_shortest_path[current_node] &&
+                packed_s_v_path[current_node + 1] == packed_shortest_path[current_node + 1])
             {
-                EdgeID edgeID =
-                    facade->FindEdgeInEitherDirection(packed_s_v_path[i], packed_s_v_path[i + 1]);
+                EdgeID edgeID = facade->FindEdgeInEitherDirection(
+                    packed_s_v_path[current_node], packed_s_v_path[current_node + 1]);
                 *sharing_of_via_path += facade->GetEdgeData(edgeID).distance;
             }
             else
             {
-                if (packed_s_v_path[i] == packed_shortest_path[i])
+                if (packed_s_v_path[current_node] == packed_shortest_path[current_node])
                 {
-                    super::UnpackEdge(
-                        packed_s_v_path[i], packed_s_v_path[i + 1], partially_unpacked_via_path);
-                    super::UnpackEdge(packed_shortest_path[i],
-                                      packed_shortest_path[i + 1],
+                    super::UnpackEdge(packed_s_v_path[current_node],
+                                      packed_s_v_path[current_node + 1],
+                                      partially_unpacked_via_path);
+                    super::UnpackEdge(packed_shortest_path[current_node],
+                                      packed_shortest_path[current_node + 1],
                                       partially_unpacked_shortest_path);
                     break;
                 }
             }
         }
         // traverse partially unpacked edge and note common prefix
-        for (int i = 0,
-                 packed_path_length = std::min(partially_unpacked_via_path.size(),
-                                               partially_unpacked_shortest_path.size()) -
-                                      1;
-             (i < packed_path_length) &&
-                 (partially_unpacked_via_path[i] == partially_unpacked_shortest_path[i] &&
-                  partially_unpacked_via_path[i + 1] == partially_unpacked_shortest_path[i + 1]);
-             ++i)
+        const int64_t packed_path_length =
+            std::min(partially_unpacked_via_path.size(), partially_unpacked_shortest_path.size()) -
+            1;
+        for (int64_t current_node = 0;
+             (current_node < packed_path_length) &&
+                 (partially_unpacked_via_path[current_node] ==
+                      partially_unpacked_shortest_path[current_node] &&
+                  partially_unpacked_via_path[current_node + 1] ==
+                      partially_unpacked_shortest_path[current_node + 1]);
+             ++current_node)
         {
-            EdgeID edgeID = facade->FindEdgeInEitherDirection(partially_unpacked_via_path[i],
-                                                              partially_unpacked_via_path[i + 1]);
-            *sharing_of_via_path += facade->GetEdgeData(edgeID).distance;
+            EdgeID selected_edge =
+                facade->FindEdgeInEitherDirection(partially_unpacked_via_path[current_node],
+                                                  partially_unpacked_via_path[current_node + 1]);
+            *sharing_of_via_path += facade->GetEdgeData(selected_edge).distance;
         }
 
         // Second, partially unpack v-->t in reverse order until paths deviate and note lengths
-        int via_path_index = packed_v_t_path.size() - 1;
-        int shortest_path_index = packed_shortest_path.size() - 1;
+        int64_t via_path_index = packed_v_t_path.size() - 1;
+        int64_t shortest_path_index = packed_shortest_path.size() - 1;
         for (; via_path_index > 0 && shortest_path_index > 0;
              --via_path_index, --shortest_path_index)
         {
@@ -572,11 +602,17 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
                                        NodeID *middle_node,
                                        int *upper_bound_to_shortest_path_distance,
                                        std::vector<NodeID> &search_space_intersection,
-                                       std::vector<SearchSpaceEdge> &search_space) const
+                                       std::vector<SearchSpaceEdge> &search_space,
+                                       const EdgeWeight min_edge_offset) const
     {
         const NodeID node = forward_heap.DeleteMin();
         const int distance = forward_heap.GetKey(node);
-        const int scaled_distance = static_cast<int>(distance / (1. + VIAPATH_EPSILON));
+        // const NodeID parentnode = forward_heap.GetData(node).parent;
+        // SimpleLogger().Write() << (is_forward_directed ? "[fwd] " : "[rev] ") << "settled edge ("
+        // << parentnode << "," << node << "), dist: " << distance;
+
+        const int scaled_distance =
+            static_cast<int>((distance + min_edge_offset) / (1. + VIAPATH_EPSILON));
         if ((INVALID_EDGE_WEIGHT != *upper_bound_to_shortest_path_distance) &&
             (scaled_distance > *upper_bound_to_shortest_path_distance))
         {
@@ -589,7 +625,6 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
         if (reverse_heap.WasInserted(node))
         {
             search_space_intersection.emplace_back(node);
-
             const int new_distance = reverse_heap.GetKey(node) + distance;
             if (new_distance < *upper_bound_to_shortest_path_distance)
             {
@@ -597,6 +632,11 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
                 {
                     *middle_node = node;
                     *upper_bound_to_shortest_path_distance = new_distance;
+                    //     SimpleLogger().Write() << "accepted middle_node " << *middle_node << " at
+                    //     distance " << new_distance;
+                    // } else {
+                    //     SimpleLogger().Write() << "discarded middle_node " << *middle_node << "
+                    //     at distance " << new_distance;
                 }
             }
         }
@@ -641,7 +681,8 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
                                             const int length_of_shortest_path,
                                             int *length_of_via_path,
                                             NodeID *s_v_middle,
-                                            NodeID *v_t_middle) const
+                                            NodeID *v_t_middle,
+                                            const EdgeWeight min_edge_offset) const
     {
         new_forward_heap.Clear();
         new_reverse_heap.Clear();
@@ -658,6 +699,7 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
                                existing_forward_heap,
                                s_v_middle,
                                &upper_bound_s_v_path_length,
+                               min_edge_offset,
                                false);
         }
 
@@ -676,6 +718,7 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
                                existing_reverse_heap,
                                v_t_middle,
                                &upper_bound_of_v_t_path_length,
+                               min_edge_offset,
                                true);
         }
 
@@ -844,11 +887,13 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
         {
             if (!forward_heap3.Empty())
             {
-                super::RoutingStep(forward_heap3, reverse_heap3, &middle, &upper_bound, true);
+                super::RoutingStep(
+                    forward_heap3, reverse_heap3, &middle, &upper_bound, min_edge_offset, true);
             }
             if (!reverse_heap3.Empty())
             {
-                super::RoutingStep(reverse_heap3, forward_heap3, &middle, &upper_bound, false);
+                super::RoutingStep(
+                    reverse_heap3, forward_heap3, &middle, &upper_bound, min_edge_offset, false);
             }
         }
         return (upper_bound <= t_test_path_length);

RoutingAlgorithms/BasicRoutingInterface.h

@@ -63,10 +63,15 @@ template <class DataFacadeT> class BasicRoutingInterface
                             SearchEngineData::QueryHeap &reverse_heap,
                             NodeID *middle_node_id,
                             int *upper_bound,
+                            const int min_edge_offset,
                             const bool forward_direction) const
     {
         const NodeID node = forward_heap.DeleteMin();
         const int distance = forward_heap.GetKey(node);
+
+        // const NodeID parentnode = forward_heap.GetData(node).parent;
+        // SimpleLogger().Write() << (forward_direction ? "[fwd] " : "[rev] ") << "settled edge (" << parentnode << "," << node << "), dist: " << distance;
+
         if (reverse_heap.WasInserted(node))
         {
             const int new_distance = reverse_heap.GetKey(node) + distance;
@@ -76,18 +81,22 @@ template <class DataFacadeT> class BasicRoutingInterface
                 {
                     *middle_node_id = node;
                     *upper_bound = new_distance;
+                //     SimpleLogger().Write() << "accepted middle node " << node << " at distance " << new_distance;
+                // } else {
+                //     SimpleLogger().Write() << "discared middle node " << node << " at distance " << new_distance;
                 }
             }
         }
 
-        if (distance > *upper_bound)
+        if (distance + min_edge_offset > *upper_bound)
         {
+            // SimpleLogger().Write() << "min_edge_offset: " << min_edge_offset;
             forward_heap.DeleteAll();
             return;
         }
 
         // Stalling
-        for (auto edge : facade->GetAdjacentEdgeRange(node))
+        for (const auto edge : facade->GetAdjacentEdgeRange(node))
         {
             const EdgeData &data = facade->GetEdgeData(edge);
             const bool reverse_flag = ((!forward_direction) ? data.forward : data.backward);
@@ -108,7 +117,7 @@ template <class DataFacadeT> class BasicRoutingInterface
             }
         }
 
-        for (auto edge : facade->GetAdjacentEdgeRange(node))
+        for (const auto edge : facade->GetAdjacentEdgeRange(node))
         {
             const EdgeData &data = facade->GetEdgeData(edge);
             bool forward_directionFlag = (forward_direction ? data.forward : data.backward);
@@ -171,8 +180,8 @@ template <class DataFacadeT> class BasicRoutingInterface
             // facade->FindEdge does not suffice here in case of shortcuts.
             // The above explanation unclear? Think!
             EdgeID smaller_edge_id = SPECIAL_EDGEID;
-            int edge_weight = INT_MAX;
-            for (auto edge_id : facade->GetAdjacentEdgeRange(edge.first))
+            int edge_weight = std::numeric_limits<EdgeWeight>::max();
+            for (const auto edge_id : facade->GetAdjacentEdgeRange(edge.first))
             {
                 const int weight = facade->GetEdgeData(edge_id).distance;
                 if ((facade->GetTarget(edge_id) == edge.second) && (weight < edge_weight) &&
@@ -192,7 +201,7 @@ template <class DataFacadeT> class BasicRoutingInterface
             */
             if (SPECIAL_EDGEID == smaller_edge_id)
             {
-                for (auto edge_id : facade->GetAdjacentEdgeRange(edge.second))
+                for (const auto edge_id : facade->GetAdjacentEdgeRange(edge.second))
                 {
                     const int weight = facade->GetEdgeData(edge_id).distance;
                     if ((facade->GetTarget(edge_id) == edge.first) && (weight < edge_weight) &&
@@ -233,18 +242,18 @@ template <class DataFacadeT> class BasicRoutingInterface
                     facade->GetUncompressedGeometry(facade->GetGeometryIndexForEdgeID(ed.id),
                                                     id_vector);
 
-                    const int start_index =
+                    const std::size_t start_index =
                         (unpacked_path.empty()
                              ? ((start_traversed_in_reverse)
                                     ? id_vector.size() -
                                           phantom_node_pair.source_phantom.fwd_segment_position - 1
                                     : phantom_node_pair.source_phantom.fwd_segment_position)
                              : 0);
-                    const int end_index = id_vector.size();
+                    const std::size_t end_index = id_vector.size();
 
                     BOOST_ASSERT(start_index >= 0);
                     BOOST_ASSERT(start_index <= end_index);
-                    for (int i = start_index; i < end_index; ++i)
+                    for (std::size_t i = start_index; i < end_index; ++i)
                     {
                         unpacked_path.emplace_back(id_vector[i], name_index, TurnInstruction::NoTurn, 0);
                     }
@@ -258,38 +267,37 @@ template <class DataFacadeT> class BasicRoutingInterface
             std::vector<unsigned> id_vector;
             facade->GetUncompressedGeometry(phantom_node_pair.target_phantom.packed_geometry_id,
                                             id_vector);
-            if (target_traversed_in_reverse)
-            {
-                std::reverse(id_vector.begin(), id_vector.end());
-            }
             const bool is_local_path = (phantom_node_pair.source_phantom.packed_geometry_id ==
                                         phantom_node_pair.target_phantom.packed_geometry_id) &&
                                        unpacked_path.empty();
 
-            int start_index = 0;
-            int end_index = phantom_node_pair.target_phantom.fwd_segment_position;
-            if (target_traversed_in_reverse)
-            {
-                end_index =
-                    id_vector.size() - phantom_node_pair.target_phantom.fwd_segment_position;
-            }
+            std::size_t start_index = 0;
             if (is_local_path)
             {
                 start_index = phantom_node_pair.source_phantom.fwd_segment_position;
-                end_index = phantom_node_pair.target_phantom.fwd_segment_position;
                 if (target_traversed_in_reverse)
                 {
                     start_index =
                         id_vector.size() - phantom_node_pair.source_phantom.fwd_segment_position;
-                    end_index =
-                        id_vector.size() - phantom_node_pair.target_phantom.fwd_segment_position;
                 }
             }
 
-            BOOST_ASSERT(start_index >= 0);
-            for (int i = start_index; i != end_index; (start_index < end_index ? ++i : --i))
+            std::size_t end_index = phantom_node_pair.target_phantom.fwd_segment_position;
+            if (target_traversed_in_reverse)
             {
-                BOOST_ASSERT(i >= -1);
+                std::reverse(id_vector.begin(), id_vector.end());
+                end_index =
+                    id_vector.size() - phantom_node_pair.target_phantom.fwd_segment_position;
+            }
+
+            if (start_index > end_index)
+            {
+                start_index = std::min(start_index, id_vector.size()-1);
+            }
+
+            for (std::size_t i = start_index; i != end_index; (start_index < end_index ? ++i : --i))
+            {
+                BOOST_ASSERT(i < id_vector.size());
                 unpacked_path.emplace_back(PathData{id_vector[i],
                                            phantom_node_pair.target_phantom.name_id,
                                            TurnInstruction::NoTurn,
@@ -304,8 +312,8 @@ template <class DataFacadeT> class BasicRoutingInterface
         // the last node.
         if (unpacked_path.size() > 1)
         {
-            const unsigned last_index = unpacked_path.size() - 1;
-            const unsigned second_to_last_index = last_index - 1;
+            const std::size_t last_index = unpacked_path.size() - 1;
+            const std::size_t second_to_last_index = last_index - 1;
 
             // looks like a trivially true check but tests for underflow
             BOOST_ASSERT(last_index > second_to_last_index);
@@ -330,8 +338,8 @@ template <class DataFacadeT> class BasicRoutingInterface
             recursion_stack.pop();
 
             EdgeID smaller_edge_id = SPECIAL_EDGEID;
-            int edge_weight = INT_MAX;
-            for (auto edge_id : facade->GetAdjacentEdgeRange(edge.first))
+            int edge_weight = std::numeric_limits<EdgeWeight>::max();
+            for (const auto edge_id : facade->GetAdjacentEdgeRange(edge.first))
             {
                 const int weight = facade->GetEdgeData(edge_id).distance;
                 if ((facade->GetTarget(edge_id) == edge.second) && (weight < edge_weight) &&
@@ -344,7 +352,7 @@ template <class DataFacadeT> class BasicRoutingInterface
 
             if (SPECIAL_EDGEID == smaller_edge_id)
             {
-                for (auto edge_id : facade->GetAdjacentEdgeRange(edge.second))
+                for (const auto edge_id : facade->GetAdjacentEdgeRange(edge.second))
                 {
                     const int weight = facade->GetEdgeData(edge_id).distance;
                     if ((facade->GetTarget(edge_id) == edge.first) && (weight < edge_weight) &&
@@ -355,7 +363,7 @@ template <class DataFacadeT> class BasicRoutingInterface
                     }
                 }
             }
-            BOOST_ASSERT_MSG(edge_weight != INT_MAX, "edge weight invalid");
+            BOOST_ASSERT_MSG(edge_weight != std::numeric_limits<EdgeWeight>::max(), "edge weight invalid");
 
             const EdgeData &ed = facade->GetEdgeData(smaller_edge_id);
             if (ed.shortcut)
@@ -379,20 +387,10 @@ template <class DataFacadeT> class BasicRoutingInterface
                                            const NodeID middle_node_id,
                                            std::vector<NodeID> &packed_path) const
     {
-        NodeID current_node_id = middle_node_id;
-        while (current_node_id != forward_heap.GetData(current_node_id).parent)
-        {
-            current_node_id = forward_heap.GetData(current_node_id).parent;
-            packed_path.emplace_back(current_node_id);
-        }
+        RetrievePackedPathFromSingleHeap(forward_heap, middle_node_id, packed_path);
         std::reverse(packed_path.begin(), packed_path.end());
         packed_path.emplace_back(middle_node_id);
-        current_node_id = middle_node_id;
-        while (current_node_id != reverse_heap.GetData(current_node_id).parent)
-        {
-            current_node_id = reverse_heap.GetData(current_node_id).parent;
-            packed_path.emplace_back(current_node_id);
-        }
+        RetrievePackedPathFromSingleHeap(reverse_heap, middle_node_id, packed_path);
     }
 
     inline void RetrievePackedPathFromSingleHeap(const SearchEngineData::QueryHeap &search_heap,

RoutingAlgorithms/ShortestPathRouting.h

@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <boost/assert.hpp>
 
 #include "BasicRoutingInterface.h"
+#include "../DataStructures/Range.h"
 #include "../DataStructures/SearchEngineData.h"
 #include "../typedefs.h"
 
@@ -49,14 +50,15 @@ template <class DataFacadeT> class ShortestPathRouting : public BasicRoutingInte
     ~ShortestPathRouting() {}
 
     void operator()(const std::vector<PhantomNodes> &phantom_nodes_vector,
+                    const std::vector<bool> &uturn_indicators,
                     RawRouteData &raw_route_data) const
     {
         int distance1 = 0;
         int distance2 = 0;
         bool search_from_1st_node = true;
         bool search_from_2nd_node = true;
-        NodeID middle1 = UINT_MAX;
-        NodeID middle2 = UINT_MAX;
+        NodeID middle1 = SPECIAL_NODEID;
+        NodeID middle2 = SPECIAL_NODEID;
         std::vector<std::vector<NodeID>> packed_legs1(phantom_nodes_vector.size());
         std::vector<std::vector<NodeID>> packed_legs2(phantom_nodes_vector.size());
 
@@ -72,7 +74,7 @@ template <class DataFacadeT> class ShortestPathRouting : public BasicRoutingInte
         QueryHeap &forward_heap2 = *(engine_working_data.forwardHeap2);
         QueryHeap &reverse_heap2 = *(engine_working_data.backwardHeap2);
 
-        int current_leg = 0;
+        std::size_t current_leg = 0;
         // Get distance to next pair of target nodes.
         for (const PhantomNodes &phantom_node_pair : phantom_nodes_vector)
         {
@@ -80,36 +82,50 @@ template <class DataFacadeT> class ShortestPathRouting : public BasicRoutingInte
             forward_heap2.Clear();
             reverse_heap1.Clear();
             reverse_heap2.Clear();
-            int local_upper_bound1 = INT_MAX;
-            int local_upper_bound2 = INT_MAX;
+            int local_upper_bound1 = INVALID_EDGE_WEIGHT;
+            int local_upper_bound2 = INVALID_EDGE_WEIGHT;
 
-            middle1 = UINT_MAX;
-            middle2 = UINT_MAX;
+            middle1 = SPECIAL_NODEID;
+            middle2 = SPECIAL_NODEID;
+
+            const bool allow_u_turn = current_leg > 0 && uturn_indicators.size() > current_leg && uturn_indicators[current_leg-1];
+            EdgeWeight min_edge_offset = 0;
 
             // insert new starting nodes into forward heap, adjusted by previous distances.
-            if (search_from_1st_node &&
+            if ((allow_u_turn || search_from_1st_node) &&
                 phantom_node_pair.source_phantom.forward_node_id != SPECIAL_NODEID)
             {
                 forward_heap1.Insert(
                     phantom_node_pair.source_phantom.forward_node_id,
-                    distance1 - phantom_node_pair.source_phantom.GetForwardWeightPlusOffset(),
+                    (allow_u_turn ? 0 : distance1) - phantom_node_pair.source_phantom.GetForwardWeightPlusOffset(),
                     phantom_node_pair.source_phantom.forward_node_id);
+                min_edge_offset = std::min(min_edge_offset, (allow_u_turn ? 0 : distance1) - phantom_node_pair.source_phantom.GetForwardWeightPlusOffset());
+                // SimpleLogger().Write(logDEBUG) << "fwd-a2 insert: " << phantom_node_pair.source_phantom.forward_node_id << ", w: " << (allow_u_turn ? 0 : distance1) - phantom_node_pair.source_phantom.GetForwardWeightPlusOffset();
                 forward_heap2.Insert(
                     phantom_node_pair.source_phantom.forward_node_id,
-                    distance1 - phantom_node_pair.source_phantom.GetForwardWeightPlusOffset(),
+                    (allow_u_turn ? 0 : distance1) - phantom_node_pair.source_phantom.GetForwardWeightPlusOffset(),
                     phantom_node_pair.source_phantom.forward_node_id);
+                min_edge_offset = std::min(min_edge_offset, (allow_u_turn ? 0 : distance1) - phantom_node_pair.source_phantom.GetForwardWeightPlusOffset());
+                // SimpleLogger().Write(logDEBUG) << "fwd-b2 insert: " << phantom_node_pair.source_phantom.forward_node_id << ", w: " << (allow_u_turn ? 0 : distance1) - phantom_node_pair.source_phantom.GetForwardWeightPlusOffset();
+
             }
-            if (search_from_2nd_node &&
+            if ((allow_u_turn || search_from_2nd_node) &&
                 phantom_node_pair.source_phantom.reverse_node_id != SPECIAL_NODEID)
             {
                 forward_heap1.Insert(
                     phantom_node_pair.source_phantom.reverse_node_id,
-                    distance2 - phantom_node_pair.source_phantom.GetReverseWeightPlusOffset(),
+                    (allow_u_turn ? 0 : distance2) - phantom_node_pair.source_phantom.GetReverseWeightPlusOffset(),
                     phantom_node_pair.source_phantom.reverse_node_id);
+                min_edge_offset = std::min(min_edge_offset, (allow_u_turn ? 0 : distance2) - phantom_node_pair.source_phantom.GetReverseWeightPlusOffset());
+                // SimpleLogger().Write(logDEBUG) << "fwd-a2 insert: " << phantom_node_pair.source_phantom.reverse_node_id <<
+                //                     ", w: " << (allow_u_turn ? 0 : distance2) - phantom_node_pair.source_phantom.GetReverseWeightPlusOffset();
                 forward_heap2.Insert(
                     phantom_node_pair.source_phantom.reverse_node_id,
-                    distance2 - phantom_node_pair.source_phantom.GetReverseWeightPlusOffset(),
+                    (allow_u_turn ? 0 : distance2) - phantom_node_pair.source_phantom.GetReverseWeightPlusOffset(),
                     phantom_node_pair.source_phantom.reverse_node_id);
+                min_edge_offset = std::min(min_edge_offset, (allow_u_turn ? 0 : distance2) - phantom_node_pair.source_phantom.GetReverseWeightPlusOffset());
+                // SimpleLogger().Write(logDEBUG) << "fwd-b2 insert: " << phantom_node_pair.source_phantom.reverse_node_id <<
+                //                     ", w: " << (allow_u_turn ? 0 : distance2) - phantom_node_pair.source_phantom.GetReverseWeightPlusOffset();
             }
 
             // insert new backward nodes into backward heap, unadjusted.
@@ -118,27 +134,31 @@ template <class DataFacadeT> class ShortestPathRouting : public BasicRoutingInte
                 reverse_heap1.Insert(phantom_node_pair.target_phantom.forward_node_id,
                                      phantom_node_pair.target_phantom.GetForwardWeightPlusOffset(),
                                      phantom_node_pair.target_phantom.forward_node_id);
-            }
+                // SimpleLogger().Write(logDEBUG) << "rev-a insert: " << phantom_node_pair.target_phantom.forward_node_id <<
+                //                     ", w: " << phantom_node_pair.target_phantom.GetForwardWeightPlusOffset();
+           }
 
             if (phantom_node_pair.target_phantom.reverse_node_id != SPECIAL_NODEID)
             {
                 reverse_heap2.Insert(phantom_node_pair.target_phantom.reverse_node_id,
                                      phantom_node_pair.target_phantom.GetReverseWeightPlusOffset(),
                                      phantom_node_pair.target_phantom.reverse_node_id);
+                // SimpleLogger().Write(logDEBUG) << "rev-a insert: " << phantom_node_pair.target_phantom.reverse_node_id <<
+                //                     ", w: " << phantom_node_pair.target_phantom.GetReverseWeightPlusOffset();
             }
 
             // run two-Target Dijkstra routing step.
             while (0 < (forward_heap1.Size() + reverse_heap1.Size()))
             {
-                if (0 < forward_heap1.Size())
+                if (!forward_heap1.Empty())
                 {
                     super::RoutingStep(
-                        forward_heap1, reverse_heap1, &middle1, &local_upper_bound1, true);
+                        forward_heap1, reverse_heap1, &middle1, &local_upper_bound1, min_edge_offset, true);
                 }
-                if (0 < reverse_heap1.Size())
+                if (!reverse_heap1.Empty())
                 {
                     super::RoutingStep(
-                        reverse_heap1, forward_heap1, &middle1, &local_upper_bound1, false);
+                        reverse_heap1, forward_heap1, &middle1, &local_upper_bound1, min_edge_offset, false);
                 }
             }
 
@@ -146,15 +166,15 @@ template <class DataFacadeT> class ShortestPathRouting : public BasicRoutingInte
             {
                 while (0 < (forward_heap2.Size() + reverse_heap2.Size()))
                 {
-                    if (0 < forward_heap2.Size())
+                    if (!forward_heap2.Empty())
                     {
                         super::RoutingStep(
-                            forward_heap2, reverse_heap2, &middle2, &local_upper_bound2, true);
+                            forward_heap2, reverse_heap2, &middle2, &local_upper_bound2, min_edge_offset, true);
                     }
-                    if (0 < reverse_heap2.Size())
+                    if (!reverse_heap2.Empty())
                     {
                         super::RoutingStep(
-                            reverse_heap2, forward_heap2, &middle2, &local_upper_bound2, false);
+                            reverse_heap2, forward_heap2, &middle2, &local_upper_bound2, min_edge_offset, false);
                     }
                 }
             }
@@ -180,7 +200,7 @@ template <class DataFacadeT> class ShortestPathRouting : public BasicRoutingInte
             }
 
             // Was at most one of the two paths not found?
-            BOOST_ASSERT_MSG((INT_MAX != distance1 || INT_MAX != distance2), "no path found");
+            BOOST_ASSERT_MSG((INVALID_EDGE_WEIGHT != distance1 || INVALID_EDGE_WEIGHT != distance2), "no path found");
 
             // Unpack paths if they exist
             std::vector<NodeID> temporary_packed_leg1;
@@ -202,15 +222,17 @@ template <class DataFacadeT> class ShortestPathRouting : public BasicRoutingInte
             }
 
             // if one of the paths was not found, replace it with the other one.
-            if (temporary_packed_leg1.empty())
+            if ((allow_u_turn && local_upper_bound1 > local_upper_bound2) || temporary_packed_leg1.empty())
             {
+                temporary_packed_leg1.clear();
                 temporary_packed_leg1.insert(temporary_packed_leg1.end(),
                                              temporary_packed_leg2.begin(),
                                              temporary_packed_leg2.end());
                 local_upper_bound1 = local_upper_bound2;
             }
-            if (temporary_packed_leg2.empty())
+            if ((allow_u_turn && local_upper_bound2 > local_upper_bound1) || temporary_packed_leg2.empty())
             {
+                temporary_packed_leg2.clear();
                 temporary_packed_leg2.insert(temporary_packed_leg2.end(),
                                              temporary_packed_leg1.begin(),
                                              temporary_packed_leg1.end());
@@ -223,7 +245,7 @@ template <class DataFacadeT> class ShortestPathRouting : public BasicRoutingInte
             BOOST_ASSERT((0 == current_leg) || !packed_legs1[current_leg - 1].empty());
             BOOST_ASSERT((0 == current_leg) || !packed_legs2[current_leg - 1].empty());
 
-            if (0 < current_leg)
+            if (!allow_u_turn && 0 < current_leg)
             {
                 const NodeID end_id_of_segment1 = packed_legs1[current_leg - 1].back();
                 const NodeID end_id_of_segment2 = packed_legs2[current_leg - 1].back();
@@ -236,13 +258,8 @@ template <class DataFacadeT> class ShortestPathRouting : public BasicRoutingInte
                     std::swap(temporary_packed_leg1, temporary_packed_leg2);
                     std::swap(local_upper_bound1, local_upper_bound2);
                 }
-            }
 
-            // remove the shorter path if both legs end at the same segment
-            if (0 < current_leg)
-            {
-                const NodeID start_id_of_leg1 = temporary_packed_leg1.front();
-                const NodeID start_id_of_leg2 = temporary_packed_leg2.front();
+                // remove the shorter path if both legs end at the same segment
                 if (start_id_of_leg1 == start_id_of_leg2)
                 {
                     const NodeID last_id_of_packed_legs1 = packed_legs1[current_leg - 1].back();
@@ -270,7 +287,7 @@ template <class DataFacadeT> class ShortestPathRouting : public BasicRoutingInte
                                              temporary_packed_leg2.end());
             BOOST_ASSERT(packed_legs2[current_leg].size() == temporary_packed_leg2.size());
 
-            if ((packed_legs1[current_leg].back() == packed_legs2[current_leg].back()) &&
+            if (!allow_u_turn && (packed_legs1[current_leg].back() == packed_legs2[current_leg].back()) &&
                 phantom_node_pair.target_phantom.isBidirected())
             {
                 const NodeID last_node_id = packed_legs2[current_leg].back();
@@ -292,24 +309,24 @@ template <class DataFacadeT> class ShortestPathRouting : public BasicRoutingInte
         }
         raw_route_data.unpacked_path_segments.resize(packed_legs1.size());
 
-        for (unsigned i = 0; i < packed_legs1.size(); ++i)
+        for (const std::size_t index : osrm::irange<std::size_t>(0, packed_legs1.size()))
         {
             BOOST_ASSERT(!phantom_nodes_vector.empty());
             BOOST_ASSERT(packed_legs1.size() == raw_route_data.unpacked_path_segments.size());
 
-            PhantomNodes unpack_phantom_node_pair = phantom_nodes_vector[i];
+            PhantomNodes unpack_phantom_node_pair = phantom_nodes_vector[index];
             super::UnpackPath(
                 // -- packed input
-                packed_legs1[i],
+                packed_legs1[index],
                 // -- start and end of (sub-)route
                 unpack_phantom_node_pair,
                 // -- unpacked output
-                raw_route_data.unpacked_path_segments[i]);
+                raw_route_data.unpacked_path_segments[index]);
 
             raw_route_data.source_traversed_in_reverse.push_back(
-            (packed_legs1[i].front() != phantom_nodes_vector[i].source_phantom.forward_node_id));
+            (packed_legs1[index].front() != phantom_nodes_vector[index].source_phantom.forward_node_id));
             raw_route_data.target_traversed_in_reverse.push_back(
-            (packed_legs1[i].back() != phantom_nodes_vector[i].target_phantom.forward_node_id));
+            (packed_legs1[index].back() != phantom_nodes_vector[index].target_phantom.forward_node_id));
         }
         raw_route_data.shortest_path_length = std::min(distance1, distance2);
     }

Server/APIGrammar.h

@@ -39,8 +39,8 @@ struct APIGrammar : qi::grammar<Iterator>
 {
     explicit APIGrammar(HandlerT * h) : APIGrammar::base_type(api_call), handler(h)
     {
-        api_call = qi::lit('/') >> string[boost::bind(&HandlerT::setService, handler, ::_1)] >> *(query);
-        query    = ('?') >> (+(zoom | output | jsonp | checksum | location | hint | cmp | language | instruction | geometry | alt_route | old_API) ) ;
+        api_call = qi::lit('/') >> string[boost::bind(&HandlerT::setService, handler, ::_1)] >> *(query) >> -(uturns);
+        query    = ('?') >> (+(zoom | output | jsonp | checksum | location | hint | u | cmp | language | instruction | geometry | alt_route | old_API));
 
         zoom        = (-qi::lit('&')) >> qi::lit('z')            >> '=' >> qi::short_[boost::bind(&HandlerT::setZoomLevel, handler, ::_1)];
         output      = (-qi::lit('&')) >> qi::lit("output")       >> '=' >> string[boost::bind(&HandlerT::setOutputFormat, handler, ::_1)];
@@ -51,6 +51,8 @@ struct APIGrammar : qi::grammar<Iterator>
         cmp         = (-qi::lit('&')) >> qi::lit("compression")  >> '=' >> qi::bool_[boost::bind(&HandlerT::setCompressionFlag, handler, ::_1)];
         location    = (-qi::lit('&')) >> qi::lit("loc")          >> '=' >> (qi::double_ >> qi::lit(',') >> qi::double_)[boost::bind(&HandlerT::addCoordinate, handler, ::_1)];
         hint        = (-qi::lit('&')) >> qi::lit("hint")         >> '=' >> stringwithDot[boost::bind(&HandlerT::addHint, handler, ::_1)];
+        u           = (-qi::lit('&')) >> qi::lit("u")            >> '=' >> qi::bool_[boost::bind(&HandlerT::setUTurn, handler, ::_1)];
+        uturns      = (-qi::lit('&')) >> qi::lit("uturns")       >> '=' >> qi::bool_[boost::bind(&HandlerT::setAllUTurns, handler, ::_1)];
         language    = (-qi::lit('&')) >> qi::lit("hl")           >> '=' >> string[boost::bind(&HandlerT::setLanguage, handler, ::_1)];
         alt_route   = (-qi::lit('&')) >> qi::lit("alt")          >> '=' >> qi::bool_[boost::bind(&HandlerT::setAlternateRouteFlag, handler, ::_1)];
         old_API     = (-qi::lit('&')) >> qi::lit("geomformat")   >> '=' >> string[boost::bind(&HandlerT::setDeprecatedAPIFlag, handler, ::_1)];
@@ -63,7 +65,7 @@ struct APIGrammar : qi::grammar<Iterator>
     qi::rule<Iterator> api_call, query;
     qi::rule<Iterator, std::string()> service, zoom, output, string, jsonp, checksum, location, hint,
                                       stringwithDot, stringwithPercent, language, instruction, geometry,
-                                      cmp, alt_route, old_API;
+                                      cmp, alt_route, u, uturns, old_API ;
 
     HandlerT * handler;
 };

Server/DataStructures/BaseDataFacade.h

@@ -33,18 +33,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../../DataStructures/EdgeBasedNode.h"
 #include "../../DataStructures/ImportNode.h"
 #include "../../DataStructures/PhantomNodes.h"
+#include "../../DataStructures/Range.h"
 #include "../../DataStructures/TurnInstructions.h"
 #include "../../Util/OSRMException.h"
 #include "../../Util/StringUtil.h"
 #include "../../typedefs.h"
 
-#include <boost/range/irange.hpp>
-
 #include <osrm/Coordinate.h>
 
 #include <string>
 
-typedef decltype(boost::irange(0u,0u)) EdgeRange;
+typedef osrm::range<EdgeID> EdgeRange;
 
 template <class EdgeDataT> class BaseDataFacade
 {
@@ -95,16 +94,16 @@ template <class EdgeDataT> class BaseDataFacade
 
     virtual bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate,
                                                     FixedPointCoordinate &result,
-                                                    const unsigned zoom_level = 18) const = 0;
+                                                    const unsigned zoom_level = 18) = 0;
 
     virtual bool FindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
                                               PhantomNode &resulting_phantom_node,
-                                              const unsigned zoom_level) const = 0;
+                                              const unsigned zoom_level) = 0;
 
     virtual bool IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
                                               std::vector<PhantomNode> &resulting_phantom_node_vector,
                                               const unsigned zoom_level,
-                                              const unsigned number_of_results) const = 0;
+                                              const unsigned number_of_results) = 0;
 
     virtual unsigned GetCheckSum() const = 0;
 

Server/DataStructures/InternalDataFacade.h

@@ -71,8 +71,10 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
     ShM<unsigned, false>::vector m_geometry_indices;
     ShM<unsigned, false>::vector m_geometry_list;
 
-    std::shared_ptr<StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, false>::vector, false>>
+    boost::thread_specific_ptr<StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, false>::vector, false>>
     m_static_rtree;
+    boost::filesystem::path ram_index_path;
+    boost::filesystem::path file_index_path;
     RangeTable<16, false> m_name_table;
 
     void LoadTimestamp(const boost::filesystem::path &timestamp_path)
@@ -192,13 +194,13 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
         geometry_stream.close();
     }
 
-    void LoadRTree(const boost::filesystem::path &ram_index_path,
-                   const boost::filesystem::path &file_index_path)
+    void LoadRTree()
     {
         BOOST_ASSERT_MSG(!m_coordinate_list->empty(), "coordinates must be loaded before r-tree");
 
-        m_static_rtree = std::make_shared<StaticRTree<RTreeLeaf>>(
-            ram_index_path, file_index_path, m_coordinate_list);
+        m_static_rtree.reset(
+            new StaticRTree<RTreeLeaf>(ram_index_path, file_index_path, m_coordinate_list)
+        );
     }
 
     void LoadStreetNames(const boost::filesystem::path &names_file)
@@ -220,7 +222,7 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
     }
 
   public:
-    ~InternalDataFacade()
+    virtual ~InternalDataFacade()
     {
         delete m_query_graph;
         m_static_rtree.reset();
@@ -266,10 +268,10 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
         const boost::filesystem::path &timestamp_path = paths_iterator->second;
         paths_iterator = server_paths.find("ramindex");
         BOOST_ASSERT(server_paths.end() != paths_iterator);
-        const boost::filesystem::path &ram_index_path = paths_iterator->second;
+        ram_index_path = paths_iterator->second;
         paths_iterator = server_paths.find("fileindex");
         BOOST_ASSERT(server_paths.end() != paths_iterator);
-        const boost::filesystem::path &file_index_path = paths_iterator->second;
+        file_index_path = paths_iterator->second;
         paths_iterator = server_paths.find("nodesdata");
         BOOST_ASSERT(server_paths.end() != paths_iterator);
         const boost::filesystem::path &nodes_data_path = paths_iterator->second;
@@ -297,7 +299,6 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
         SimpleLogger().Write() << "loading r-tree";
         AssertPathExists(ram_index_path);
         AssertPathExists(file_index_path);
-        LoadRTree(ram_index_path, file_index_path);
         SimpleLogger().Write() << "loading timestamp";
         LoadTimestamp(timestamp_path);
         SimpleLogger().Write() << "loading street names";
@@ -358,16 +359,26 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
 
     bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate,
                                             FixedPointCoordinate &result,
-                                            const unsigned zoom_level = 18) const
+                                            const unsigned zoom_level = 18)
     {
+        if (!m_static_rtree.get())
+        {
+            LoadRTree();
+        }
+
         return m_static_rtree->LocateClosestEndPointForCoordinate(
             input_coordinate, result, zoom_level);
     }
 
     bool FindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
                                       PhantomNode &resulting_phantom_node,
-                                      const unsigned zoom_level) const
+                                      const unsigned zoom_level)
     {
+        if (!m_static_rtree.get())
+        {
+            LoadRTree();
+        }
+
         return m_static_rtree->FindPhantomNodeForCoordinate(
             input_coordinate, resulting_phantom_node, zoom_level);
     }
@@ -376,8 +387,13 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
     IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
                                             std::vector<PhantomNode> &resulting_phantom_node_vector,
                                             const unsigned zoom_level,
-                                            const unsigned number_of_results) const
+                                            const unsigned number_of_results)
     {
+        if (!m_static_rtree.get())
+        {
+            LoadRTree();
+        }
+
         return m_static_rtree->IncrementalFindPhantomNodeForCoordinate(
             input_coordinate, resulting_phantom_node_vector, zoom_level, number_of_results);
     }

Server/DataStructures/SharedDataFacade.h

@@ -83,8 +83,9 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
     ShM<unsigned, true>::vector m_geometry_indices;
     ShM<unsigned, true>::vector m_geometry_list;
 
-    std::shared_ptr<StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, true>::vector, true>>
+    boost::thread_specific_ptr<StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, true>::vector, true>>
     m_static_rtree;
+    boost::filesystem::path file_index_path;
 
     std::shared_ptr<RangeTable<16, true>> m_name_table;
 
@@ -105,18 +106,19 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
                   m_timestamp.begin());
     }
 
-    void LoadRTree(const boost::filesystem::path &file_index_path)
+    void LoadRTree()
     {
         BOOST_ASSERT_MSG(!m_coordinate_list->empty(), "coordinates must be loaded before r-tree");
 
         RTreeNode *tree_ptr =
             data_layout->GetBlockPtr<RTreeNode>(shared_memory, SharedDataLayout::R_SEARCH_TREE);
-        m_static_rtree =
-            std::make_shared<StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, true>::vector, true>>(
+        m_static_rtree.reset(
+            new StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, true>::vector, true>(
                 tree_ptr,
                 data_layout->num_entries[SharedDataLayout::R_SEARCH_TREE],
                 file_index_path,
-                m_coordinate_list);
+                m_coordinate_list)
+        );
     }
 
     void LoadGraph()
@@ -210,6 +212,8 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
     }
 
   public:
+    virtual ~SharedDataFacade() {}
+
     SharedDataFacade()
     {
         data_timestamp_ptr = (SharedDataTimestamp *)SharedMemoryFactory::Get(
@@ -244,13 +248,9 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
             m_large_memory.reset(SharedMemoryFactory::Get(CURRENT_DATA));
             shared_memory = (char *)(m_large_memory->Ptr());
 
-            std::ofstream out("debug.bin");
-            out.write(shared_memory, data_layout->GetSizeOfLayout());
-            out.close();
-
             const char *file_index_ptr =
                 data_layout->GetBlockPtr<char>(shared_memory, SharedDataLayout::FILE_INDEX_PATH);
-            boost::filesystem::path file_index_path(file_index_ptr);
+            file_index_path = boost::filesystem::path(file_index_ptr);
             if (!boost::filesystem::exists(file_index_path))
             {
                 SimpleLogger().Write(logDEBUG) << "Leaf file name " << file_index_path.string();
@@ -262,12 +262,20 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
             LoadChecksum();
             LoadNodeAndEdgeInformation();
             LoadGeometries();
-            LoadRTree(file_index_path);
             LoadTimestamp();
             LoadViaNodeList();
             LoadNames();
 
             data_layout->PrintInformation();
+
+            SimpleLogger().Write() << "number of geometries: " << m_coordinate_list->size();
+            for (unsigned i = 0; i < m_coordinate_list->size(); ++i)
+            {
+                if(!GetCoordinateOfNode(i).isValid())
+                {
+                    SimpleLogger().Write() << "coordinate " << i << " not valid";
+                }
+            }
         }
     }
 
@@ -312,7 +320,7 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
     }
 
     // node and edge information access
-    FixedPointCoordinate GetCoordinateOfNode(const unsigned id) const
+    FixedPointCoordinate GetCoordinateOfNode(const NodeID id) const
     {
         return m_coordinate_list->at(id);
     };
@@ -342,16 +350,26 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
 
     bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate,
                                             FixedPointCoordinate &result,
-                                            const unsigned zoom_level = 18) const
+                                            const unsigned zoom_level = 18)
     {
+        if (!m_static_rtree.get())
+        {
+            LoadRTree();
+        }
+
         return m_static_rtree->LocateClosestEndPointForCoordinate(
             input_coordinate, result, zoom_level);
     }
 
     bool FindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
                                       PhantomNode &resulting_phantom_node,
-                                      const unsigned zoom_level) const
+                                      const unsigned zoom_level)
     {
+        if (!m_static_rtree.get())
+        {
+            LoadRTree();
+        }
+
         return m_static_rtree->FindPhantomNodeForCoordinate(
             input_coordinate, resulting_phantom_node, zoom_level);
     }
@@ -360,8 +378,13 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
     IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
                                             std::vector<PhantomNode> &resulting_phantom_node_vector,
                                             const unsigned zoom_level,
-                                            const unsigned number_of_results) const
+                                            const unsigned number_of_results)
     {
+        if (!m_static_rtree.get())
+        {
+            LoadRTree();
+        }
+
         return m_static_rtree->IncrementalFindPhantomNodeForCoordinate(
             input_coordinate, resulting_phantom_node_vector, zoom_level, number_of_results);
     }

Server/Server.h

@@ -63,8 +63,8 @@ class Server
             boost::bind(&Server::HandleAccept, this, boost::asio::placeholders::error));
     }
 
-    Server() = delete;
-    Server(const Server &) = delete;
+    // Server() = delete;
+    // Server(const Server &) = delete;
 
     void Run()
     {

Tools/check-hsgr.cpp

@@ -0,0 +1,117 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#include "../DataStructures/DeallocatingVector.h"
+#include "../DataStructures/Percent.h"
+#include "../DataStructures/QueryEdge.h"
+#include "../DataStructures/Range.h"
+#include "../DataStructures/StaticGraph.h"
+#include "../Util/GraphLoader.h"
+#include "../Util/SimpleLogger.h"
+
+#include <boost/assert.hpp>
+#include <boost/filesystem.hpp>
+
+#include <memory>
+#include <vector>
+
+typedef QueryEdge::EdgeData EdgeData;
+typedef StaticGraph<EdgeData> QueryGraph;
+
+int main(int argc, char *argv[])
+{
+    LogPolicy::GetInstance().Unmute();
+    if (argc != 2)
+    {
+        SimpleLogger().Write(logWARNING) << "usage: " << argv[0] << " <file.hsgr>";
+        return 1;
+    }
+
+    try
+    {
+        boost::filesystem::path hsgr_path(argv[1]);
+
+        std::vector<QueryGraph::NodeArrayEntry> node_list;
+        std::vector<QueryGraph::EdgeArrayEntry> edge_list;
+
+        SimpleLogger().Write() << "loading graph from " << hsgr_path.string();
+
+        unsigned m_check_sum = 0;
+        unsigned m_number_of_nodes =
+            readHSGRFromStream(hsgr_path, node_list, edge_list, &m_check_sum);
+        SimpleLogger().Write() << "announced " << m_number_of_nodes
+                               << " nodes, checksum: " << m_check_sum;
+        BOOST_ASSERT_MSG(0 != node_list.size(), "node list empty");
+        // BOOST_ASSERT_MSG(0 != edge_list.size(), "edge list empty");
+        SimpleLogger().Write() << "loaded " << node_list.size() << " nodes and " << edge_list.size()
+                               << " edges";
+        std::shared_ptr<QueryGraph> m_query_graph =
+            std::make_shared<QueryGraph>(node_list, edge_list);
+
+        BOOST_ASSERT_MSG(0 == node_list.size(), "node list not flushed");
+        BOOST_ASSERT_MSG(0 == edge_list.size(), "edge list not flushed");
+
+        Percent p(m_query_graph->GetNumberOfNodes());
+        for (const auto node_u : osrm::irange(0u, m_query_graph->GetNumberOfNodes()))
+        {
+            for (const auto eid : m_query_graph->GetAdjacentEdgeRange(node_u))
+            {
+                const EdgeData &data = m_query_graph->GetEdgeData(eid);
+                if (!data.shortcut)
+                {
+                    continue;
+                }
+                const unsigned node_v = m_query_graph->GetTarget(eid);
+                const EdgeID edge_id_1 = m_query_graph->FindEdgeInEitherDirection(node_u, data.id);
+                if (SPECIAL_EDGEID == edge_id_1)
+                {
+                    SimpleLogger().Write(logWARNING) << "cannot find first segment of edge ("
+                                                     << node_u << "," << data.id << "," << node_v
+                                                     << "), eid: " << eid;
+                    BOOST_ASSERT(false);
+                    return 1;
+                }
+                const EdgeID edge_id_2 = m_query_graph->FindEdgeInEitherDirection(data.id, node_v);
+                if (SPECIAL_EDGEID == edge_id_2)
+                {
+                    SimpleLogger().Write(logWARNING) << "cannot find second segment of edge ("
+                                                     << node_u << "," << data.id << "," << node_v
+                                                     << "), eid: " << eid;
+                    BOOST_ASSERT(false);
+                    return 1;
+                }
+            }
+            p.printIncrement();
+        }
+        m_query_graph.reset();
+        SimpleLogger().Write() << "Data file " << argv[0] << " appears to be OK";
+    }
+    catch (const std::exception &e)
+    {
+        SimpleLogger().Write(logWARNING) << "[exception] " << e.what();
+    }
+    return 0;
+}

Tools/components.cpp

@@ -27,9 +27,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "../typedefs.h"
 #include "../Algorithms/StronglyConnectedComponents.h"
-#include "../DataStructures/DynamicGraph.h"
-#include "../DataStructures/QueryEdge.h"
-#include "../DataStructures/TurnInstructions.h"
 #include "../Util/GraphLoader.h"
 #include "../Util/OSRMException.h"
 #include "../Util/SimpleLogger.h"
@@ -40,16 +37,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>
 
-typedef QueryEdge::EdgeData EdgeData;
-typedef DynamicGraph<EdgeData>::InputEdge InputEdge;
-
-std::vector<NodeInfo> internal_to_external_node_map;
+std::vector<NodeInfo> coordinate_list;
 std::vector<TurnRestriction> restrictions_vector;
-std::vector<NodeID> bollard_node_IDs_vector;
-std::vector<NodeID> traffic_light_node_IDs_vector;
+std::vector<NodeID> bollard_ID_list;
+std::vector<NodeID> trafficlight_ID_list;
 
 int main(int argc, char *argv[])
 {
+    // enable logging
     LogPolicy::GetInstance().Unmute();
     if (argc < 3)
     {
@@ -65,6 +60,7 @@ int main(int argc, char *argv[])
         FingerPrint fingerprint_loaded;
         restriction_ifstream.read((char *)&fingerprint_loaded, sizeof(FingerPrint));
 
+        // check fingerprint and warn if necessary
         if (!fingerprint_loaded.TestGraphUtil(fingerprint_orig))
         {
             SimpleLogger().Write(logWARNING) << argv[2] << " was prepared with a different build. "
@@ -79,6 +75,7 @@ int main(int argc, char *argv[])
         restriction_ifstream.read((char *)&usable_restriction_count, sizeof(uint32_t));
         restrictions_vector.resize(usable_restriction_count);
 
+        // load restrictions
         if (usable_restriction_count>0)
         {
             restriction_ifstream.read((char *)&(restrictions_vector[0]),
@@ -86,20 +83,19 @@ int main(int argc, char *argv[])
         }
         restriction_ifstream.close();
 
-        std::ifstream input_stream;
-        input_stream.open(argv[1], std::ifstream::in | std::ifstream::binary);
-
+        std::ifstream input_stream(argv[1], std::ifstream::in | std::ifstream::binary);
         if (!input_stream.is_open())
         {
             throw OSRMException("Cannot open osrm file");
         }
 
+        // load graph data
         std::vector<ImportEdge> edge_list;
         const NodeID number_of_nodes = readBinaryOSRMGraphFromStream(input_stream,
                                                                      edge_list,
-                                                                     bollard_node_IDs_vector,
-                                                                     traffic_light_node_IDs_vector,
-                                                                     &internal_to_external_node_map,
+                                                                     bollard_ID_list,
+                                                                     trafficlight_ID_list,
+                                                                     &coordinate_list,
                                                                      restrictions_vector);
         input_stream.close();
 
@@ -107,23 +103,21 @@ int main(int argc, char *argv[])
                          "size of restrictions_vector changed");
 
         SimpleLogger().Write() << restrictions_vector.size() << " restrictions, "
-                               << bollard_node_IDs_vector.size() << " bollard nodes, "
-                               << traffic_light_node_IDs_vector.size() << " traffic lights";
-
-        /***
-         * Building an edge-expanded graph from node-based input an turn
-         * restrictions
-         */
+                               << bollard_ID_list.size() << " bollard nodes, "
+                               << trafficlight_ID_list.size() << " traffic lights";
 
+        // Building an edge-expanded graph from node-based input an turn
+        // restrictions
         SimpleLogger().Write() << "Starting SCC graph traversal";
         std::shared_ptr<TarjanSCC> tarjan =
             std::make_shared<TarjanSCC>(number_of_nodes,
                                         edge_list,
-                                        bollard_node_IDs_vector,
-                                        traffic_light_node_IDs_vector,
+                                        bollard_ID_list,
+                                        trafficlight_ID_list,
                                         restrictions_vector,
-                                        internal_to_external_node_map);
-        std::vector<ImportEdge>().swap(edge_list);
+                                        coordinate_list);
+        edge_list.clear();
+        edge_list.shrink_to_fit();
 
         tarjan->Run();
         SimpleLogger().Write() << "finished component analysis";

UnitTests/DataStructures/BinaryHeapTest.cpp

@@ -0,0 +1,151 @@
+#include "../../DataStructures/BinaryHeap.h"
+#include "../../typedefs.h"
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/test_case_template.hpp>
+#include <boost/mpl/list.hpp>
+
+#include <random>
+
+BOOST_AUTO_TEST_SUITE(binary_heap)
+
+struct TestData
+{
+    unsigned value;
+};
+
+typedef NodeID TestNodeID;
+typedef int TestKey;
+typedef int TestWeight;
+typedef boost::mpl::list<ArrayStorage<TestNodeID, TestKey>,
+                         MapStorage<TestNodeID, TestKey>,
+                         UnorderedMapStorage<TestNodeID, TestKey>> storage_types;
+
+template <unsigned NUM_ELEM> struct RandomDataFixture
+{
+    RandomDataFixture()
+    {
+        for (unsigned i = 0; i < NUM_ELEM; i++)
+        {
+            data.push_back(TestData{i * 3});
+            weights.push_back((i + 1) * 100);
+            ids.push_back(i);
+            order.push_back(i);
+        }
+
+        // Choosen by a fair W20 dice roll
+        std::mt19937 g(15);
+
+        std::shuffle(order.begin(), order.end(), g);
+    }
+
+    std::vector<TestData> data;
+    std::vector<TestWeight> weights;
+    std::vector<TestNodeID> ids;
+    std::vector<unsigned> order;
+};
+
+constexpr unsigned NUM_NODES = 100;
+
+BOOST_FIXTURE_TEST_CASE_TEMPLATE(insert_test, T, storage_types, RandomDataFixture<NUM_NODES>)
+{
+    BinaryHeap<TestNodeID, TestKey, TestWeight, TestData, T> heap(NUM_NODES);
+
+    TestWeight min_weight = std::numeric_limits<TestWeight>::max();
+    TestNodeID min_id;
+
+    for (unsigned idx : order)
+    {
+        BOOST_CHECK(!heap.WasInserted(ids[idx]));
+
+        heap.Insert(ids[idx], weights[idx], data[idx]);
+
+        BOOST_CHECK(heap.WasInserted(ids[idx]));
+
+        if (weights[idx] < min_weight)
+        {
+            min_weight = weights[idx];
+            min_id = ids[idx];
+        }
+        BOOST_CHECK_EQUAL(min_id, heap.Min());
+    }
+
+    for (auto id : ids)
+    {
+        const auto &d = heap.GetData(id);
+        BOOST_CHECK_EQUAL(d.value, data[id].value);
+
+        const auto &w = heap.GetKey(id);
+        BOOST_CHECK_EQUAL(w, weights[id]);
+    }
+}
+
+BOOST_FIXTURE_TEST_CASE_TEMPLATE(delete_min_test, T, storage_types, RandomDataFixture<NUM_NODES>)
+{
+    BinaryHeap<TestNodeID, TestKey, TestWeight, TestData, T> heap(NUM_NODES);
+
+    for (unsigned idx : order)
+    {
+        heap.Insert(ids[idx], weights[idx], data[idx]);
+    }
+
+    for (auto id : ids)
+    {
+        BOOST_CHECK(!heap.WasRemoved(id));
+
+        BOOST_CHECK_EQUAL(heap.Min(), id);
+        BOOST_CHECK_EQUAL(id, heap.DeleteMin());
+        if (id + 1 < NUM_NODES)
+            BOOST_CHECK_EQUAL(heap.Min(), id + 1);
+
+        BOOST_CHECK(heap.WasRemoved(id));
+    }
+}
+
+BOOST_FIXTURE_TEST_CASE_TEMPLATE(delete_all_test, T, storage_types, RandomDataFixture<NUM_NODES>)
+{
+    BinaryHeap<TestNodeID, TestKey, TestWeight, TestData, T> heap(NUM_NODES);
+
+    for (unsigned idx : order)
+    {
+        heap.Insert(ids[idx], weights[idx], data[idx]);
+    }
+
+    heap.DeleteAll();
+
+    BOOST_CHECK(heap.Empty());
+}
+
+BOOST_FIXTURE_TEST_CASE_TEMPLATE(decrease_key_test, T, storage_types, RandomDataFixture<10>)
+{
+    BinaryHeap<TestNodeID, TestKey, TestWeight, TestData, T> heap(10);
+
+    for (unsigned idx : order)
+    {
+        heap.Insert(ids[idx], weights[idx], data[idx]);
+    }
+
+    std::vector<TestNodeID> rids(ids);
+    std::reverse(rids.begin(), rids.end());
+
+    for (auto id : rids)
+    {
+        TestNodeID min_id = heap.Min();
+        TestWeight min_weight = heap.GetKey(min_id);
+
+        // decrease weight until we reach min weight
+        while (weights[id] > min_weight)
+        {
+            heap.DecreaseKey(id, weights[id]);
+            BOOST_CHECK_EQUAL(heap.Min(), min_id);
+            weights[id]--;
+        }
+
+        // make weight smaller than min
+        weights[id] -= 2;
+        heap.DecreaseKey(id, weights[id]);
+        BOOST_CHECK_EQUAL(heap.Min(), id);
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()

UnitTests/DataStructures/RangeTableTest.cpp

@@ -0,0 +1,104 @@
+#include "../../DataStructures/RangeTable.h"
+#include "../../typedefs.h"
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/test_case_template.hpp>
+
+#include <numeric>
+
+constexpr unsigned BLOCK_SIZE = 16;
+typedef RangeTable<BLOCK_SIZE, false> TestRangeTable;
+
+BOOST_AUTO_TEST_SUITE(range_table)
+
+void ConstructionTest(std::vector<unsigned> lengths, std::vector<unsigned> offsets)
+{
+    BOOST_ASSERT(lengths.size() == offsets.size() - 1);
+
+    TestRangeTable table(lengths);
+
+    for (unsigned i = 0; i < lengths.size(); i++)
+    {
+        auto range = table.GetRange(i);
+        BOOST_CHECK_EQUAL(range.front(), offsets[i]);
+        BOOST_CHECK_EQUAL(range.back() + 1, offsets[i + 1]);
+    }
+}
+
+void
+ComputeLengthsOffsets(std::vector<unsigned> &lengths, std::vector<unsigned> &offsets, unsigned num)
+{
+    lengths.resize(num);
+    offsets.resize(num + 1);
+    std::iota(lengths.begin(), lengths.end(), 1);
+    offsets[0] = 0;
+    std::partial_sum(lengths.begin(), lengths.end(), offsets.begin() + 1);
+
+    std::stringstream l_ss;
+    l_ss << "Lengths: ";
+    for (auto l : lengths)
+        l_ss << l << ", ";
+    BOOST_TEST_MESSAGE(l_ss.str());
+    std::stringstream o_ss;
+    o_ss << "Offsets: ";
+    for (auto o : offsets)
+        o_ss << o << ", ";
+    BOOST_TEST_MESSAGE(o_ss.str());
+}
+
+BOOST_AUTO_TEST_CASE(serialization_test)
+{
+    std::vector<unsigned> lengths;
+    std::vector<unsigned> offsets;
+    ComputeLengthsOffsets(lengths, offsets, (BLOCK_SIZE + 1) * 10);
+
+    TestRangeTable in_table(lengths);
+    TestRangeTable out_table;
+
+    std::stringstream ss;
+    ss << in_table;
+    ss >> out_table;
+
+    for (unsigned i = 0; i < lengths.size(); i++)
+    {
+        auto range = out_table.GetRange(i);
+        BOOST_CHECK_EQUAL(range.front(), offsets[i]);
+        BOOST_CHECK_EQUAL(range.back() + 1, offsets[i + 1]);
+    }
+}
+
+BOOST_AUTO_TEST_CASE(construction_test)
+{
+    // only offset empty block
+    ConstructionTest({1}, {0, 1});
+    // first block almost full => sentinel is last element of block
+    // [0] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, (16)}
+    std::vector<unsigned> almost_full_lengths;
+    std::vector<unsigned> almost_full_offsets;
+    ComputeLengthsOffsets(almost_full_lengths, almost_full_offsets, BLOCK_SIZE);
+    ConstructionTest(almost_full_lengths, almost_full_offsets);
+
+    // first block full => sentinel is offset of new block, next block empty
+    // [0]     {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}
+    // [(153)] {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+    std::vector<unsigned> full_lengths;
+    std::vector<unsigned> full_offsets;
+    ComputeLengthsOffsets(full_lengths, full_offsets, BLOCK_SIZE + 1);
+    ConstructionTest(full_lengths, full_offsets);
+
+    // first block full and offset of next block not sentinel, but the first differential value
+    // [0]   {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}
+    // [153] {(17), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+    std::vector<unsigned> over_full_lengths;
+    std::vector<unsigned> over_full_offsets;
+    ComputeLengthsOffsets(over_full_lengths, over_full_offsets, BLOCK_SIZE + 2);
+    ConstructionTest(over_full_lengths, over_full_offsets);
+
+    // test multiple blocks
+    std::vector<unsigned> multiple_lengths;
+    std::vector<unsigned> multiple_offsets;
+    ComputeLengthsOffsets(multiple_lengths, multiple_offsets, (BLOCK_SIZE + 1) * 10);
+    ConstructionTest(multiple_lengths, multiple_offsets);
+}
+
+BOOST_AUTO_TEST_SUITE_END()

UnitTests/DataStructures/StaticGraphTest.cpp

@@ -0,0 +1,164 @@
+#include "../../DataStructures/StaticGraph.h"
+#include "../../typedefs.h"
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/test_case_template.hpp>
+#include <boost/mpl/list.hpp>
+
+#include <random>
+#include <unordered_map>
+
+BOOST_AUTO_TEST_SUITE(static_graph)
+
+struct TestData
+{
+    EdgeID id;
+    bool shortcut;
+    unsigned distance;
+};
+
+struct TestEdge
+{
+    unsigned source;
+    unsigned target;
+    unsigned distance;
+};
+
+typedef StaticGraph<TestData> TestStaticGraph;
+typedef TestStaticGraph::NodeArrayEntry TestNodeArrayEntry;
+typedef TestStaticGraph::EdgeArrayEntry TestEdgeArrayEntry;
+typedef TestStaticGraph::InputEdge TestInputEdge;
+
+constexpr unsigned TEST_NUM_NODES = 100;
+constexpr unsigned TEST_NUM_EDGES = 500;
+// Choosen by a fair W20 dice roll (this value is completely arbitrary)
+constexpr unsigned RANDOM_SEED = 15;
+
+template <unsigned NUM_NODES, unsigned NUM_EDGES> struct RandomArrayEntryFixture
+{
+    RandomArrayEntryFixture()
+    {
+        std::mt19937 g(RANDOM_SEED);
+
+        std::uniform_int_distribution<> edge_udist(0, NUM_EDGES - 1);
+        std::vector<unsigned> offsets;
+        for (unsigned i = 0; i < NUM_NODES; i++)
+        {
+            offsets.push_back(edge_udist(g));
+        }
+        std::sort(offsets.begin(), offsets.end());
+        // add sentinel
+        offsets.push_back(offsets.back());
+
+        // extract interval lengths
+        for (unsigned i = 0; i < offsets.size() - 1; i++)
+        {
+            lengths.push_back(offsets[i + 1] - offsets[i]);
+        }
+        lengths.push_back(NUM_EDGES - offsets[NUM_NODES - 1]);
+
+        for (auto offset : offsets)
+        {
+            nodes.emplace_back(TestNodeArrayEntry{offset});
+        }
+
+        std::uniform_int_distribution<> lengths_udist(0, 100000);
+        std::uniform_int_distribution<> node_udist(0, NUM_NODES - 1);
+        for (unsigned i = 0; i < NUM_EDGES; i++)
+        {
+            edges.emplace_back(
+                TestEdgeArrayEntry{static_cast<unsigned>(node_udist(g)),
+                                   TestData{i, false, static_cast<unsigned>(lengths_udist(g))}});
+        }
+
+        for (unsigned i = 0; i < NUM_NODES; i++)
+            order.push_back(i);
+        std::shuffle(order.begin(), order.end(), g);
+    }
+
+    typename ShM<TestNodeArrayEntry, false>::vector nodes;
+    typename ShM<TestEdgeArrayEntry, false>::vector edges;
+    std::vector<unsigned> lengths;
+    std::vector<unsigned> order;
+};
+
+typedef RandomArrayEntryFixture<TEST_NUM_NODES, TEST_NUM_EDGES> TestRandomArrayEntryFixture;
+
+BOOST_FIXTURE_TEST_CASE(array_test, TestRandomArrayEntryFixture)
+{
+    auto nodes_copy = nodes;
+
+    TestStaticGraph graph(nodes, edges);
+
+    BOOST_CHECK_EQUAL(graph.GetNumberOfEdges(), TEST_NUM_EDGES);
+    BOOST_CHECK_EQUAL(graph.GetNumberOfNodes(), TEST_NUM_NODES);
+
+    for (auto idx : order)
+    {
+        BOOST_CHECK_EQUAL(graph.BeginEdges((NodeID)idx), nodes_copy[idx].first_edge);
+        BOOST_CHECK_EQUAL(graph.EndEdges((NodeID)idx), nodes_copy[idx + 1].first_edge);
+        BOOST_CHECK_EQUAL(graph.GetOutDegree((NodeID)idx), lengths[idx]);
+    }
+}
+
+TestStaticGraph GraphFromEdgeList(const std::vector<TestEdge> &edges)
+{
+    std::vector<TestInputEdge> input_edges;
+    unsigned i = 0;
+    unsigned num_nodes = 0;
+    for (const auto &e : edges)
+    {
+        input_edges.push_back(TestInputEdge{e.source, e.target, TestData{i++, false, e.distance}});
+
+        num_nodes = std::max(num_nodes, std::max(e.source, e.target));
+    }
+
+    return TestStaticGraph(num_nodes, input_edges);
+}
+
+BOOST_AUTO_TEST_CASE(find_test)
+{
+    /*
+     *  (0) -1-> (1)
+     *  ^ ^
+     *  2 1
+     *  | |
+     *  (3) -4-> (4)
+     *      <-3-
+     */
+    TestStaticGraph simple_graph = GraphFromEdgeList({TestEdge{0, 1, 1},
+                                                      TestEdge{3, 0, 2},
+                                                      TestEdge{3, 4, 4},
+                                                      TestEdge{4, 3, 3},
+                                                      TestEdge{3, 0, 1}});
+
+    auto eit = simple_graph.FindEdge(0, 1);
+    BOOST_CHECK_EQUAL(simple_graph.GetEdgeData(eit).id, 0);
+
+    eit = simple_graph.FindEdge(1, 0);
+    BOOST_CHECK_EQUAL(eit, SPECIAL_EDGEID);
+
+    eit = simple_graph.FindEdgeInEitherDirection(1, 0);
+    BOOST_CHECK_EQUAL(simple_graph.GetEdgeData(eit).id, 0);
+
+    bool reverse = false;
+    eit = simple_graph.FindEdgeIndicateIfReverse(1, 0, reverse);
+    BOOST_CHECK_EQUAL(simple_graph.GetEdgeData(eit).id, 0);
+    BOOST_CHECK(reverse);
+
+    eit = simple_graph.FindEdge(3, 1);
+    BOOST_CHECK_EQUAL(eit, SPECIAL_EDGEID);
+    eit = simple_graph.FindEdge(0, 4);
+    BOOST_CHECK_EQUAL(eit, SPECIAL_EDGEID);
+
+    eit = simple_graph.FindEdge(3, 4);
+    BOOST_CHECK_EQUAL(simple_graph.GetEdgeData(eit).id, 2);
+    eit = simple_graph.FindEdgeInEitherDirection(3, 4);
+    // I think this is wrong behaviour! Should be 3.
+    BOOST_CHECK_EQUAL(simple_graph.GetEdgeData(eit).id, 2);
+
+    eit = simple_graph.FindEdge(3, 0);
+    BOOST_CHECK_EQUAL(simple_graph.GetEdgeData(eit).id, 4);
+}
+
+BOOST_AUTO_TEST_SUITE_END()

UnitTests/DataStructures/StaticRTreeTest.cpp

@@ -0,0 +1,465 @@
+#include "../../DataStructures/StaticRTree.h"
+#include "../../DataStructures/QueryNode.h"
+#include "../../DataStructures/EdgeBasedNode.h"
+#include "../../Util/NumericUtil.h"
+#include "../../typedefs.h"
+
+#include <osrm/Coordinate.h>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/test_case_template.hpp>
+#include <boost/mpl/list.hpp>
+
+#include <random>
+#include <unordered_set>
+
+BOOST_AUTO_TEST_SUITE(static_rtree)
+
+constexpr uint32_t TEST_BRANCHING_FACTOR = 8;
+constexpr uint32_t TEST_LEAF_NODE_SIZE = 64;
+
+typedef EdgeBasedNode TestData;
+typedef StaticRTree<TestData,
+                    std::vector<FixedPointCoordinate>,
+                    false,
+                    TEST_BRANCHING_FACTOR,
+                    TEST_LEAF_NODE_SIZE> TestStaticRTree;
+
+// Choosen by a fair W20 dice roll (this value is completely arbitrary)
+constexpr unsigned RANDOM_SEED = 15;
+static const int32_t WORLD_MIN_LAT = -90 * COORDINATE_PRECISION;
+static const int32_t WORLD_MAX_LAT = 90 * COORDINATE_PRECISION;
+static const int32_t WORLD_MIN_LON = -180 * COORDINATE_PRECISION;
+static const int32_t WORLD_MAX_LON = 180 * COORDINATE_PRECISION;
+
+class LinearSearchNN
+{
+  public:
+    LinearSearchNN(const std::shared_ptr<std::vector<FixedPointCoordinate>> &coords,
+                   const std::vector<TestData> &edges)
+        : coords(coords), edges(edges)
+    {
+    }
+
+    bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                            FixedPointCoordinate &result_coordinate,
+                                            const unsigned zoom_level)
+    {
+        bool ignore_tiny_components = (zoom_level <= 14);
+
+        float min_dist = std::numeric_limits<float>::max();
+        FixedPointCoordinate min_coord;
+        for (const TestData &e : edges)
+        {
+            if (ignore_tiny_components && e.is_in_tiny_cc)
+                continue;
+
+            const FixedPointCoordinate &start = coords->at(e.u);
+            const FixedPointCoordinate &end = coords->at(e.v);
+            float distance = FixedPointCoordinate::ApproximateEuclideanDistance(
+                input_coordinate.lat, input_coordinate.lon, start.lat, start.lon);
+            if (distance < min_dist)
+            {
+                min_coord = start;
+                min_dist = distance;
+            }
+
+            distance = FixedPointCoordinate::ApproximateEuclideanDistance(
+                input_coordinate.lat, input_coordinate.lon, end.lat, end.lon);
+            if (distance < min_dist)
+            {
+                min_coord = end;
+                min_dist = distance;
+            }
+        }
+
+        result_coordinate = min_coord;
+        return result_coordinate.isValid();
+    }
+
+    bool FindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                      PhantomNode &result_phantom_node,
+                                      const unsigned zoom_level)
+    {
+        bool ignore_tiny_components = (zoom_level <= 14);
+
+        float min_dist = std::numeric_limits<float>::max();
+        TestData nearest_edge;
+        for (const TestData &e : edges)
+        {
+            if (ignore_tiny_components && e.is_in_tiny_cc)
+                continue;
+
+            float current_ratio = 0.;
+            FixedPointCoordinate nearest;
+            const float current_perpendicular_distance =
+                FixedPointCoordinate::ComputePerpendicularDistance(
+                    coords->at(e.u), coords->at(e.v), input_coordinate, nearest, current_ratio);
+
+            if ((current_perpendicular_distance < min_dist) &&
+                !EpsilonCompare(current_perpendicular_distance, min_dist))
+            { // found a new minimum
+                min_dist = current_perpendicular_distance;
+                result_phantom_node = {e.forward_edge_based_node_id,
+                                       e.reverse_edge_based_node_id,
+                                       e.name_id,
+                                       e.forward_weight,
+                                       e.reverse_weight,
+                                       e.forward_offset,
+                                       e.reverse_offset,
+                                       e.packed_geometry_id,
+                                       nearest,
+                                       e.fwd_segment_position};
+                nearest_edge = e;
+            }
+        }
+
+        if (result_phantom_node.location.isValid())
+        {
+            // Hack to fix rounding errors and wandering via nodes.
+            if (1 == std::abs(input_coordinate.lon - result_phantom_node.location.lon))
+            {
+                result_phantom_node.location.lon = input_coordinate.lon;
+            }
+            if (1 == std::abs(input_coordinate.lat - result_phantom_node.location.lat))
+            {
+                result_phantom_node.location.lat = input_coordinate.lat;
+            }
+
+            const float distance_1 = FixedPointCoordinate::ApproximateEuclideanDistance(
+                coords->at(nearest_edge.u), result_phantom_node.location);
+            const float distance_2 = FixedPointCoordinate::ApproximateEuclideanDistance(
+                coords->at(nearest_edge.u), coords->at(nearest_edge.v));
+            const float ratio = std::min(1.f, distance_1 / distance_2);
+
+            if (SPECIAL_NODEID != result_phantom_node.forward_node_id)
+            {
+                result_phantom_node.forward_weight *= ratio;
+            }
+            if (SPECIAL_NODEID != result_phantom_node.reverse_node_id)
+            {
+                result_phantom_node.reverse_weight *= (1. - ratio);
+            }
+        }
+
+        return result_phantom_node.location.isValid();
+    }
+
+  private:
+    const std::shared_ptr<std::vector<FixedPointCoordinate>> &coords;
+    const std::vector<TestData> &edges;
+};
+
+template <unsigned NUM_NODES, unsigned NUM_EDGES> struct RandomGraphFixture
+{
+    struct TupleHash
+    {
+        typedef std::pair<unsigned, unsigned> argument_type;
+        typedef std::size_t result_type;
+
+        result_type operator()(const argument_type &t) const
+        {
+            std::size_t val{0};
+            boost::hash_combine(val, t.first);
+            boost::hash_combine(val, t.second);
+            return val;
+        }
+    };
+
+    RandomGraphFixture() : coords(std::make_shared<std::vector<FixedPointCoordinate>>())
+    {
+        BOOST_TEST_MESSAGE("Constructing " << NUM_NODES << " nodes and " << NUM_EDGES << " edges.");
+
+        std::mt19937 g(RANDOM_SEED);
+
+        std::uniform_int_distribution<> lat_udist(WORLD_MIN_LAT, WORLD_MAX_LAT);
+        std::uniform_int_distribution<> lon_udist(WORLD_MIN_LON, WORLD_MAX_LON);
+
+        for (unsigned i = 0; i < NUM_NODES; i++)
+        {
+            int lat = lat_udist(g);
+            int lon = lon_udist(g);
+            nodes.emplace_back(NodeInfo(lat, lon, i));
+            coords->emplace_back(FixedPointCoordinate(lat, lon));
+        }
+
+        std::uniform_int_distribution<> edge_udist(0, nodes.size() - 1);
+
+        std::unordered_set<std::pair<unsigned, unsigned>, TupleHash> used_edges;
+
+        while (edges.size() < NUM_EDGES)
+        {
+            TestData data;
+            data.u = edge_udist(g);
+            data.v = edge_udist(g);
+            if (used_edges.find(std::pair<unsigned, unsigned>(
+                    std::min(data.u, data.v), std::max(data.u, data.v))) == used_edges.end())
+            {
+                data.is_in_tiny_cc = false;
+                edges.emplace_back(data);
+                used_edges.emplace(std::min(data.u, data.v), std::max(data.u, data.v));
+            }
+        }
+    }
+
+    std::vector<NodeInfo> nodes;
+    std::shared_ptr<std::vector<FixedPointCoordinate>> coords;
+    std::vector<TestData> edges;
+};
+
+struct GraphFixture
+{
+    GraphFixture(const std::vector<std::pair<float, float>> &input_coords,
+                 const std::vector<std::pair<unsigned, unsigned>> &input_edges)
+        : coords(std::make_shared<std::vector<FixedPointCoordinate>>())
+    {
+
+        for (unsigned i = 0; i < input_coords.size(); i++)
+        {
+            FixedPointCoordinate c(input_coords[i].first * COORDINATE_PRECISION,
+                                   input_coords[i].second * COORDINATE_PRECISION);
+            coords->emplace_back(c);
+            nodes.emplace_back(NodeInfo(c.lat, c.lon, i));
+        }
+
+        for (const auto &pair : input_edges)
+        {
+            TestData d;
+            d.u = pair.first;
+            d.v = pair.second;
+            edges.emplace_back(d);
+        }
+    }
+
+    std::vector<NodeInfo> nodes;
+    std::shared_ptr<std::vector<FixedPointCoordinate>> coords;
+    std::vector<TestData> edges;
+};
+
+typedef RandomGraphFixture<TEST_LEAF_NODE_SIZE * 3, TEST_LEAF_NODE_SIZE / 2>
+TestRandomGraphFixture_LeafHalfFull;
+typedef RandomGraphFixture<TEST_LEAF_NODE_SIZE * 5, TEST_LEAF_NODE_SIZE>
+TestRandomGraphFixture_LeafFull;
+typedef RandomGraphFixture<TEST_LEAF_NODE_SIZE * 10, TEST_LEAF_NODE_SIZE * 2>
+TestRandomGraphFixture_TwoLeaves;
+typedef RandomGraphFixture<TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 3,
+                           TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR>
+TestRandomGraphFixture_Branch;
+typedef RandomGraphFixture<TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 3,
+                           TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 2>
+TestRandomGraphFixture_MultipleLevels;
+
+template <typename RTreeT>
+void simple_verify_rtree(RTreeT &rtree,
+                         const std::shared_ptr<std::vector<FixedPointCoordinate>> &coords,
+                         const std::vector<TestData> &edges)
+{
+    BOOST_TEST_MESSAGE("Verify end points");
+    for (const auto &e : edges)
+    {
+        FixedPointCoordinate result_u, result_v;
+        const FixedPointCoordinate &pu = coords->at(e.u);
+        const FixedPointCoordinate &pv = coords->at(e.v);
+        bool found_u = rtree.LocateClosestEndPointForCoordinate(pu, result_u, 1);
+        bool found_v = rtree.LocateClosestEndPointForCoordinate(pv, result_v, 1);
+        BOOST_CHECK(found_u && found_v);
+        float dist_u = FixedPointCoordinate::ApproximateEuclideanDistance(
+            result_u.lat, result_u.lon, pu.lat, pu.lon);
+        BOOST_CHECK_LE(dist_u, std::numeric_limits<float>::epsilon());
+        float dist_v = FixedPointCoordinate::ApproximateEuclideanDistance(
+            result_v.lat, result_v.lon, pv.lat, pv.lon);
+        BOOST_CHECK_LE(dist_v, std::numeric_limits<float>::epsilon());
+    }
+}
+
+template <typename RTreeT>
+void sampling_verify_rtree(RTreeT &rtree, LinearSearchNN &lsnn, unsigned num_samples)
+{
+    std::mt19937 g(RANDOM_SEED);
+    std::uniform_int_distribution<> lat_udist(WORLD_MIN_LAT, WORLD_MAX_LAT);
+    std::uniform_int_distribution<> lon_udist(WORLD_MIN_LON, WORLD_MAX_LON);
+    std::vector<FixedPointCoordinate> queries;
+    for (unsigned i = 0; i < num_samples; i++)
+    {
+        queries.emplace_back(FixedPointCoordinate(lat_udist(g), lon_udist(g)));
+    }
+
+    BOOST_TEST_MESSAGE("Sampling queries");
+    for (const auto &q : queries)
+    {
+        FixedPointCoordinate result_rtree;
+        rtree.LocateClosestEndPointForCoordinate(q, result_rtree, 1);
+        FixedPointCoordinate result_ln;
+        lsnn.LocateClosestEndPointForCoordinate(q, result_ln, 1);
+        BOOST_CHECK_EQUAL(result_ln, result_rtree);
+
+        PhantomNode phantom_rtree;
+        rtree.FindPhantomNodeForCoordinate(q, phantom_rtree, 1);
+        PhantomNode phantom_ln;
+        lsnn.FindPhantomNodeForCoordinate(q, phantom_ln, 1);
+        BOOST_CHECK_EQUAL(phantom_rtree, phantom_ln);
+    }
+}
+
+template <typename FixtureT, typename RTreeT = TestStaticRTree>
+void build_rtree(const std::string &prefix,
+                 FixtureT *fixture,
+                 std::string &leaves_path,
+                 std::string &nodes_path)
+{
+    nodes_path = prefix + ".ramIndex";
+    leaves_path = prefix + ".fileIndex";
+    const std::string coords_path = prefix + ".nodes";
+
+    boost::filesystem::ofstream node_stream(coords_path, std::ios::binary);
+    const unsigned num_nodes = fixture->nodes.size();
+    node_stream.write((char *)&num_nodes, sizeof(unsigned));
+    node_stream.write((char *)&(fixture->nodes[0]), num_nodes * sizeof(NodeInfo));
+    node_stream.close();
+
+    RTreeT r(fixture->edges, nodes_path, leaves_path, fixture->nodes);
+}
+
+template <typename FixtureT, typename RTreeT = TestStaticRTree>
+void construction_test(const std::string &prefix, FixtureT *fixture)
+{
+    std::string leaves_path;
+    std::string nodes_path;
+    build_rtree<FixtureT, RTreeT>(prefix, fixture, leaves_path, nodes_path);
+    RTreeT rtree(nodes_path, leaves_path, fixture->coords);
+    LinearSearchNN lsnn(fixture->coords, fixture->edges);
+
+    simple_verify_rtree(rtree, fixture->coords, fixture->edges);
+    sampling_verify_rtree(rtree, lsnn, 100);
+}
+
+BOOST_FIXTURE_TEST_CASE(construct_half_leaf_test, TestRandomGraphFixture_LeafHalfFull)
+{
+    construction_test("test_1", this);
+}
+
+BOOST_FIXTURE_TEST_CASE(construct_full_leaf_test, TestRandomGraphFixture_LeafFull)
+{
+    construction_test("test_2", this);
+}
+
+BOOST_FIXTURE_TEST_CASE(construct_two_leaves_test, TestRandomGraphFixture_TwoLeaves)
+{
+    construction_test("test_3", this);
+}
+
+BOOST_FIXTURE_TEST_CASE(construct_branch_test, TestRandomGraphFixture_Branch)
+{
+    construction_test("test_4", this);
+}
+
+BOOST_FIXTURE_TEST_CASE(construct_multiple_levels_test, TestRandomGraphFixture_MultipleLevels)
+{
+    construction_test("test_5", this);
+}
+
+/*
+ * Bug: If you querry a point that lies between two BBs that have a gap,
+ * one BB will be pruned, even if it could contain a nearer match.
+ */
+BOOST_AUTO_TEST_CASE(regression_test)
+{
+    typedef std::pair<float, float> Coord;
+    typedef std::pair<unsigned, unsigned> Edge;
+    GraphFixture fixture({
+                          Coord(40.0, 0.0),
+                          Coord(35.0, 5.0),
+
+                          Coord(5.0, 5.0),
+                          Coord(0.0, 10.0),
+
+                          Coord(20.0, 10.0),
+                          Coord(20.0, 5.0),
+
+                          Coord(40.0, 100.0),
+                          Coord(35.0, 105.0),
+
+                          Coord(5.0, 105.0),
+                          Coord(0.0, 110.0),
+                         },
+                         {Edge(0, 1), Edge(2, 3), Edge(4, 5), Edge(6, 7), Edge(8, 9)});
+
+    typedef StaticRTree<TestData, std::vector<FixedPointCoordinate>, false, 2, 3> MiniStaticRTree;
+
+    std::string leaves_path;
+    std::string nodes_path;
+    build_rtree<GraphFixture, MiniStaticRTree>(
+        "test_regression", &fixture, leaves_path, nodes_path);
+    MiniStaticRTree rtree(nodes_path, leaves_path, fixture.coords);
+
+    // query a node just right of the center of the gap
+    FixedPointCoordinate input(20.0 * COORDINATE_PRECISION, 55.1 * COORDINATE_PRECISION);
+    FixedPointCoordinate result;
+    rtree.LocateClosestEndPointForCoordinate(input, result, 1);
+    FixedPointCoordinate result_ln;
+    LinearSearchNN lsnn(fixture.coords, fixture.edges);
+    lsnn.LocateClosestEndPointForCoordinate(input, result_ln, 1);
+
+    BOOST_CHECK_EQUAL(result_ln, result);
+}
+
+void TestRectangle(double width, double height, double center_lat, double center_lon)
+{
+    FixedPointCoordinate center(center_lat * COORDINATE_PRECISION,
+                                center_lon * COORDINATE_PRECISION);
+
+    TestStaticRTree::RectangleT rect;
+    rect.min_lat = center.lat - height / 2.0 * COORDINATE_PRECISION;
+    rect.max_lat = center.lat + height / 2.0 * COORDINATE_PRECISION;
+    rect.min_lon = center.lon - width / 2.0 * COORDINATE_PRECISION;
+    rect.max_lon = center.lon + width / 2.0 * COORDINATE_PRECISION;
+
+    unsigned offset = 5 * COORDINATE_PRECISION;
+    FixedPointCoordinate north(rect.max_lat + offset, center.lon);
+    FixedPointCoordinate south(rect.min_lat - offset, center.lon);
+    FixedPointCoordinate west(center.lat, rect.min_lon - offset);
+    FixedPointCoordinate east(center.lat, rect.max_lon + offset);
+    FixedPointCoordinate north_east(rect.max_lat + offset, rect.max_lon + offset);
+    FixedPointCoordinate north_west(rect.max_lat + offset, rect.min_lon - offset);
+    FixedPointCoordinate south_east(rect.min_lat - offset, rect.max_lon + offset);
+    FixedPointCoordinate south_west(rect.min_lat - offset, rect.min_lon - offset);
+
+    /* Distance to line segments of rectangle */
+    BOOST_CHECK_EQUAL(rect.GetMinDist(north),
+                      FixedPointCoordinate::ApproximateEuclideanDistance(
+                          north, FixedPointCoordinate(rect.max_lat, north.lon)));
+    BOOST_CHECK_EQUAL(rect.GetMinDist(south),
+                      FixedPointCoordinate::ApproximateEuclideanDistance(
+                          south, FixedPointCoordinate(rect.min_lat, south.lon)));
+    BOOST_CHECK_EQUAL(rect.GetMinDist(west),
+                      FixedPointCoordinate::ApproximateEuclideanDistance(
+                          west, FixedPointCoordinate(west.lat, rect.min_lon)));
+    BOOST_CHECK_EQUAL(rect.GetMinDist(east),
+                      FixedPointCoordinate::ApproximateEuclideanDistance(
+                          east, FixedPointCoordinate(east.lat, rect.max_lon)));
+
+    /* Distance to corner points */
+    BOOST_CHECK_EQUAL(rect.GetMinDist(north_east),
+                      FixedPointCoordinate::ApproximateEuclideanDistance(
+                          north_east, FixedPointCoordinate(rect.max_lat, rect.max_lon)));
+    BOOST_CHECK_EQUAL(rect.GetMinDist(north_west),
+                      FixedPointCoordinate::ApproximateEuclideanDistance(
+                          north_west, FixedPointCoordinate(rect.max_lat, rect.min_lon)));
+    BOOST_CHECK_EQUAL(rect.GetMinDist(south_east),
+                      FixedPointCoordinate::ApproximateEuclideanDistance(
+                          south_east, FixedPointCoordinate(rect.min_lat, rect.max_lon)));
+    BOOST_CHECK_EQUAL(rect.GetMinDist(south_west),
+                      FixedPointCoordinate::ApproximateEuclideanDistance(
+                          south_west, FixedPointCoordinate(rect.min_lat, rect.min_lon)));
+}
+
+BOOST_AUTO_TEST_CASE(rectangle_test)
+{
+    TestRectangle(10, 10, 5, 5);
+    TestRectangle(10, 10, -5, 5);
+    TestRectangle(10, 10, 5, -5);
+    TestRectangle(10, 10, -5, -5);
+    TestRectangle(10, 10, 0, 0);
+}
+
+BOOST_AUTO_TEST_SUITE_END()

UnitTests/datastructure_tests.cpp

@@ -0,0 +1,7 @@
+#define BOOST_TEST_MODULE datastructure tests
+
+#include <boost/test/unit_test.hpp>
+
+/*
+ * This file will contain an automatically generated main function.
+ */

Util/ContainerUtils.h

@@ -38,34 +38,35 @@ template <typename T> inline void sort_unique_resize(std::vector<T> &vector)
     vector.resize(number_of_unique_elements);
 }
 
-template <typename T> inline void sort_unique_resize_shrink_vector(std::vector<T> &vector)
-{
-    sort_unique_resize(vector);
-    std::vector<T>().swap(vector);
-}
+// template <typename T> inline void sort_unique_resize_shrink_vector(std::vector<T> &vector)
+// {
+//     sort_unique_resize(vector);
+//     vector.shrink_to_fit();
+// }
 
-template <typename T> inline void remove_consecutive_duplicates_from_vector(std::vector<T> &vector)
-{
-    const auto number_of_unique_elements = std::unique(vector.begin(), vector.end()) - vector.begin();
-    vector.resize(number_of_unique_elements);
-}
+// template <typename T> inline void remove_consecutive_duplicates_from_vector(std::vector<T> &vector)
+// {
+//     const auto number_of_unique_elements = std::unique(vector.begin(), vector.end()) - vector.begin();
+//     vector.resize(number_of_unique_elements);
+// }
 
-template <typename FwdIter, typename Func>
-Func for_each_pair(FwdIter iter_begin, FwdIter iter_end, Func func)
+template <typename ForwardIterator, typename Function>
+Function for_each_pair(ForwardIterator begin, ForwardIterator end, Function function)
 {
-    if (iter_begin == iter_end)
+    if (begin == end)
     {
-        return func;
+        return function;
     }
 
-    FwdIter iter_next = iter_begin;
-    ++iter_next;
+    ForwardIterator next = begin;
+    ++next;
 
-    for (; iter_next != iter_end; ++iter_begin, ++iter_next)
+    while (next != end)
     {
-        func(*iter_begin, *iter_next);
+        function(*begin, *next);
+        ++begin; ++next;
     }
-    return func;
+    return function;
 }
 
 #endif /* CONTAINERUTILS_H_ */

Util/FingerPrint.cpp.in

@@ -31,8 +31,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/uuid/name_generator.hpp>
 
-#include <cstring>
-
 #include <algorithm>
 #include <string>
 

Util/GraphLoader.h

@@ -268,6 +268,119 @@ NodeID readBinaryOSRMGraphFromStream(std::istream &input_stream,
     return n;
 }
 
+template <typename EdgeT, typename CoordinateT>
+NodeID readBinaryOSRMGraphFromStream(std::istream &input_stream,
+                                     std::vector<EdgeT> &edge_list,
+                                     std::vector<CoordinateT> & coordinate_list)
+{
+    const FingerPrint fingerprint_orig;
+    FingerPrint fingerprint_loaded;
+    input_stream.read((char *)&fingerprint_loaded, sizeof(FingerPrint));
+
+    if (!fingerprint_loaded.TestGraphUtil(fingerprint_orig))
+    {
+        SimpleLogger().Write(logWARNING) << ".osrm was prepared with different build.\n"
+                                            "Reprocess to get rid of this warning.";
+    }
+
+    NodeID n, source, target;
+    EdgeID m;
+    short dir; // direction (0 = open, 1 = forward, 2+ = open)
+    std::unordered_map<NodeID, NodeID> ext_to_int_id_map;
+
+    input_stream.read((char *)&n, sizeof(NodeID));
+    SimpleLogger().Write() << "Importing n = " << n << " nodes ";
+    ExternalMemoryNode current_node;
+    for (NodeID i = 0; i < n; ++i)
+    {
+        input_stream.read((char *)&current_node, sizeof(ExternalMemoryNode));
+        coordinate_list.emplace_back(current_node.lat, current_node.lon);
+        ext_to_int_id_map.emplace(current_node.node_id, i);
+    }
+
+    input_stream.read((char *)&m, sizeof(unsigned));
+    SimpleLogger().Write() << " and " << m << " edges ";
+
+    edge_list.reserve(m);
+    EdgeWeight weight;
+    short type;
+    NodeID nameID;
+    int length;
+    bool is_roundabout, ignore_in_grid, is_access_restricted, is_contra_flow, is_split;
+
+    for (EdgeID i = 0; i < m; ++i)
+    {
+        input_stream.read((char *)&source, sizeof(unsigned));
+        input_stream.read((char *)&target, sizeof(unsigned));
+        input_stream.read((char *)&length, sizeof(int));
+        input_stream.read((char *)&dir, sizeof(short));
+        input_stream.read((char *)&weight, sizeof(int));
+        input_stream.read((char *)&type, sizeof(short));
+        input_stream.read((char *)&nameID, sizeof(unsigned));
+        input_stream.read((char *)&is_roundabout, sizeof(bool));
+        input_stream.read((char *)&ignore_in_grid, sizeof(bool));
+        input_stream.read((char *)&is_access_restricted, sizeof(bool));
+        input_stream.read((char *)&is_contra_flow, sizeof(bool));
+        input_stream.read((char *)&is_split, sizeof(bool));
+
+        BOOST_ASSERT_MSG(length > 0, "loaded null length edge");
+        BOOST_ASSERT_MSG(weight > 0, "loaded null weight");
+        BOOST_ASSERT_MSG(0 <= dir && dir <= 2, "loaded bogus direction");
+
+        BOOST_ASSERT(type >= 0);
+
+        // translate the external NodeIDs to internal IDs
+        auto internal_id_iter = ext_to_int_id_map.find(source);
+        if (ext_to_int_id_map.find(source) == ext_to_int_id_map.end())
+        {
+#ifndef NDEBUG
+            SimpleLogger().Write(logWARNING) << " unresolved source NodeID: " << source;
+#endif
+            continue;
+        }
+        source = internal_id_iter->second;
+        internal_id_iter = ext_to_int_id_map.find(target);
+        if (ext_to_int_id_map.find(target) == ext_to_int_id_map.end())
+        {
+#ifndef NDEBUG
+            SimpleLogger().Write(logWARNING) << "unresolved target NodeID : " << target;
+#endif
+            continue;
+        }
+        target = internal_id_iter->second;
+        BOOST_ASSERT_MSG(source != UINT_MAX && target != UINT_MAX, "nonexisting source or target");
+
+        if (source > target)
+        {
+            std::swap(source, target);
+        }
+
+        edge_list.emplace_back(source,
+                               target);
+    }
+
+    tbb::parallel_sort(edge_list.begin(), edge_list.end());
+    for (unsigned i = 1; i < edge_list.size(); ++i)
+    {
+        if ((edge_list[i - 1].target == edge_list[i].target) &&
+            (edge_list[i - 1].source == edge_list[i].source))
+        {
+                edge_list[i].distance = std::min(edge_list[i - 1].distance, edge_list[i].distance);
+                edge_list[i - 1].source = UINT_MAX;
+        }
+    }
+    const auto new_end_iter = std::remove_if(edge_list.begin(),
+                                       edge_list.end(),
+                                       [](const EdgeT &edge)
+                                       { return edge.source == SPECIAL_NODEID; });
+    ext_to_int_id_map.clear();
+    edge_list.erase(new_end_iter, edge_list.end()); // remove excess candidates.
+    edge_list.shrink_to_fit();
+    SimpleLogger().Write() << "Graph loaded ok and has " << n << " nodes and " << edge_list.size() << " edges";
+    return n;
+}
+
+
 template <typename NodeT, typename EdgeT>
 unsigned readHSGRFromStream(const boost::filesystem::path &hsgr_file,
                             std::vector<NodeT> &node_list,
@@ -304,7 +417,7 @@ unsigned readHSGRFromStream(const boost::filesystem::path &hsgr_file,
                            << ", number_of_edges: " << number_of_edges;
 
     // BOOST_ASSERT_MSG( 0 != number_of_edges, "number of edges is zero");
-    node_list.resize(number_of_nodes + 1);
+    node_list.resize(number_of_nodes);
     hsgr_input_stream.read((char *)&(node_list[0]), number_of_nodes * sizeof(NodeT));
 
     edge_list.resize(number_of_edges);

Util/NumericUtil.h

@@ -0,0 +1,39 @@
+/*
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef __NUMERIC_UTIL_H__
+#define __NUMERIC_UTIL_H__
+
+#include <cstdlib>
+
+#include <limits>
+
+template <typename FloatT> inline bool EpsilonCompare(const FloatT d1, const FloatT d2)
+{
+    return (std::abs(d1 - d2) < std::numeric_limits<FloatT>::epsilon());
+}
+
+#endif

Util/SimpleLogger.h

@@ -40,6 +40,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <unistd.h>
 #endif
 
+#include <atomic>
 #include <ostream>
 #include <iostream>
 #include <mutex>
@@ -77,7 +78,7 @@ class LogPolicy
 
   private:
     LogPolicy() : m_is_mute(true) {}
-    bool m_is_mute;
+    std::atomic<bool> m_is_mute;
 };
 
 class SimpleLogger

Util/StringUtil.h

@@ -122,7 +122,7 @@ static inline unsigned StringToUint(const std::string &input)
 {
     auto first_digit = input.begin();
     // Delete any trailing white-spaces
-    while (first_digit != input.end() && std::isspace(*first_digit))
+    while (first_digit != input.end() && (std::isspace(*first_digit) || '-' == *first_digit))
     {
         ++first_digit;
     }

appveyor.yml

@@ -38,7 +38,12 @@ build_script:
   - set TBB_ARCH_PLATFORM=intel64/vc12
   - cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=%Configuration% -DBZIP2_INCLUDE_DIR=%P%/libs/include -DBZIP2_LIBRARIES=%P%/libs/lib/libbz2.lib -DCMAKE_INSTALL_PREFIX=%P%/libs -DBOOST_ROOT=%P%/boost_min -DBoost_USE_STATIC_LIBS=ON
   - nmake
+  - nmake tests
+  - nmake benchmarks
   - if "%APPVEYOR_REPO_BRANCH%"=="develop" (7z a %P%/osrm_%Configuration%.zip *.exe *.pdb %P%/libs/bin/*.dll -tzip)
+  - set PATH=%PATH%;c:/projects/osrm/libs/bin
+  - cd c:/projects/osrm/build
+  - datastructure-tests.exe
 
 test: off
 

cmake/CPackDebianConfig.cmake

@@ -0,0 +1,44 @@
+IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  MESSAGE(FATAL_ERROR "Cannot configure CPack to generate Debian packages on non-linux systems.")
+ENDIF()
+
+INCLUDE(FindDebArch)
+
+SET(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md")
+SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENCE.TXT")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CPACK_RESOURCE_FILE_README}")
+SET(CPACK_PACKAGE_VERSION_MAJOR "0")
+SET(CPACK_PACKAGE_VERSION_MINOR "4")
+SET(CPACK_PACKAGE_VERSION_PATCH "3")
+
+SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
+string(TOLOWER "${CMAKE_PROJECT_NAME}" LOWER_PROJECT_NAME)
+SET(CPACK_PACKAGE_FILE_NAME "${LOWER_PROJECT_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${LOWER_PROJECT_NAME}_${CPACK_PACKAGE_VERSION}_orig")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Open Source Routing Machine (OSRM).")
+SET(CPACK_PACKAGE_DESCRIPTION "Open Source Routing Machine (OSRM) is a routing engine.")
+
+# To create a proper Debian/Ubuntu package, the following CMake
+# options should be used:
+
+SET(CPACK_STRIP_FILES "TRUE")
+SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY "FALSE")
+SET(CPACK_GENERATOR "DEB")
+
+SET(CPACK_DEBIAN_PACKAGE_NAME        "${CPACK_PACKAGE_NAME}${VERSION_SUFFIX}")
+SET(CPACK_DEBIAN_PACKAGE_VERSION     "${CPACK_PACKAGE_VERSION}${CPACK_PACKAGE_REVISION}")
+SET(CPACK_DEBIAN_PACKAGE_MAINTAINER  "Dennis Luxen <info@project-osrm.org>")
+SET(CPACK_DEBIAN_PACKAGE_PRIORITY    "optional")
+SET(CPACK_DEBIAN_PACKAGE_SECTION     "devel")
+SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Open Source Routing Machine (OSRM) is a high-performance routing engine.
+  It combines sophisticated routing algorithms with the open and free data of the OpenStreetMap."
+)
+SET(CPACK_DEBIAN_PACKAGE_DEPENDS     "libc6-dev, libprotobuf-dev, libosmpbf-dev, libbz2-1.0, libstxxl1, libxml2, libzip2, liblua5.1-0, libtbb2, libboost-all-dev")
+
+file(GLOB_RECURSE ProfileGlob ${CMAKE_SOURCE_DIR}/profiles/*)
+install(FILES ${ProfileGlob} DESTINATION "share/doc/${LOWER_PROJECT_NAME}/profiles")
+CONFIGURE_FILE (${CMAKE_SOURCE_DIR}/cmake/postinst.in postinst)
+set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_BINARY_DIR}/postinst;${CMAKE_CURRENT_BINARY_DIR}/copyright;")
+
+MESSAGE(STATUS "Debian Package: ${CPACK_DEBIAN_PACKAGE_NAME} (${CPACK_DEBIAN_PACKAGE_VERSION}) [${CPACK_PACKAGE_FILE_NAME}.deb]")

cmake/FindDebArch.cmake

@@ -0,0 +1,19 @@
+#
+# Copyright (C) 2013	Emmanuel Roullit <emmanuel.roullit@gmail.com>
+#
+
+IF(NOT CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+  FIND_PROGRAM(DPKG_CMD dpkg)
+  IF(NOT DPKG_CMD)
+    EXECUTE_PROCESS(COMMAND uname -p
+      OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    MESSAGE(STATUS "Can not find dpkg in your path, default to uname -p: ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.")
+  ELSE(NOT DPKG_CMD)
+    EXECUTE_PROCESS(COMMAND "${DPKG_CMD}" --print-architecture
+      OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+  ENDIF(NOT DPKG_CMD)
+ENDIF(NOT CPACK_DEBIAN_PACKAGE_ARCHITECTURE)

cmake/postinst.in

@@ -0,0 +1,2 @@
+#/usr/bin/env bash
+ln -s /usr/share/doc/@CMAKE_PROJECT_NAME@/profiles/car.lua @CMAKE_INSTALL_PREFIX@/profile.lua

datastore.cpp

@@ -60,12 +60,54 @@ typedef StaticGraph<QueryEdge::EdgeData> QueryGraph;
 #include <fstream>
 #include <string>
 
+// delete a shared memory region. report warning if it could not be deleted
+void delete_region(const SharedDataType region)
+{
+    if (SharedMemory::RegionExists(region) && !SharedMemory::Remove(region))
+    {
+        const std::string name = [&]
+        {
+            switch (region)
+            {
+            case CURRENT_REGIONS:
+                return "CURRENT_REGIONS";
+            case LAYOUT_1:
+                return "LAYOUT_1";
+            case DATA_1:
+                return "DATA_1";
+            case LAYOUT_2:
+                return "LAYOUT_2";
+            case DATA_2:
+                return "DATA_2";
+            case LAYOUT_NONE:
+                return "LAYOUT_NONE";
+            default: // DATA_NONE:
+                return "DATA_NONE";
+            }
+        }();
+
+        SimpleLogger().Write(logWARNING) << "could not delete shared memory region " << name;
+    }
+}
+
+// find all existing shmem regions and remove them.
+void springclean()
+{
+    SimpleLogger().Write() << "spring-cleaning all shared memory regions";
+    delete_region(DATA_1);
+    delete_region(LAYOUT_1);
+    delete_region(DATA_2);
+    delete_region(LAYOUT_2);
+    delete_region(CURRENT_REGIONS);
+}
+
 int main(const int argc, const char *argv[])
 {
     LogPolicy::GetInstance().Unmute();
     SharedBarriers barrier;
 
 #ifdef __linux__
+    // try to disable swapping on Linux
     const bool lock_flags = MCL_CURRENT | MCL_FUTURE;
     if (-1 == mlockall(lock_flags))
     {
@@ -96,36 +138,14 @@ int main(const int argc, const char *argv[])
         SimpleLogger().Write(logDEBUG) << "Checking input parameters";
 
         ServerPaths server_paths;
-        bool springclean = false;
-        if (!GenerateDataStoreOptions(argc, argv, server_paths, springclean))
+        bool should_springclean = false;
+        if (!GenerateDataStoreOptions(argc, argv, server_paths, should_springclean))
         {
             return 0;
         }
-        if (springclean)
+        if (should_springclean)
         {
-            SimpleLogger().Write() << "spring-cleaning all shared memory regions";
-            // find all existing shmem regions and remove them.
-            if (SharedMemory::RegionExists(DATA_1) && !SharedMemory::Remove(DATA_1))
-            {
-                SimpleLogger().Write(logWARNING) << "could not delete DATA_1";
-            }
-            if (SharedMemory::RegionExists(LAYOUT_1) && !SharedMemory::Remove(LAYOUT_1))
-            {
-                SimpleLogger().Write(logWARNING) << "could not delete LAYOUT_1";
-            }
-            if (SharedMemory::RegionExists(DATA_2) && !SharedMemory::Remove(DATA_2))
-            {
-                SimpleLogger().Write(logWARNING) << "could not delete DATA_2";
-            }
-            if (SharedMemory::RegionExists(LAYOUT_2) && !SharedMemory::Remove(LAYOUT_2))
-            {
-                SimpleLogger().Write(logWARNING) << "could not delete LAYOUT_2";
-            }
-            if (SharedMemory::RegionExists(CURRENT_REGIONS) &&
-                !SharedMemory::Remove(CURRENT_REGIONS))
-            {
-                SimpleLogger().Write(logWARNING) << "could not delete CURRENT_REGIONS";
-            }
+            springclean();
             return 0;
         }
 
@@ -193,27 +213,28 @@ int main(const int argc, const char *argv[])
         BOOST_ASSERT(!paths_iterator->second.empty());
         const boost::filesystem::path &geometries_data_path = paths_iterator->second;
 
-        // get the shared memory segment to use
-        bool use_first_segment = SharedMemory::RegionExists(LAYOUT_2);
-        const SharedDataType LAYOUT = [&]
+        // determine segment to use
+        bool segment2_in_use = SharedMemory::RegionExists(LAYOUT_2);
+        const SharedDataType layout_region = [&]
         {
-            if (use_first_segment)
-            {
-                return LAYOUT_1;
-            }
-            return LAYOUT_2;
+            return segment2_in_use ? LAYOUT_1 : LAYOUT_2;
         }();
-        const SharedDataType DATA = [&]
+        const SharedDataType data_region = [&]
         {
-            if (use_first_segment)
-            {
-                return DATA_1;
-            }
-            return DATA_2;
+            return segment2_in_use ? DATA_1 : DATA_2;
+        }();
+        const SharedDataType previous_layout_region = [&]
+        {
+            return segment2_in_use ? LAYOUT_2 : LAYOUT_1;
+        }();
+        const SharedDataType previous_data_region = [&]
+        {
+            return segment2_in_use ? DATA_2 : DATA_1;
         }();
 
         // Allocate a memory layout in shared memory, deallocate previous
-        SharedMemory *layout_memory = SharedMemoryFactory::Get(LAYOUT, sizeof(SharedDataLayout));
+        SharedMemory *layout_memory =
+            SharedMemoryFactory::Get(layout_region, sizeof(SharedDataLayout));
         SharedDataLayout *shared_layout_ptr = static_cast<SharedDataLayout *>(layout_memory->Ptr());
         shared_layout_ptr = new (layout_memory->Ptr()) SharedDataLayout();
 
@@ -344,7 +365,7 @@ int main(const int argc, const char *argv[])
         SimpleLogger().Write() << "allocating shared memory of "
                                << shared_layout_ptr->GetSizeOfLayout() << " bytes";
         SharedMemory *shared_memory =
-            SharedMemoryFactory::Get(DATA, shared_layout_ptr->GetSizeOfLayout());
+            SharedMemoryFactory::Get(data_region, shared_layout_ptr->GetSizeOfLayout());
         char *shared_memory_ptr = static_cast<char *>(shared_memory->Ptr());
 
         // read actual data into shared memory object //
@@ -533,35 +554,11 @@ int main(const int argc, const char *argv[])
             barrier.no_running_queries_condition.wait(query_lock);
         }
 
-        data_timestamp_ptr->layout = LAYOUT;
-        data_timestamp_ptr->data = DATA;
+        data_timestamp_ptr->layout = layout_region;
+        data_timestamp_ptr->data = data_region;
         data_timestamp_ptr->timestamp += 1;
-        if (use_first_segment)
-        {
-            BOOST_ASSERT(DATA == DATA_1);
-            BOOST_ASSERT(LAYOUT == LAYOUT_1);
-            if (!SharedMemory::Remove(DATA_2))
-            {
-                SimpleLogger().Write(logWARNING) << "could not delete DATA_2";
-            }
-            if (!SharedMemory::Remove(LAYOUT_2))
-            {
-                SimpleLogger().Write(logWARNING) << "could not delete LAYOUT_2";
-            }
-        }
-        else
-        {
-            BOOST_ASSERT(DATA == DATA_2);
-            BOOST_ASSERT(LAYOUT == LAYOUT_2);
-            if (!SharedMemory::Remove(DATA_1))
-            {
-                SimpleLogger().Write(logWARNING) << "could not delete DATA_1";
-            }
-            if (!SharedMemory::Remove(LAYOUT_1))
-            {
-                SimpleLogger().Write(logWARNING) << "could not delete LAYOUT_1";
-            }
-        }
+        delete_region(previous_data_region);
+        delete_region(previous_layout_region);
         SimpleLogger().Write() << "all data loaded";
 
         shared_layout_ptr->PrintInformation();

extractor.cpp

@@ -25,262 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "Extractor/ExtractorCallbacks.h"
-#include "Extractor/ExtractionContainers.h"
-#include "Extractor/ScriptingEnvironment.h"
-#include "Extractor/PBFParser.h"
-#include "Extractor/XMLParser.h"
-#include "Util/FingerPrint.h"
-#include "Util/GitDescription.h"
-#include "Util/MachineInfo.h"
-#include "Util/OSRMException.h"
-#include "Util/ProgramOptions.h"
-#include "Util/SimpleLogger.h"
-#include "Util/StringUtil.h"
-#include "Util/TimingUtil.h"
-#include "typedefs.h"
+#include "Extractor/Extractor.h"
 
-#include <cstdlib>
-
-#include <thread>
-#include <chrono>
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <unordered_map>
-
-#include <tbb/task_scheduler_init.h>
-
-ExtractorCallbacks *extractor_callbacks;
-FingerPrint fingerprint;
-
-int main(int argc, char *argv[])
+int main (int argc, char *argv[])
 {
-    try
-    {
-        LogPolicy::GetInstance().Unmute();
-
-        TIMER_START(extracting);
-
-        boost::filesystem::path config_file_path, input_path, profile_path;
-        unsigned requested_num_threads;
-
-        // declare a group of options that will be allowed only on command line
-        boost::program_options::options_description generic_options("Options");
-        generic_options.add_options()("version,v", "Show version")("help,h",
-                                                                   "Show this help message")(
-            "config,c",
-            boost::program_options::value<boost::filesystem::path>(&config_file_path)
-                ->default_value("extractor.ini"),
-            "Path to a configuration file.");
-
-        // declare a group of options that will be allowed both on command line and in config file
-        boost::program_options::options_description config_options("Configuration");
-        config_options.add_options()("profile,p",
-                                     boost::program_options::value<boost::filesystem::path>(
-                                         &profile_path)->default_value("profile.lua"),
-                                     "Path to LUA routing profile")(
-            "threads,t",
-            boost::program_options::value<unsigned int>(&requested_num_threads)->default_value(tbb::task_scheduler_init::default_num_threads()),
-            "Number of threads to use");
-
-        // hidden options, will be allowed both on command line and in config file, but will not be
-        // shown to the user
-        boost::program_options::options_description hidden_options("Hidden options");
-        hidden_options.add_options()(
-            "input,i",
-            boost::program_options::value<boost::filesystem::path>(&input_path),
-            "Input file in .osm, .osm.bz2 or .osm.pbf format");
-
-        // positional option
-        boost::program_options::positional_options_description positional_options;
-        positional_options.add("input", 1);
-
-        // combine above options for parsing
-        boost::program_options::options_description cmdline_options;
-        cmdline_options.add(generic_options).add(config_options).add(hidden_options);
-
-        boost::program_options::options_description config_file_options;
-        config_file_options.add(config_options).add(hidden_options);
-
-        boost::program_options::options_description visible_options(
-            boost::filesystem::basename(argv[0]) + " <input.osm/.osm.bz2/.osm.pbf> [options]");
-        visible_options.add(generic_options).add(config_options);
-
-        // parse command line options
-        boost::program_options::variables_map option_variables;
-        boost::program_options::store(boost::program_options::command_line_parser(argc, argv)
-                                          .options(cmdline_options)
-                                          .positional(positional_options)
-                                          .run(),
-                                      option_variables);
-
-        if (option_variables.count("version"))
-        {
-            SimpleLogger().Write() << g_GIT_DESCRIPTION;
-            return 0;
-        }
-
-        if (option_variables.count("help"))
-        {
-            SimpleLogger().Write() << visible_options;
-            return 0;
-        }
-
-        boost::program_options::notify(option_variables);
-
-        // parse config file
-        if (boost::filesystem::is_regular_file(config_file_path))
-        {
-            SimpleLogger().Write() << "Reading options from: " << config_file_path.string();
-            std::string ini_file_contents = ReadIniFileAndLowerContents(config_file_path);
-            std::stringstream config_stream(ini_file_contents);
-            boost::program_options::store(parse_config_file(config_stream, config_file_options),
-                                          option_variables);
-            boost::program_options::notify(option_variables);
-        }
-
-        if (!option_variables.count("input"))
-        {
-            SimpleLogger().Write() << visible_options;
-            return 0;
-        }
-
-        if (1 > requested_num_threads)
-        {
-            SimpleLogger().Write(logWARNING) << "Number of threads must be 1 or larger";
-            return 1;
-        }
-
-        if (!boost::filesystem::is_regular_file(input_path))
-        {
-            SimpleLogger().Write(logWARNING) << "Input file " << input_path.string()
-                                             << " not found!";
-            return 1;
-        }
-
-        if (!boost::filesystem::is_regular_file(profile_path))
-        {
-            SimpleLogger().Write(logWARNING) << "Profile " << profile_path.string()
-                                             << " not found!";
-            return 1;
-        }
-
-        const unsigned recommended_num_threads = tbb::task_scheduler_init::default_num_threads();
-
-        SimpleLogger().Write() << "Input file: " << input_path.filename().string();
-        SimpleLogger().Write() << "Profile: " << profile_path.filename().string();
-        SimpleLogger().Write() << "Threads: " << requested_num_threads;
-        if (recommended_num_threads != requested_num_threads)
-        {
-            SimpleLogger().Write(logWARNING) << "The recommended number of threads is "
-                                             << recommended_num_threads
-                                             << "! This setting may have performance side-effects.";
-        }
-
-        tbb::task_scheduler_init init(requested_num_threads);
-
-        /*** Setup Scripting Environment ***/
-        ScriptingEnvironment scripting_environment(profile_path.string().c_str());
-
-        bool file_has_pbf_format(false);
-        std::string output_file_name = input_path.string();
-        std::string restriction_fileName = input_path.string();
-        std::string::size_type pos = output_file_name.find(".osm.bz2");
-        if (pos == std::string::npos)
-        {
-            pos = output_file_name.find(".osm.pbf");
-            if (pos != std::string::npos)
-            {
-                file_has_pbf_format = true;
-            } else {
-                pos = output_file_name.find(".osm.xml");
-            }
-        }
-        if (pos == std::string::npos)
-        {
-            pos = output_file_name.find(".pbf");
-            if (pos != std::string::npos)
-            {
-                file_has_pbf_format = true;
-            }
-        }
-        if (pos == std::string::npos)
-        {
-            pos = output_file_name.find(".osm");
-            if (pos == std::string::npos)
-            {
-                output_file_name.append(".osrm");
-                restriction_fileName.append(".osrm.restrictions");
-            }
-            else
-            {
-                output_file_name.replace(pos, 5, ".osrm");
-                restriction_fileName.replace(pos, 5, ".osrm.restrictions");
-            }
-        }
-        else
-        {
-            output_file_name.replace(pos, 8, ".osrm");
-            restriction_fileName.replace(pos, 8, ".osrm.restrictions");
-        }
-
-        std::unordered_map<std::string, NodeID> string_map;
-        ExtractionContainers extraction_containers;
-
-        string_map[""] = 0;
-        extractor_callbacks = new ExtractorCallbacks(extraction_containers, string_map);
-        BaseParser *parser;
-        if (file_has_pbf_format)
-        {
-            parser = new PBFParser(input_path.string().c_str(),
-                                   extractor_callbacks,
-                                   scripting_environment,
-                                   requested_num_threads);
-        }
-        else
-        {
-            parser = new XMLParser(input_path.string().c_str(), extractor_callbacks, scripting_environment);
-        }
-
-        if (!parser->ReadHeader())
-        {
-            throw OSRMException("Parser not initialized!");
-        }
-        SimpleLogger().Write() << "Parsing in progress..";
-        TIMER_START(parsing);
-
-        parser->Parse();
-        delete parser;
-        delete extractor_callbacks;
-
-        TIMER_STOP(parsing);
-        SimpleLogger().Write() << "Parsing finished after " << TIMER_SEC(parsing)
-                               << " seconds";
-
-        if (extraction_containers.all_edges_list.empty())
-        {
-            SimpleLogger().Write(logWARNING) << "The input data is empty, exiting.";
-            return 1;
-        }
-
-        extraction_containers.PrepareData(output_file_name, restriction_fileName);
-
-        TIMER_STOP(extracting);
-        SimpleLogger().Write() << "extraction finished after " << TIMER_SEC(extracting)
-                               << "s";
-        SimpleLogger().Write() << "To prepare the data for routing, run: "
-                               << "./osrm-prepare " << output_file_name << std::endl;
-    }
-    catch (boost::program_options::too_many_positional_options_error &)
-    {
-        SimpleLogger().Write(logWARNING) << "Only one input file can be specified";
-        return 1;
-    }
-    catch (std::exception &e)
-    {
-        SimpleLogger().Write(logWARNING) << e.what();
-        return 1;
-    }
-    return 0;
+    return Extractor().Run(argc, argv);
 }

features/car/restrictions.feature

@@ -312,3 +312,72 @@ Feature: Car - Turn restrictions
             | e    | f  | ae,xa,bx,fb                      |
             | c    | f  | dc,da,ae,ge,hg,hg,ge,ae,xa,bx,fb |
             | d    | f  | da,ae,ge,hg,hg,ge,ae,xa,bx,fb    |
+
+    @except
+    Scenario: Car - two only_ restrictions share same to-way
+        Given the node map
+            |   |   | e |   |   |   | f |   |   |
+            |   |   |   |   | a |   |   |   |   |
+            |   |   |   |   |   |   |   |   |   |
+            |   |   | c |   | x |   | d |   |   |
+            |   |   |   |   | y |   |   |   |   |
+            |   |   |   |   |   |   |   |   |   |
+            |   |   |   |   | b |   |   |   |   |
+
+        And the ways
+            | nodes | oneway |
+            | ef    | no     |
+            | ce    | no     |
+            | fd    | no     |
+            | ca    | no     |
+            | ad    | no     |
+            | ax    | no     |
+            | xy    | no     |
+            | yb    | no     |
+            | cb    | no     |
+            | db    | no     |
+
+        And the relations
+            | type        | way:from | way:to | node:via | restriction      |
+            | restriction | ax       | xy     | x        | only_straight_on |
+            | restriction | by       | xy     | y        | only_straight_on |
+
+        When I route I should get
+            | from | to | route    |
+            | a    | b  | ax,xy,yb |
+            | b    | a  | yb,xy,ax |
+
+    @except
+    Scenario: Car - two only_ restrictions share same from-way
+        Given the node map
+            |   |   | e |   |   |   | f |   |   |
+            |   |   |   |   | a |   |   |   |   |
+            |   |   |   |   |   |   |   |   |   |
+            |   |   | c |   | x |   | d |   |   |
+            |   |   |   |   | y |   |   |   |   |
+            |   |   |   |   |   |   |   |   |   |
+            |   |   |   |   | b |   |   |   |   |
+
+        And the ways
+            | nodes | oneway |
+            | ef    | no     |
+            | ce    | no     |
+            | fd    | no     |
+            | ca    | no     |
+            | ad    | no     |
+            | ax    | no     |
+            | xy    | no     |
+            | yb    | no     |
+            | cb    | no     |
+            | db    | no     |
+
+        And the relations
+            | type        | way:from | way:to | node:via | restriction      |
+            | restriction | xy       | xa     | x        | only_straight_on |
+            | restriction | xy       | yb     | y        | only_straight_on |
+
+        When I route I should get
+            | from | to | route    |
+            | a    | b  | ax,xy,yb |
+            | b    | a  | yb,xy,ax |
+

features/step_definitions/options.rb

@@ -15,35 +15,39 @@ When(/^I run "osrm\-prepare\s?(.*?)"$/) do |options|
 end
 
 Then /^it should exit with code (\d+)$/ do |code|
-  @exit_code.should == code.to_i
+  expect(@exit_code).to eq( code.to_i )
 end
 
 Then /^stdout should contain "(.*?)"$/ do |str|
-  @stdout.should include(str)
+  expect(@stdout).to include(str)
 end
 
 Then /^stderr should contain "(.*?)"$/ do |str|
-  @stderr.should include(str)
+  expect(@stderr).to include(str)
 end
 
 Then(/^stdout should contain \/(.*)\/$/) do |regex_str|
   regex = Regexp.new regex_str
-  @stdout.should =~ regex
+  expect(@stdout).to match( regex )
 end
 
 Then(/^stderr should contain \/(.*)\/$/) do |regex_str|
   regex = Regexp.new regex_str
-  @stderr.should =~ regex
+  expect(@stderr).to match( regex )
 end
 
 Then /^stdout should be empty$/ do
-  @stdout.should == ""
+  expect(@stdout).to eq("")
 end
 
 Then /^stderr should be empty$/ do
-  @stderr.should == ""
+  expect(@stderr).to eq("")
 end
 
 Then /^stdout should contain (\d+) lines?$/ do |lines|
-  @stdout.lines.count.should == lines.to_i
+  expect(@stdout.lines.count).to eq( lines.to_i )
+end
+
+Given (/^the query options$/) do |table|
+  @query_params = table.rows_hash
 end

features/step_definitions/requests.rb

@@ -6,9 +6,9 @@ When /^I request \/(.*)$/ do |path|
 end
 
 Then /^I should get a response/ do
-  @response.code.should == "200"
-  @response.body.should_not == nil
-  @response.body.should_not == ''
+  expect(@response.code).to eq("200")
+  expect(@response.body).not_to eq(nil)
+  expect(@response.body).not_to eq('')
 end
 
 Then /^response should be valid JSON$/ do
@@ -16,31 +16,31 @@ Then /^response should be valid JSON$/ do
 end
 
 Then /^response should be well-formed$/ do
-  @json['status'].class.should == Fixnum
+  expect(@json['status'].class).to eq(Fixnum)
 end
 
 Then /^status code should be (\d+)$/ do |code|
   @json = JSON.parse @response.body
-  @json['status'].should == code.to_i
+  expect(@json['status']).to eq(code.to_i)
 end
 
 Then /^status message should be "(.*?)"$/ do |message|
   @json = JSON.parse @response.body
-  @json['status_message'].should == message
+  expect(@json['status_message']).to eq(message)
 end
 
 Then /^response should be a well-formed route$/ do
   step "response should be well-formed"
-  @json['status_message'].class.should == String
-  @json['route_summary'].class.should == Hash
-  @json['route_geometry'].class.should == String
-  @json['route_instructions'].class.should == Array
-  @json['via_points'].class.should == Array
-  @json['via_indices'].class.should == Array
+  expect(@json['status_message'].class).to eq(String)
+  expect(@json['route_summary'].class).to eq(Hash)
+  expect(@json['route_geometry'].class).to eq(String)
+  expect(@json['route_instructions'].class).to eq(Array)
+  expect(@json['via_points'].class).to eq(Array)
+  expect(@json['via_indices'].class).to eq(Array)
 end
 
 Then /^"([^"]*)" should return code (\d+)$/ do |binary, code|
-  @process_error.is_a?(OSRMError).should == true
-  @process_error.process.should == binary
-  @process_error.code.to_i.should == code.to_i
+  expect(@process_error.is_a?(OSRMError)).to eq(true)
+  expect(@process_error.process).to eq(binary)
+  expect(@process_error.code.to_i).to eq(code.to_i)
 end

features/step_definitions/routability.rb

@@ -4,7 +4,7 @@ def test_routability_row i
     a = Location.new @origin[0]+(1+WAY_SPACING*i)*@zoom, @origin[1]
     b = Location.new @origin[0]+(3+WAY_SPACING*i)*@zoom, @origin[1]
     r = {}
-    r[:response] = request_route direction=='forw' ? [a,b] : [b,a]
+    r[:response] = request_route (direction=='forw' ? [a,b] : [b,a]), @query_params
     r[:query] = @query
     r[:json] = JSON.parse(r[:response].body)
 

features/step_definitions/routing.rb

@@ -7,7 +7,7 @@ When /^I route I should get$/ do |table|
         got = {'request' => row['request'] }
         response = request_url row['request']
       else
-        params = {}
+        params = @query_params
         waypoints = []
         if row['from'] and row['to']
           node = find_node_by_name(row['from'])

features/step_definitions/timestamp.rb

@@ -2,6 +2,6 @@ Then /^I should get a valid timestamp/ do
   step "I should get a response"
   step "response should be valid JSON"
   step "response should be well-formed"
-  @json['timestamp'].class.should == String
-  @json['timestamp'].should == OSM_TIMESTAMP
+  expect(@json['timestamp'].class).to eq(String)
+  expect(@json['timestamp']).to eq(OSM_TIMESTAMP)
 end

features/support/env.rb

@@ -9,7 +9,7 @@ OSM_GENERATOR = 'osrm-test'
 OSM_UID = 1
 TEST_FOLDER = File.join ROOT_FOLDER, 'test'
 DATA_FOLDER = 'cache'
-OSM_TIMESTAMP = '2000-00-00T00:00:00Z'
+OSM_TIMESTAMP = '2000-01-01T00:00:00Z'
 DEFAULT_SPEEDPROFILE = 'bicycle'
 WAY_SPACING = 100
 DEFAULT_GRID_SIZE = 100   #meters
@@ -54,4 +54,4 @@ end
 
 AfterConfiguration do |config|
   clear_log_files
-end
+end

features/support/hooks.rb

@@ -18,7 +18,7 @@ Before do |scenario|
       @scenario_title = scenario.scenario_outline.name
   end
 
-
+  @query_params = {}
   @scenario_time = Time.now.strftime("%Y-%m-%dT%H:%m:%SZ")
   reset_data
   @has_logged_preprocess_info = false

features/testbot/loop.feature

@@ -73,6 +73,6 @@ Feature: Avoid weird loops caused by rounding errors
             | cf    | secondary |
 
         When I route I should get
-            | waypoints | route          | turns                                  |
-            | a,2,d     | ab,be,ef,cf,cd | head,left,right,right,left,destination |
-            | a,1,d     | ab,be,ef,cf,cd | head,left,right,right,left,destination |
+            | waypoints | route             | turns                                      |
+            | a,2,d     | ab,be,ef,ef,cf,cd | head,left,right,via,right,left,destination |
+            | a,1,d     | ab,be,ef,ef,cf,cd | head,left,right,via,right,left,destination |

features/testbot/uturn.feature

@@ -0,0 +1,69 @@
+@routing @uturn @via
+Feature: U-turns at via points
+
+    Background:
+        Given the profile "testbot"
+
+    Scenario: U-turns at via points disabled by default
+        Given the node map
+            | a | b | c | d |
+            |   | e | f | g |
+
+        And the ways
+            | nodes |
+            | ab    |
+            | bc    |
+            | cd    |
+            | be    |
+            | dg    |
+            | ef    |
+            | fg    |
+
+        When I route I should get
+            | waypoints | route             | turns                                          |
+            | a,e,c     | ab,be,be,ef,fg,dg,cd | head,right,via,left,straight,left,left,destination |
+
+    Scenario: Query param to allow U-turns at all via points
+        Given the node map
+            | a | b | c | d |
+            |   | e | f | g |
+
+        And the query options
+            | uturns | true |
+
+        And the ways
+            | nodes |
+            | ab    |
+            | bc    |
+            | cd    |
+            | be    |
+            | dg    |
+            | ef    |
+            | fg    |
+
+        When I route I should get
+            | waypoints | route       |
+            | a,e,c     | ab,be,be,bc |
+
+    @todo
+    Scenario: Instructions at via points at u-turns
+        Given the node map
+            | a | b | c | d |
+            |   | e | f | g |
+
+        And the query options
+            | uturns | true |
+
+        And the ways
+            | nodes |
+            | ab    |
+            | bc    |
+            | cd    |
+            | be    |
+            | dg    |
+            | ef    |
+            | fg    |
+
+        When I route I should get
+            | waypoints | route       | turns                              |
+            | a,e,c     | ab,be,be,bc | head,right,uturn,right,destination |

features/testbot/via.feature

@@ -13,9 +13,9 @@ Feature: Via points
             | abc   |
 
         When I route I should get
-            | waypoints | route |
-            | a,b,c     | abc   |
-            | c,b,a     | abc   |
+            | waypoints | route   |
+            | a,b,c     | abc,abc |
+            | c,b,a     | abc,abc |
 
     Scenario: Via point at a dead end
         Given the node map
@@ -28,9 +28,9 @@ Feature: Via points
             | bd    |
 
         When I route I should get
-            | waypoints | route         |
-            | a,d,c     | abc,bd,bd,abc |
-            | c,d,a     | abc,bd,bd,abc |
+            | waypoints | route            |
+            | a,d,c     | abc,bd,bd,bd,abc |
+            | c,d,a     | abc,bd,bd,bd,abc |
 
     Scenario: Multiple via points
         Given the node map
@@ -48,9 +48,9 @@ Feature: Via points
             | dh    |
 
         When I route I should get
-            | waypoints | route            |
-            | a,c,f     | ab,bcd,de,efg    |
-            | a,c,f,h   | ab,bcd,de,efg,gh |
+            | waypoints | route                    |
+            | a,c,f     | ab,bcd,bcd,de,efg        |
+            | a,c,f,h   | ab,bcd,bcd,de,efg,efg,gh |
 
     Scenario: Via points on ring of oneways
     # xa it to avoid only having a single ring, which cna trigger edge cases
@@ -73,9 +73,9 @@ Feature: Via points
             | waypoints | route                      | distance  | turns                                                               |
             | 1,3       | ab,bc,cd                   |  400m +-1 | head,straight,straight,destination                                  |
             | 3,1       | cd,de,ef,fa,ab             | 1000m +-1 | head,right,right,right,right,destination                            |
-            | 1,2,3     | ab,bc,cd                   |  400m +-1 | head,straight,straight,destination                                  |
-            | 1,3,2     | ab,bc,cd,de,ef,fa,ab,bc    | 1600m +-1 | head,straight,straight,right,right,right,right,straight,destination |
-            | 3,2,1     | cd,de,ef,fa,ab,bc,cd,de,ef,fa,ab | 2400m +-1 | head,right,right,right,right,straight,straight,right,right,right,right,destination |
+            | 1,2,3     | ab,bc,bc,cd                |  400m +-1 | head,straight,via,straight,destination                              |
+            | 1,3,2     | ab,bc,cd,cd,de,ef,fa,ab,bc | 1600m +-1 | head,straight,straight,via,right,right,right,right,straight,destination |
+            | 3,2,1     | cd,de,ef,fa,ab,bc,bc,cd,de,ef,fa,ab | 2400m +-1 | head,right,right,right,right,straight,via,straight,right,right,right,right,destination |
 
     @bug
     Scenario: Via points on ring on the same oneway

prepare.cpp

@@ -25,484 +25,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "Algorithms/IteratorBasedCRC32.h"
-#include "Contractor/Contractor.h"
-#include "Contractor/EdgeBasedGraphFactory.h"
-#include "DataStructures/BinaryHeap.h"
-#include "DataStructures/DeallocatingVector.h"
-#include "DataStructures/QueryEdge.h"
-#include "DataStructures/StaticGraph.h"
-#include "DataStructures/StaticRTree.h"
-#include "DataStructures/RestrictionMap.h"
-#include "Util/GitDescription.h"
-#include "Util/GraphLoader.h"
-#include "Util/LuaUtil.h"
-#include "Util/OSRMException.h"
+#include "Contractor/Prepare.h"
 
-#include "Util/SimpleLogger.h"
-#include "Util/StringUtil.h"
-#include "Util/TimingUtil.h"
-#include "typedefs.h"
-
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
-
-#include <luabind/luabind.hpp>
-
-#include <thread>
-#include <chrono>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <tbb/task_scheduler_init.h>
-#include <tbb/parallel_sort.h>
-
-typedef QueryEdge::EdgeData EdgeData;
-typedef DynamicGraph<EdgeData>::InputEdge InputEdge;
-typedef StaticGraph<EdgeData>::InputEdge StaticEdge;
-
-std::vector<NodeInfo> internal_to_external_node_map;
-std::vector<TurnRestriction> restriction_list;
-std::vector<NodeID> barrier_node_list;
-std::vector<NodeID> traffic_light_list;
-std::vector<ImportEdge> edge_list;
+#include <boost/program_options.hpp>
 
 int main(int argc, char *argv[])
 {
     try
     {
-        LogPolicy::GetInstance().Unmute();
-        TIMER_START(preparing);
-        TIMER_START(expansion);
-
-        boost::filesystem::path config_file_path, input_path, restrictions_path, profile_path;
-        unsigned int requested_num_threads;
-
-        // declare a group of options that will be allowed only on command line
-        boost::program_options::options_description generic_options("Options");
-        generic_options.add_options()("version,v", "Show version")("help,h",
-                                                                   "Show this help message")(
-            "config,c",
-            boost::program_options::value<boost::filesystem::path>(&config_file_path)
-                ->default_value("contractor.ini"),
-            "Path to a configuration file.");
-
-        // declare a group of options that will be allowed both on command line and in config file
-        boost::program_options::options_description config_options("Configuration");
-        config_options.add_options()(
-            "restrictions,r",
-            boost::program_options::value<boost::filesystem::path>(&restrictions_path),
-            "Restrictions file in .osrm.restrictions format")(
-            "profile,p",
-            boost::program_options::value<boost::filesystem::path>(&profile_path)
-                ->default_value("profile.lua"),
-            "Path to LUA routing profile")(
-            "threads,t",
-            boost::program_options::value<unsigned int>(&requested_num_threads)->default_value(tbb::task_scheduler_init::default_num_threads()),
-            "Number of threads to use");
-
-        // hidden options, will be allowed both on command line and in config file, but will not be
-        // shown to the user
-        boost::program_options::options_description hidden_options("Hidden options");
-        hidden_options.add_options()(
-            "input,i",
-            boost::program_options::value<boost::filesystem::path>(&input_path),
-            "Input file in .osm, .osm.bz2 or .osm.pbf format");
-
-        // positional option
-        boost::program_options::positional_options_description positional_options;
-        positional_options.add("input", 1);
-
-        // combine above options for parsing
-        boost::program_options::options_description cmdline_options;
-        cmdline_options.add(generic_options).add(config_options).add(hidden_options);
-
-        boost::program_options::options_description config_file_options;
-        config_file_options.add(config_options).add(hidden_options);
-
-        boost::program_options::options_description visible_options(
-            "Usage: " + boost::filesystem::basename(argv[0]) + " <input.osrm> [options]");
-        visible_options.add(generic_options).add(config_options);
-
-        // parse command line options
-        boost::program_options::variables_map option_variables;
-        boost::program_options::store(boost::program_options::command_line_parser(argc, argv)
-                                          .options(cmdline_options)
-                                          .positional(positional_options)
-                                          .run(),
-                                      option_variables);
-
-        if (option_variables.count("version"))
-        {
-            SimpleLogger().Write() << g_GIT_DESCRIPTION;
-            return 0;
-        }
-
-        if (option_variables.count("help"))
-        {
-            SimpleLogger().Write() << "\n" << visible_options;
-            return 0;
-        }
-
-        boost::program_options::notify(option_variables);
-
-        if (!option_variables.count("restrictions"))
-        {
-            restrictions_path = std::string(input_path.string() + ".restrictions");
-        }
-
-        if (!option_variables.count("input"))
-        {
-            SimpleLogger().Write() << "\n" << visible_options;
-            return 0;
-        }
-
-        if (!boost::filesystem::is_regular_file(input_path))
-        {
-            SimpleLogger().Write(logWARNING) << "Input file " << input_path.string()
-                                             << " not found!";
-            return 1;
-        }
-
-        if (!boost::filesystem::is_regular_file(profile_path))
-        {
-            SimpleLogger().Write(logWARNING) << "Profile " << profile_path.string()
-                                             << " not found!";
-            return 1;
-        }
-
-        if (1 > requested_num_threads)
-        {
-            SimpleLogger().Write(logWARNING) << "Number of threads must be 1 or larger";
-            return 1;
-        }
-
-        const unsigned recommended_num_threads = tbb::task_scheduler_init::default_num_threads();
-
-        SimpleLogger().Write() << "Input file: " << input_path.filename().string();
-        SimpleLogger().Write() << "Restrictions file: " << restrictions_path.filename().string();
-        SimpleLogger().Write() << "Profile: " << profile_path.filename().string();
-        SimpleLogger().Write() << "Threads: " << requested_num_threads;
-        if (recommended_num_threads != requested_num_threads)
-        {
-            SimpleLogger().Write(logWARNING) << "The recommended number of threads is "
-                                             << recommended_num_threads
-                                             << "! This setting may have performance side-effects.";
-        }
-
-        tbb::task_scheduler_init init(requested_num_threads);
-
-        LogPolicy::GetInstance().Unmute();
-        boost::filesystem::ifstream restriction_stream(restrictions_path, std::ios::binary);
-        TurnRestriction restriction;
-        FingerPrint fingerprint_loaded, fingerprint_orig;
-        unsigned number_of_usable_restrictions = 0;
-        restriction_stream.read((char *)&fingerprint_loaded, sizeof(FingerPrint));
-        if (!fingerprint_loaded.TestPrepare(fingerprint_orig))
-        {
-            SimpleLogger().Write(logWARNING) << ".restrictions was prepared with different build.\n"
-                                                "Reprocess to get rid of this warning.";
-        }
-
-        restriction_stream.read((char *)&number_of_usable_restrictions, sizeof(unsigned));
-        restriction_list.resize(number_of_usable_restrictions);
-        if (number_of_usable_restrictions > 0)
-        {
-            restriction_stream.read((char *)&(restriction_list[0]),
-                                number_of_usable_restrictions * sizeof(TurnRestriction));
-        }
-        restriction_stream.close();
-
-        boost::filesystem::ifstream in;
-        in.open(input_path, std::ios::in | std::ios::binary);
-
-        const std::string node_filename = input_path.string() + ".nodes";
-        const std::string edge_out = input_path.string() + ".edges";
-        const std::string geometry_filename = input_path.string() + ".geometry";
-        const std::string graphOut = input_path.string() + ".hsgr";
-        const std::string rtree_nodes_path = input_path.string() + ".ramIndex";
-        const std::string rtree_leafs_path = input_path.string() + ".fileIndex";
-
-        /*** Setup Scripting Environment ***/
-
-        // Create a new lua state
-        lua_State *lua_state = luaL_newstate();
-
-        // Connect LuaBind to this lua state
-        luabind::open(lua_state);
-
-        // open utility libraries string library;
-        luaL_openlibs(lua_state);
-
-        // adjust lua load path
-        luaAddScriptFolderToLoadPath(lua_state, profile_path.string().c_str());
-
-        // Now call our function in a lua script
-        if (0 != luaL_dofile(lua_state, profile_path.string().c_str()))
-        {
-            std::cerr << lua_tostring(lua_state, -1) << " occured in scripting block" << std::endl;
-            return 1;
-        }
-
-        EdgeBasedGraphFactory::SpeedProfileProperties speed_profile;
-
-        if (0 != luaL_dostring(lua_state, "return traffic_signal_penalty\n"))
-        {
-            std::cerr << lua_tostring(lua_state, -1) << " occured in scripting block" << std::endl;
-            return 1;
-        }
-        speed_profile.trafficSignalPenalty = 10 * lua_tointeger(lua_state, -1);
-        SimpleLogger().Write(logDEBUG)
-            << "traffic_signal_penalty: " << speed_profile.trafficSignalPenalty;
-
-        if (0 != luaL_dostring(lua_state, "return u_turn_penalty\n"))
-        {
-            std::cerr << lua_tostring(lua_state, -1) << " occured in scripting block" << std::endl;
-            return 1;
-        }
-        speed_profile.uTurnPenalty = 10 * lua_tointeger(lua_state, -1);
-
-        speed_profile.has_turn_penalty_function = lua_function_exists(lua_state, "turn_function");
-
-        #ifdef WIN32
-        #pragma message ("Memory consumption on Windows can be higher due to memory alignment")
-        #else
-        static_assert(sizeof(ImportEdge) == 20,
-                      "changing ImportEdge type has influence on memory consumption!");
-        #endif
-        std::vector<ImportEdge> edge_list;
-        NodeID number_of_node_based_nodes =
-            readBinaryOSRMGraphFromStream(in,
-                                          edge_list,
-                                          barrier_node_list,
-                                          traffic_light_list,
-                                          &internal_to_external_node_map,
-                                          restriction_list);
-        in.close();
-
-        if (edge_list.empty())
-        {
-            SimpleLogger().Write(logWARNING) << "The input data is empty, exiting.";
-            return 1;
-        }
-
-        SimpleLogger().Write() << restriction_list.size() << " restrictions, "
-                               << barrier_node_list.size() << " bollard nodes, "
-                               << traffic_light_list.size() << " traffic lights";
-
-        /***
-         * Building an edge-expanded graph from node-based input and turn restrictions
-         */
-
-        SimpleLogger().Write() << "Generating edge-expanded graph representation";
-        std::shared_ptr<NodeBasedDynamicGraph> node_based_graph =
-            NodeBasedDynamicGraphFromImportEdges(number_of_node_based_nodes, edge_list);
-        std::unique_ptr<RestrictionMap> restriction_map =
-            std::unique_ptr<RestrictionMap>(new RestrictionMap(node_based_graph, restriction_list));
-        EdgeBasedGraphFactory *edge_based_graph_factor =
-            new EdgeBasedGraphFactory(node_based_graph,
-                                      std::move(restriction_map),
-                                      barrier_node_list,
-                                      traffic_light_list,
-                                      internal_to_external_node_map,
-                                      speed_profile);
-        edge_list.clear();
-        edge_list.shrink_to_fit();
-
-        edge_based_graph_factor->Run(edge_out, geometry_filename, lua_state);
-
-        restriction_list.clear();
-        restriction_list.shrink_to_fit();
-        barrier_node_list.clear();
-        barrier_node_list.shrink_to_fit();
-        traffic_light_list.clear();
-        traffic_light_list.shrink_to_fit();
-
-        unsigned number_of_edge_based_nodes = edge_based_graph_factor->GetNumberOfEdgeBasedNodes();
-        BOOST_ASSERT(number_of_edge_based_nodes != std::numeric_limits<unsigned>::max());
-        DeallocatingVector<EdgeBasedEdge> edgeBasedEdgeList;
-        #ifndef WIN32
-        static_assert(sizeof(EdgeBasedEdge) == 16,
-                      "changing ImportEdge type has influence on memory consumption!");
-        #endif
-
-        edge_based_graph_factor->GetEdgeBasedEdges(edgeBasedEdgeList);
-        std::vector<EdgeBasedNode> node_based_edge_list;
-        edge_based_graph_factor->GetEdgeBasedNodes(node_based_edge_list);
-        delete edge_based_graph_factor;
-
-        // TODO actually use scoping: Split this up in subfunctions
-        node_based_graph.reset();
-
-        TIMER_STOP(expansion);
-
-        // Building grid-like nearest-neighbor data structure
-        SimpleLogger().Write() << "building r-tree ...";
-        StaticRTree<EdgeBasedNode> *rtree =
-            new StaticRTree<EdgeBasedNode>(node_based_edge_list,
-                                           rtree_nodes_path.c_str(),
-                                           rtree_leafs_path.c_str(),
-                                           internal_to_external_node_map);
-        delete rtree;
-        IteratorbasedCRC32<std::vector<EdgeBasedNode>> crc32;
-        unsigned node_based_edge_list_CRC32 =
-            crc32(node_based_edge_list.begin(), node_based_edge_list.end());
-        node_based_edge_list.clear();
-        node_based_edge_list.shrink_to_fit();
-        SimpleLogger().Write() << "CRC32: " << node_based_edge_list_CRC32;
-
-        /***
-         * Writing info on original (node-based) nodes
-         */
-
-        SimpleLogger().Write() << "writing node map ...";
-        boost::filesystem::ofstream node_stream(node_filename, std::ios::binary);
-        const unsigned size_of_mapping = internal_to_external_node_map.size();
-        node_stream.write((char *)&size_of_mapping, sizeof(unsigned));
-        if (size_of_mapping > 0)
-        {
-            node_stream.write((char *)&(internal_to_external_node_map[0]),
-                          size_of_mapping * sizeof(NodeInfo));
-        }
-        node_stream.close();
-        internal_to_external_node_map.clear();
-        internal_to_external_node_map.shrink_to_fit();
-
-        /***
-         * Contracting the edge-expanded graph
-         */
-
-        SimpleLogger().Write() << "initializing contractor";
-        Contractor *contractor = new Contractor(number_of_edge_based_nodes, edgeBasedEdgeList);
-
-        TIMER_START(contraction);
-        contractor->Run();
-        TIMER_STOP(contraction);
-
-        SimpleLogger().Write() << "Contraction took " << TIMER_SEC(contraction) << " sec";
-
-        DeallocatingVector<QueryEdge> contracted_edge_list;
-        contractor->GetEdges(contracted_edge_list);
-        delete contractor;
-
-        /***
-         * Sorting contracted edges in a way that the static query graph can read some in in-place.
-         */
-
-        std::sort(contracted_edge_list.begin(), contracted_edge_list.end());
-        unsigned max_used_node_id = 0;
-        unsigned contracted_edge_count = contracted_edge_list.size();
-        SimpleLogger().Write() << "Serializing compacted graph of " << contracted_edge_count
-                               << " edges";
-
-        boost::filesystem::ofstream hsgr_output_stream(graphOut, std::ios::binary);
-        hsgr_output_stream.write((char *)&fingerprint_orig, sizeof(FingerPrint));
-        for (const QueryEdge &edge : contracted_edge_list)
-        {
-            BOOST_ASSERT(UINT_MAX != edge.source);
-            BOOST_ASSERT(UINT_MAX != edge.target);
-
-            max_used_node_id = std::max(max_used_node_id, edge.source);
-            max_used_node_id = std::max(max_used_node_id, edge.target);
-        }
-        SimpleLogger().Write(logDEBUG) << "input graph has " << number_of_edge_based_nodes
-                                       << " nodes";
-        SimpleLogger().Write(logDEBUG) << "contracted graph has " << max_used_node_id << " nodes";
-        max_used_node_id += 1;
-
-        std::vector<StaticGraph<EdgeData>::NodeArrayEntry> node_array;
-        node_array.resize(number_of_edge_based_nodes + 1);
-
-        SimpleLogger().Write() << "Building node array";
-        StaticGraph<EdgeData>::EdgeIterator edge = 0;
-        StaticGraph<EdgeData>::EdgeIterator position = 0;
-        StaticGraph<EdgeData>::EdgeIterator last_edge = edge;
-
-        for (StaticGraph<EdgeData>::NodeIterator node = 0; node < max_used_node_id; ++node)
-        {
-            last_edge = edge;
-            while ((edge < contracted_edge_count) && (contracted_edge_list[edge].source == node))
-            {
-                ++edge;
-            }
-            node_array[node].first_edge = position; //=edge
-            position += edge - last_edge;           // remove
-        }
-
-        for (unsigned sentinel_counter = max_used_node_id; sentinel_counter != node_array.size();
-             ++sentinel_counter)
-        {
-            // sentinel element, guarded against underflow
-            node_array[sentinel_counter].first_edge = contracted_edge_count;
-        }
-
-        unsigned node_array_size = node_array.size();
-        // serialize crc32, aka checksum
-        hsgr_output_stream.write((char *)&node_based_edge_list_CRC32, sizeof(unsigned));
-        // serialize number of nodes
-        hsgr_output_stream.write((char *)&node_array_size, sizeof(unsigned));
-        // serialize number of edges
-        hsgr_output_stream.write((char *)&contracted_edge_count, sizeof(unsigned));
-        // serialize all nodes
-        if (node_array_size > 0)
-        {
-            hsgr_output_stream.write((char *)&node_array[0],
-                                 sizeof(StaticGraph<EdgeData>::NodeArrayEntry) * node_array_size);
-        }
-        // serialize all edges
-
-        SimpleLogger().Write() << "Building edge array";
-        edge = 0;
-        int number_of_used_edges = 0;
-
-        StaticGraph<EdgeData>::EdgeArrayEntry current_edge;
-        for (unsigned edge = 0; edge < contracted_edge_list.size(); ++edge)
-        {
-            // no eigen loops
-            BOOST_ASSERT(contracted_edge_list[edge].source != contracted_edge_list[edge].target);
-            current_edge.target = contracted_edge_list[edge].target;
-            current_edge.data = contracted_edge_list[edge].data;
-
-            // every target needs to be valid
-            BOOST_ASSERT(current_edge.target < max_used_node_id);
-#ifndef NDEBUG
-            if (current_edge.data.distance <= 0)
-            {
-                SimpleLogger().Write(logWARNING)
-                    << "Edge: " << edge << ",source: " << contracted_edge_list[edge].source
-                    << ", target: " << contracted_edge_list[edge].target
-                    << ", dist: " << current_edge.data.distance;
-
-                SimpleLogger().Write(logWARNING) << "Failed at adjacency list of node "
-                                                 << contracted_edge_list[edge].source << "/"
-                                                 << node_array.size() - 1;
-                return 1;
-            }
-#endif
-            hsgr_output_stream.write((char *)&current_edge,
-                                     sizeof(StaticGraph<EdgeData>::EdgeArrayEntry));
-            ++number_of_used_edges;
-        }
-        hsgr_output_stream.close();
-
-        TIMER_STOP(preparing);
-
-        SimpleLogger().Write() << "Preprocessing : " << TIMER_SEC(preparing) << " seconds";
-        SimpleLogger().Write() << "Expansion  : "
-                               << (number_of_node_based_nodes / TIMER_SEC(expansion))
-                               << " nodes/sec and "
-                               << (number_of_edge_based_nodes / TIMER_SEC(expansion))
-                               << " edges/sec";
-
-        SimpleLogger().Write() << "Contraction: "
-                               << (number_of_edge_based_nodes / TIMER_SEC(contraction))
-                               << " nodes/sec and "
-                               << number_of_used_edges / TIMER_SEC(contraction)
-                               << " edges/sec";
-
-        node_array.clear();
-        SimpleLogger().Write() << "finished preprocessing";
+        return Prepare().Process(argc, argv);
     }
     catch (boost::program_options::too_many_positional_options_error &)
     {
@@ -519,5 +50,4 @@ int main(int argc, char *argv[])
         SimpleLogger().Write(logWARNING) << "Exception occured: " << e.what() << std::endl;
         return 1;
     }
-    return 0;
 }

profiles/car.lua

@@ -112,6 +112,14 @@ function node_function (node)
 end
 
 function way_function (way)
+
+  local is_highway = way.tags:Holds("highway")
+  local is_route = way.tags:Holds("route")
+
+  if not (is_highway or is_route) then
+    return
+  end
+
   -- we dont route over areas
   local is_area = way.tags:Holds("area")
   if ignore_areas and is_area then

routed.cpp

@@ -169,14 +169,14 @@ int main(int argc, const char *argv[])
 
             auto status = future.wait_for(std::chrono::seconds(2));
 
-            if (status != std::future_status::ready)
+            if (status == std::future_status::ready)
             {
-                SimpleLogger().Write(logWARNING) << "Didn't exit within 2 seconds. Hard abort!";
-                server_task.reset(); // just kill it
+               server_thread.join();
             }
             else
             {
-                server_thread.join();
+                SimpleLogger().Write(logWARNING) << "Didn't exit within 2 seconds. Hard abort!";
+                server_task.reset(); // just kill it
             }
         }