renamed: Util/GraphLoader.h -> Util/graph_loader.hpp

remove UINT_MAX

.gitignore

@@ -36,8 +36,9 @@ Thumbs.db
 # build related files #
 #######################
 /build/
-/Util/UUID.cpp
+/Util/finger_print.cpp
 /Util/GitDescription.cpp
+/cmake/postinst
 
 # Eclipse related files #
 #########################
@@ -79,6 +80,8 @@ stxxl.errlog
 /osrm-prepare
 /osrm-unlock-all
 /osrm-cli
+/osrm-check-hsgr
+/osrm-springclean
 /nohup.out
 
 # Sandbox folder #

.travis.yml

@@ -7,13 +7,17 @@ install:
  - sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
  - 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
- - sudo apt-get -q install g++-4.7
+ - sudo apt-get -q install protobuf-compiler libprotoc-dev libprotobuf7 libprotobuf-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.8
  - sudo apt-get install libboost1.54-all-dev
- #luabind
+ # luabind
  - curl https://gist.githubusercontent.com/DennisOSRM/f2eb7b948e6fe1ae319e/raw/install-luabind.sh | sudo bash
- #osmosis
+ # osmosis
  - curl -s https://gist.githubusercontent.com/DennisOSRM/803a64a9178ec375069f/raw/ | sudo bash
+ # cmake
+ - curl -s https://gist.githubusercontent.com/DennisOSRM/5fad9bee5c7f09fd7fc9/raw/ | sudo bash
+ # osmpbf library
+ - curl -s https://gist.githubusercontent.com/DennisOSRM/13b1b4fe38a57ead850e/raw/install_osmpbf.sh | sudo bash
 before_script:
  - rvm use 1.9.3
  - gem install bundler
@@ -23,6 +27,8 @@ before_script:
  - cmake .. $CMAKEOPTIONS
 script:
  - make -j 2
+ - make -j 2 tests
+ - ./datastructure-tests
  - cd ..
  - cucumber -p verify
 after_script:
@@ -36,8 +42,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

@@ -1,130 +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 <osrm/Coordinate.h>
-
-#include "DouglasPeucker.h"
-#include "../DataStructures/SegmentInformation.h"
-
-#include <boost/assert.hpp>
-
-#include <cmath>
-
-#include <limits>
-
-DouglasPeucker::DouglasPeucker()
-    : douglas_peucker_thresholds({262144., // z0
-                                  131072., // z1
-                                  65536.,  // z2
-                                  32768.,  // z3
-                                  16384.,  // z4
-                                  8192.,   // z5
-                                  4096.,   // z6
-                                  2048.,   // z7
-                                  960.,    // z8
-                                  480.,    // z9
-                                  240.,    // z10
-                                  90.,     // z11
-                                  50.,     // z12
-                                  25.,     // z13
-                                  15.,     // z14
-                                  5.,      // z15
-                                  .65,     // z16
-                                  .5,      // z17
-                                  .35      // z18
-      })
-{
-}
-
-void DouglasPeucker::Run(std::vector<SegmentInformation> &input_geometry, const unsigned zoom_level)
-{
-    BOOST_ASSERT_MSG(!input_geometry.empty(), "geometry invalid");
-    if (input_geometry.size() <= 2)
-    {
-        return;
-    }
-
-    {
-        BOOST_ASSERT_MSG(zoom_level < 19, "unsupported zoom level");
-        unsigned left_border = 0;
-        unsigned right_border = 1;
-        // Sweep over array and identify those ranges that need to be checked
-        do
-        {
-            BOOST_ASSERT_MSG(input_geometry[left_border].necessary,
-                             "left border must be necessary");
-            BOOST_ASSERT_MSG(input_geometry.back().necessary, "right border must be necessary");
-
-            if (input_geometry[right_border].necessary)
-            {
-                recursion_stack.emplace(left_border, right_border);
-                left_border = right_border;
-            }
-            ++right_border;
-        } while (right_border < input_geometry.size());
-    }
-    while (!recursion_stack.empty())
-    {
-        // pop next element
-        const GeometryRange pair = recursion_stack.top();
-        recursion_stack.pop();
-        BOOST_ASSERT_MSG(input_geometry[pair.first].necessary, "left border mus be necessary");
-        BOOST_ASSERT_MSG(input_geometry[pair.second].necessary, "right border must be necessary");
-        BOOST_ASSERT_MSG(pair.second < input_geometry.size(), "right border outside of geometry");
-        BOOST_ASSERT_MSG(pair.first < pair.second, "left border on the wrong side");
-        double max_distance = std::numeric_limits<double>::min();
-
-        unsigned farthest_element_index = pair.second;
-        // find index idx of element with max_distance
-        for (unsigned i = pair.first + 1; i < pair.second; ++i)
-        {
-            const double temp_dist = FixedPointCoordinate::ComputePerpendicularDistance(
-                input_geometry[i].location,
-                input_geometry[pair.first].location,
-                input_geometry[pair.second].location);
-            const double distance = std::abs(temp_dist);
-            if (distance > douglas_peucker_thresholds[zoom_level] && distance > max_distance)
-            {
-                farthest_element_index = i;
-                max_distance = distance;
-            }
-        }
-        if (max_distance > douglas_peucker_thresholds[zoom_level])
-        {
-            //  mark idx as necessary
-            input_geometry[farthest_element_index].necessary = true;
-            if (1 < (farthest_element_index - pair.first))
-            {
-                recursion_stack.emplace(pair.first, farthest_element_index);
-            }
-            if (1 < (pair.second - farthest_element_index))
-            {
-                recursion_stack.emplace(farthest_element_index, pair.second);
-            }
-        }
-    }
-}

Algorithms/ObjectToBase64.h

@@ -1,99 +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 OBJECTTOBASE64_H_
-#define OBJECTTOBASE64_H_
-
-#include "../Util/StringUtil.h"
-
-#include <boost/assert.hpp>
-#include <boost/archive/iterators/base64_from_binary.hpp>
-#include <boost/archive/iterators/binary_from_base64.hpp>
-#include <boost/archive/iterators/transform_width.hpp>
-
-#include <algorithm>
-#include <string>
-#include <vector>
-
-typedef
-        boost::archive::iterators::base64_from_binary<
-            boost::archive::iterators::transform_width<const char *, 6, 8>
-        > base64_t;
-
-typedef
-        boost::archive::iterators::transform_width<
-            boost::archive::iterators::binary_from_base64<
-            std::string::const_iterator>, 8, 6
-        > binary_t;
-
-template<class ObjectT>
-static void EncodeObjectToBase64(const ObjectT & object, std::string& encoded) {
-    const char * char_ptr_to_object = (const char *)&object;
-    std::vector<unsigned char> data(sizeof(object));
-    std::copy(
-        char_ptr_to_object,
-        char_ptr_to_object + sizeof(ObjectT),
-        data.begin()
-    );
-
-    unsigned char number_of_padded_chars = 0; // is in {0,1,2};
-    while(data.size() % 3 != 0)  {
-      ++number_of_padded_chars;
-      data.push_back(0x00);
-    }
-
-    BOOST_ASSERT_MSG(
-        0 == data.size() % 3,
-        "base64 input data size is not a multiple of 3!"
-    );
-    encoded.resize(sizeof(ObjectT));
-    encoded.assign(
-        base64_t( &data[0] ),
-        base64_t( &data[0] + (data.size() - number_of_padded_chars) )
-    );
-    replaceAll(encoded, "+", "-");
-    replaceAll(encoded, "/", "_");
-}
-
-template<class ObjectT>
-static void DecodeObjectFromBase64(const std::string& input, ObjectT & object) {
-    try {
-    	std::string encoded(input);
-        //replace "-" with "+" and "_" with "/"
-        replaceAll(encoded, "-", "+");
-        replaceAll(encoded, "_", "/");
-
-        std::copy (
-            binary_t( encoded.begin() ),
-            binary_t( encoded.begin() + encoded.length() - 1),
-            (char *)&object
-        );
-
-    } catch(...) { }
-}
-
-#endif /* OBJECTTOBASE64_H_ */

Algorithms/PolylineCompressor.cpp

@@ -1,162 +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 "PolylineCompressor.h"
-
-void PolylineCompressor::encodeVectorSignedNumber(std::vector<int> &numbers, std::string &output)
-    const
-{
-    const unsigned end = numbers.size();
-    for (unsigned i = 0; i < end; ++i)
-    {
-        numbers[i] <<= 1;
-        if (numbers[i] < 0)
-        {
-            numbers[i] = ~(numbers[i]);
-        }
-    }
-    for (unsigned i = 0; i < end; ++i)
-    {
-        encodeNumber(numbers[i], output);
-    }
-}
-
-void PolylineCompressor::encodeNumber(int number_to_encode, std::string &output) const
-{
-    while (number_to_encode >= 0x20)
-    {
-        int next_value = (0x20 | (number_to_encode & 0x1f)) + 63;
-        output += static_cast<char>(next_value);
-        if (92 == next_value)
-        {
-            output += static_cast<char>(next_value);
-        }
-        number_to_encode >>= 5;
-    }
-
-    number_to_encode += 63;
-    output += static_cast<char>(number_to_encode);
-    if (92 == number_to_encode)
-    {
-        output += static_cast<char>(number_to_encode);
-    }
-}
-
-void PolylineCompressor::printEncodedString(const std::vector<SegmentInformation> &polyline,
-                                            std::string &output) const
-{
-    std::vector<int> delta_numbers;
-    output += "\"";
-    if (!polyline.empty())
-    {
-        FixedPointCoordinate last_coordinate = polyline[0].location;
-        delta_numbers.emplace_back(last_coordinate.lat);
-        delta_numbers.emplace_back(last_coordinate.lon);
-        for (unsigned i = 1; i < polyline.size(); ++i)
-        {
-            if (polyline[i].necessary)
-            {
-                int lat_diff = polyline[i].location.lat - last_coordinate.lat;
-                int lon_diff = polyline[i].location.lon - last_coordinate.lon;
-                delta_numbers.emplace_back(lat_diff);
-                delta_numbers.emplace_back(lon_diff);
-                last_coordinate = polyline[i].location;
-            }
-        }
-        encodeVectorSignedNumber(delta_numbers, output);
-    }
-    output += "\"";
-}
-
-void PolylineCompressor::printEncodedString(const std::vector<FixedPointCoordinate> &polyline,
-                                            std::string &output) const
-{
-    std::vector<int> delta_numbers(2 * polyline.size());
-    output += "\"";
-    if (!polyline.empty())
-    {
-        delta_numbers[0] = polyline[0].lat;
-        delta_numbers[1] = polyline[0].lon;
-        for (unsigned i = 1; i < polyline.size(); ++i)
-        {
-            int lat_diff = polyline[i].lat - polyline[i - 1].lat;
-            int lon_diff = polyline[i].lon - polyline[i - 1].lon;
-            delta_numbers[(2 * i)] = (lat_diff);
-            delta_numbers[(2 * i) + 1] = (lon_diff);
-        }
-        encodeVectorSignedNumber(delta_numbers, output);
-    }
-    output += "\"";
-}
-
-void PolylineCompressor::printUnencodedString(const std::vector<FixedPointCoordinate> &polyline,
-                                              std::string &output) const
-{
-    output += "[";
-    std::string tmp;
-    for (unsigned i = 0; i < polyline.size(); i++)
-    {
-        FixedPointCoordinate::convertInternalLatLonToString(polyline[i].lat, tmp);
-        output += "[";
-        output += tmp;
-        FixedPointCoordinate::convertInternalLatLonToString(polyline[i].lon, tmp);
-        output += ", ";
-        output += tmp;
-        output += "]";
-        if (i < polyline.size() - 1)
-        {
-            output += ",";
-        }
-    }
-    output += "]";
-}
-
-void PolylineCompressor::printUnencodedString(const std::vector<SegmentInformation> &polyline,
-                                              std::string &output) const
-{
-    output += "[";
-    std::string tmp;
-    for (unsigned i = 0; i < polyline.size(); i++)
-    {
-        if (!polyline[i].necessary)
-        {
-            continue;
-        }
-        FixedPointCoordinate::convertInternalLatLonToString(polyline[i].location.lat, tmp);
-        output += "[";
-        output += tmp;
-        FixedPointCoordinate::convertInternalLatLonToString(polyline[i].location.lon, tmp);
-        output += ", ";
-        output += tmp;
-        output += "]";
-        if (i < polyline.size() - 1)
-        {
-            output += ",";
-        }
-    }
-    output += "]";
-}

Algorithms/StronglyConnectedComponents.h

@@ -1,468 +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 STRONGLYCONNECTEDCOMPONENTS_H_
-#define STRONGLYCONNECTEDCOMPONENTS_H_
-
-#include "../typedefs.h"
-#include "../DataStructures/DeallocatingVector.h"
-#include "../DataStructures/DynamicGraph.h"
-#include "../DataStructures/ImportEdge.h"
-#include "../DataStructures/QueryNode.h"
-#include "../DataStructures/Percent.h"
-#include "../DataStructures/Restriction.h"
-#include "../DataStructures/TurnInstructions.h"
-
-#include "../Util/SimpleLogger.h"
-
-#include <osrm/Coordinate.h>
-
-#include <boost/assert.hpp>
-#include <boost/filesystem.hpp>
-
-#ifdef __APPLE__
-#include <gdal.h>
-#include <ogrsf_frmts.h>
-#else
-#include <gdal/gdal.h>
-#include <gdal/ogrsf_frmts.h>
-#endif
-
-#include <cstdint>
-
-#include <memory>
-#include <stack>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-namespace std
-{
-template <> struct hash<std::pair<NodeID, NodeID>>
-{
-    size_t operator()(const std::pair<NodeID, NodeID> &pair) const
-    {
-        return std::hash<int>()(pair.first) ^ std::hash<int>()(pair.second);
-    }
-};
-}
-
-class TarjanSCC
-{
-  private:
-    struct TarjanNode
-    {
-        TarjanNode() : index(UINT_MAX), low_link(UINT_MAX), on_stack(false) {}
-        unsigned index;
-        unsigned low_link;
-        bool on_stack;
-    };
-
-    struct TarjanEdgeData
-    {
-        int distance;
-        unsigned name_id : 31;
-        bool shortcut : 1;
-        short type;
-        bool forward : 1;
-        bool backward : 1;
-        bool reversedEdge : 1;
-    };
-
-    struct TarjanStackFrame
-    {
-        explicit TarjanStackFrame(NodeID v, NodeID parent) : v(v), parent(parent) {}
-        NodeID v;
-        NodeID parent;
-    };
-
-    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::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;
-    unsigned m_restriction_counter;
-    RestrictionMap m_restriction_map;
-
-  public:
-    TarjanSCC(int number_of_nodes,
-              std::vector<NodeBasedEdge> &input_edges,
-              std::vector<NodeID> &bn,
-              std::vector<NodeID> &tl,
-              std::vector<TurnRestriction> &irs,
-              std::vector<NodeInfo> &nI)
-        : m_coordinate_list(nI), m_restriction_counter(irs.size())
-    {
-        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);
-            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);
-            }
-            else
-            {
-                index = restriction_iterator->second;
-                // Map already contains an is_only_*-restriction
-                if (m_restriction_bucket_list.at(index).begin()->second)
-                {
-                    continue;
-                }
-                else if (restriction.flags.isOnly)
-                {
-                    // We are going to insert an is_only_*-restriction. There can be only one.
-                    m_restriction_bucket_list.at(index).clear();
-                }
-            }
-
-            m_restriction_bucket_list.at(index)
-                .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());
-
-        DeallocatingVector<TarjanEdge> edge_list;
-        for (const NodeBasedEdge &input_edge : input_edges)
-        {
-            if (input_edge.source() == input_edge.target())
-            {
-                continue;
-            }
-
-            TarjanEdge edge;
-            if (input_edge.isForward())
-            {
-                edge.source = input_edge.source();
-                edge.target = input_edge.target();
-                edge.data.forward = input_edge.isForward();
-                edge.data.backward = input_edge.isBackward();
-            }
-            else
-            {
-                edge.source = input_edge.target();
-                edge.target = input_edge.source();
-                edge.data.backward = input_edge.isForward();
-                edge.data.forward = input_edge.isBackward();
-            }
-
-            edge.data.distance = (std::max)((int)input_edge.weight(), 1);
-            BOOST_ASSERT(edge.data.distance > 0);
-            edge.data.shortcut = false;
-            // edge.data.roundabout = input_edge.isRoundabout();
-            // edge.data.ignoreInGrid = input_edge.ignoreInGrid();
-            edge.data.name_id = input_edge.name();
-            edge.data.type = input_edge.type();
-            // edge.data.isAccessRestricted = input_edge.isAccessRestricted();
-            edge.data.reversedEdge = false;
-            edge_list.push_back(edge);
-            if (edge.data.backward)
-            {
-                std::swap(edge.source, edge.target);
-                edge.data.forward = input_edge.isBackward();
-                edge.data.backward = input_edge.isForward();
-                edge.data.reversedEdge = true;
-                edge_list.push_back(edge);
-            }
-        }
-        std::vector<NodeBasedEdge>().swap(input_edges);
-        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());
-
-        m_node_based_graph = std::make_shared<TarjanDynamicGraph>(number_of_nodes, edge_list);
-    }
-
-    ~TarjanSCC() { m_node_based_graph.reset(); }
-
-    void Run()
-    {
-        // remove files from previous run if exist
-        DeleteFileIfExists("component.dbf");
-        DeleteFileIfExists("component.shx");
-        DeleteFileIfExists("component.shp");
-
-        Percent p(m_node_based_graph->GetNumberOfNodes());
-
-        OGRRegisterAll();
-
-        const char *pszDriverName = "ESRI Shapefile";
-        OGRSFDriver *poDriver =
-            OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName(pszDriverName);
-        if (NULL == poDriver)
-        {
-            throw OSRMException("ESRI Shapefile driver not available");
-        }
-        OGRDataSource *poDS = poDriver->CreateDataSource("component.shp", NULL);
-
-        if (NULL == poDS)
-        {
-            throw OSRMException("Creation of output file failed");
-        }
-
-        OGRLayer *poLayer = poDS->CreateLayer("component", NULL, wkbLineString, NULL);
-
-        if (NULL == poLayer)
-        {
-            throw OSRMException("Layer creation failed.");
-        }
-
-        // 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;
-        // 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<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)
-        {
-            if (UINT_MAX == components_index[node])
-            {
-                recursion_stack.emplace(true, 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;
-                recursion_stack.pop();
-
-                if (before_recursion)
-                {
-                    // Mark frame to handle tail of recursion
-                    recursion_stack.emplace(false, currentFrame);
-
-                    // Mark essential information for SCC
-                    tarjan_node_list[v].index = index;
-                    tarjan_node_list[v].low_link = index;
-                    tarjan_stack.push(v);
-                    tarjan_node_list[v].on_stack = true;
-                    ++index;
-
-                    // Traverse outgoing edges
-                    EdgeID end_edge = m_node_based_graph->EndEdges(v);
-                    for (auto e2 = m_node_based_graph->BeginEdges(v); e2 < end_edge; ++e2)
-                    {
-                        const TarjanDynamicGraph::NodeIterator vprime =
-                            m_node_based_graph->GetTarget(e2);
-                        if (UINT_MAX == tarjan_node_list[vprime].index)
-                        {
-                            recursion_stack.emplace(true, TarjanStackFrame(vprime, v));
-                        }
-                        else
-                        {
-                            if (tarjan_node_list[vprime].on_stack &&
-                                tarjan_node_list[vprime].index < tarjan_node_list[v].low_link)
-                            {
-                                tarjan_node_list[v].low_link = tarjan_node_list[vprime].index;
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    tarjan_node_list[currentFrame.parent].low_link =
-                        std::min(tarjan_node_list[currentFrame.parent].low_link,
-                                 tarjan_node_list[v].low_link);
-                    // after recursion, lets do cycle checking
-                    // Check if we found a cycle. This is the bottom part of the recursion
-                    if (tarjan_node_list[v].low_link == tarjan_node_list[v].index)
-                    {
-                        NodeID vprime;
-                        do
-                        {
-                            vprime = tarjan_stack.top();
-                            tarjan_stack.pop();
-                            tarjan_node_list[vprime].on_stack = false;
-                            components_index[vprime] = component_index;
-                            ++size_of_current_component;
-                        } while (v != vprime);
-
-                        component_size_vector.emplace_back(size_of_current_component);
-
-                        if (size_of_current_component > 1000)
-                        {
-                            SimpleLogger().Write() << "large component [" << component_index
-                                                   << "]=" << size_of_current_component;
-                        }
-
-                        ++component_index;
-                        size_of_current_component = 0;
-                    }
-                }
-            }
-        }
-
-        SimpleLogger().Write() << "identified: " << component_size_vector.size()
-                               << " many components, marking small components";
-
-        // TODO/C++11: prime candidate for lambda function
-        unsigned size_one_counter = 0;
-        for (unsigned i = 0, end = component_size_vector.size(); i < end; ++i)
-        {
-            if (1 == component_size_vector[i])
-            {
-                ++size_one_counter;
-            }
-        }
-
-        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)
-        {
-            p.printIncrement();
-            EdgeID last_edge = m_node_based_graph->EndEdges(u);
-            for (auto e1 = m_node_based_graph->BeginEdges(u); e1 < last_edge; ++e1)
-            {
-                if (!m_node_based_graph->GetEdgeData(e1).reversedEdge)
-                {
-                    continue;
-                }
-                const TarjanDynamicGraph::NodeIterator v = m_node_based_graph->GetTarget(e1);
-
-                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)
-                {
-                    BOOST_ASSERT(e1 != UINT_MAX);
-                    BOOST_ASSERT(u != UINT_MAX);
-                    BOOST_ASSERT(v != UINT_MAX);
-
-                    const unsigned size_of_containing_component =
-                        std::min(component_size_vector[components_index[u]],
-                                 component_size_vector[components_index[v]]);
-
-                    // 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);
-
-                        OGRFeature *poFeature = OGRFeature::CreateFeature(poLayer->GetLayerDefn());
-
-                        poFeature->SetGeometry(&lineString);
-                        if (OGRERR_NONE != poLayer->CreateFeature(poFeature))
-                        {
-                            throw OSRMException("Failed to create feature in shapefile.");
-                        }
-                        OGRFeature::DestroyFeature(poFeature);
-                    }
-                }
-            }
-        }
-        OGRDataSource::DestroyDataSource(poDS);
-        std::vector<NodeID>().swap(component_size_vector);
-        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);
-        BOOST_ASSERT_MSG(0 == components_index.size() && 0 == components_index.capacity(),
-                         "icomponents_index not properly deallocated");
-
-        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);
-        if (restriction_iterator != m_restriction_map.end())
-        {
-            const unsigned index = restriction_iterator->second;
-            for (const RestrictionSource &restriction_target : m_restriction_bucket_list.at(index))
-            {
-                if (restriction_target.second)
-                {
-                    return restriction_target.first;
-                }
-            }
-        }
-        return UINT_MAX;
-    }
-
-    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);
-        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))
-            {
-                if (w == restriction_target.first)
-                {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    void DeleteFileIfExists(const std::string &file_name) const
-    {
-        if (boost::filesystem::exists(file_name))
-        {
-            boost::filesystem::remove(file_name);
-        }
-    }
-};
-
-#endif /* STRONGLYCONNECTEDCOMPONENTS_H_ */

CMakeLists.txt

@@ -1,4 +1,11 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.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)
@@ -8,8 +15,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 include(GetGitRevisionDescription)
 git_describe(GIT_DESCRIPTION)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-
 set(bitness 32)
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
   set(bitness 64)
@@ -18,40 +23,57 @@ else()
   message(WARNING "Building on a 32 bit system is unsupported")
 endif()
 
-include_directories(${CMAKE_SOURCE_DIR}/Include/)
+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()
 
-add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/Util/UUID.cpp UUID.cpp.alwaysbuild
+OPTION(WITH_TOOLS "Build OSRM tools" OFF)
+OPTION(BUILD_TOOLS "Build OSRM tools" OFF)
+
+include_directories(${CMAKE_SOURCE_DIR}/Include/)
+include_directories(${CMAKE_SOURCE_DIR}/third_party/)
+
+add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/Util/finger_print.cpp finger_print.cpp.alwaysbuild
   COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_SOURCE_DIR}
-    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/UUID-Config.cmake
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FingerPrint-Config.cmake
   DEPENDS
-    ${CMAKE_SOURCE_DIR}/Util/UUID.cpp.in
-    ${CMAKE_SOURCE_DIR}/cmake/UUID-Config.cmake
-  COMMENT "Configuring UUID.cpp"
+    ${CMAKE_SOURCE_DIR}/Util/finger_print.cpp.in
+  COMMENT "Configuring finger_print.cpp"
   VERBATIM)
 
-add_custom_target(UUIDConfigure DEPENDS ${CMAKE_SOURCE_DIR}/Util/UUID.cpp)
+add_custom_target(FingerPrintConfigure DEPENDS ${CMAKE_SOURCE_DIR}/Util/finger_print.cpp)
+add_custom_target(tests DEPENDS datastructure-tests algorithm-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
   ${CMAKE_SOURCE_DIR}/Util/GitDescription.cpp
 )
-file(GLOB ExtractorGlob Extractor/*.cpp)
-set(ExtractorSources extractor.cpp ${ExtractorGlob})
-add_executable(osrm-extract ${ExtractorSources})
+file(GLOB ExtractorGlob extractor/*.cpp)
+file(GLOB ImporterGlob data_structures/import_edge.cpp data_structures/external_memory_node.cpp)
+add_library(IMPORT OBJECT ${ImporterGlob})
+add_library(LOGGER OBJECT Util/simple_logger.cpp)
+add_library(PHANTOMNODE OBJECT data_structures/phantom_node.cpp)
 
-file(GLOB PrepareGlob Contractor/*.cpp DataStructures/HilbertValue.cpp DataStructures/RestrictionMap.cpp)
+set(ExtractorSources extract.cpp ${ExtractorGlob})
+add_executable(osrm-extract ${ExtractorSources} $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:LOGGER>)
+
+file(GLOB PrepareGlob contractor/*.cpp data_structures/hilbert_value.cpp data_structures/restriction_map.cpp Util/compute_angle.cpp)
 set(PrepareSources prepare.cpp ${PrepareGlob})
-add_executable(osrm-prepare ${PrepareSources})
+add_executable(osrm-prepare ${PrepareSources} $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:LOGGER>)
 
 file(GLOB ServerGlob Server/*.cpp)
-file(GLOB DescriptorGlob Descriptors/*.cpp)
-file(GLOB DatastructureGlob DataStructures/SearchEngineData.cpp DataStructures/RouteParameters.cpp)
-file(GLOB CoordinateGlob DataStructures/Coordinate.cpp)
-file(GLOB AlgorithmGlob Algorithms/*.cpp)
+file(GLOB DescriptorGlob descriptors/*.cpp)
+file(GLOB DatastructureGlob data_structures/search_engine_data.cpp data_structures/route_parameters.cpp Util/bearing.cpp)
+list(REMOVE_ITEM DatastructureGlob data_structures/Coordinate.cpp)
+file(GLOB CoordinateGlob data_structures/Coordinate.cpp)
+file(GLOB AlgorithmGlob algorithms/*.cpp)
 file(GLOB HttpGlob Server/Http/*.cpp)
 file(GLOB LibOSRMGlob Library/*.cpp)
+file(GLOB DataStructureTestsGlob UnitTests/data_structures/*.cpp data_structures/hilbert_value.cpp)
+file(GLOB AlgorithmTestsGlob UnitTests/Algorithms/*.cpp)
 
 set(
   OSRMSources
@@ -62,16 +84,21 @@ set(
   ${AlgorithmGlob}
   ${HttpGlob}
 )
-add_library(COORDLIB STATIC ${CoordinateGlob})
-add_library(OSRM ${OSRMSources} Util/GitDescription.cpp Util/UUID.cpp)
-add_library(UUID STATIC Util/UUID.cpp)
-add_library(GITDESCRIPTION STATIC Util/GitDescription.cpp)
-add_dependencies(UUID UUIDConfigure)
-add_dependencies(GITDESCRIPTION GIT_DESCRIPTION)
+add_library(COORDINATE OBJECT ${CoordinateGlob})
+add_library(FINGERPRINT OBJECT Util/finger_print.cpp)
+add_library(GITDESCRIPTION OBJECT Util/GitDescription.cpp)
+add_library(OSRM ${OSRMSources} $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE>)
+add_dependencies(FINGERPRINT FingerPrintConfigure)
 
 add_executable(osrm-routed routed.cpp ${ServerGlob})
-set_target_properties(osrm-routed PROPERTIES COMPILE_FLAGS -DROUTED)
-add_executable(osrm-datastore datastore.cpp)
+add_executable(osrm-datastore datastore.cpp $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:LOGGER>)
+
+# Unit tests
+add_executable(datastructure-tests EXCLUDE_FROM_ALL UnitTests/datastructure_tests.cpp ${DataStructureTestsGlob} $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE>)
+add_executable(algorithm-tests EXCLUDE_FROM_ALL UnitTests/algorithm_tests.cpp ${AlgorithmTestsGlob} $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE>)
+
+# Benchmarks
+add_executable(rtree-bench EXCLUDE_FROM_ALL benchmarks/static_rtree.cpp $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE>)
 
 # Check the release mode
 if(NOT CMAKE_BUILD_TYPE MATCHES Debug)
@@ -86,56 +113,58 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
   endif()
 endif()
 if(CMAKE_BUILD_TYPE MATCHES Release)
-    message(STATUS "Configuring OSRM in release mode")
+  message(STATUS "Configuring OSRM in release mode")
+  # Check if LTO is available
+  set(LTO_FLAGS "")
+  CHECK_CXX_COMPILER_FLAG("-flto" HAS_LTO_FLAG)
+  if (HAS_LTO_FLAG)
+    set(LTO_FLAGS "${LTO_FLAGS} -flto")
+
+    # Since gcc 4.9 the LTO format is non-standart ('slim'), so we need to use the build-in tools
+    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND
+        NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0" AND NOT MINGW)
+      message(STATUS "Using gcc specific binutils for LTO.")
+      set(CMAKE_AR     "/usr/bin/gcc-ar")
+      set(CMAKE_RANLIB "/usr/bin/gcc-ranlib")
+    endif()
+  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
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wunreachable-code -Wno-unknown-pragmas -Wno-unneeded-internal-declaration -pedantic -fPIC")
-  message(STATUS "OpenMP parallelization not available using clang++")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wunreachable-code -pedantic -fPIC")
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
   # using GCC
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fopenmp -pedantic -fPIC")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -fPIC")
+  if (WIN32) # using mingw
+    add_definitions(-D_USE_MATH_DEFINES) # define M_PI, M_1_PI etc.
+    add_definitions(-DWIN32)
+    SET(OPTIONAL_SOCKET_LIBS ws2_32 wsock32)
+  endif()
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
   # using Intel C++
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-intel -wd10237 -Wall -openmp -ipo -fPIC")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-intel -wd10237 -Wall -ipo -fPIC")
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
   # using Visual Studio C++
+  set(BOOST_COMPONENTS ${BOOST_COMPONENTS} date_time chrono zlib)
+  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+  add_definitions(-DNOMINMAX) # avoid min and max macros that can break compilation
+  add_definitions(-D_USE_MATH_DEFINES) # define M_PI
+  add_definitions(-D_WIN32_WINNT=0x0501)
+  add_definitions(-DXML_STATIC)
+  find_library(ws2_32_LIBRARY_PATH ws2_32)
+  target_link_libraries(osrm-extract wsock32 ws2_32)
 endif()
 
-# Check if LTO is available
-set(LTO_FLAGS "")
-CHECK_CXX_COMPILER_FLAG("-flto" HAS_LTO_FLAG)
-if (HAS_LTO_FLAG)
-  set(LTO_FLAGS "${LTO_FLAGS} -flto")
-
-  # Since gcc 4.9 the LTO format is non-standart ('slim'), so we need to use the build-in tools
-  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND
-      NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0")
-    message(STATUS "Using gcc specific binutils for LTO.")
-    set(CMAKE_AR     "/usr/bin/gcc-ar")
-    set(CMAKE_RANLIB "/usr/bin/gcc-ranlib")
-  endif()
-endif (HAS_LTO_FLAG)
-
-# disable partitioning of LTO process when possible (fixes Debian issues)
-set(LTO_PARTITION_FLAGS "")
-CHECK_CXX_COMPILER_FLAG("-flto-partition=none" HAS_LTO_PARTITION_FLAG)
-if    (HAS_LTO_PARTITION_FLAG)
-  set(LTO_PARTITION_FLAGS "${LTO_PARTITION_FLAGS} -flto-partition=none")
-endif (HAS_LTO_PARTITION_FLAG)
-
-# Add Link-Time-Optimization flags, if supported (GCC >= 4.7) and enabled
-set(CMAKE_CXX_FLAGS           "${CMAKE_CXX_FLAGS}           ${LTO_FLAGS}")
-set(CMAKE_EXE_LINKER_FLAGS    "${CMAKE_EXE_LINKER_FLAGS}    ${LTO_FLAGS} ${LTO_PARTITION_FLAGS}")
-set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LTO_FLAGS} ${LTO_PARTITION_FLAGS}")
-
 # Activate C++11
-ADD_DEFINITIONS(
-    -std=c++11 # Or -std=c++0x
-    # Other flags
-)
+if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+  ADD_DEFINITIONS(-std=c++11)
+endif()
 
 # Configuring other platform dependencies
 if(APPLE)
@@ -143,10 +172,6 @@ if(APPLE)
   message(STATUS "Set Architecture to x64 on OS X")
   exec_program(uname ARGS -v  OUTPUT_VARIABLE DARWIN_VERSION)
   string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
-#  if(DARWIN_VERSION GREATER 12 AND NOT OSXLIBSTD)
-#    message(STATUS "Activating -std=c++11 flag for >= OS X 10.9")
-#    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-#  endif()
   if(OSXLIBSTD)
     message(STATUS "linking against ${OSXLIBSTD}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=${OSXLIBSTD}")
@@ -157,6 +182,7 @@ if(APPLE)
 endif()
 
 if(UNIX AND NOT APPLE)
+  target_link_libraries(osrm-prepare rt)
   target_link_libraries(osrm-datastore rt)
   target_link_libraries(OSRM rt)
 endif()
@@ -169,26 +195,43 @@ if(NOT Boost_FOUND)
 endif()
 include_directories(${Boost_INCLUDE_DIRS})
 
-target_link_libraries(OSRM ${Boost_LIBRARIES} COORDLIB)
-target_link_libraries(osrm-extract ${Boost_LIBRARIES} UUID GITDESCRIPTION COORDLIB)
-target_link_libraries(osrm-prepare ${Boost_LIBRARIES} UUID GITDESCRIPTION COORDLIB)
-target_link_libraries(osrm-routed ${Boost_LIBRARIES} OSRM UUID GITDESCRIPTION)
-target_link_libraries(osrm-datastore ${Boost_LIBRARIES} UUID GITDESCRIPTION COORDLIB)
+target_link_libraries(OSRM ${Boost_LIBRARIES})
+target_link_libraries(osrm-extract ${Boost_LIBRARIES})
+target_link_libraries(osrm-prepare ${Boost_LIBRARIES})
+target_link_libraries(osrm-routed ${Boost_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} OSRM)
+target_link_libraries(osrm-datastore ${Boost_LIBRARIES})
+target_link_libraries(datastructure-tests ${Boost_LIBRARIES})
+target_link_libraries(algorithm-tests ${Boost_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} OSRM)
+target_link_libraries(rtree-bench ${Boost_LIBRARIES})
 
 find_package(Threads REQUIRED)
 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(algorithm-tests ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(rtree-bench ${CMAKE_THREAD_LIBS_INIT})
 
-find_package(Lua52)
-if(NOT LUA52_FOUND)
-  find_package(Lua51 REQUIRED)
-  if(NOT APPLE)
-    find_package(LuaJIT 5.1)
-  endif()
-else()
-  if(NOT APPLE)
-    find_package(LuaJIT 5.2)
-  endif()
+find_package(TBB REQUIRED)
+if(WIN32 AND CMAKE_BUILD_TYPE MATCHES Debug)
+  set(TBB_LIBRARIES ${TBB_DEBUG_LIBRARIES})
 endif()
+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(algorithm-tests ${TBB_LIBRARIES})
+target_link_libraries(rtree-bench ${TBB_LIBRARIES})
+include_directories(${TBB_INCLUDE_DIR})
+
+find_package( Luabind REQUIRED )
+include(check_luabind)
+
+include_directories(${LUABIND_INCLUDE_DIR})
+target_link_libraries(osrm-extract ${LUABIND_LIBRARY})
+target_link_libraries(osrm-prepare ${LUABIND_LIBRARY})
 
 if( LUAJIT_FOUND )
   target_link_libraries(osrm-extract ${LUAJIT_LIBRARIES})
@@ -199,14 +242,9 @@ else()
 endif()
 include_directories(${LUA_INCLUDE_DIR})
 
-find_package(LibXml2 REQUIRED)
-include_directories(${LIBXML2_INCLUDE_DIR})
-target_link_libraries(osrm-extract ${LIBXML2_LIBRARIES})
-
-find_package( Luabind REQUIRED )
-include_directories(${LUABIND_INCLUDE_DIR})
-target_link_libraries(osrm-extract ${LUABIND_LIBRARY})
-target_link_libraries(osrm-prepare ${LUABIND_LIBRARY})
+find_package(EXPAT REQUIRED)
+include_directories(${EXPAT_INCLUDE_DIRS})
+target_link_libraries(osrm-extract ${EXPAT_LIBRARIES})
 
 find_package( STXXL REQUIRED )
 include_directories(${STXXL_INCLUDE_DIR})
@@ -214,6 +252,11 @@ target_link_libraries(OSRM ${STXXL_LIBRARY})
 target_link_libraries(osrm-extract ${STXXL_LIBRARY})
 target_link_libraries(osrm-prepare ${STXXL_LIBRARY})
 
+if(MINGW)
+  # STXXL needs OpenMP library
+  target_link_libraries(osrm-extract gomp)
+endif()
+
 find_package( OSMPBF REQUIRED )
 include_directories(${OSMPBF_INCLUDE_DIR})
 target_link_libraries(osrm-extract ${OSMPBF_LIBRARY})
@@ -233,25 +276,40 @@ 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)
-    add_executable(osrm-components Tools/components.cpp)
+    add_executable(osrm-components tools/components.cpp $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER>)
+    target_link_libraries(osrm-components ${TBB_LIBRARIES})
     include_directories(${GDAL_INCLUDE_DIR})
     target_link_libraries(
       osrm-components
-      ${GDAL_LIBRARIES} ${Boost_LIBRARIES} UUID GITDESCRIPTION COORDLIB)
+      ${GDAL_LIBRARIES} ${Boost_LIBRARIES})
+    install(TARGETS osrm-components DESTINATION bin)
+  else()
+    message(FATAL_ERROR "libgdal and/or development headers not found")
   endif()
-  add_executable(osrm-cli Tools/simpleclient.cpp)
-  target_link_libraries(osrm-cli ${Boost_LIBRARIES} OSRM UUID GITDESCRIPTION)
-    add_executable(osrm-io-benchmark Tools/io-benchmark.cpp)
-    target_link_libraries(osrm-io-benchmark ${Boost_LIBRARIES} GITDESCRIPTION)
-    add_executable(osrm-unlock-all Tools/unlock_all_mutexes.cpp)
-    target_link_libraries(osrm-unlock-all ${Boost_LIBRARIES} GITDESCRIPTION)
-    if(UNIX AND NOT APPLE)
-        target_link_libraries(osrm-unlock-all rt)
-    endif()
+  add_executable(osrm-cli tools/simpleclient.cpp $<TARGET_OBJECTS:LOGGER>)
+  target_link_libraries(osrm-cli ${Boost_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} OSRM)
+  target_link_libraries(osrm-cli ${TBB_LIBRARIES})
+  add_executable(osrm-io-benchmark tools/io-benchmark.cpp $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:LOGGER>)
+  target_link_libraries(osrm-io-benchmark ${Boost_LIBRARIES})
+  add_executable(osrm-unlock-all tools/unlock_all_mutexes.cpp $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:LOGGER>)
+  target_link_libraries(osrm-unlock-all ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+  if(UNIX AND NOT APPLE)
+    target_link_libraries(osrm-unlock-all rt)
+  endif()
+  add_executable(osrm-check-hsgr tools/check-hsgr.cpp $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:LOGGER>)
+  target_link_libraries(osrm-check-hsgr ${Boost_LIBRARIES})
+  add_executable(osrm-springclean tools/springclean.cpp $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:GITDESCRIPTION>)
+  target_link_libraries(osrm-springclean ${Boost_LIBRARIES})
+
+  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)
+  install(TARGETS osrm-springclean DESTINATION bin)
 endif()
 
 file(GLOB InstallGlob Include/osrm/*.h Library/OSRM.h)
@@ -281,3 +339,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/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.append(
-                            TemporaryFilePattern.begin(), TemporaryFilePattern.end()))),
-      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 &e) { Abort(e); }
-}
-
-uint64_t TemporaryStorage::GetFreeBytesOnTemporaryDevice()
-{
-    uint64_t value = -1;
-    try
-    {
-        boost::filesystem::path p = boost::filesystem::temp_directory_path();
-        boost::filesystem::space_info s = boost::filesystem::space(p);
-        value = s.free;
-    }
-    catch (boost::filesystem::filesystem_error &e) { Abort(e); }
-    return value;
-}
-
-void TemporaryStorage::CheckIfTemporaryDeviceFull()
-{
-    boost::filesystem::path p = boost::filesystem::temp_directory_path();
-    boost::filesystem::space_info s = boost::filesystem::space(p);
-    if ((1024 * 1024) > s.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 &e)
-{
-    RemoveAll();
-    throw OSRMException(e.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/Coordinate.cpp

@@ -1,331 +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 <osrm/Coordinate.h>
-#include "../Util/MercatorUtil.h"
-#include "../Util/SimpleLogger.h"
-#include "../Util/StringUtil.h"
-
-#include <boost/assert.hpp>
-
-#ifndef NDEBUG
-#include <bitset>
-#endif
-#include <iostream>
-#include <limits>
-
-FixedPointCoordinate::FixedPointCoordinate()
-    : lat(std::numeric_limits<int>::min()), lon(std::numeric_limits<int>::min())
-{
-}
-
-FixedPointCoordinate::FixedPointCoordinate(int lat, int lon) : lat(lat), lon(lon)
-{
-#ifndef NDEBUG
-    if (0 != (std::abs(lat) >> 30))
-    {
-        std::bitset<32> y(lat);
-        SimpleLogger().Write(logDEBUG) << "broken lat: " << lat << ", bits: " << y;
-    }
-    if (0 != (std::abs(lon) >> 30))
-    {
-        std::bitset<32> x(lon);
-        SimpleLogger().Write(logDEBUG) << "broken lon: " << lon << ", bits: " << x;
-    }
-#endif
-}
-
-void FixedPointCoordinate::Reset()
-{
-    lat = std::numeric_limits<int>::min();
-    lon = std::numeric_limits<int>::min();
-}
-bool FixedPointCoordinate::isSet() const
-{
-    return (std::numeric_limits<int>::min() != lat) && (std::numeric_limits<int>::min() != lon);
-}
-bool FixedPointCoordinate::isValid() const
-{
-    if (lat > 90 * COORDINATE_PRECISION || lat < -90 * COORDINATE_PRECISION ||
-        lon > 180 * COORDINATE_PRECISION || lon < -180 * COORDINATE_PRECISION)
-    {
-        return false;
-    }
-    return true;
-}
-bool FixedPointCoordinate::operator==(const FixedPointCoordinate &other) const
-{
-    return lat == other.lat && lon == other.lon;
-}
-
-double FixedPointCoordinate::ApproximateDistance(const int lat1,
-                                                 const int lon1,
-                                                 const int lat2,
-                                                 const int lon2)
-{
-    BOOST_ASSERT(lat1 != std::numeric_limits<int>::min());
-    BOOST_ASSERT(lon1 != std::numeric_limits<int>::min());
-    BOOST_ASSERT(lat2 != std::numeric_limits<int>::min());
-    BOOST_ASSERT(lon2 != std::numeric_limits<int>::min());
-    double RAD = 0.017453292519943295769236907684886;
-    double lt1 = lat1 / COORDINATE_PRECISION;
-    double ln1 = lon1 / COORDINATE_PRECISION;
-    double lt2 = lat2 / COORDINATE_PRECISION;
-    double ln2 = lon2 / COORDINATE_PRECISION;
-    double dlat1 = lt1 * (RAD);
-
-    double dlong1 = ln1 * (RAD);
-    double dlat2 = lt2 * (RAD);
-    double dlong2 = ln2 * (RAD);
-
-    double dLong = dlong1 - dlong2;
-    double dLat = dlat1 - dlat2;
-
-    double aHarv = pow(sin(dLat / 2.0), 2.0) + cos(dlat1) * cos(dlat2) * pow(sin(dLong / 2.), 2);
-    double cHarv = 2. * atan2(sqrt(aHarv), sqrt(1.0 - aHarv));
-    // earth radius varies between 6,356.750-6,378.135 km (3,949.901-3,963.189mi)
-    // The IUGG value for the equatorial radius is 6378.137 km (3963.19 miles)
-    const double earth = 6372797.560856;
-    return earth * cHarv;
-}
-
-double FixedPointCoordinate::ApproximateDistance(const FixedPointCoordinate &c1,
-                                                 const FixedPointCoordinate &c2)
-{
-    return ApproximateDistance(c1.lat, c1.lon, c2.lat, c2.lon);
-}
-
-double FixedPointCoordinate::ApproximateEuclideanDistance(const FixedPointCoordinate &c1,
-                                                 const FixedPointCoordinate &c2)
-{
-    return ApproximateEuclideanDistance(c1.lat, c1.lon, c2.lat, c2.lon);
-}
-
-double FixedPointCoordinate::ApproximateEuclideanDistance(const int lat1,
-                                                          const int lon1,
-                                                          const int lat2,
-                                                          const int lon2)
-{
-    BOOST_ASSERT(lat1 != std::numeric_limits<int>::min());
-    BOOST_ASSERT(lon1 != std::numeric_limits<int>::min());
-    BOOST_ASSERT(lat2 != std::numeric_limits<int>::min());
-    BOOST_ASSERT(lon2 != std::numeric_limits<int>::min());
-
-    const double RAD = 0.017453292519943295769236907684886;
-    const double float_lat1 = (lat1 / COORDINATE_PRECISION) * RAD;
-    const double float_lon1 = (lon1 / COORDINATE_PRECISION) * RAD;
-    const double float_lat2 = (lat2 / COORDINATE_PRECISION) * RAD;
-    const double float_lon2 = (lon2 / COORDINATE_PRECISION) * RAD;
-
-    const double x = (float_lon2 - float_lon1) * cos((float_lat1 + float_lat2) / 2.);
-    const double y = (float_lat2 - float_lat1);
-    const double earth_radius = 6372797.560856;
-    return sqrt(x * x + y * y) * earth_radius;
-}
-
-// Yuck! Code duplication. This function is also in EgdeBasedNode.h
-double FixedPointCoordinate::ComputePerpendicularDistance(const FixedPointCoordinate &point,
-                                                          const FixedPointCoordinate &segA,
-                                                          const FixedPointCoordinate &segB)
-{
-    const double x = lat2y(point.lat / COORDINATE_PRECISION);
-    const double y = point.lon / COORDINATE_PRECISION;
-    const double a = lat2y(segA.lat / COORDINATE_PRECISION);
-    const double b = segA.lon / COORDINATE_PRECISION;
-    const double c = lat2y(segB.lat / COORDINATE_PRECISION);
-    const double d = segB.lon / COORDINATE_PRECISION;
-    double p, q, nY;
-    if (std::abs(a - c) > std::numeric_limits<double>::epsilon())
-    {
-        const double m = (d - b) / (c - a); // slope
-        // Projection of (x,y) on line joining (a,b) and (c,d)
-        p = ((x + (m * y)) + (m * m * a - m * b)) / (1. + m * m);
-        q = b + m * (p - a);
-    }
-    else
-    {
-        p = c;
-        q = y;
-    }
-    nY = (d * p - c * q) / (a * d - b * c);
-
-    // discretize the result to coordinate precision. it's a hack!
-    if (std::abs(nY) < (1. / COORDINATE_PRECISION))
-    {
-        nY = 0.;
-    }
-
-    double r = (p - nY * a) / c;
-    if (std::isnan(r))
-    {
-        r = ((segB.lat == point.lat) && (segB.lon == point.lon)) ? 1. : 0.;
-    }
-    else if (std::abs(r) <= std::numeric_limits<double>::epsilon())
-    {
-        r = 0.;
-    }
-    else if (std::abs(r - 1.) <= std::numeric_limits<double>::epsilon())
-    {
-        r = 1.;
-    }
-    FixedPointCoordinate nearest_location;
-    BOOST_ASSERT(!std::isnan(r));
-    if (r <= 0.)
-    { // point is "left" of edge
-        nearest_location.lat = segA.lat;
-        nearest_location.lon = segA.lon;
-    }
-    else if (r >= 1.)
-    { // point is "right" of edge
-        nearest_location.lat = segB.lat;
-        nearest_location.lon = segB.lon;
-    }
-    else
-    { // point lies in between
-        nearest_location.lat = y2lat(p) * COORDINATE_PRECISION;
-        nearest_location.lon = q * COORDINATE_PRECISION;
-    }
-    BOOST_ASSERT(nearest_location.isValid());
-    const double approximated_distance =
-        FixedPointCoordinate::ApproximateDistance(point, nearest_location);
-    BOOST_ASSERT(0. <= approximated_distance);
-    return approximated_distance;
-}
-
-double FixedPointCoordinate::ComputePerpendicularDistance(const FixedPointCoordinate &coord_a,
-                                                   const FixedPointCoordinate &coord_b,
-                                                   const FixedPointCoordinate &query_location,
-                                                   FixedPointCoordinate &nearest_location,
-                                                   double &r)
-{
-    BOOST_ASSERT(query_location.isValid());
-
-    const double x = lat2y(query_location.lat / COORDINATE_PRECISION);
-    const double y = query_location.lon / COORDINATE_PRECISION;
-    const double a = lat2y(coord_a.lat / COORDINATE_PRECISION);
-    const double b = coord_a.lon / COORDINATE_PRECISION;
-    const double c = lat2y(coord_b.lat / COORDINATE_PRECISION);
-    const double d = coord_b.lon / COORDINATE_PRECISION;
-    double p, q /*,mX*/, nY;
-    if (std::abs(a - c) > std::numeric_limits<double>::epsilon())
-    {
-        const double m = (d - b) / (c - a); // slope
-        // Projection of (x,y) on line joining (a,b) and (c,d)
-        p = ((x + (m * y)) + (m * m * a - m * b)) / (1. + m * m);
-        q = b + m * (p - a);
-    }
-    else
-    {
-        p = c;
-        q = y;
-    }
-    nY = (d * p - c * q) / (a * d - b * c);
-
-    // discretize the result to coordinate precision. it's a hack!
-    if (std::abs(nY) < (1. / COORDINATE_PRECISION))
-    {
-        nY = 0.;
-    }
-
-    r = (p - nY * a) / c; // These values are actually n/m+n and m/m+n , we need
-    // not calculate the explicit values of m an n as we
-    // are just interested in the ratio
-    if (std::isnan(r))
-    {
-        r = ((coord_b.lat == query_location.lat) && (coord_b.lon == query_location.lon)) ? 1. : 0.;
-    }
-    else if (std::abs(r) <= std::numeric_limits<double>::epsilon())
-    {
-        r = 0.;
-    }
-    else if (std::abs(r - 1.) <= std::numeric_limits<double>::epsilon())
-    {
-        r = 1.;
-    }
-    BOOST_ASSERT(!std::isnan(r));
-    if (r <= 0.)
-    {
-        nearest_location.lat = coord_a.lat;
-        nearest_location.lon = coord_a.lon;
-    }
-    else if (r >= 1.)
-    {
-        nearest_location.lat = coord_b.lat;
-        nearest_location.lon = coord_b.lon;
-    }
-    else
-    {
-        // point lies in between
-        nearest_location.lat = y2lat(p) * COORDINATE_PRECISION;
-        nearest_location.lon = q * COORDINATE_PRECISION;
-    }
-    BOOST_ASSERT(nearest_location.isValid());
-
-    // TODO: Replace with euclidean approximation when k-NN search is done
-    // const double approximated_distance = FixedPointCoordinate::ApproximateEuclideanDistance(
-    const double approximated_distance =
-        FixedPointCoordinate::ApproximateDistance(query_location, nearest_location);
-    BOOST_ASSERT(0. <= approximated_distance);
-    return approximated_distance;
-}
-
-void FixedPointCoordinate::convertInternalLatLonToString(const int value, std::string &output)
-{
-    char buffer[12];
-    buffer[11] = 0; // zero termination
-    output = printInt<11, 6>(buffer, value);
-}
-
-void FixedPointCoordinate::convertInternalCoordinateToString(const FixedPointCoordinate &coord,
-                                                             std::string &output)
-{
-    std::string tmp;
-    tmp.reserve(23);
-    convertInternalLatLonToString(coord.lon, tmp);
-    output = tmp;
-    output += ",";
-    convertInternalLatLonToString(coord.lat, tmp);
-    output += tmp;
-}
-
-void
-FixedPointCoordinate::convertInternalReversedCoordinateToString(const FixedPointCoordinate &coord,
-                                                                std::string &output)
-{
-    std::string tmp;
-    tmp.reserve(23);
-    convertInternalLatLonToString(coord.lat, tmp);
-    output = tmp;
-    output += ",";
-    convertInternalLatLonToString(coord.lon, tmp);
-    output += tmp;
-}
-
-void FixedPointCoordinate::Output(std::ostream &out) const
-{
-    out << "(" << lat / COORDINATE_PRECISION << "," << lon / COORDINATE_PRECISION << ")";
-}

DataStructures/DeallocatingVector.h

@@ -1,401 +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 DEALLOCATINGVECTOR_H_
-#define DEALLOCATINGVECTOR_H_
-
-#include <boost/assert.hpp>
-#include <cstring>
-#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>
-{
-  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)
-    {
-    }
-
-    DeallocatingVectorIterator(std::size_t idx, std::vector<ElementT *> &input_list)
-        : current_state(idx, input_list)
-    {
-    }
-    explicit DeallocatingVectorIterator(const DeallocatingVectorIteratorState &r) : current_state(r) {}
-
-    template <typename T2>
-    DeallocatingVectorIterator &operator=(const DeallocatingVectorIterator<T2> &r)
-    {
-        if (DeallocateC)
-        {
-            BOOST_ASSERT(false);
-        }
-        current_state = r.current_state;
-        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)>
-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;
-
-    // this iterator deallocates all buckets that have been visited. Iterators to visited objects
-    // become invalid.
-    typedef DeallocatingVectorIterator<ElementT, bucketSizeC, true> deallocation_iterator;
-
-    DeallocatingVector() : current_size(0)
-    {
-        // initial bucket
-        bucket_list.emplace_back(new ElementT[bucketSizeC]);
-    }
-
-    ~DeallocatingVector() { clear(); }
-
-    inline void swap(DeallocatingVector<ElementT, bucketSizeC> &other)
-    {
-        std::swap(current_size, other.current_size);
-        bucket_list.swap(other.bucket_list);
-    }
-
-    inline void clear()
-    {
-        // Delete[]'ing ptr's to all Buckets
-        for (unsigned i = 0; i < bucket_list.size(); ++i)
-        {
-            if (nullptr != bucket_list[i])
-            {
-                delete[] bucket_list[i];
-                bucket_list[i] = nullptr;
-            }
-        }
-        // Removing all ptrs from vector
-        std::vector<ElementT *>().swap(bucket_list);
-        current_size = 0;
-    }
-
-    inline void push_back(const ElementT &element)
-    {
-        const std::size_t current_capacity = capacity();
-        if (current_size == current_capacity)
-        {
-            bucket_list.push_back(new ElementT[bucketSizeC]);
-        }
-
-        std::size_t current_index = size() % bucketSizeC;
-        bucket_list.back()[current_index] = element;
-        ++current_size;
-    }
-
-    inline void emplace_back(const ElementT &&element)
-    {
-        const std::size_t current_capacity = capacity();
-        if (current_size == current_capacity)
-        {
-            bucket_list.push_back(new ElementT[bucketSizeC]);
-        }
-
-        const std::size_t current_index = size() % bucketSizeC;
-        bucket_list.back()[current_index] = element;
-        ++current_size;
-    }
-
-    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)
-        {
-            while (capacity() < new_size)
-            {
-                bucket_list.push_back(new ElementT[bucketSizeC]);
-            }
-            current_size = new_size;
-        }
-        if (new_size < current_size)
-        {
-            const std::size_t number_of_necessary_buckets = 1 + (new_size / bucketSizeC);
-
-            for (unsigned i = number_of_necessary_buckets; i < bucket_list.size(); ++i)
-            {
-                delete[] bucket_list[i];
-            }
-            bucket_list.resize(number_of_necessary_buckets);
-            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 iterator begin() { return iterator(static_cast<std::size_t>(0), 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);
-    }
-
-    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);
-    }
-
-    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;
-        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;
-        return (bucket_list[_bucket][_index]);
-    }
-
-    inline ElementT &back()
-    {
-        std::size_t _bucket = current_size / bucketSizeC;
-        std::size_t _index = current_size % bucketSizeC;
-        return (bucket_list[_bucket][_index]);
-    }
-
-    const inline ElementT &back() const
-    {
-        std::size_t _bucket = current_size / bucketSizeC;
-        std::size_t _index = current_size % bucketSizeC;
-        return (bucket_list[_bucket][_index]);
-    }
-};
-
-#endif /* DEALLOCATINGVECTOR_H_ */

DataStructures/ImportEdge.h

@@ -1,178 +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 IMPORT_EDGE_H
-#define IMPORT_EDGE_H
-
-#include "../Util/OSRMException.h"
-#include "../typedefs.h"
-
-#include <boost/assert.hpp>
-
-class NodeBasedEdge
-{
-
-  public:
-    bool operator<(const NodeBasedEdge &e) const
-    {
-        if (source() == e.source())
-        {
-            if (target() == e.target())
-            {
-                if (weight() == e.weight())
-                {
-                    return (isForward() && isBackward() && ((!e.isForward()) || (!e.isBackward())));
-                }
-                return (weight() < e.weight());
-            }
-            return (target() < e.target());
-        }
-        return (source() < e.source());
-    }
-
-    explicit NodeBasedEdge(NodeID s,
-                           NodeID t,
-                           NodeID n,
-                           EdgeWeight w,
-                           bool f,
-                           bool b,
-                           short ty,
-                           bool ra,
-                           bool ig,
-                           bool ar,
-                           bool cf,
-                           bool is_split)
-        : _source(s), _target(t), _name(n), _weight(w), _type(ty), forward(f), backward(b),
-          _roundabout(ra), _ignoreInGrid(ig), _accessRestricted(ar), _contraFlow(cf),
-          is_split(is_split)
-    {
-        if (ty < 0)
-        {
-            throw OSRMException("negative edge type");
-        }
-    }
-
-    NodeID target() const { return _target; }
-    NodeID source() const { return _source; }
-    NodeID name() const { return _name; }
-    EdgeWeight weight() const { return _weight; }
-    short type() const
-    {
-        BOOST_ASSERT_MSG(_type >= 0, "type of ImportEdge invalid");
-        return _type;
-    }
-    bool isBackward() const { return backward; }
-    bool isForward() const { return forward; }
-    bool isLocatable() const { return _type != 14; }
-    bool isRoundabout() const { return _roundabout; }
-    bool ignoreInGrid() const { return _ignoreInGrid; }
-    bool isAccessRestricted() const { return _accessRestricted; }
-    bool isContraFlow() const { return _contraFlow; }
-    bool IsSplit() const { return is_split; }
-
-    // TODO: names need to be fixed.
-    NodeID _source;
-    NodeID _target;
-    NodeID _name;
-    EdgeWeight _weight;
-    short _type;
-    bool forward : 1;
-    bool backward : 1;
-    bool _roundabout : 1;
-    bool _ignoreInGrid : 1;
-    bool _accessRestricted : 1;
-    bool _contraFlow : 1;
-    bool is_split : 1;
-
-  private:
-    NodeBasedEdge() {}
-};
-
-class EdgeBasedEdge
-{
-
-  public:
-    bool operator<(const EdgeBasedEdge &e) const
-    {
-        if (source() == e.source())
-        {
-            if (target() == e.target())
-            {
-                if (weight() == e.weight())
-                {
-                    return (isForward() && isBackward() && ((!e.isForward()) || (!e.isBackward())));
-                }
-                return (weight() < e.weight());
-            }
-            return (target() < e.target());
-        }
-        return (source() < e.source());
-    }
-
-    template <class EdgeT>
-    explicit EdgeBasedEdge(const EdgeT &myEdge)
-        : m_source(myEdge.source), m_target(myEdge.target), m_edgeID(myEdge.data.via),
-          m_weight(myEdge.data.distance), m_forward(myEdge.data.forward),
-          m_backward(myEdge.data.backward)
-    {
-    }
-
-    /** Default constructor. target and weight are set to 0.*/
-    EdgeBasedEdge()
-        : m_source(0), m_target(0), m_edgeID(0), m_weight(0), m_forward(false), m_backward(false)
-    {
-    }
-
-    explicit EdgeBasedEdge(const NodeID s,
-                           const NodeID t,
-                           const NodeID v,
-                           const EdgeWeight w,
-                           const bool f,
-                           const bool b)
-        : m_source(s), m_target(t), m_edgeID(v), m_weight(w), m_forward(f), m_backward(b)
-    {
-    }
-
-    NodeID target() const { return m_target; }
-    NodeID source() const { return m_source; }
-    EdgeWeight weight() const { return m_weight; }
-    NodeID id() const { return m_edgeID; }
-    bool isBackward() const { return m_backward; }
-    bool isForward() const { return m_forward; }
-
-  private:
-    NodeID m_source;
-    NodeID m_target;
-    NodeID m_edgeID;
-    EdgeWeight m_weight : 30;
-    bool m_forward : 1;
-    bool m_backward : 1;
-};
-
-typedef NodeBasedEdge ImportEdge;
-
-#endif /* IMPORT_EDGE_H */

DataStructures/NodeBasedGraph.h

@@ -1,109 +0,0 @@
-#ifndef __NODE_BASED_GRAPH_H__
-#define __NODE_BASED_GRAPH_H__
-
-#include "DynamicGraph.h"
-#include "ImportEdge.h"
-
-#include <memory>
-
-struct NodeBasedEdgeData
-{
-    NodeBasedEdgeData()
-        : distance(INVALID_EDGE_WEIGHT), edgeBasedNodeID(SPECIAL_NODEID),
-          nameID(std::numeric_limits<unsigned>::max()), type(std::numeric_limits<short>::max()),
-          isAccessRestricted(false), shortcut(false), forward(false), backward(false),
-          roundabout(false), ignore_in_grid(false), contraFlow(false)
-    {
-    }
-
-    int distance;
-    unsigned edgeBasedNodeID;
-    unsigned nameID;
-    short type;
-    bool isAccessRestricted : 1;
-    bool shortcut : 1;
-    bool forward : 1;
-    bool backward : 1;
-    bool roundabout : 1;
-    bool ignore_in_grid : 1;
-    bool contraFlow : 1;
-
-    void SwapDirectionFlags()
-    {
-        bool temp_flag = forward;
-        forward = backward;
-        backward = temp_flag;
-    }
-
-    bool IsEqualTo(const NodeBasedEdgeData &other) const
-    {
-        return (forward == other.forward) && (backward == other.backward) &&
-               (nameID == other.nameID) && (ignore_in_grid == other.ignore_in_grid) &&
-               (contraFlow == other.contraFlow);
-    }
-};
-
-typedef DynamicGraph<NodeBasedEdgeData> NodeBasedDynamicGraph;
-
-// Factory method to create NodeBasedDynamicGraph from ImportEdges
-inline std::shared_ptr<NodeBasedDynamicGraph>
-NodeBasedDynamicGraphFromImportEdges(int number_of_nodes, std::vector<ImportEdge> &input_edge_list)
-{
-    std::sort(input_edge_list.begin(), input_edge_list.end());
-
-    // TODO: remove duplicate edges
-    DeallocatingVector<NodeBasedDynamicGraph::InputEdge> edges_list;
-    NodeBasedDynamicGraph::InputEdge edge;
-    for (const ImportEdge &import_edge : input_edge_list)
-    {
-        // TODO: give ImportEdge a proper c'tor to use emplace_back's below
-        if (!import_edge.isForward())
-        {
-            edge.source = import_edge.target();
-            edge.target = import_edge.source();
-            edge.data.backward = import_edge.isForward();
-            edge.data.forward = import_edge.isBackward();
-        }
-        else
-        {
-            edge.source = import_edge.source();
-            edge.target = import_edge.target();
-            edge.data.forward = import_edge.isForward();
-            edge.data.backward = import_edge.isBackward();
-        }
-
-        if (edge.source == edge.target)
-        {
-            continue;
-        }
-
-        edge.data.distance = (std::max)((int)import_edge.weight(), 1);
-        BOOST_ASSERT(edge.data.distance > 0);
-        edge.data.shortcut = false;
-        edge.data.roundabout = import_edge.isRoundabout();
-        edge.data.ignore_in_grid = import_edge.ignoreInGrid();
-        edge.data.nameID = import_edge.name();
-        edge.data.type = import_edge.type();
-        edge.data.isAccessRestricted = import_edge.isAccessRestricted();
-        edge.data.contraFlow = import_edge.isContraFlow();
-        edges_list.push_back(edge);
-
-        if (!import_edge.IsSplit())
-        {
-            using std::swap; // enable ADL
-            swap(edge.source, edge.target);
-            edge.data.SwapDirectionFlags();
-            edges_list.push_back(edge);
-        }
-    }
-
-    std::sort(edges_list.begin(), edges_list.end());
-    auto graph = std::make_shared<NodeBasedDynamicGraph>(number_of_nodes, edges_list);
-
-    edges_list.clear();
-    BOOST_ASSERT(0 == edges_list.size());
-
-    return graph;
-}
-
-#endif // __NODE_BASED_GRAPH_H__

DataStructures/PhantomNodes.h

@@ -1,174 +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 PHANTOM_NODES_H
-#define PHANTOM_NODES_H
-
-#include <osrm/Coordinate.h>
-#include "../Util/SimpleLogger.h"
-#include "../typedefs.h"
-
-struct PhantomNode
-{
-    PhantomNode() :
-        forward_node_id(SPECIAL_NODEID),
-        reverse_node_id(SPECIAL_NODEID),
-        name_id(std::numeric_limits<unsigned>::max()),
-        forward_weight(INVALID_EDGE_WEIGHT),
-        reverse_weight(INVALID_EDGE_WEIGHT),
-        forward_offset(0),
-        reverse_offset(0),
-        packed_geometry_id(SPECIAL_EDGEID),
-        fwd_segment_position(0)
-    { }
-
-    NodeID forward_node_id;
-    NodeID reverse_node_id;
-    unsigned name_id;
-    int forward_weight;
-    int reverse_weight;
-    int forward_offset;
-    int reverse_offset;
-    unsigned packed_geometry_id;
-    FixedPointCoordinate location;
-    unsigned short fwd_segment_position;
-
-    int GetForwardWeightPlusOffset() const
-    {
-        if (SPECIAL_NODEID == forward_node_id)
-        {
-            return 0;
-        }
-        const int result = (forward_offset + forward_weight);
-        return result;
-    }
-
-    int GetReverseWeightPlusOffset() const
-    {
-        if (SPECIAL_NODEID == reverse_node_id)
-        {
-            return 0;
-        }
-        const int result = (reverse_offset + reverse_weight);
-        return result;
-    }
-
-    void Reset()
-    {
-        forward_node_id = SPECIAL_NODEID;
-        name_id = SPECIAL_NODEID;
-        forward_weight = INVALID_EDGE_WEIGHT;
-        reverse_weight = INVALID_EDGE_WEIGHT;
-        forward_offset = 0;
-        reverse_offset = 0;
-        location.Reset();
-    }
-
-    bool isBidirected() const
-    {
-        return (forward_node_id != SPECIAL_NODEID) &&
-               (reverse_node_id != SPECIAL_NODEID);
-    }
-
-    bool IsCompressed() const
-    {
-        return (forward_offset != 0) || (reverse_offset != 0);
-    }
-
-    bool isValid(const unsigned numberOfNodes) const
-    {
-        return
-            location.isValid() &&
-            (
-                (forward_node_id < numberOfNodes) ||
-                (reverse_node_id < numberOfNodes)
-            ) &&
-            (
-                (forward_weight != INVALID_EDGE_WEIGHT) ||
-                (reverse_weight != INVALID_EDGE_WEIGHT)
-            ) &&
-            (name_id != std::numeric_limits<unsigned>::max()
-        );
-    }
-
-    bool operator==(const PhantomNode & other) const
-    {
-        return location == other.location;
-    }
-};
-
-struct PhantomNodes
-{
-    PhantomNode source_phantom;
-    PhantomNode target_phantom;
-
-    void Reset()
-    {
-        source_phantom.Reset();
-        target_phantom.Reset();
-    }
-
-    bool PhantomsAreOnSameNodeBasedEdge() const
-    {
-        return (source_phantom.forward_node_id == target_phantom.forward_node_id);
-    }
-
-    bool AtLeastOnePhantomNodeIsInvalid() const
-    {
-        return ((source_phantom.forward_node_id == SPECIAL_NODEID) && (source_phantom.reverse_node_id == SPECIAL_NODEID)) ||
-               ((target_phantom.forward_node_id == SPECIAL_NODEID) && (target_phantom.reverse_node_id == SPECIAL_NODEID));
-    }
-
-    bool PhantomNodesHaveEqualLocation() const
-    {
-        return source_phantom == target_phantom;
-    }
-};
-
-inline std::ostream& operator<<(std::ostream &out, const PhantomNodes & pn)
-{
-    out << "source_coord: " << pn.source_phantom.location        << "\n";
-    out << "target_coord: " << pn.target_phantom.location        << std::endl;
-    return out;
-}
-
-inline std::ostream& operator<<(std::ostream &out, const PhantomNode & pn)
-{
-    out <<  "node1: " << pn.forward_node_id      << ", " <<
-            "node2: " << pn.reverse_node_id      << ", " <<
-            "name: "  << pn.name_id              << ", " <<
-            "fwd-w: " << pn.forward_weight       << ", " <<
-            "rev-w: " << pn.reverse_weight       << ", " <<
-            "fwd-o: " << pn.forward_offset       << ", " <<
-            "rev-o: " << pn.reverse_offset       << ", " <<
-            "geom: "  << pn.packed_geometry_id   << ", " <<
-            "pos: "   << pn.fwd_segment_position << ", " <<
-            "loc: "   << pn.location;
-    return out;
-}
-
-#endif // PHANTOM_NODES_H

DataStructures/RestrictionMap.cpp

@@ -1,168 +0,0 @@
-#include "RestrictionMap.h"
-#include "NodeBasedGraph.h"
-
-RestrictionMap::RestrictionMap(const std::shared_ptr<NodeBasedDynamicGraph> &graph,
-                               const std::vector<TurnRestriction> &input_restrictions_list)
-    : m_count(0), m_graph(graph)
-{
-    // decompose restirction consisting of a start, via and end note into a start-edge
-    // and all end-nodes
-    for (auto &restriction : input_restrictions_list)
-    {
-        std::pair<NodeID, NodeID> restriction_source =
-            std::make_pair(restriction.fromNode, restriction.viaNode);
-        unsigned index;
-        auto restriction_iter = m_restriction_map.find(restriction_source);
-        if (restriction_iter == m_restriction_map.end())
-        {
-            index = m_restriction_bucket_list.size();
-            m_restriction_bucket_list.resize(index + 1);
-            m_restriction_map.emplace(restriction_source, index);
-        }
-        else
-        {
-            index = restriction_iter->second;
-            // Map already contains an is_only_*-restriction
-            if (m_restriction_bucket_list.at(index).begin()->second)
-            {
-                continue;
-            }
-            else if (restriction.flags.isOnly)
-            {
-                // We are going to insert an is_only_*-restriction. There can be only one.
-                m_count -= m_restriction_bucket_list.at(index).size();
-                m_restriction_bucket_list.at(index).clear();
-            }
-        }
-        ++m_count;
-        m_restriction_bucket_list.at(index)
-            .push_back(std::make_pair(restriction.toNode, restriction.flags.isOnly));
-    }
-}
-
-/**
- * Replace end v with w in each turn restriction containing u as via node
- *
- * Note: We need access to node based graph.
- */
-void RestrictionMap::FixupArrivingTurnRestriction(const NodeID u, const NodeID v, const NodeID w)
-{
-    BOOST_ASSERT(u != std::numeric_limits<unsigned>::max());
-    BOOST_ASSERT(v != std::numeric_limits<unsigned>::max());
-    BOOST_ASSERT(w != std::numeric_limits<unsigned>::max());
-
-    // find all possible start edges
-    // it is more efficent to get a (small) list of potential start edges
-    // than iterating over all buckets
-    std::vector<NodeID> predecessors;
-    for (EdgeID current_edge_id = m_graph->BeginEdges(u); current_edge_id < m_graph->EndEdges(u);
-         ++current_edge_id)
-    {
-        const EdgeData &edge_data = m_graph->GetEdgeData(current_edge_id);
-        const NodeID target = m_graph->GetTarget(current_edge_id);
-        if (edge_data.backward && (v != target))
-        {
-            predecessors.push_back(target);
-        }
-    }
-
-    for (const NodeID x : predecessors)
-    {
-        const std::pair<NodeID, NodeID> restr_start = std::make_pair(x, u);
-        auto restriction_iterator = m_restriction_map.find(restr_start);
-        if (restriction_iterator == m_restriction_map.end())
-            continue;
-
-        const unsigned index = restriction_iterator->second;
-        auto &bucket = m_restriction_bucket_list.at(index);
-        for (RestrictionTarget &restriction_target : bucket)
-        {
-            if (v == restriction_target.first)
-            {
-                restriction_target.first = w;
-            }
-        }
-    }
-}
-
-/**
- * Replaces the start edge (v, w) with (u, w), only start node changes.
- */
-void RestrictionMap::FixupStartingTurnRestriction(const NodeID u, const NodeID v, const NodeID w)
-{
-    BOOST_ASSERT(u != std::numeric_limits<unsigned>::max());
-    BOOST_ASSERT(v != std::numeric_limits<unsigned>::max());
-    BOOST_ASSERT(w != std::numeric_limits<unsigned>::max());
-
-    const std::pair<NodeID, NodeID> old_start = std::make_pair(v, w);
-
-    auto restriction_iterator = m_restriction_map.find(old_start);
-    if (restriction_iterator != m_restriction_map.end())
-    {
-        const unsigned index = restriction_iterator->second;
-        // remove old restriction start (v,w)
-        m_restriction_map.erase(restriction_iterator);
-
-        // insert new restriction start (u,w) (point to index)
-        const std::pair<NodeID, NodeID> new_start = std::make_pair(u, w);
-        m_restriction_map.insert(std::make_pair(new_start, index));
-    }
-}
-
-/*
- * Check if the edge (u, v) is contained in any turn restriction.
- * If so returns id of first target node.
- */
-NodeID RestrictionMap::CheckForEmanatingIsOnlyTurn(const NodeID u, const NodeID v) const
-{
-    BOOST_ASSERT(u != std::numeric_limits<unsigned>::max());
-    BOOST_ASSERT(v != std::numeric_limits<unsigned>::max());
-
-    const std::pair<NodeID, NodeID> restriction_source = std::make_pair(u, v);
-    auto restriction_iter = m_restriction_map.find(restriction_source);
-
-    if (restriction_iter != m_restriction_map.end())
-    {
-        const unsigned index = restriction_iter->second;
-        auto &bucket = m_restriction_bucket_list.at(index);
-        for (const RestrictionSource &restriction_target : bucket)
-        {
-            if (restriction_target.second)
-            {
-                return restriction_target.first;
-            }
-        }
-    }
-
-    return std::numeric_limits<unsigned>::max();
-}
-
-/**
- * Checks if the turn described by start u, via v and targed w is covert by any turn restriction.
- */
-bool RestrictionMap::CheckIfTurnIsRestricted(const NodeID u, const NodeID v, const NodeID w) const
-{
-    BOOST_ASSERT(u != std::numeric_limits<unsigned>::max());
-    BOOST_ASSERT(v != std::numeric_limits<unsigned>::max());
-    BOOST_ASSERT(w != std::numeric_limits<unsigned>::max());
-
-    const std::pair<NodeID, NodeID> restriction_source = std::make_pair(u, v);
-    auto restriction_iter = m_restriction_map.find(restriction_source);
-
-    if (restriction_iter != m_restriction_map.end())
-    {
-        const unsigned index = restriction_iter->second;
-        auto &bucket = m_restriction_bucket_list.at(index);
-        for (const RestrictionTarget &restriction_target : bucket)
-        {
-            if ((w == restriction_target.first) && // target found
-                (!restriction_target.second)       // and not an only_-restr.
-                )
-            {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}

DataStructures/RestrictionMap.h

@@ -1,71 +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 __RESTRICTION_MAP_H__
-#define __RESTRICTION_MAP_H__
-
-#include <memory>
-
-#include "../typedefs.h"
-#include "DynamicGraph.h"
-#include "Restriction.h"
-#include "NodeBasedGraph.h"
-
-#include <boost/unordered_map.hpp>
-
-/*!
- * Makee it efficent to look up if an edge is the start + via node of a TurnRestriction.
- * Is needed by EdgeBasedGraphFactory.
- */
-class RestrictionMap
-{
-  public:
-    RestrictionMap(const std::shared_ptr<NodeBasedDynamicGraph> &graph,
-                   const std::vector<TurnRestriction> &input_restrictions_list);
-
-    void FixupArrivingTurnRestriction(const NodeID u, const NodeID v, const NodeID w);
-    void FixupStartingTurnRestriction(const NodeID u, const NodeID v, const NodeID w);
-    NodeID CheckForEmanatingIsOnlyTurn(const NodeID u, const NodeID v) const;
-    bool CheckIfTurnIsRestricted(const NodeID u, const NodeID v, const NodeID w) const;
-
-    unsigned size() { return m_count; }
-
-  private:
-    typedef std::pair<NodeID, NodeID> RestrictionSource;
-    typedef std::pair<NodeID, bool> RestrictionTarget;
-    typedef std::vector<RestrictionTarget> EmanatingRestrictionsVector;
-    typedef NodeBasedDynamicGraph::EdgeData EdgeData;
-
-    unsigned m_count;
-    std::shared_ptr<NodeBasedDynamicGraph> m_graph;
-    //! index -> list of (target, isOnly)
-    std::vector<EmanatingRestrictionsVector> m_restriction_bucket_list;
-    //! maps (start, via) -> bucket index
-    boost::unordered_map<RestrictionSource, unsigned> m_restriction_map;
-};
-
-#endif

DataStructures/StaticRTree.h

@@ -1,780 +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 STATICRTREE_H
-#define STATICRTREE_H
-
-#include "DeallocatingVector.h"
-#include "HilbertValue.h"
-#include "PhantomNodes.h"
-#include "QueryNode.h"
-#include "SharedMemoryFactory.h"
-#include "SharedMemoryVectorWrapper.h"
-
-#include "../Util/MercatorUtil.h"
-#include "../Util/OSRMException.h"
-#include "../Util/SimpleLogger.h"
-#include "../typedefs.h"
-
-#include <osrm/Coordinate.h>
-
-#include <boost/assert.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
-
-#include <boost/thread.hpp>
-
-#include <algorithm>
-#include <array>
-#include <chrono>
-#include <limits>
-#include <memory>
-#include <queue>
-#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 DataT,
-          class CoordinateListT = std::vector<FixedPointCoordinate>,
-          bool UseSharedMemory = false>
-class StaticRTree
-{
-  public:
-    struct RectangleInt2D
-    {
-        RectangleInt2D() : min_lon(INT_MAX), max_lon(INT_MIN), min_lat(INT_MAX), max_lat(INT_MIN) {}
-
-        int32_t min_lon, max_lon;
-        int32_t min_lat, max_lat;
-
-        inline void InitializeMBRectangle(const std::array<DataT, RTREE_LEAF_NODE_SIZE> &objects,
-                                          const uint32_t element_count,
-                                          const std::vector<NodeInfo> &coordinate_list)
-        {
-            for (uint32_t i = 0; i < element_count; ++i)
-            {
-                min_lon = std::min(min_lon,
-                                   std::min(coordinate_list.at(objects[i].u).lon,
-                                            coordinate_list.at(objects[i].v).lon));
-                max_lon = std::max(max_lon,
-                                   std::max(coordinate_list.at(objects[i].u).lon,
-                                            coordinate_list.at(objects[i].v).lon));
-
-                min_lat = std::min(min_lat,
-                                   std::min(coordinate_list.at(objects[i].u).lat,
-                                            coordinate_list.at(objects[i].v).lat));
-                max_lat = std::max(max_lat,
-                                   std::max(coordinate_list.at(objects[i].u).lat,
-                                            coordinate_list.at(objects[i].v).lat));
-            }
-        }
-
-        inline void AugmentMBRectangle(const RectangleInt2D &other)
-        {
-            min_lon = std::min(min_lon, other.min_lon);
-            max_lon = std::max(max_lon, other.max_lon);
-            min_lat = std::min(min_lat, other.min_lat);
-            max_lat = std::max(max_lat, other.max_lat);
-        }
-
-        inline FixedPointCoordinate Centroid() const
-        {
-            FixedPointCoordinate centroid;
-            // The coordinates of the midpoints are given by:
-            // x = (x1 + x2) /2 and y = (y1 + y2) /2.
-            centroid.lon = (min_lon + max_lon) / 2;
-            centroid.lat = (min_lat + max_lat) / 2;
-            return centroid;
-        }
-
-        inline bool Intersects(const RectangleInt2D &other) const
-        {
-            FixedPointCoordinate upper_left(other.max_lat, other.min_lon);
-            FixedPointCoordinate upper_right(other.max_lat, other.max_lon);
-            FixedPointCoordinate lower_right(other.min_lat, other.max_lon);
-            FixedPointCoordinate lower_left(other.min_lat, other.min_lon);
-
-            return (Contains(upper_left) || Contains(upper_right) || Contains(lower_right) ||
-                    Contains(lower_left));
-        }
-
-        inline double GetMinDist(const FixedPointCoordinate &location) const
-        {
-            bool is_contained = Contains(location);
-            if (is_contained)
-            {
-                return 0.;
-            }
-
-            double min_dist = std::numeric_limits<double>::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));
-            return min_dist;
-        }
-
-        inline double GetMinMaxDist(const FixedPointCoordinate &location) const
-        {
-            double min_max_dist = std::numeric_limits<double>::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);
-
-            min_max_dist = std::min(
-                min_max_dist,
-                std::max(
-                    FixedPointCoordinate::ApproximateEuclideanDistance(location, upper_left),
-                    FixedPointCoordinate::ApproximateEuclideanDistance(location, upper_right)));
-
-            min_max_dist = std::min(
-                min_max_dist,
-                std::max(
-                    FixedPointCoordinate::ApproximateEuclideanDistance(location, upper_right),
-                    FixedPointCoordinate::ApproximateEuclideanDistance(location, lower_right)));
-
-            min_max_dist = std::min(
-                min_max_dist,
-                std::max(FixedPointCoordinate::ApproximateEuclideanDistance(location, lower_right),
-                         FixedPointCoordinate::ApproximateEuclideanDistance(location, lower_left)));
-
-            min_max_dist = std::min(
-                min_max_dist,
-                std::max(FixedPointCoordinate::ApproximateEuclideanDistance(location, lower_left),
-                         FixedPointCoordinate::ApproximateEuclideanDistance(location, upper_left)));
-            return min_max_dist;
-        }
-
-        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);
-            return lats_contained && lons_contained;
-        }
-
-        inline friend std::ostream &operator<<(std::ostream &out, const RectangleInt2D &rect)
-        {
-            out << rect.min_lat / COORDINATE_PRECISION << "," << rect.min_lon / COORDINATE_PRECISION
-                << " " << rect.max_lat / COORDINATE_PRECISION << ","
-                << rect.max_lon / COORDINATE_PRECISION;
-            return out;
-        }
-    };
-
-    typedef RectangleInt2D RectangleT;
-
-    struct TreeNode
-    {
-        TreeNode() : child_count(0), child_is_on_disk(false) {}
-        RectangleT minimum_bounding_rectangle;
-        uint32_t child_count : 31;
-        bool child_is_on_disk : 1;
-        uint32_t children[RTREE_BRANCHING_FACTOR];
-    };
-
-  private:
-    struct WrappedInputElement
-    {
-        explicit WrappedInputElement(const uint32_t _array_index, const uint64_t _hilbert_value)
-            : m_array_index(_array_index), m_hilbert_value(_hilbert_value)
-        {
-        }
-
-        WrappedInputElement() : m_array_index(UINT_MAX), m_hilbert_value(0) {}
-
-        uint32_t m_array_index;
-        uint64_t m_hilbert_value;
-
-        inline bool operator<(const WrappedInputElement &other) const
-        {
-            return m_hilbert_value < other.m_hilbert_value;
-        }
-    };
-
-    struct LeafNode
-    {
-        LeafNode() : object_count(0) {}
-        uint32_t object_count;
-        std::array<DataT, RTREE_LEAF_NODE_SIZE> objects;
-    };
-
-    struct QueryCandidate
-    {
-        explicit QueryCandidate(const uint32_t n_id, const double dist)
-            : node_id(n_id), min_dist(dist)
-        {
-        }
-        QueryCandidate() : node_id(UINT_MAX), min_dist(std::numeric_limits<double>::max()) {}
-        uint32_t node_id;
-        double min_dist;
-        inline bool operator<(const QueryCandidate &other) const
-        {
-            return min_dist < other.min_dist;
-        }
-    };
-
-    typename ShM<TreeNode, UseSharedMemory>::vector m_search_tree;
-    uint64_t m_element_count;
-    const std::string m_leaf_node_filename;
-    std::shared_ptr<CoordinateListT> m_coordinate_list;
-
-  public:
-    StaticRTree() = delete;
-    StaticRTree(const StaticRTree &) = delete;
-
-    // Construct a packed Hilbert-R-Tree with Kamel-Faloutsos algorithm [1]
-    explicit StaticRTree(std::vector<DataT> &input_data_vector,
-                         const std::string tree_node_filename,
-                         const std::string leaf_node_filename,
-                         const std::vector<NodeInfo> &coordinate_list)
-        : m_element_count(input_data_vector.size()), m_leaf_node_filename(leaf_node_filename)
-    {
-        SimpleLogger().Write() << "constructing r-tree of " << m_element_count
-                               << " edge elements build on-top of " << coordinate_list.size()
-                               << " coordinates";
-
-        std::chrono::time_point<std::chrono::steady_clock> time0 = std::chrono::steady_clock::now();
-        std::vector<WrappedInputElement> input_wrapper_vector(m_element_count);
-
-        HilbertCode get_hilbert_number;
-
-// generate auxiliary vector of hilbert-values
-#pragma omp parallel for schedule(guided)
-        for (uint64_t element_counter = 0; element_counter < m_element_count; ++element_counter)
-        {
-            input_wrapper_vector[element_counter].m_array_index = element_counter;
-            // Get Hilbert-Value for centroid in mercartor projection
-            DataT const &current_element = input_data_vector[element_counter];
-            FixedPointCoordinate current_centroid =
-                DataT::Centroid(FixedPointCoordinate(coordinate_list.at(current_element.u).lat,
-                                                     coordinate_list.at(current_element.u).lon),
-                                FixedPointCoordinate(coordinate_list.at(current_element.v).lat,
-                                                     coordinate_list.at(current_element.v).lon));
-            current_centroid.lat =
-                COORDINATE_PRECISION * lat2y(current_centroid.lat / COORDINATE_PRECISION);
-
-            uint64_t current_hilbert_value = get_hilbert_number(current_centroid);
-            input_wrapper_vector[element_counter].m_hilbert_value = current_hilbert_value;
-        }
-
-        // open leaf file
-        boost::filesystem::ofstream leaf_node_file(leaf_node_filename, std::ios::binary);
-        leaf_node_file.write((char *)&m_element_count, sizeof(uint64_t));
-
-        // sort the hilbert-value representatives
-        std::sort(input_wrapper_vector.begin(), input_wrapper_vector.end());
-        std::vector<TreeNode> tree_nodes_in_level;
-
-        // pack M elements into leaf node and write to leaf file
-        uint64_t processed_objects_count = 0;
-        while (processed_objects_count < m_element_count)
-        {
-
-            LeafNode current_leaf;
-            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;
-                 ++current_element_index)
-            {
-                if (m_element_count > (processed_objects_count + current_element_index))
-                {
-                    uint32_t index_of_next_object =
-                        input_wrapper_vector[processed_objects_count + current_element_index]
-                            .m_array_index;
-                    current_leaf.objects[current_element_index] =
-                        input_data_vector[index_of_next_object];
-                    ++current_leaf.object_count;
-                }
-            }
-
-            // generate tree node that resemble the objects in leaf and store it for next level
-            current_node.minimum_bounding_rectangle.InitializeMBRectangle(
-                current_leaf.objects, current_leaf.object_count, coordinate_list);
-            current_node.child_is_on_disk = true;
-            current_node.children[0] = tree_nodes_in_level.size();
-            tree_nodes_in_level.emplace_back(current_node);
-
-            // write leaf_node to leaf node file
-            leaf_node_file.write((char *)&current_leaf, sizeof(current_leaf));
-            processed_objects_count += current_leaf.object_count;
-        }
-
-        // close leaf file
-        leaf_node_file.close();
-
-        uint32_t processing_level = 0;
-        while (1 < tree_nodes_in_level.size())
-        {
-            std::vector<TreeNode> tree_nodes_in_next_level;
-            uint32_t processed_tree_nodes_in_level = 0;
-            while (processed_tree_nodes_in_level < tree_nodes_in_level.size())
-            {
-                TreeNode parent_node;
-                // pack RTREE_BRANCHING_FACTOR elements into tree_nodes each
-                for (uint32_t current_child_node_index = 0;
-                     RTREE_BRANCHING_FACTOR > current_child_node_index;
-                     ++current_child_node_index)
-                {
-                    if (processed_tree_nodes_in_level < tree_nodes_in_level.size())
-                    {
-                        TreeNode &current_child_node =
-                            tree_nodes_in_level[processed_tree_nodes_in_level];
-                        // add tree node to parent entry
-                        parent_node.children[current_child_node_index] = m_search_tree.size();
-                        m_search_tree.emplace_back(current_child_node);
-                        // augment MBR of parent
-                        parent_node.minimum_bounding_rectangle.AugmentMBRectangle(
-                            current_child_node.minimum_bounding_rectangle);
-                        // increase counters
-                        ++parent_node.child_count;
-                        ++processed_tree_nodes_in_level;
-                    }
-                }
-                tree_nodes_in_next_level.emplace_back(parent_node);
-            }
-            tree_nodes_in_level.swap(tree_nodes_in_next_level);
-            ++processing_level;
-        }
-        BOOST_ASSERT_MSG(1 == tree_nodes_in_level.size(), "tree broken, more than one root node");
-        // last remaining entry is the root node, store it
-        m_search_tree.emplace_back(tree_nodes_in_level[0]);
-
-        // reverse and renumber tree to have root at index 0
-        std::reverse(m_search_tree.begin(), m_search_tree.end());
-
-#pragma omp parallel for schedule(guided)
-        for (uint32_t i = 0; i < m_search_tree.size(); ++i)
-        {
-            TreeNode &current_tree_node = m_search_tree[i];
-            for (uint32_t j = 0; j < current_tree_node.child_count; ++j)
-            {
-                const uint32_t old_id = current_tree_node.children[j];
-                const uint32_t new_id = m_search_tree.size() - old_id - 1;
-                current_tree_node.children[j] = new_id;
-            }
-        }
-
-        // open tree file
-        boost::filesystem::ofstream tree_node_file(tree_node_filename, std::ios::binary);
-
-        uint32_t size_of_tree = m_search_tree.size();
-        BOOST_ASSERT_MSG(0 < size_of_tree, "tree empty");
-        tree_node_file.write((char *)&size_of_tree, sizeof(uint32_t));
-        tree_node_file.write((char *)&m_search_tree[0], sizeof(TreeNode) * size_of_tree);
-        // close tree node file.
-        tree_node_file.close();
-        std::chrono::time_point<std::chrono::steady_clock> time1 = std::chrono::steady_clock::now();
-        std::chrono::duration<double> elapsed_seconds = time1 - time0;
-        SimpleLogger().Write() << "finished r-tree construction in " << (elapsed_seconds.count())
-                               << " seconds";
-    }
-
-    // Read-only operation for queries
-    explicit StaticRTree(const boost::filesystem::path &node_file,
-                         const boost::filesystem::path &leaf_file,
-                         const std::shared_ptr<CoordinateListT> coordinate_list)
-        : m_leaf_node_filename(leaf_file.string())
-    {
-        // open tree node file and load into RAM.
-        m_coordinate_list = coordinate_list;
-
-        if (!boost::filesystem::exists(node_file))
-        {
-            throw OSRMException("ram index file does not exist");
-        }
-        if (0 == boost::filesystem::file_size(node_file))
-        {
-            throw OSRMException("ram index file is empty");
-        }
-        boost::filesystem::ifstream tree_node_file(node_file, std::ios::binary);
-
-        uint32_t tree_size = 0;
-        tree_node_file.read((char *)&tree_size, sizeof(uint32_t));
-
-        m_search_tree.resize(tree_size);
-        tree_node_file.read((char *)&m_search_tree[0], sizeof(TreeNode) * tree_size);
-        tree_node_file.close();
-        // open leaf node file and store thread specific pointer
-        if (!boost::filesystem::exists(leaf_file))
-        {
-            throw OSRMException("mem index file does not exist");
-        }
-        if (0 == boost::filesystem::file_size(leaf_file))
-        {
-            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();
-
-        // 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 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()),
-          m_coordinate_list(coordinate_list)
-    {
-        // open leaf node file and store thread specific pointer
-        if (!boost::filesystem::exists(leaf_file))
-        {
-            throw OSRMException("mem index file does not exist");
-        }
-        if (0 == boost::filesystem::file_size(leaf_file))
-        {
-            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();
-        }
-
-        // SimpleLogger().Write() << tree_size << " nodes in search tree";
-        // SimpleLogger().Write() << m_element_count << " elements in leafs";
-    }
-    // Read-only operation for queries
-
-    bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate,
-                                            FixedPointCoordinate &result_coordinate,
-                                            const unsigned zoom_level)
-    {
-        bool ignore_tiny_components = (zoom_level <= 14);
-        DataT nearest_edge;
-        double min_dist = std::numeric_limits<double>::max();
-        double min_max_dist = std::numeric_limits<double>::max();
-        bool found_a_nearest_edge = false;
-
-        // initialize queue with root element
-        std::priority_queue<QueryCandidate> traversal_queue;
-        double current_min_dist =
-            m_search_tree[0].minimum_bounding_rectangle.GetMinDist(input_coordinate);
-        traversal_queue.emplace(0, current_min_dist);
-
-        while (!traversal_queue.empty())
-        {
-            const QueryCandidate current_query_node = traversal_queue.top();
-            traversal_queue.pop();
-
-            const bool prune_downward = (current_query_node.min_dist >= min_max_dist);
-            const bool prune_upward = (current_query_node.min_dist >= min_dist);
-            if (!prune_downward && !prune_upward)
-            { // downward pruning
-                TreeNode &current_tree_node = m_search_tree[current_query_node.node_id];
-                if (current_tree_node.child_is_on_disk)
-                {
-                    LeafNode current_leaf_node;
-                    LoadLeafFromDisk(current_tree_node.children[0], current_leaf_node);
-                    for (uint32_t i = 0; i < current_leaf_node.object_count; ++i)
-                    {
-                        DataT const &current_edge = current_leaf_node.objects[i];
-                        if (ignore_tiny_components && current_edge.is_in_tiny_cc)
-                        {
-                            continue;
-                        }
-
-                        double current_minimum_distance =
-                            FixedPointCoordinate::ApproximateEuclideanDistance(
-                                input_coordinate.lat,
-                                input_coordinate.lon,
-                                m_coordinate_list->at(current_edge.u).lat,
-                                m_coordinate_list->at(current_edge.u).lon);
-                        if (current_minimum_distance < min_dist)
-                        {
-                            // found a new minimum
-                            min_dist = current_minimum_distance;
-                            result_coordinate.lat = m_coordinate_list->at(current_edge.u).lat;
-                            result_coordinate.lon = m_coordinate_list->at(current_edge.u).lon;
-                            found_a_nearest_edge = true;
-                        }
-
-                        current_minimum_distance =
-                            FixedPointCoordinate::ApproximateEuclideanDistance(
-                                input_coordinate.lat,
-                                input_coordinate.lon,
-                                m_coordinate_list->at(current_edge.v).lat,
-                                m_coordinate_list->at(current_edge.v).lon);
-
-                        if (current_minimum_distance < min_dist)
-                        {
-                            // found a new minimum
-                            min_dist = current_minimum_distance;
-                            result_coordinate.lat = m_coordinate_list->at(current_edge.v).lat;
-                            result_coordinate.lon = m_coordinate_list->at(current_edge.v).lon;
-                            found_a_nearest_edge = true;
-                        }
-                    }
-                }
-                else
-                {
-                    // traverse children, prune if global mindist is smaller than local one
-                    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 double current_min_dist =
-                            child_rectangle.GetMinDist(input_coordinate);
-                        const double current_min_max_dist =
-                            child_rectangle.GetMinMaxDist(input_coordinate);
-                        if (current_min_max_dist < min_max_dist)
-                        {
-                            min_max_dist = current_min_max_dist;
-                        }
-                        if (current_min_dist > min_max_dist)
-                        {
-                            continue;
-                        }
-                        if (current_min_dist > min_dist)
-                        { // upward pruning
-                            continue;
-                        }
-                        traversal_queue.emplace(child_id, current_min_dist);
-                    }
-                }
-            }
-        }
-
-        return found_a_nearest_edge;
-    }
-
-    bool FindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
-                                      PhantomNode &result_phantom_node,
-                                      const unsigned zoom_level)
-    {
-        // SimpleLogger().Write() << "searching for coordinate " << input_coordinate;
-
-        const bool ignore_tiny_components = (zoom_level <= 14);
-        DataT nearest_edge;
-
-        double min_dist = std::numeric_limits<double>::max();
-        double min_max_dist = std::numeric_limits<double>::max();
-        bool found_a_nearest_edge = false;
-
-        FixedPointCoordinate nearest, current_start_coordinate, current_end_coordinate;
-
-        // initialize queue with root element
-        std::priority_queue<QueryCandidate> traversal_queue;
-        double current_min_dist =
-            m_search_tree[0].minimum_bounding_rectangle.GetMinDist(input_coordinate);
-        traversal_queue.emplace(0, current_min_dist);
-
-        BOOST_ASSERT_MSG(std::numeric_limits<double>::epsilon() >
-                             (0. - traversal_queue.top().min_dist),
-                         "Root element in NN Search has min dist != 0.");
-
-        LeafNode current_leaf_node;
-        while (!traversal_queue.empty())
-        {
-            const QueryCandidate current_query_node = traversal_queue.top();
-            traversal_queue.pop();
-
-            const bool prune_downward = (current_query_node.min_dist >= min_max_dist);
-            const bool prune_upward = (current_query_node.min_dist >= min_dist);
-            if (!prune_downward && !prune_upward)
-            { // downward pruning
-                const TreeNode &current_tree_node = m_search_tree[current_query_node.node_id];
-                if (current_tree_node.child_is_on_disk)
-                {
-                    LoadLeafFromDisk(current_tree_node.children[0], current_leaf_node);
-                    for (uint32_t i = 0; i < current_leaf_node.object_count; ++i)
-                    {
-                        DataT &current_edge = current_leaf_node.objects[i];
-                        if (ignore_tiny_components && current_edge.is_in_tiny_cc)
-                        {
-                            continue;
-                        }
-
-                        double current_ratio = 0.;
-                        const double current_perpendicular_distance =
-                            FixedPointCoordinate::ComputePerpendicularDistance(
-                                m_coordinate_list->at(current_edge.u),
-                                m_coordinate_list->at(current_edge.v),
-                                input_coordinate,
-                                nearest,
-                                current_ratio);
-
-                        BOOST_ASSERT(0. <= current_perpendicular_distance);
-
-                        if ((current_perpendicular_distance < min_dist) &&
-                            !DoubleEpsilonCompare(current_perpendicular_distance, min_dist))
-                        { // found a new minimum
-                            min_dist = current_perpendicular_distance;
-                            // TODO: use assignment c'tor in PhantomNode
-                            result_phantom_node.forward_node_id =
-                                current_edge.forward_edge_based_node_id;
-                            result_phantom_node.reverse_node_id =
-                                current_edge.reverse_edge_based_node_id;
-                            result_phantom_node.name_id = current_edge.name_id;
-                            result_phantom_node.forward_weight = current_edge.forward_weight;
-                            result_phantom_node.reverse_weight = current_edge.reverse_weight;
-                            result_phantom_node.forward_offset = current_edge.forward_offset;
-                            result_phantom_node.reverse_offset = current_edge.reverse_offset;
-                            result_phantom_node.packed_geometry_id =
-                                current_edge.packed_geometry_id;
-                            result_phantom_node.fwd_segment_position =
-                                current_edge.fwd_segment_position;
-
-                            result_phantom_node.location = nearest;
-                            current_start_coordinate.lat =
-                                m_coordinate_list->at(current_edge.u).lat;
-                            current_start_coordinate.lon =
-                                m_coordinate_list->at(current_edge.u).lon;
-                            current_end_coordinate.lat = m_coordinate_list->at(current_edge.v).lat;
-                            current_end_coordinate.lon = m_coordinate_list->at(current_edge.v).lon;
-                            nearest_edge = current_edge;
-                            found_a_nearest_edge = true;
-                        }
-                    }
-                }
-                else
-                {
-                    // traverse children, prune if global mindist is smaller than local one
-                    for (uint32_t i = 0; i < current_tree_node.child_count; ++i)
-                    {
-                        const int32_t child_id = current_tree_node.children[i];
-                        TreeNode &child_tree_node = m_search_tree[child_id];
-                        RectangleT &child_rectangle = child_tree_node.minimum_bounding_rectangle;
-                        const double current_min_dist =
-                            child_rectangle.GetMinDist(input_coordinate);
-                        const double current_min_max_dist =
-                            child_rectangle.GetMinMaxDist(input_coordinate);
-                        if (current_min_max_dist < min_max_dist)
-                        {
-                            min_max_dist = current_min_max_dist;
-                        }
-                        if (current_min_dist > min_max_dist)
-                        {
-                            continue;
-                        }
-                        if (current_min_dist > min_dist)
-                        { // upward pruning
-                            continue;
-                        }
-                        traversal_queue.emplace(child_id, current_min_dist);
-                    }
-                }
-            }
-        }
-
-        // 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;
-        }
-
-        double ratio = 0.;
-
-        if (found_a_nearest_edge)
-        {
-            const double distance_1 = FixedPointCoordinate::ApproximateEuclideanDistance(
-                current_start_coordinate, result_phantom_node.location);
-
-            const double distance_2 = FixedPointCoordinate::ApproximateEuclideanDistance(
-                current_start_coordinate, current_end_coordinate);
-
-            ratio = distance_1 / distance_2;
-            ratio = std::min(1., ratio);
-
-            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 found_a_nearest_edge;
-    }
-
-  private:
-    inline void LoadLeafFromDisk(const uint32_t leaf_id, LeafNode &result_node)
-    {
-        if (!thread_local_rtree_stream.get() || !thread_local_rtree_stream->is_open())
-        {
-            thread_local_rtree_stream.reset(new boost::filesystem::ifstream(
-                m_leaf_node_filename, std::ios::in | std::ios::binary));
-        }
-        if (!thread_local_rtree_stream->good())
-        {
-            thread_local_rtree_stream->clear(std::ios::goodbit);
-            SimpleLogger().Write(logDEBUG) << "Resetting stale filestream";
-        }
-        uint64_t seek_pos = sizeof(uint64_t) + leaf_id * sizeof(LeafNode);
-        thread_local_rtree_stream->seekg(seek_pos);
-        thread_local_rtree_stream->read((char *)&result_node, sizeof(LeafNode));
-    }
-
-    inline bool EdgesAreEquivalent(const FixedPointCoordinate &a,
-                                   const FixedPointCoordinate &b,
-                                   const FixedPointCoordinate &c,
-                                   const FixedPointCoordinate &d) const
-    {
-        return (a == b && c == d) || (a == c && b == d) || (a == d && b == c);
-    }
-
-    inline bool DoubleEpsilonCompare(const double d1, const double d2) const
-    {
-        return (std::abs(d1 - d2) < std::numeric_limits<double>::epsilon());
-    }
-};
-
-//[1] "On Packing R-Trees"; I. Kamel, C. Faloutsos; 1993; DOI: 10.1145/170088.170403
-//[2] "Nearest Neighbor Queries", N. Roussopulos et al; 1995; DOI: 10.1145/223784.223794
-
-#endif // STATICRTREE_H

Descriptors/DescriptionFactory.cpp

@@ -1,131 +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 "DescriptionFactory.h"
-
-DescriptionFactory::DescriptionFactory() : entireLength(0) {}
-
-DescriptionFactory::~DescriptionFactory() {}
-
-inline double DescriptionFactory::DegreeToRadian(const double degree) const
-{
-    return degree * (M_PI / 180.);
-}
-
-inline double DescriptionFactory::RadianToDegree(const double radian) const
-{
-    return radian * (180. / M_PI);
-}
-
-double DescriptionFactory::GetBearing(const FixedPointCoordinate &A, const FixedPointCoordinate &B)
-    const
-{
-    double delta_long = DegreeToRadian(B.lon / COORDINATE_PRECISION - A.lon / COORDINATE_PRECISION);
-
-    const double lat1 = DegreeToRadian(A.lat / COORDINATE_PRECISION);
-    const double lat2 = DegreeToRadian(B.lat / COORDINATE_PRECISION);
-
-    const double y = sin(delta_long) * cos(lat2);
-    const double x = cos(lat1) * sin(lat2) - sin(lat1) * cos(lat2) * cos(delta_long);
-    double result = RadianToDegree(atan2(y, x));
-    while (result < 0.)
-    {
-        result += 360.;
-    }
-
-    while (result >= 360.)
-    {
-        result -= 360.;
-    }
-    return result;
-}
-
-void DescriptionFactory::SetStartSegment(const PhantomNode &source)
-{
-    start_phantom = source;
-    AppendSegment(source.location, PathData(0, source.name_id, TurnInstruction::HeadOn, source.forward_weight));
-}
-
-void DescriptionFactory::SetEndSegment(const PhantomNode &target)
-{
-    target_phantom = target;
-    path_description.emplace_back(
-        target.location, target.name_id, 0, target.reverse_weight, TurnInstruction::NoTurn, true);
-}
-
-void DescriptionFactory::AppendSegment(const FixedPointCoordinate &coordinate,
-                                       const PathData &path_point)
-{
-    if ((1 == path_description.size()) && (path_description.back().location == coordinate))
-    {
-        path_description.back().name_id = path_point.name_id;
-    }
-    else
-    {
-        path_description.emplace_back(coordinate,
-                                      path_point.name_id,
-                                      path_point.segment_duration,
-                                      0,
-                                      path_point.turn_instruction);
-    }
-}
-
-void DescriptionFactory::AppendEncodedPolylineString(const bool return_encoded,
-                                                     std::vector<std::string> &output)
-{
-    std::string temp;
-    if (return_encoded)
-    {
-        polyline_compressor.printEncodedString(path_description, temp);
-    }
-    else
-    {
-        polyline_compressor.printUnencodedString(path_description, temp);
-    }
-    output.emplace_back(temp);
-}
-
-void DescriptionFactory::AppendEncodedPolylineString(std::vector<std::string> &output) const
-{
-    std::string temp;
-    polyline_compressor.printEncodedString(path_description, temp);
-    output.emplace_back(temp);
-}
-
-void DescriptionFactory::AppendUnencodedPolylineString(std::vector<std::string> &output) const
-{
-    std::string temp;
-    polyline_compressor.printUnencodedString(path_description, temp);
-    output.emplace_back(temp);
-}
-
-void DescriptionFactory::BuildRouteSummary(const double distance, const unsigned time)
-{
-    summary.startName = start_phantom.name_id;
-    summary.destName = target_phantom.name_id;
-    summary.BuildDurationAndLengthStrings(distance, time);
-}

Descriptors/GPXDescriptor.h

@@ -1,97 +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 GPX_DESCRIPTOR_H
-#define GPX_DESCRIPTOR_H
-
-#include "BaseDescriptor.h"
-
-template <class DataFacadeT> class GPXDescriptor : public BaseDescriptor<DataFacadeT>
-{
-  private:
-    DescriptorConfig config;
-    FixedPointCoordinate current;
-
-    std::string tmp;
-
-  public:
-    void SetConfig(const DescriptorConfig &c) { config = c; }
-
-    // TODO: reorder parameters
-    void Run(const RawRouteData &raw_route,
-             const PhantomNodes &phantom_node_list,
-             DataFacadeT *facade,
-             http::Reply &reply)
-    {
-        reply.content.emplace_back("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-        reply.content.emplace_back("<gpx creator=\"OSRM Routing Engine\" version=\"1.1\" "
-                                   "xmlns=\"http://www.topografix.com/GPX/1/1\" "
-                                   "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
-                                   "xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 gpx.xsd"
-                                   "\">");
-        reply.content.emplace_back("<metadata><copyright author=\"Project OSRM\"><license>Data (c)"
-                                   " OpenStreetMap contributors (ODbL)</license></copyright>"
-                                   "</metadata>");
-        reply.content.emplace_back("<rte>");
-        bool found_route = (raw_route.shortest_path_length != INVALID_EDGE_WEIGHT) &&
-                           (!raw_route.unpacked_path_segments.front().empty());
-        if (found_route)
-        {
-            FixedPointCoordinate::convertInternalLatLonToString(
-                phantom_node_list.source_phantom.location.lat, tmp);
-            reply.content.emplace_back("<rtept lat=\"" + tmp + "\" ");
-            FixedPointCoordinate::convertInternalLatLonToString(
-                phantom_node_list.source_phantom.location.lon, tmp);
-            reply.content.emplace_back("lon=\"" + tmp + "\"></rtept>");
-
-            for (const std::vector<PathData> &path_data_vector : raw_route.unpacked_path_segments)
-            {
-                for (const PathData &path_data : path_data_vector)
-                {
-                    FixedPointCoordinate current_coordinate =
-                        facade->GetCoordinateOfNode(path_data.node);
-
-                    FixedPointCoordinate::convertInternalLatLonToString(current_coordinate.lat,
-                                                                        tmp);
-                    reply.content.emplace_back("<rtept lat=\"" + tmp + "\" ");
-                    FixedPointCoordinate::convertInternalLatLonToString(current_coordinate.lon,
-                                                                        tmp);
-                    reply.content.emplace_back("lon=\"" + tmp + "\"></rtept>");
-                }
-            }
-            // Add the via point or the end coordinate
-            FixedPointCoordinate::convertInternalLatLonToString(
-                phantom_node_list.target_phantom.location.lat, tmp);
-            reply.content.emplace_back("<rtept lat=\"" + tmp + "\" ");
-            FixedPointCoordinate::convertInternalLatLonToString(
-                phantom_node_list.target_phantom.location.lon, tmp);
-            reply.content.emplace_back("lon=\"" + tmp + "\"></rtept>");
-        }
-        reply.content.emplace_back("</rte></gpx>");
-    }
-};
-#endif // GPX_DESCRIPTOR_H

Descriptors/JSONDescriptor.h

@@ -1,524 +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 JSON_DESCRIPTOR_H_
-#define JSON_DESCRIPTOR_H_
-
-#include "BaseDescriptor.h"
-#include "DescriptionFactory.h"
-#include "../Algorithms/ObjectToBase64.h"
-#include "../DataStructures/SegmentInformation.h"
-#include "../DataStructures/TurnInstructions.h"
-#include "../Util/Azimuth.h"
-#include "../Util/StringUtil.h"
-
-#include <algorithm>
-
-template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFacadeT>
-{
-  private:
-    // TODO: initalize in c'tor
-    DataFacadeT *facade;
-    DescriptorConfig config;
-    DescriptionFactory description_factory;
-    DescriptionFactory alternate_descriptionFactory;
-    FixedPointCoordinate current;
-    unsigned entered_restricted_area_count;
-    struct RoundAbout
-    {
-        RoundAbout() : start_index(INT_MAX), name_id(INT_MAX), leave_at_exit(INT_MAX) {}
-        int start_index;
-        int name_id;
-        int leave_at_exit;
-    } round_about;
-
-    struct Segment
-    {
-        Segment() : name_id(-1), length(-1), position(-1) {}
-        Segment(int n, int l, int p) : name_id(n), length(l), position(p) {}
-        int name_id;
-        int length;
-        int position;
-    };
-    std::vector<Segment> shortest_path_segments, alternative_path_segments;
-    std::vector<unsigned> shortest_leg_end_indices, alternative_leg_end_indices;
-
-    struct RouteNames
-    {
-        std::string shortest_path_name_1;
-        std::string shortest_path_name_2;
-        std::string alternative_path_name_1;
-        std::string alternative_path_name_2;
-    };
-
-  public:
-    JSONDescriptor() : facade(nullptr), entered_restricted_area_count(0)
-    {
-        shortest_leg_end_indices.emplace_back(0);
-        alternative_leg_end_indices.emplace_back(0);
-    }
-
-    void SetConfig(const DescriptorConfig &c) { config = c; }
-
-    unsigned DescribeLeg(const std::vector<PathData> route_leg, const PhantomNodes &leg_phantoms)
-    {
-        unsigned added_element_count = 0;
-        // Get all the coordinates for the computed route
-        FixedPointCoordinate current_coordinate;
-        for (const PathData &path_data : route_leg)
-        {
-            current_coordinate = facade->GetCoordinateOfNode(path_data.node);
-            description_factory.AppendSegment(current_coordinate, path_data);
-            ++added_element_count;
-        }
-        ++added_element_count;
-        BOOST_ASSERT((route_leg.size() + 1) == added_element_count);
-        return added_element_count;
-    }
-
-    void Run(const RawRouteData &raw_route,
-             const PhantomNodes &phantom_nodes,
-             // TODO: move facade initalization to c'tor
-             DataFacadeT *f,
-             http::Reply &reply)
-    {
-        facade = f;
-        reply.content.emplace_back("{\"status\":");
-
-        if (INVALID_EDGE_WEIGHT == raw_route.shortest_path_length)
-        {
-            // We do not need to do much, if there is no route ;-)
-            reply.content.emplace_back(
-                "207,\"status_message\": \"Cannot find route between points\"}");
-            return;
-        }
-
-        SimpleLogger().Write(logDEBUG) << "distance: " << raw_route.shortest_path_length;
-
-        // check if first segment is non-zero
-        std::string road_name =
-            facade->GetEscapedNameForNameID(phantom_nodes.source_phantom.name_id);
-
-        BOOST_ASSERT(raw_route.unpacked_path_segments.size() ==
-                     raw_route.segment_end_coordinates.size());
-
-        description_factory.SetStartSegment(phantom_nodes.source_phantom);
-        reply.content.emplace_back("0,"
-                                   "\"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)
-        {
-            const int added_segments = DescribeLeg(raw_route.unpacked_path_segments[i],
-                                                   raw_route.segment_end_coordinates[i]);
-            BOOST_ASSERT(0 < added_segments);
-            shortest_leg_end_indices.emplace_back(added_segments + shortest_leg_end_indices.back());
-        }
-        description_factory.SetEndSegment(phantom_nodes.target_phantom);
-        description_factory.Run(facade, config.zoom_level);
-
-        reply.content.emplace_back("\"route_geometry\": ");
-        if (config.geometry)
-        {
-            description_factory.AppendEncodedPolylineString(config.encode_geometry, reply.content);
-        }
-        else
-        {
-            reply.content.emplace_back("[]");
-        }
-
-        reply.content.emplace_back(",\"route_instructions\": [");
-        if (config.instructions)
-        {
-            BuildTextualDescription(description_factory,
-                                    reply,
-                                    raw_route.shortest_path_length,
-                                    facade,
-                                    shortest_path_segments);
-        }
-        reply.content.emplace_back("],");
-        description_factory.BuildRouteSummary(description_factory.entireLength,
-                                              raw_route.shortest_path_length);
-
-        reply.content.emplace_back("\"route_summary\":");
-        reply.content.emplace_back("{");
-        reply.content.emplace_back("\"total_distance\":");
-        reply.content.emplace_back(description_factory.summary.lengthString);
-        reply.content.emplace_back(","
-                                   "\"total_time\":");
-        reply.content.emplace_back(description_factory.summary.durationString);
-        reply.content.emplace_back(","
-                                   "\"start_point\":\"");
-        reply.content.emplace_back(
-            facade->GetEscapedNameForNameID(description_factory.summary.startName));
-        reply.content.emplace_back("\","
-                                   "\"end_point\":\"");
-        reply.content.emplace_back(
-            facade->GetEscapedNameForNameID(description_factory.summary.destName));
-        reply.content.emplace_back("\"");
-        reply.content.emplace_back("}");
-        reply.content.emplace_back(",");
-
-        // only one alternative route is computed at this time, so this is hardcoded
-        if (raw_route.alternative_path_length != INVALID_EDGE_WEIGHT)
-        {
-            alternate_descriptionFactory.SetStartSegment(phantom_nodes.source_phantom);
-            // Get all the coordinates for the computed route
-            for (const PathData &path_data : raw_route.unpacked_alternative)
-            {
-                current = facade->GetCoordinateOfNode(path_data.node);
-                alternate_descriptionFactory.AppendSegment(current, path_data);
-            }
-        }
-        alternate_descriptionFactory.Run(facade, config.zoom_level);
-
-        // //give an array of alternative routes
-        reply.content.emplace_back("\"alternative_geometries\": [");
-        if (config.geometry && INVALID_EDGE_WEIGHT != raw_route.alternative_path_length)
-        {
-            // Generate the linestrings for each alternative
-            alternate_descriptionFactory.AppendEncodedPolylineString(config.encode_geometry,
-                                                                     reply.content);
-        }
-        reply.content.emplace_back("],");
-        reply.content.emplace_back("\"alternative_instructions\":[");
-        if (INVALID_EDGE_WEIGHT != raw_route.alternative_path_length)
-        {
-            reply.content.emplace_back("[");
-            // Generate instructions for each alternative
-            if (config.instructions)
-            {
-                BuildTextualDescription(alternate_descriptionFactory,
-                                        reply,
-                                        raw_route.alternative_path_length,
-                                        facade,
-                                        alternative_path_segments);
-            }
-            reply.content.emplace_back("]");
-        }
-        reply.content.emplace_back("],");
-        reply.content.emplace_back("\"alternative_summaries\":[");
-        if (INVALID_EDGE_WEIGHT != raw_route.alternative_path_length)
-        {
-            // Generate route summary (length, duration) for each alternative
-            alternate_descriptionFactory.BuildRouteSummary(
-                alternate_descriptionFactory.entireLength, raw_route.alternative_path_length);
-            reply.content.emplace_back("{");
-            reply.content.emplace_back("\"total_distance\":");
-            reply.content.emplace_back(alternate_descriptionFactory.summary.lengthString);
-            reply.content.emplace_back(","
-                                       "\"total_time\":");
-            reply.content.emplace_back(alternate_descriptionFactory.summary.durationString);
-            reply.content.emplace_back(","
-                                       "\"start_point\":\"");
-            reply.content.emplace_back(
-                facade->GetEscapedNameForNameID(description_factory.summary.startName));
-            reply.content.emplace_back("\","
-                                       "\"end_point\":\"");
-            reply.content.emplace_back(
-                facade->GetEscapedNameForNameID(description_factory.summary.destName));
-            reply.content.emplace_back("\"");
-            reply.content.emplace_back("}");
-        }
-        reply.content.emplace_back("],");
-
-        // //Get Names for both routes
-        RouteNames routeNames;
-        GetRouteNames(shortest_path_segments, alternative_path_segments, facade, routeNames);
-
-        reply.content.emplace_back("\"route_name\":[\"");
-        reply.content.emplace_back(routeNames.shortest_path_name_1);
-        reply.content.emplace_back("\",\"");
-        reply.content.emplace_back(routeNames.shortest_path_name_2);
-        reply.content.emplace_back("\"],"
-                                   "\"alternative_names\":[");
-        reply.content.emplace_back("[\"");
-        reply.content.emplace_back(routeNames.alternative_path_name_1);
-        reply.content.emplace_back("\",\"");
-        reply.content.emplace_back(routeNames.alternative_path_name_2);
-        reply.content.emplace_back("\"]");
-        reply.content.emplace_back("],");
-        // list all viapoints so that the client may display it
-        reply.content.emplace_back("\"via_points\":[");
-
-        BOOST_ASSERT(!raw_route.segment_end_coordinates.empty());
-
-        std::string tmp;
-        FixedPointCoordinate::convertInternalReversedCoordinateToString(
-            raw_route.segment_end_coordinates.front().source_phantom.location, tmp);
-        reply.content.emplace_back("[");
-        reply.content.emplace_back(tmp);
-        reply.content.emplace_back("]");
-
-        for (const PhantomNodes &nodes : raw_route.segment_end_coordinates)
-        {
-            tmp.clear();
-            FixedPointCoordinate::convertInternalReversedCoordinateToString(
-                nodes.target_phantom.location, tmp);
-            reply.content.emplace_back(",[");
-            reply.content.emplace_back(tmp);
-            reply.content.emplace_back("]");
-        }
-
-        reply.content.emplace_back("],");
-        reply.content.emplace_back("\"via_indices\":[");
-        for (const unsigned index : shortest_leg_end_indices)
-        {
-            tmp.clear();
-            intToString(index, tmp);
-            reply.content.emplace_back(tmp);
-            if (index != shortest_leg_end_indices.back())
-            {
-                reply.content.emplace_back(",");
-            }
-        }
-        reply.content.emplace_back("],\"alternative_indices\":[");
-        if (INVALID_EDGE_WEIGHT != raw_route.alternative_path_length)
-        {
-            reply.content.emplace_back("0,");
-            tmp.clear();
-            intToString(alternate_descriptionFactory.path_description.size(), tmp);
-            reply.content.emplace_back(tmp);
-        }
-
-        reply.content.emplace_back("],");
-        reply.content.emplace_back("\"hint_data\": {");
-        reply.content.emplace_back("\"checksum\":");
-        intToString(raw_route.check_sum, tmp);
-        reply.content.emplace_back(tmp);
-        reply.content.emplace_back(", \"locations\": [");
-
-        std::string hint;
-        for (unsigned i = 0; i < raw_route.segment_end_coordinates.size(); ++i)
-        {
-            reply.content.emplace_back("\"");
-            EncodeObjectToBase64(raw_route.segment_end_coordinates[i].source_phantom, hint);
-            reply.content.emplace_back(hint);
-            reply.content.emplace_back("\", ");
-        }
-        EncodeObjectToBase64(raw_route.segment_end_coordinates.back().target_phantom, hint);
-        reply.content.emplace_back("\"");
-        reply.content.emplace_back(hint);
-        reply.content.emplace_back("\"]");
-        reply.content.emplace_back("}}");
-    }
-
-    // construct routes names
-    void GetRouteNames(std::vector<Segment> &shortest_path_segments,
-                       std::vector<Segment> &alternative_path_segments,
-                       const DataFacadeT *facade,
-                       RouteNames &routeNames)
-    {
-        Segment shortest_segment_1, shortest_segment_2;
-        Segment alternativeSegment1, alternative_segment_2;
-
-        auto length_comperator = [](Segment a, Segment b)
-        { return a.length < b.length; };
-        auto name_id_comperator = [](Segment a, Segment b)
-        { return a.name_id < b.name_id; };
-
-        if (!shortest_path_segments.empty())
-        {
-            std::sort(
-                shortest_path_segments.begin(), shortest_path_segments.end(), length_comperator);
-            shortest_segment_1 = shortest_path_segments[0];
-            if (!alternative_path_segments.empty())
-            {
-                std::sort(alternative_path_segments.begin(),
-                          alternative_path_segments.end(),
-                          length_comperator);
-                alternativeSegment1 = alternative_path_segments[0];
-            }
-            std::vector<Segment> shortestDifference(shortest_path_segments.size());
-            std::vector<Segment> alternativeDifference(alternative_path_segments.size());
-            std::set_difference(shortest_path_segments.begin(),
-                                shortest_path_segments.end(),
-                                alternative_path_segments.begin(),
-                                alternative_path_segments.end(),
-                                shortestDifference.begin(),
-                                length_comperator);
-            int size_of_difference = shortestDifference.size();
-            if (size_of_difference)
-            {
-                int i = 0;
-                while (i < size_of_difference &&
-                       shortestDifference[i].name_id == shortest_path_segments[0].name_id)
-                {
-                    ++i;
-                }
-                if (i < size_of_difference)
-                {
-                    shortest_segment_2 = shortestDifference[i];
-                }
-            }
-
-            std::set_difference(alternative_path_segments.begin(),
-                                alternative_path_segments.end(),
-                                shortest_path_segments.begin(),
-                                shortest_path_segments.end(),
-                                alternativeDifference.begin(),
-                                name_id_comperator);
-            size_of_difference = alternativeDifference.size();
-            if (size_of_difference)
-            {
-                int i = 0;
-                while (i < size_of_difference &&
-                       alternativeDifference[i].name_id == alternative_path_segments[0].name_id)
-                {
-                    ++i;
-                }
-                if (i < size_of_difference)
-                {
-                    alternative_segment_2 = alternativeDifference[i];
-                }
-            }
-            if (shortest_segment_1.position > shortest_segment_2.position)
-                std::swap(shortest_segment_1, shortest_segment_2);
-
-            if (alternativeSegment1.position > alternative_segment_2.position)
-                std::swap(alternativeSegment1, alternative_segment_2);
-
-            routeNames.shortest_path_name_1 =
-                facade->GetEscapedNameForNameID(shortest_segment_1.name_id);
-            routeNames.shortest_path_name_2 =
-                facade->GetEscapedNameForNameID(shortest_segment_2.name_id);
-
-            routeNames.alternative_path_name_1 =
-                facade->GetEscapedNameForNameID(alternativeSegment1.name_id);
-            routeNames.alternative_path_name_2 =
-                facade->GetEscapedNameForNameID(alternative_segment_2.name_id);
-        }
-    }
-
-    // TODO: reorder parameters
-    inline void BuildTextualDescription(DescriptionFactory &description_factory,
-                                        http::Reply &reply,
-                                        const int route_length,
-                                        const DataFacadeT *facade,
-                                        std::vector<Segment> &route_segments_list)
-    {
-        // Segment information has following format:
-        //["instruction","streetname",length,position,time,"length","earth_direction",azimuth]
-        // Example: ["Turn left","High Street",200,4,10,"200m","NE",22.5]
-        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;
-
-        // Fetch data from Factory and generate a string from it.
-        for (const SegmentInformation &segment : description_factory.path_description)
-        {
-            TurnInstruction current_instruction = segment.turn_instruction;
-            entered_restricted_area_count += (current_instruction != segment.turn_instruction);
-            if (TurnInstructionsClass::TurnIsNecessary(current_instruction))
-            {
-                if (TurnInstruction::EnterRoundAbout == current_instruction)
-                {
-                    round_about.name_id = segment.name_id;
-                    round_about.start_index = necessary_segments_running_index;
-                }
-                else
-                {
-                    if (necessary_segments_running_index)
-                    {
-                        reply.content.emplace_back(",");
-                    }
-                    reply.content.emplace_back("[\"");
-                    if (TurnInstruction::LeaveRoundAbout == current_instruction)
-                    {
-                        intToString(as_integer(TurnInstruction::EnterRoundAbout), temp_instruction);
-                        reply.content.emplace_back(temp_instruction);
-                        reply.content.emplace_back("-");
-                        intToString(round_about.leave_at_exit + 1, temp_instruction);
-                        reply.content.emplace_back(temp_instruction);
-                        round_about.leave_at_exit = 0;
-                    }
-                    else
-                    {
-                        intToString(as_integer(current_instruction), temp_instruction);
-                        reply.content.emplace_back(temp_instruction);
-                    }
-
-                    reply.content.emplace_back("\",\"");
-                    reply.content.emplace_back(facade->GetEscapedNameForNameID(segment.name_id));
-                    reply.content.emplace_back("\",");
-                    intToString(segment.length, temp_dist);
-                    reply.content.emplace_back(temp_dist);
-                    reply.content.emplace_back(",");
-                    intToString(necessary_segments_running_index, temp_length);
-                    reply.content.emplace_back(temp_length);
-                    reply.content.emplace_back(",");
-                    intToString(round(segment.duration / 10.), temp_duration);
-                    reply.content.emplace_back(temp_duration);
-                    reply.content.emplace_back(",\"");
-                    intToString(segment.length, temp_length);
-                    reply.content.emplace_back(temp_length);
-                    reply.content.emplace_back("m\",\"");
-                    int bearing_value = round(segment.bearing / 10.);
-                    reply.content.emplace_back(Azimuth::Get(bearing_value));
-                    reply.content.emplace_back("\",");
-                    intToString(bearing_value, temp_bearing);
-                    reply.content.emplace_back(temp_bearing);
-                    reply.content.emplace_back("]");
-
-                    route_segments_list.emplace_back(
-                        Segment(segment.name_id, segment.length, route_segments_list.size()));
-                }
-            }
-            else if (TurnInstruction::StayOnRoundAbout == current_instruction)
-            {
-                ++round_about.leave_at_exit;
-            }
-            if (segment.necessary)
-            {
-                ++necessary_segments_running_index;
-            }
-        }
-        if (INVALID_EDGE_WEIGHT != route_length)
-        {
-            reply.content.emplace_back(",[\"");
-            intToString(as_integer(TurnInstruction::ReachedYourDestination), temp_instruction);
-            reply.content.emplace_back(temp_instruction);
-            reply.content.emplace_back("\",\"");
-            reply.content.emplace_back("\",");
-            reply.content.emplace_back("0");
-            reply.content.emplace_back(",");
-            intToString(necessary_segments_running_index - 1, temp_length);
-            reply.content.emplace_back(temp_length);
-            reply.content.emplace_back(",");
-            reply.content.emplace_back("0");
-            reply.content.emplace_back(",\"");
-            reply.content.emplace_back("\",\"");
-            reply.content.emplace_back(Azimuth::Get(0.0));
-            reply.content.emplace_back("\",");
-            reply.content.emplace_back("0.0");
-            reply.content.emplace_back("]");
-        }
-    }
-};
-
-#endif /* JSON_DESCRIPTOR_H_ */

Docs/webclient.txt

@@ -1,3 +0,0 @@
-The javascript based web client is a seperate project available at
-
-https://github.com/DennisSchiefer/Project-OSRM-Web

Extractor/BaseParser.cpp

@@ -1,138 +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 "BaseParser.h"
-#include "ExtractionWay.h"
-#include "ScriptingEnvironment.h"
-
-#include "../DataStructures/ImportNode.h"
-#include "../Util/LuaUtil.h"
-#include "../Util/OSRMException.h"
-#include "../Util/SimpleLogger.h"
-
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/regex.hpp>
-#include <boost/regex.hpp>
-
-BaseParser::BaseParser(ExtractorCallbacks *extractor_callbacks,
-                       ScriptingEnvironment &scripting_environment)
-    : extractor_callbacks(extractor_callbacks),
-      lua_state(scripting_environment.getLuaStateForThreadID(0)),
-      scripting_environment(scripting_environment), use_turn_restrictions(true)
-{
-    ReadUseRestrictionsSetting();
-    ReadRestrictionExceptions();
-}
-
-void BaseParser::ReadUseRestrictionsSetting()
-{
-    if (0 != luaL_dostring(lua_state, "return use_turn_restrictions\n"))
-    {
-        throw OSRMException("ERROR occured in scripting block");
-    }
-    if (lua_isboolean(lua_state, -1))
-    {
-        use_turn_restrictions = lua_toboolean(lua_state, -1);
-    }
-    if (use_turn_restrictions)
-    {
-        SimpleLogger().Write() << "Using turn restrictions";
-    }
-    else
-    {
-        SimpleLogger().Write() << "Ignoring turn restrictions";
-    }
-}
-
-void BaseParser::ReadRestrictionExceptions()
-{
-    if (lua_function_exists(lua_state, "get_exceptions"))
-    {
-        // get list of turn restriction exceptions
-        luabind::call_function<void>(
-            lua_state, "get_exceptions", boost::ref(restriction_exceptions));
-        const unsigned exception_count = restriction_exceptions.size();
-        SimpleLogger().Write() << "Found " << exception_count
-                               << " exceptions to turn restrictions:";
-        for (const std::string &str : restriction_exceptions)
-        {
-            SimpleLogger().Write() << "  " << str;
-        }
-    }
-    else
-    {
-        SimpleLogger().Write() << "Found no exceptions to turn restrictions";
-    }
-}
-
-void BaseParser::report_errors(lua_State *lua_state, const int status) const
-{
-    if (0 != status)
-    {
-        std::cerr << "-- " << lua_tostring(lua_state, -1) << std::endl;
-        lua_pop(lua_state, 1); // remove error message
-    }
-}
-
-void BaseParser::ParseNodeInLua(ImportNode &node, lua_State *local_lua_state)
-{
-    luabind::call_function<void>(local_lua_state, "node_function", boost::ref(node));
-}
-
-void BaseParser::ParseWayInLua(ExtractionWay &way, lua_State *local_lua_state)
-{
-    luabind::call_function<void>(local_lua_state, "way_function", boost::ref(way));
-}
-
-bool BaseParser::ShouldIgnoreRestriction(const std::string &except_tag_string) const
-{
-    // should this restriction be ignored? yes if there's an overlap between:
-    // a) the list of modes in the except tag of the restriction
-    //    (except_tag_string), eg: except=bus;bicycle
-    // b) the lua profile defines a hierachy of modes,
-    //    eg: [access, vehicle, bicycle]
-
-    if (except_tag_string.empty())
-    {
-        return false;
-    }
-
-    // Be warned, this is quadratic work here, but we assume that
-    // only a few exceptions are actually defined.
-    std::vector<std::string> exceptions;
-    boost::algorithm::split_regex(exceptions, except_tag_string, boost::regex("[;][ ]*"));
-    for (std::string &current_string : exceptions)
-    {
-        const auto string_iterator =
-            std::find(restriction_exceptions.begin(), restriction_exceptions.end(), current_string);
-        if (restriction_exceptions.end() != string_iterator)
-        {
-            return true;
-        }
-    }
-    return false;
-}

Extractor/ExtractionWay.h

@@ -1,79 +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 EXTRACTION_WAY_H
-#define EXTRACTION_WAY_H
-
-#include "../DataStructures/HashTable.h"
-#include "../typedefs.h"
-
-#include <string>
-#include <vector>
-
-struct ExtractionWay
-{
-    ExtractionWay() { Clear(); }
-
-    inline void Clear()
-    {
-        id = SPECIAL_NODEID;
-        nameID = INVALID_NAMEID;
-        path.clear();
-        keyVals.clear();
-        direction = ExtractionWay::notSure;
-        speed = -1;
-        backward_speed = -1;
-        duration = -1;
-        type = -1;
-        access = true;
-        roundabout = false;
-        isAccessRestricted = false;
-        ignoreInGrid = false;
-    }
-
-    enum Directions
-    { notSure = 0,
-      oneway,
-      bidirectional,
-      opposite };
-    unsigned id;
-    unsigned nameID;
-    double speed;
-    double backward_speed;
-    double duration;
-    Directions direction;
-    std::string name;
-    short type;
-    bool access;
-    bool roundabout;
-    bool isAccessRestricted;
-    bool ignoreInGrid;
-    std::vector<NodeID> path;
-    HashTable<std::string, std::string> keyVals;
-};
-
-#endif // EXTRACTION_WAY_H

Extractor/ExtractorCallbacks.cpp

@@ -1,164 +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 "ExtractorCallbacks.h"
-#include "ExtractionContainers.h"
-#include "ExtractionWay.h"
-
-#include "../DataStructures/Restriction.h"
-#include "../DataStructures/ImportNode.h"
-#include "../Util/SimpleLogger.h"
-
-#include <osrm/Coordinate.h>
-
-#include <limits>
-#include <string>
-#include <vector>
-
-ExtractorCallbacks::ExtractorCallbacks(ExtractionContainers &extraction_containers,
-                                       std::unordered_map<std::string, NodeID> &string_map)
-    : string_map(string_map), external_memory(extraction_containers)
-{
-}
-
-/** warning: caller needs to take care of synchronization! */
-void ExtractorCallbacks::ProcessNode(const ExternalMemoryNode &n)
-{
-    if (n.lat <= 85 * COORDINATE_PRECISION && n.lat >= -85 * COORDINATE_PRECISION)
-    {
-        external_memory.all_nodes_list.push_back(n);
-    }
-}
-
-bool ExtractorCallbacks::ProcessRestriction(const InputRestrictionContainer &restriction)
-{
-    external_memory.restrictions_list.push_back(restriction);
-    return true;
-}
-
-/** warning: caller needs to take care of synchronization! */
-void ExtractorCallbacks::ProcessWay(ExtractionWay &parsed_way)
-{
-    if ((0 < parsed_way.speed) || (0 < parsed_way.duration))
-    { // Only true if the way is specified by the speed profile
-        if (std::numeric_limits<unsigned>::max() == parsed_way.id)
-        {
-            SimpleLogger().Write(logDEBUG) << "found bogus way with id: " << parsed_way.id
-                                           << " of size " << parsed_way.path.size();
-            return;
-        }
-
-        if (0 < parsed_way.duration)
-        {
-            // TODO: iterate all way segments and set duration corresponding to the length of each
-            // segment
-            parsed_way.speed = parsed_way.duration / (parsed_way.path.size() - 1);
-        }
-
-        if (std::numeric_limits<double>::epsilon() >= std::abs(-1. - parsed_way.speed))
-        {
-            SimpleLogger().Write(logDEBUG) << "found way with bogus speed, id: " << parsed_way.id;
-            return;
-        }
-
-        // Get the unique identifier for the street name
-        const auto &string_map_iterator = string_map.find(parsed_way.name);
-        if (string_map.end() == string_map_iterator)
-        {
-            parsed_way.nameID = external_memory.name_list.size();
-            external_memory.name_list.push_back(parsed_way.name);
-            string_map.insert(std::make_pair(parsed_way.name, parsed_way.nameID));
-        }
-        else
-        {
-            parsed_way.nameID = string_map_iterator->second;
-        }
-
-        if (ExtractionWay::opposite == parsed_way.direction)
-        {
-            std::reverse(parsed_way.path.begin(), parsed_way.path.end());
-            parsed_way.direction = ExtractionWay::oneway;
-        }
-
-        const bool split_bidirectional_edge =
-            (parsed_way.backward_speed > 0) && (parsed_way.speed != parsed_way.backward_speed);
-
-        for (unsigned n = 0; n < parsed_way.path.size() - 1; ++n)
-        {
-            external_memory.all_edges_list.push_back(InternalExtractorEdge(
-                parsed_way.path[n],
-                parsed_way.path[n + 1],
-                parsed_way.type,
-                (split_bidirectional_edge ? ExtractionWay::oneway : parsed_way.direction),
-                parsed_way.speed,
-                parsed_way.nameID,
-                parsed_way.roundabout,
-                parsed_way.ignoreInGrid,
-                (0 < parsed_way.duration),
-                parsed_way.isAccessRestricted,
-                false,
-                split_bidirectional_edge));
-            external_memory.used_node_id_list.push_back(parsed_way.path[n]);
-        }
-        external_memory.used_node_id_list.push_back(parsed_way.path.back());
-
-        // The following information is needed to identify start and end segments of restrictions
-        external_memory.way_start_end_id_list.push_back(
-            WayIDStartAndEndEdge(parsed_way.id,
-                                 parsed_way.path[0],
-                                 parsed_way.path[1],
-                                 parsed_way.path[parsed_way.path.size() - 2],
-                                 parsed_way.path.back()));
-
-        if (split_bidirectional_edge)
-        { // Only true if the way should be split
-            std::reverse(parsed_way.path.begin(), parsed_way.path.end());
-            for (std::vector<NodeID>::size_type n = 0; n < parsed_way.path.size() - 1; ++n)
-            {
-                external_memory.all_edges_list.push_back(
-                    InternalExtractorEdge(parsed_way.path[n],
-                                          parsed_way.path[n + 1],
-                                          parsed_way.type,
-                                          ExtractionWay::oneway,
-                                          parsed_way.backward_speed,
-                                          parsed_way.nameID,
-                                          parsed_way.roundabout,
-                                          parsed_way.ignoreInGrid,
-                                          (0 < parsed_way.duration),
-                                          parsed_way.isAccessRestricted,
-                                          (ExtractionWay::oneway == parsed_way.direction),
-                                          split_bidirectional_edge));
-            }
-            external_memory.way_start_end_id_list.push_back(
-                WayIDStartAndEndEdge(parsed_way.id,
-                                     parsed_way.path[0],
-                                     parsed_way.path[1],
-                                     parsed_way.path[parsed_way.path.size() - 2],
-                                     parsed_way.path.back()));
-        }
-    }
-}

Extractor/ExtractorStructs.h

@@ -1,114 +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 EXTRACTORSTRUCTS_H_
-#define EXTRACTORSTRUCTS_H_
-
-#include "../DataStructures/HashTable.h"
-#include "../DataStructures/ImportNode.h"
-#include "../typedefs.h"
-
-#include <limits>
-#include <string>
-
-struct ExtractorRelation
-{
-    ExtractorRelation() : type(unknown) {}
-    enum
-    { unknown = 0,
-      ferry,
-      turnRestriction } type;
-    HashTable<std::string, std::string> keyVals;
-};
-
-struct WayIDStartAndEndEdge
-{
-    unsigned wayID;
-    NodeID firstStart;
-    NodeID firstTarget;
-    NodeID lastStart;
-    NodeID lastTarget;
-    WayIDStartAndEndEdge()
-        : wayID(std::numeric_limits<unsigned>::max()), firstStart(std::numeric_limits<unsigned>::max()), firstTarget(std::numeric_limits<unsigned>::max()), lastStart(std::numeric_limits<unsigned>::max()),
-          lastTarget(std::numeric_limits<unsigned>::max())
-    {
-    }
-
-    explicit WayIDStartAndEndEdge(unsigned w, NodeID fs, NodeID ft, NodeID ls, NodeID lt)
-        : wayID(w), firstStart(fs), firstTarget(ft), lastStart(ls), lastTarget(lt)
-    {
-    }
-
-    static WayIDStartAndEndEdge min_value()
-    {
-        return WayIDStartAndEndEdge((std::numeric_limits<unsigned>::min)(),
-                                    (std::numeric_limits<unsigned>::min)(),
-                                    (std::numeric_limits<unsigned>::min)(),
-                                    (std::numeric_limits<unsigned>::min)(),
-                                    (std::numeric_limits<unsigned>::min)());
-    }
-    static WayIDStartAndEndEdge max_value()
-    {
-        return WayIDStartAndEndEdge((std::numeric_limits<unsigned>::max)(),
-                                    (std::numeric_limits<unsigned>::max)(),
-                                    (std::numeric_limits<unsigned>::max)(),
-                                    (std::numeric_limits<unsigned>::max)(),
-                                    (std::numeric_limits<unsigned>::max)());
-    }
-};
-
-struct CmpWayByID
-{
-    typedef WayIDStartAndEndEdge value_type;
-    bool operator()(const WayIDStartAndEndEdge &a, const WayIDStartAndEndEdge &b) const
-    {
-        return a.wayID < b.wayID;
-    }
-    value_type max_value() { return WayIDStartAndEndEdge::max_value(); }
-    value_type min_value() { return WayIDStartAndEndEdge::min_value(); }
-};
-
-struct Cmp
-{
-    typedef NodeID value_type;
-    bool operator()(const NodeID a, const NodeID b) const { return a < b; }
-    value_type max_value() { return 0xffffffff; }
-    value_type min_value() { return 0x0; }
-};
-
-struct CmpNodeByID
-{
-    typedef ExternalMemoryNode value_type;
-    bool operator()(const ExternalMemoryNode &a, const ExternalMemoryNode &b) const
-    {
-        return a.id < b.id;
-    }
-    value_type max_value() { return ExternalMemoryNode::max_value(); }
-    value_type min_value() { return ExternalMemoryNode::min_value(); }
-};
-
-#endif /* EXTRACTORSTRUCTS_H_ */

Extractor/PBFParser.cpp

@@ -1,640 +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 "PBFParser.h"
-
-#include "ExtractionWay.h"
-#include "ExtractorCallbacks.h"
-#include "ScriptingEnvironment.h"
-
-#include "../DataStructures/HashTable.h"
-#include "../DataStructures/ImportNode.h"
-#include "../DataStructures/Restriction.h"
-#include "../Util/MachineInfo.h"
-#include "../Util/OpenMPWrapper.h"
-#include "../Util/OSRMException.h"
-#include "../Util/SimpleLogger.h"
-#include "../typedefs.h"
-
-#include <osrm/Coordinate.h>
-
-#include <boost/ref.hpp>
-
-#include <zlib.h>
-
-#include <functional>
-#include <limits>
-#include <thread>
-
-PBFParser::PBFParser(const char *fileName,
-                     ExtractorCallbacks *extractor_callbacks,
-                     ScriptingEnvironment &scripting_environment)
-    : BaseParser(extractor_callbacks, scripting_environment)
-{
-    GOOGLE_PROTOBUF_VERIFY_VERSION;
-    // TODO: What is the bottleneck here? Filling the queue or reading the stuff from disk?
-    // NOTE: With Lua scripting, it is parsing the stuff. I/O is virtually for free.
-
-    // Max 2500 items in queue, hardcoded.
-    thread_data_queue = std::make_shared<ConcurrentQueue<ParserThreadData *>>(2500);
-    input.open(fileName, std::ios::in | std::ios::binary);
-
-    if (!input)
-    {
-        throw OSRMException("pbf file not found.");
-    }
-
-    block_count = 0;
-    group_count = 0;
-}
-
-PBFParser::~PBFParser()
-{
-    if (input.is_open())
-    {
-        input.close();
-    }
-
-    // Clean up any leftover ThreadData objects in the queue
-    ParserThreadData *thread_data;
-    while (thread_data_queue->try_pop(thread_data))
-    {
-        delete thread_data;
-    }
-    google::protobuf::ShutdownProtobufLibrary();
-
-    SimpleLogger().Write(logDEBUG) << "parsed " << block_count << " blocks from pbf with "
-                                   << group_count << " groups";
-}
-
-inline bool PBFParser::ReadHeader()
-{
-    ParserThreadData init_data;
-    /** read Header */
-    if (!readPBFBlobHeader(input, &init_data))
-    {
-        return false;
-    }
-
-    if (readBlob(input, &init_data))
-    {
-        if (!init_data.PBFHeaderBlock.ParseFromArray(&(init_data.charBuffer[0]),
-                                                    init_data.charBuffer.size()))
-        {
-            std::cerr << "[error] Header not parseable!" << std::endl;
-            return false;
-        }
-
-        const auto feature_size = init_data.PBFHeaderBlock.required_features_size();
-        for (int i = 0; i < feature_size; ++i)
-        {
-            const std::string &feature = init_data.PBFHeaderBlock.required_features(i);
-            bool supported = false;
-            if ("OsmSchema-V0.6" == feature)
-            {
-                supported = true;
-            }
-            else if ("DenseNodes" == feature)
-            {
-                supported = true;
-            }
-
-            if (!supported)
-            {
-                std::cerr << "[error] required feature not supported: " << feature.data()
-                          << std::endl;
-                return false;
-            }
-        }
-    }
-    else
-    {
-        std::cerr << "[error] blob not loaded!" << std::endl;
-    }
-    return true;
-}
-
-inline void PBFParser::ReadData()
-{
-    bool keep_running = true;
-    do
-    {
-        ParserThreadData *thread_data = new ParserThreadData();
-        keep_running = readNextBlock(input, thread_data);
-
-        if (keep_running)
-        {
-            thread_data_queue->push(thread_data);
-        }
-        else
-        {
-            // No more data to read, parse stops when nullptr encountered
-            thread_data_queue->push(nullptr);
-            delete thread_data;
-        }
-    } while (keep_running);
-}
-
-inline void PBFParser::ParseData()
-{
-    while (true)
-    {
-        ParserThreadData *thread_data;
-        thread_data_queue->wait_and_pop(thread_data);
-        if (nullptr == thread_data)
-        {
-            thread_data_queue->push(nullptr); // Signal end of data for other threads
-            break;
-        }
-
-        loadBlock(thread_data);
-
-        int group_size = thread_data->PBFprimitiveBlock.primitivegroup_size();
-        for (int i = 0; i < group_size; ++i)
-        {
-            thread_data->currentGroupID = i;
-            loadGroup(thread_data);
-
-            if (thread_data->entityTypeIndicator == TypeNode)
-            {
-                parseNode(thread_data);
-            }
-            if (thread_data->entityTypeIndicator == TypeWay)
-            {
-                parseWay(thread_data);
-            }
-            if (thread_data->entityTypeIndicator == TypeRelation)
-            {
-                parseRelation(thread_data);
-            }
-            if (thread_data->entityTypeIndicator == TypeDenseNode)
-            {
-                parseDenseNode(thread_data);
-            }
-        }
-
-        delete thread_data;
-        thread_data = nullptr;
-    }
-}
-
-inline bool PBFParser::Parse()
-{
-    // Start the read and parse threads
-    std::thread read_thread(std::bind(&PBFParser::ReadData, this));
-
-    // Open several parse threads that are synchronized before call to
-    std::thread parse_thread(std::bind(&PBFParser::ParseData, this));
-
-    // Wait for the threads to finish
-    read_thread.join();
-    parse_thread.join();
-
-    return true;
-}
-
-inline void PBFParser::parseDenseNode(ParserThreadData *thread_data)
-{
-    const OSMPBF::DenseNodes &dense =
-        thread_data->PBFprimitiveBlock.primitivegroup(thread_data->currentGroupID).dense();
-    int denseTagIndex = 0;
-    int64_t m_lastDenseID = 0;
-    int64_t m_lastDenseLatitude = 0;
-    int64_t m_lastDenseLongitude = 0;
-
-    const int number_of_nodes = dense.id_size();
-    std::vector<ImportNode> extracted_nodes_vector(number_of_nodes);
-    for (int i = 0; i < number_of_nodes; ++i)
-    {
-        m_lastDenseID += dense.id(i);
-        m_lastDenseLatitude += dense.lat(i);
-        m_lastDenseLongitude += dense.lon(i);
-        extracted_nodes_vector[i].id = m_lastDenseID;
-        extracted_nodes_vector[i].lat =
-            COORDINATE_PRECISION *
-            ((double)m_lastDenseLatitude * thread_data->PBFprimitiveBlock.granularity() +
-             thread_data->PBFprimitiveBlock.lat_offset()) /
-            NANO;
-        extracted_nodes_vector[i].lon =
-            COORDINATE_PRECISION *
-            ((double)m_lastDenseLongitude * thread_data->PBFprimitiveBlock.granularity() +
-             thread_data->PBFprimitiveBlock.lon_offset()) /
-            NANO;
-        while (denseTagIndex < dense.keys_vals_size())
-        {
-            const int tagValue = dense.keys_vals(denseTagIndex);
-            if (0 == tagValue)
-            {
-                ++denseTagIndex;
-                break;
-            }
-            const int keyValue = dense.keys_vals(denseTagIndex + 1);
-            const std::string &key = thread_data->PBFprimitiveBlock.stringtable().s(tagValue);
-            const std::string &value = thread_data->PBFprimitiveBlock.stringtable().s(keyValue);
-            extracted_nodes_vector[i].keyVals.emplace(key, value);
-            denseTagIndex += 2;
-        }
-    }
-#pragma omp parallel
-    {
-        const int thread_num = omp_get_thread_num();
-#pragma omp parallel for schedule(guided)
-        for (int i = 0; i < number_of_nodes; ++i)
-        {
-            ImportNode &import_node = extracted_nodes_vector[i];
-            ParseNodeInLua(import_node, scripting_environment.getLuaStateForThreadID(thread_num));
-        }
-    }
-
-    for (const ImportNode &import_node : extracted_nodes_vector)
-    {
-        extractor_callbacks->ProcessNode(import_node);
-    }
-}
-
-inline void PBFParser::parseNode(ParserThreadData *)
-{
-    throw OSRMException("Parsing of simple nodes not supported. PBF should use dense nodes");
-}
-
-inline void PBFParser::parseRelation(ParserThreadData *thread_data)
-{
-    // TODO: leave early, if relation is not a restriction
-    // TODO: reuse rawRestriction container
-    if (!use_turn_restrictions)
-    {
-        return;
-    }
-    const OSMPBF::PrimitiveGroup &group =
-        thread_data->PBFprimitiveBlock.primitivegroup(thread_data->currentGroupID);
-
-    for (int i = 0, relation_size = group.relations_size(); i < relation_size; ++i)
-    {
-        std::string except_tag_string;
-        const OSMPBF::Relation &inputRelation =
-            thread_data->PBFprimitiveBlock.primitivegroup(thread_data->currentGroupID).relations(i);
-        bool isRestriction = false;
-        bool isOnlyRestriction = false;
-        for (int k = 0, endOfKeys = inputRelation.keys_size(); k < endOfKeys; ++k)
-        {
-            const std::string &key =
-                thread_data->PBFprimitiveBlock.stringtable().s(inputRelation.keys(k));
-            const std::string &val =
-                thread_data->PBFprimitiveBlock.stringtable().s(inputRelation.vals(k));
-            if ("type" == key)
-            {
-                if ("restriction" == val)
-                {
-                    isRestriction = true;
-                }
-                else
-                {
-                    break;
-                }
-            }
-            if (("restriction" == key) && (val.find("only_") == 0))
-            {
-                isOnlyRestriction = true;
-            }
-            if ("except" == key)
-            {
-                except_tag_string = val;
-            }
-        }
-
-        if (isRestriction && ShouldIgnoreRestriction(except_tag_string))
-        {
-            continue;
-        }
-
-        if (isRestriction)
-        {
-            int64_t lastRef = 0;
-            InputRestrictionContainer currentRestrictionContainer(isOnlyRestriction);
-            for (int rolesIndex = 0, last_role = inputRelation.roles_sid_size();
-                 rolesIndex < last_role;
-                 ++rolesIndex)
-            {
-                const std::string &role = thread_data->PBFprimitiveBlock.stringtable().s(
-                    inputRelation.roles_sid(rolesIndex));
-                lastRef += inputRelation.memids(rolesIndex);
-
-                if (!("from" == role || "to" == role || "via" == role))
-                {
-                    continue;
-                }
-
-                switch (inputRelation.types(rolesIndex))
-                {
-                case 0: // node
-                    if ("from" == role || "to" == role)
-                    { // Only via should be a node
-                        continue;
-                    }
-                    assert("via" == role);
-                    if (std::numeric_limits<unsigned>::max() != currentRestrictionContainer.viaNode)
-                    {
-                        currentRestrictionContainer.viaNode = std::numeric_limits<unsigned>::max();
-                    }
-                    assert(std::numeric_limits<unsigned>::max() == currentRestrictionContainer.viaNode);
-                    currentRestrictionContainer.restriction.viaNode = lastRef;
-                    break;
-                case 1: // way
-                    assert("from" == role || "to" == role || "via" == role);
-                    if ("from" == role)
-                    {
-                        currentRestrictionContainer.fromWay = lastRef;
-                    }
-                    if ("to" == role)
-                    {
-                        currentRestrictionContainer.toWay = lastRef;
-                    }
-                    if ("via" == role)
-                    {
-                        assert(currentRestrictionContainer.restriction.toNode == std::numeric_limits<unsigned>::max());
-                        currentRestrictionContainer.viaNode = lastRef;
-                    }
-                    break;
-                case 2: // relation, not used. relations relating to relations are evil.
-                    continue;
-                    assert(false);
-                    break;
-
-                default: // should not happen
-                    assert(false);
-                    break;
-                }
-            }
-            if (!extractor_callbacks->ProcessRestriction(currentRestrictionContainer))
-            {
-                std::cerr << "[PBFParser] relation not parsed" << std::endl;
-            }
-        }
-    }
-}
-
-inline void PBFParser::parseWay(ParserThreadData *thread_data)
-{
-    const int number_of_ways =
-        thread_data->PBFprimitiveBlock.primitivegroup(thread_data->currentGroupID).ways_size();
-    std::vector<ExtractionWay> parsed_way_vector(number_of_ways);
-    for (int i = 0; i < number_of_ways; ++i)
-    {
-        const OSMPBF::Way &inputWay =
-            thread_data->PBFprimitiveBlock.primitivegroup(thread_data->currentGroupID).ways(i);
-        parsed_way_vector[i].id = inputWay.id();
-        unsigned pathNode(0);
-        const int number_of_referenced_nodes = inputWay.refs_size();
-        for (int j = 0; j < number_of_referenced_nodes; ++j)
-        {
-            pathNode += inputWay.refs(j);
-            parsed_way_vector[i].path.push_back(pathNode);
-        }
-        assert(inputWay.keys_size() == inputWay.vals_size());
-        const int number_of_keys = inputWay.keys_size();
-        for (int j = 0; j < number_of_keys; ++j)
-        {
-            const std::string &key =
-                thread_data->PBFprimitiveBlock.stringtable().s(inputWay.keys(j));
-            const std::string &val =
-                thread_data->PBFprimitiveBlock.stringtable().s(inputWay.vals(j));
-            parsed_way_vector[i].keyVals.emplace(key, val);
-        }
-    }
-
-#pragma omp parallel for schedule(guided)
-    for (int i = 0; i < number_of_ways; ++i)
-    {
-        ExtractionWay &extraction_way = parsed_way_vector[i];
-        if (2 <= extraction_way.path.size())
-        {
-            ParseWayInLua(extraction_way,
-                          scripting_environment.getLuaStateForThreadID(omp_get_thread_num()));
-        }
-    }
-
-    for (ExtractionWay &extraction_way : parsed_way_vector)
-    {
-        if (2 <= extraction_way.path.size())
-        {
-            extractor_callbacks->ProcessWay(extraction_way);
-        }
-    }
-}
-
-inline void PBFParser::loadGroup(ParserThreadData *thread_data)
-{
-#ifndef NDEBUG
-    ++group_count;
-#endif
-
-    const OSMPBF::PrimitiveGroup &group =
-        thread_data->PBFprimitiveBlock.primitivegroup(thread_data->currentGroupID);
-    thread_data->entityTypeIndicator = TypeDummy;
-    if (0 != group.nodes_size())
-    {
-        thread_data->entityTypeIndicator = TypeNode;
-    }
-    if (0 != group.ways_size())
-    {
-        thread_data->entityTypeIndicator = TypeWay;
-    }
-    if (0 != group.relations_size())
-    {
-        thread_data->entityTypeIndicator = TypeRelation;
-    }
-    if (group.has_dense())
-    {
-        thread_data->entityTypeIndicator = TypeDenseNode;
-        assert(0 != group.dense().id_size());
-    }
-    assert(thread_data->entityTypeIndicator != TypeDummy);
-}
-
-inline void PBFParser::loadBlock(ParserThreadData *thread_data)
-{
-    ++block_count;
-    thread_data->currentGroupID = 0;
-    thread_data->currentEntityID = 0;
-}
-
-inline bool PBFParser::readPBFBlobHeader(std::fstream &stream, ParserThreadData *thread_data)
-{
-    int size(0);
-    stream.read((char *)&size, sizeof(int));
-    size = SwapEndian(size);
-    if (stream.eof())
-    {
-        return false;
-    }
-    if (size > MAX_BLOB_HEADER_SIZE || size < 0)
-    {
-        return false;
-    }
-    char *data = new char[size];
-    stream.read(data, size * sizeof(data[0]));
-
-    bool dataSuccessfullyParsed = (thread_data->PBFBlobHeader).ParseFromArray(data, size);
-    delete[] data;
-    return dataSuccessfullyParsed;
-}
-
-inline bool PBFParser::unpackZLIB(std::fstream &, ParserThreadData *thread_data)
-{
-    unsigned rawSize = thread_data->PBFBlob.raw_size();
-    char *unpackedDataArray = new char[rawSize];
-    z_stream compressedDataStream;
-    compressedDataStream.next_in = (unsigned char *)thread_data->PBFBlob.zlib_data().data();
-    compressedDataStream.avail_in = thread_data->PBFBlob.zlib_data().size();
-    compressedDataStream.next_out = (unsigned char *)unpackedDataArray;
-    compressedDataStream.avail_out = rawSize;
-    compressedDataStream.zalloc = Z_NULL;
-    compressedDataStream.zfree = Z_NULL;
-    compressedDataStream.opaque = Z_NULL;
-    int ret = inflateInit(&compressedDataStream);
-    if (ret != Z_OK)
-    {
-        std::cerr << "[error] failed to init zlib stream" << std::endl;
-        delete[] unpackedDataArray;
-        return false;
-    }
-
-    ret = inflate(&compressedDataStream, Z_FINISH);
-    if (ret != Z_STREAM_END)
-    {
-        std::cerr << "[error] failed to inflate zlib stream" << std::endl;
-        std::cerr << "[error] Error type: " << ret << std::endl;
-        delete[] unpackedDataArray;
-        return false;
-    }
-
-    ret = inflateEnd(&compressedDataStream);
-    if (ret != Z_OK)
-    {
-        std::cerr << "[error] failed to deinit zlib stream" << std::endl;
-        delete[] unpackedDataArray;
-        return false;
-    }
-
-    thread_data->charBuffer.clear();
-    thread_data->charBuffer.resize(rawSize);
-    std::copy(unpackedDataArray, unpackedDataArray + rawSize, thread_data->charBuffer.begin());
-    delete[] unpackedDataArray;
-    return true;
-}
-
-inline bool PBFParser::unpackLZMA(std::fstream &, ParserThreadData *) { return false; }
-
-inline bool PBFParser::readBlob(std::fstream &stream, ParserThreadData *thread_data)
-{
-    if (stream.eof())
-    {
-        return false;
-    }
-
-    const int size = thread_data->PBFBlobHeader.datasize();
-    if (size < 0 || size > MAX_BLOB_SIZE)
-    {
-        std::cerr << "[error] invalid Blob size:" << size << std::endl;
-        return false;
-    }
-
-    char *data = new char[size];
-    stream.read(data, sizeof(data[0]) * size);
-
-    if (!thread_data->PBFBlob.ParseFromArray(data, size))
-    {
-        std::cerr << "[error] failed to parse blob" << std::endl;
-        delete[] data;
-        return false;
-    }
-
-    if (thread_data->PBFBlob.has_raw())
-    {
-        const std::string &data = thread_data->PBFBlob.raw();
-        thread_data->charBuffer.clear();
-        thread_data->charBuffer.resize(data.size());
-        std::copy(data.begin(), data.end(), thread_data->charBuffer.begin());
-    }
-    else if (thread_data->PBFBlob.has_zlib_data())
-    {
-        if (!unpackZLIB(stream, thread_data))
-        {
-            std::cerr << "[error] zlib data encountered that could not be unpacked" << std::endl;
-            delete[] data;
-            return false;
-        }
-    }
-    else if (thread_data->PBFBlob.has_lzma_data())
-    {
-        if (!unpackLZMA(stream, thread_data))
-        {
-            std::cerr << "[error] lzma data encountered that could not be unpacked" << std::endl;
-        }
-        delete[] data;
-        return false;
-    }
-    else
-    {
-        std::cerr << "[error] Blob contains no data" << std::endl;
-        delete[] data;
-        return false;
-    }
-    delete[] data;
-    return true;
-}
-
-bool PBFParser::readNextBlock(std::fstream &stream, ParserThreadData *thread_data)
-{
-    if (stream.eof())
-    {
-        return false;
-    }
-
-    if (!readPBFBlobHeader(stream, thread_data))
-    {
-        return false;
-    }
-
-    if (thread_data->PBFBlobHeader.type() != "OSMData")
-    {
-        return false;
-    }
-
-    if (!readBlob(stream, thread_data))
-    {
-        return false;
-    }
-
-    if (!thread_data->PBFprimitiveBlock.ParseFromArray(&(thread_data->charBuffer[0]),
-                                                      thread_data->charBuffer.size()))
-    {
-        std::cerr << "failed to parse PrimitiveBlock" << std::endl;
-        return false;
-    }
-    return true;
-}

Extractor/PBFParser.h

@@ -1,99 +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 PBFPARSER_H_
-#define PBFPARSER_H_
-
-#include "BaseParser.h"
-#include "../DataStructures/ConcurrentQueue.h"
-
-#include <osmpbf/fileformat.pb.h>
-#include <osmpbf/osmformat.pb.h>
-
-#include <fstream>
-#include <memory>
-
-class PBFParser : public BaseParser
-{
-
-    enum EntityType
-    { TypeDummy = 0,
-      TypeNode = 1,
-      TypeWay = 2,
-      TypeRelation = 4,
-      TypeDenseNode = 8 };
-
-    struct ParserThreadData
-    {
-        int currentGroupID;
-        int currentEntityID;
-        EntityType entityTypeIndicator;
-
-        OSMPBF::BlobHeader PBFBlobHeader;
-        OSMPBF::Blob PBFBlob;
-
-        OSMPBF::HeaderBlock PBFHeaderBlock;
-        OSMPBF::PrimitiveBlock PBFprimitiveBlock;
-
-        std::vector<char> charBuffer;
-    };
-
-  public:
-    PBFParser(const char *file_name, ExtractorCallbacks *extractor_callbacks, ScriptingEnvironment &scripting_environment);
-    virtual ~PBFParser();
-
-    inline bool ReadHeader();
-    inline bool Parse();
-
-  private:
-    inline void ReadData();
-    inline void ParseData();
-    inline void parseDenseNode(ParserThreadData *thread_data);
-    inline void parseNode(ParserThreadData *thread_data);
-    inline void parseRelation(ParserThreadData *thread_data);
-    inline void parseWay(ParserThreadData *thread_data);
-
-    inline void loadGroup(ParserThreadData *thread_data);
-    inline void loadBlock(ParserThreadData *thread_data);
-    inline bool readPBFBlobHeader(std::fstream &stream, ParserThreadData *thread_data);
-    inline bool unpackZLIB(std::fstream &stream, ParserThreadData *thread_data);
-    inline bool unpackLZMA(std::fstream &stream, ParserThreadData *thread_data);
-    inline bool readBlob(std::fstream &stream, ParserThreadData *thread_data);
-    inline bool readNextBlock(std::fstream &stream, ParserThreadData *thread_data);
-
-    static const int NANO = 1000 * 1000 * 1000;
-    static const int MAX_BLOB_HEADER_SIZE = 64 * 1024;
-    static const int MAX_BLOB_SIZE = 32 * 1024 * 1024;
-
-    unsigned group_count;
-    unsigned block_count;
-
-    std::fstream input; // the input stream to parse
-    std::shared_ptr<ConcurrentQueue<ParserThreadData *>> thread_data_queue;
-};
-
-#endif /* PBFPARSER_H_ */

Extractor/ScriptingEnvironment.cpp

@@ -1,124 +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 "ScriptingEnvironment.h"
-
-#include "ExtractionHelperFunctions.h"
-#include "ExtractionWay.h"
-#include "../DataStructures/ImportNode.h"
-#include "../Util/LuaUtil.h"
-#include "../Util/OpenMPWrapper.h"
-#include "../Util/OSRMException.h"
-#include "../Util/SimpleLogger.h"
-#include "../typedefs.h"
-
-ScriptingEnvironment::ScriptingEnvironment() {}
-ScriptingEnvironment::ScriptingEnvironment(const char *file_name)
-{
-    SimpleLogger().Write() << "Using script " << file_name;
-
-    // Create a new lua state
-    for (int i = 0; i < omp_get_max_threads(); ++i)
-    {
-        lua_state_vector.push_back(luaL_newstate());
-    }
-
-// Connect LuaBind to this lua state for all threads
-#pragma omp parallel
-    {
-        lua_State *lua_state = getLuaStateForThreadID(omp_get_thread_num());
-        luabind::open(lua_state);
-        // open utility libraries string library;
-        luaL_openlibs(lua_state);
-
-        luaAddScriptFolderToLoadPath(lua_state, file_name);
-
-        // Add our function to the state's global scope
-        luabind::module(lua_state)[
-            luabind::def("print", LUA_print<std::string>),
-            luabind::def("durationIsValid", durationIsValid),
-            luabind::def("parseDuration", parseDuration)
-        ];
-
-        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::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))
-        {
-            throw OSRMException("ERROR occured in scripting block");
-        }
-    }
-}
-
-ScriptingEnvironment::~ScriptingEnvironment()
-{
-    for (unsigned i = 0; i < lua_state_vector.size(); ++i)
-    {
-        //        lua_state_vector[i];
-    }
-}
-
-lua_State *ScriptingEnvironment::getLuaStateForThreadID(const int id) { return lua_state_vector[id]; }

Extractor/XMLParser.cpp

@@ -1,347 +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 "XMLParser.h"
-
-#include "ExtractionWay.h"
-#include "ExtractorCallbacks.h"
-
-#include "../DataStructures/HashTable.h"
-#include "../DataStructures/ImportNode.h"
-#include "../DataStructures/InputReaderFactory.h"
-#include "../DataStructures/Restriction.h"
-#include "../Util/SimpleLogger.h"
-#include "../Util/StringUtil.h"
-#include "../typedefs.h"
-
-#include <osrm/Coordinate.h>
-
-#include <boost/ref.hpp>
-
-XMLParser::XMLParser(const char *filename, ExtractorCallbacks *ec, ScriptingEnvironment &se)
-    : BaseParser(ec, se)
-{
-    inputReader = inputReaderFactory(filename);
-}
-
-bool XMLParser::ReadHeader() { return (xmlTextReaderRead(inputReader) == 1); }
-bool XMLParser::Parse()
-{
-    while (xmlTextReaderRead(inputReader) == 1)
-    {
-        const int type = xmlTextReaderNodeType(inputReader);
-
-        // 1 is Element
-        if (type != 1)
-        {
-            continue;
-        }
-
-        xmlChar *currentName = xmlTextReaderName(inputReader);
-        if (currentName == NULL)
-        {
-            continue;
-        }
-
-        if (xmlStrEqual(currentName, (const xmlChar *)"node") == 1)
-        {
-            ImportNode n = ReadXMLNode();
-            ParseNodeInLua(n, lua_state);
-            extractor_callbacks->ProcessNode(n);
-        }
-
-        if (xmlStrEqual(currentName, (const xmlChar *)"way") == 1)
-        {
-            ExtractionWay way = ReadXMLWay();
-            ParseWayInLua(way, lua_state);
-            extractor_callbacks->ProcessWay(way);
-        }
-        if (use_turn_restrictions && xmlStrEqual(currentName, (const xmlChar *)"relation") == 1)
-        {
-            InputRestrictionContainer r = ReadXMLRestriction();
-            if ((UINT_MAX != r.fromWay) && !extractor_callbacks->ProcessRestriction(r))
-            {
-                std::cerr << "[XMLParser] restriction not parsed" << std::endl;
-            }
-        }
-        xmlFree(currentName);
-    }
-    return true;
-}
-
-InputRestrictionContainer XMLParser::ReadXMLRestriction()
-{
-    InputRestrictionContainer restriction;
-    std::string except_tag_string;
-
-    if (xmlTextReaderIsEmptyElement(inputReader) != 1)
-    {
-        const int depth = xmlTextReaderDepth(inputReader);
-        while (xmlTextReaderRead(inputReader) == 1)
-        {
-            const int childType = xmlTextReaderNodeType(inputReader);
-            if (childType != 1 && childType != 15)
-            {
-                continue;
-            }
-            const int childDepth = xmlTextReaderDepth(inputReader);
-            xmlChar *childName = xmlTextReaderName(inputReader);
-            if (childName == NULL)
-            {
-                continue;
-            }
-            if (depth == childDepth && childType == 15 &&
-                xmlStrEqual(childName, (const xmlChar *)"relation") == 1)
-            {
-                xmlFree(childName);
-                break;
-            }
-            if (childType != 1)
-            {
-                xmlFree(childName);
-                continue;
-            }
-
-            if (xmlStrEqual(childName, (const xmlChar *)"tag") == 1)
-            {
-                xmlChar *k = xmlTextReaderGetAttribute(inputReader, (const xmlChar *)"k");
-                xmlChar *value = xmlTextReaderGetAttribute(inputReader, (const xmlChar *)"v");
-                if (k != NULL && value != NULL)
-                {
-                    if (xmlStrEqual(k, (const xmlChar *)"restriction") &&
-                        (0 == std::string((const char *)value).find("only_")))
-                    {
-                        restriction.restriction.flags.isOnly = true;
-                    }
-                    if (xmlStrEqual(k, (const xmlChar *)"except"))
-                    {
-                        except_tag_string = (const char *)value;
-                    }
-                }
-
-                if (k != NULL)
-                {
-                    xmlFree(k);
-                }
-                if (value != NULL)
-                {
-                    xmlFree(value);
-                }
-            }
-            else if (xmlStrEqual(childName, (const xmlChar *)"member") == 1)
-            {
-                xmlChar *ref = xmlTextReaderGetAttribute(inputReader, (const xmlChar *)"ref");
-                if (ref != NULL)
-                {
-                    xmlChar *role = xmlTextReaderGetAttribute(inputReader, (const xmlChar *)"role");
-                    xmlChar *type = xmlTextReaderGetAttribute(inputReader, (const xmlChar *)"type");
-
-                    if (xmlStrEqual(role, (const xmlChar *)"to") &&
-                        xmlStrEqual(type, (const xmlChar *)"way"))
-                    {
-                        restriction.toWay = stringToUint((const char *)ref);
-                    }
-                    if (xmlStrEqual(role, (const xmlChar *)"from") &&
-                        xmlStrEqual(type, (const xmlChar *)"way"))
-                    {
-                        restriction.fromWay = stringToUint((const char *)ref);
-                    }
-                    if (xmlStrEqual(role, (const xmlChar *)"via") &&
-                        xmlStrEqual(type, (const xmlChar *)"node"))
-                    {
-                        restriction.restriction.viaNode = stringToUint((const char *)ref);
-                    }
-
-                    if (NULL != type)
-                    {
-                        xmlFree(type);
-                    }
-                    if (NULL != role)
-                    {
-                        xmlFree(role);
-                    }
-                    if (NULL != ref)
-                    {
-                        xmlFree(ref);
-                    }
-                }
-            }
-            xmlFree(childName);
-        }
-    }
-
-    if (ShouldIgnoreRestriction(except_tag_string))
-    {
-        restriction.fromWay = UINT_MAX; // workaround to ignore the restriction
-    }
-    return restriction;
-}
-
-ExtractionWay XMLParser::ReadXMLWay()
-{
-    ExtractionWay way;
-    if (xmlTextReaderIsEmptyElement(inputReader) != 1)
-    {
-        const int depth = xmlTextReaderDepth(inputReader);
-        while (xmlTextReaderRead(inputReader) == 1)
-        {
-            const int childType = xmlTextReaderNodeType(inputReader);
-            if (childType != 1 && childType != 15)
-            {
-                continue;
-            }
-            const int childDepth = xmlTextReaderDepth(inputReader);
-            xmlChar *childName = xmlTextReaderName(inputReader);
-            if (childName == NULL)
-            {
-                continue;
-            }
-
-            if (depth == childDepth && childType == 15 &&
-                xmlStrEqual(childName, (const xmlChar *)"way") == 1)
-            {
-                xmlChar *id = xmlTextReaderGetAttribute(inputReader, (const xmlChar *)"id");
-                way.id = stringToUint((char *)id);
-                xmlFree(id);
-                xmlFree(childName);
-                break;
-            }
-            if (childType != 1)
-            {
-                xmlFree(childName);
-                continue;
-            }
-
-            if (xmlStrEqual(childName, (const xmlChar *)"tag") == 1)
-            {
-                xmlChar *k = xmlTextReaderGetAttribute(inputReader, (const xmlChar *)"k");
-                xmlChar *value = xmlTextReaderGetAttribute(inputReader, (const xmlChar *)"v");
-
-                if (k != NULL && value != NULL)
-                {
-                    way.keyVals.Add(std::string((char *)k), std::string((char *)value));
-                }
-                if (k != NULL)
-                {
-                    xmlFree(k);
-                }
-                if (value != NULL)
-                {
-                    xmlFree(value);
-                }
-            }
-            else if (xmlStrEqual(childName, (const xmlChar *)"nd") == 1)
-            {
-                xmlChar *ref = xmlTextReaderGetAttribute(inputReader, (const xmlChar *)"ref");
-                if (ref != NULL)
-                {
-                    way.path.push_back(stringToUint((const char *)ref));
-                    xmlFree(ref);
-                }
-            }
-            xmlFree(childName);
-        }
-    }
-    return way;
-}
-
-ImportNode XMLParser::ReadXMLNode()
-{
-    ImportNode node;
-
-    xmlChar *attribute = xmlTextReaderGetAttribute(inputReader, (const xmlChar *)"lat");
-    if (attribute != NULL)
-    {
-        node.lat = COORDINATE_PRECISION * StringToDouble((const char *)attribute);
-        xmlFree(attribute);
-    }
-    attribute = xmlTextReaderGetAttribute(inputReader, (const xmlChar *)"lon");
-    if (attribute != NULL)
-    {
-        node.lon = COORDINATE_PRECISION * StringToDouble((const char *)attribute);
-        xmlFree(attribute);
-    }
-    attribute = xmlTextReaderGetAttribute(inputReader, (const xmlChar *)"id");
-    if (attribute != NULL)
-    {
-        node.id = stringToUint((const char *)attribute);
-        xmlFree(attribute);
-    }
-
-    if (xmlTextReaderIsEmptyElement(inputReader) != 1)
-    {
-        const int depth = xmlTextReaderDepth(inputReader);
-        while (xmlTextReaderRead(inputReader) == 1)
-        {
-            const int childType = xmlTextReaderNodeType(inputReader);
-            // 1 = Element, 15 = EndElement
-            if (childType != 1 && childType != 15)
-            {
-                continue;
-            }
-            const int childDepth = xmlTextReaderDepth(inputReader);
-            xmlChar *childName = xmlTextReaderName(inputReader);
-            if (childName == NULL)
-            {
-                continue;
-            }
-
-            if (depth == childDepth && childType == 15 &&
-                xmlStrEqual(childName, (const xmlChar *)"node") == 1)
-            {
-                xmlFree(childName);
-                break;
-            }
-            if (childType != 1)
-            {
-                xmlFree(childName);
-                continue;
-            }
-
-            if (xmlStrEqual(childName, (const xmlChar *)"tag") == 1)
-            {
-                xmlChar *k = xmlTextReaderGetAttribute(inputReader, (const xmlChar *)"k");
-                xmlChar *value = xmlTextReaderGetAttribute(inputReader, (const xmlChar *)"v");
-                if (k != NULL && value != NULL)
-                {
-                    node.keyVals.emplace(std::string((char *)(k)), std::string((char *)(value)));
-                }
-                if (k != NULL)
-                {
-                    xmlFree(k);
-                }
-                if (value != NULL)
-                {
-                    xmlFree(value);
-                }
-            }
-
-            xmlFree(childName);
-        }
-    }
-    return node;
-}

Include/osrm/Coordinate.h

@@ -29,58 +29,85 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define FIXED_POINT_COORDINATE_H_
 
 #include <iosfwd> //for std::ostream
+#include <string>
+#include <type_traits>
 
-constexpr double COORDINATE_PRECISION = 1000000.;
-
+namespace
+{
+constexpr float COORDINATE_PRECISION = 1000000.f;
+}
 struct FixedPointCoordinate
 {
     int lat;
     int lon;
 
     FixedPointCoordinate();
-    explicit FixedPointCoordinate(int lat, int lon);
+    FixedPointCoordinate(int lat, int lon);
+
+    template<class T>
+    FixedPointCoordinate(const T &coordinate) : lat(coordinate.lat), lon(coordinate.lon)
+    {
+        static_assert(std::is_same<decltype(lat), decltype(coordinate.lat)>::value, "coordinate types incompatible");
+        static_assert(std::is_same<decltype(lon), decltype(coordinate.lon)>::value, "coordinate types incompatible");
+    }
+
     void Reset();
     bool isSet() const;
-    bool isValid() const;
+    bool is_valid() const;
     bool operator==(const FixedPointCoordinate &other) const;
 
     static double
     ApproximateDistance(const int lat1, const int lon1, const int lat2, const int lon2);
 
-    static double ApproximateDistance(const FixedPointCoordinate &c1,
-                                      const FixedPointCoordinate &c2);
+    static double ApproximateDistance(const FixedPointCoordinate &first_coordinate,
+                                      const FixedPointCoordinate &second_coordinate);
 
-    static double ApproximateEuclideanDistance(const FixedPointCoordinate &c1,
-                                               const FixedPointCoordinate &c2);
+    static float ApproximateEuclideanDistance(const FixedPointCoordinate &first_coordinate,
+                                              const FixedPointCoordinate &second_coordinate);
 
-    static double
+    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);
+
     static void convertInternalLatLonToString(const int value, std::string &output);
 
-    static void convertInternalCoordinateToString(const FixedPointCoordinate &coord,
+    static void convertInternalCoordinateToString(const FixedPointCoordinate &coordinate,
                                                   std::string &output);
 
-    static void convertInternalReversedCoordinateToString(const FixedPointCoordinate &coord,
+    static void convertInternalReversedCoordinateToString(const FixedPointCoordinate &coordinate,
                                                           std::string &output);
 
-    static double ComputePerpendicularDistance(const FixedPointCoordinate &point,
-                                               const FixedPointCoordinate &segA,
-                                               const FixedPointCoordinate &segB);
+    static float ComputePerpendicularDistance(const FixedPointCoordinate &segment_source,
+                                              const FixedPointCoordinate &segment_target,
+                                              const FixedPointCoordinate &query_location);
 
-    static double ComputePerpendicularDistance(const FixedPointCoordinate &coord_a,
-                                               const FixedPointCoordinate &coord_b,
-                                               const FixedPointCoordinate &query_location,
-                                               FixedPointCoordinate &nearest_location,
-                                               double &r);
+    static float ComputePerpendicularDistance(const FixedPointCoordinate &segment_source,
+                                              const FixedPointCoordinate &segment_target,
+                                              const FixedPointCoordinate &query_location,
+                                              FixedPointCoordinate &nearest_location,
+                                              float &ratio);
+
+    static int
+    OrderedPerpendicularDistanceApproximation(const FixedPointCoordinate &segment_source,
+                                              const FixedPointCoordinate &segment_target,
+                                              const FixedPointCoordinate &query_location);
+
+    static float GetBearing(const FixedPointCoordinate &A, const FixedPointCoordinate &B);
+
+    float GetBearing(const FixedPointCoordinate &other) const;
 
     void Output(std::ostream &out) const;
+
+    static float DegreeToRadian(const float degree);
+    static float RadianToDegree(const float radian);
 };
 
-inline std::ostream &operator<<(std::ostream &o, FixedPointCoordinate const &c)
+inline std::ostream &operator<<(std::ostream &out_stream, FixedPointCoordinate const &coordinate)
 {
-    c.Output(o);
-    return o;
+    coordinate.Output(out_stream);
+    return out_stream;
 }
 
 #endif /* FIXED_POINT_COORDINATE_H_ */

Include/osrm/Header.h

@@ -29,18 +29,24 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define HTTP_HEADER_H
 
 #include <string>
+#include <algorithm>
 
 namespace http
 {
 struct Header
 {
-    std::string name;
-    std::string value;
+    Header& operator=(const Header& other) = default;
+    Header(const std::string & name, const std::string & value) : name(name), value(value) {}
+    Header(Header && other) : name(std::move(other.name)), value(std::move(other.value)) {}
+
     void Clear()
     {
         name.clear();
         value.clear();
     }
+
+    std::string name;
+    std::string value;
 };
 }
 

Include/osrm/Reply.h

@@ -56,11 +56,11 @@ class Reply
       internalServerError = 500 } status;
 
     std::vector<Header> headers;
-    std::vector<boost::asio::const_buffer> toBuffers();
+    std::vector<boost::asio::const_buffer> ToBuffers();
     std::vector<boost::asio::const_buffer> HeaderstoBuffers();
-    std::vector<std::string> content;
+    std::vector<char> content;
     static Reply StockReply(status_type status);
-    void setSize(const unsigned size);
+    void SetSize(const unsigned size);
     void SetUncompressedSize();
 
     Reply();

Include/osrm/RouteParameters.h

@@ -40,9 +40,15 @@ struct RouteParameters
     RouteParameters();
 
     void setZoomLevel(const short level);
+    
+    void setNumberOfResults(const short number);
 
     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 +77,15 @@ struct RouteParameters
     bool geometry;
     bool compression;
     bool deprecatedAPI;
+    bool uturn_default;
     unsigned check_sum;
+    short num_results;
     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;
 };
 

Library/OSRM.h

@@ -30,6 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <osrm/ServerPaths.h>
 
+#include <memory>
+
 class OSRM_impl;
 struct RouteParameters;
 
@@ -41,10 +43,10 @@ class Reply;
 class OSRM
 {
   private:
-    OSRM_impl *OSRM_pimpl_;
+    std::unique_ptr<OSRM_impl> OSRM_pimpl_;
 
   public:
-    explicit OSRM(const ServerPaths &paths, const bool use_shared_memory = false);
+    explicit OSRM(ServerPaths paths, const bool use_shared_memory = false);
     ~OSRM();
     void RunQuery(RouteParameters &route_parameters, http::Reply &reply);
 };

Library/OSRM_impl.cpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -25,36 +25,54 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
+namespace boost { namespace interprocess { class named_mutex; } }
+
 #include "OSRM_impl.h"
 #include "OSRM.h"
 
-#include "../Plugins/HelloWorldPlugin.h"
-#include "../Plugins/LocatePlugin.h"
-#include "../Plugins/NearestPlugin.h"
-#include "../Plugins/TimestampPlugin.h"
-#include "../Plugins/ViaRoutePlugin.h"
+#include <osrm/Reply.h>
+#include <osrm/RouteParameters.h>
+#include <osrm/ServerPaths.h>
 
+#include "../plugins/distance_table.hpp"
+#include "../plugins/hello_world.hpp"
+#include "../plugins/locate.hpp"
+#include "../plugins/nearest.hpp"
+#include "../plugins/timestamp.hpp"
+#include "../plugins/viaroute.hpp"
 #include "../Server/DataStructures/BaseDataFacade.h"
 #include "../Server/DataStructures/InternalDataFacade.h"
 #include "../Server/DataStructures/SharedBarriers.h"
 #include "../Server/DataStructures/SharedDataFacade.h"
+#include "../Util/make_unique.hpp"
+#include "../Util/ProgramOptions.h"
+#include "../Util/simple_logger.hpp"
 
 #include <boost/assert.hpp>
+#include <boost/interprocess/sync/named_condition.hpp>
+#include <boost/interprocess/sync/scoped_lock.hpp>
 
-OSRM_impl::OSRM_impl(const ServerPaths &server_paths, const bool use_shared_memory)
-    : use_shared_memory(use_shared_memory)
+#include <algorithm>
+#include <fstream>
+#include <utility>
+#include <vector>
+
+OSRM_impl::OSRM_impl(ServerPaths server_paths, const bool use_shared_memory)
 {
     if (use_shared_memory)
     {
-        barrier = new SharedBarriers();
+        barrier = osrm::make_unique<SharedBarriers>();
         query_data_facade = new SharedDataFacade<QueryEdge::EdgeData>();
     }
     else
     {
+        // populate base path
+        populate_base_path(server_paths);
         query_data_facade = new InternalDataFacade<QueryEdge::EdgeData>(server_paths);
     }
 
     // The following plugins handle all requests.
+    RegisterPlugin(new DistanceTablePlugin<BaseDataFacade<QueryEdge::EdgeData>>(query_data_facade));
     RegisterPlugin(new HelloWorldPlugin());
     RegisterPlugin(new LocatePlugin<BaseDataFacade<QueryEdge::EdgeData>>(query_data_facade));
     RegisterPlugin(new NearestPlugin<BaseDataFacade<QueryEdge::EdgeData>>(query_data_facade));
@@ -64,14 +82,11 @@ OSRM_impl::OSRM_impl(const ServerPaths &server_paths, const bool use_shared_memo
 
 OSRM_impl::~OSRM_impl()
 {
+    delete query_data_facade;
     for (PluginMap::value_type &plugin_pointer : plugin_map)
     {
         delete plugin_pointer.second;
     }
-    if (use_shared_memory)
-    {
-        delete barrier;
-    }
 }
 
 void OSRM_impl::RegisterPlugin(BasePlugin *plugin)
@@ -91,7 +106,7 @@ void OSRM_impl::RunQuery(RouteParameters &route_parameters, http::Reply &reply)
     if (plugin_map.end() != iter)
     {
         reply.status = http::Reply::ok;
-        if (use_shared_memory)
+        if (barrier)
         {
             // lock update pending
             boost::interprocess::scoped_lock<boost::interprocess::named_mutex> pending_lock(
@@ -112,7 +127,7 @@ void OSRM_impl::RunQuery(RouteParameters &route_parameters, http::Reply &reply)
         }
 
         iter->second->HandleRequest(route_parameters, reply);
-        if (use_shared_memory)
+        if (barrier)
         {
             // lock query
             boost::interprocess::scoped_lock<boost::interprocess::named_mutex> query_lock(
@@ -137,12 +152,12 @@ void OSRM_impl::RunQuery(RouteParameters &route_parameters, http::Reply &reply)
 
 // proxy code for compilation firewall
 
-OSRM::OSRM(const ServerPaths &paths, const bool use_shared_memory)
-    : OSRM_pimpl_(new OSRM_impl(paths, use_shared_memory))
+OSRM::OSRM(ServerPaths paths, const bool use_shared_memory)
+    : OSRM_pimpl_(osrm::make_unique<OSRM_impl>(paths, use_shared_memory))
 {
 }
 
-OSRM::~OSRM() { delete OSRM_pimpl_; }
+OSRM::~OSRM() { OSRM_pimpl_.reset(); }
 
 void OSRM::RunQuery(RouteParameters &route_parameters, http::Reply &reply)
 {

Library/OSRM_impl.h

@@ -28,14 +28,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef OSRM_IMPL_H
 #define OSRM_IMPL_H
 
-#include <osrm/Reply.h>
-#include <osrm/RouteParameters.h>
+class BasePlugin;
+namespace http { class Reply; }
+struct RouteParameters;
+
 #include <osrm/ServerPaths.h>
 
-#include "../DataStructures/QueryEdge.h"
-#include "../Plugins/BasePlugin.h"
-#include "../Util/ProgramOptions.h"
+#include "../data_structures/query_edge.hpp"
 
+#include <memory>
 #include <unordered_map>
 #include <string>
 
@@ -45,10 +46,10 @@ template <class EdgeDataT> class BaseDataFacade;
 class OSRM_impl
 {
   private:
-    typedef std::unordered_map<std::string, BasePlugin *> PluginMap;
+    using PluginMap = std::unordered_map<std::string, BasePlugin *>;
 
   public:
-    OSRM_impl(const ServerPaths &paths, const bool use_shared_memory);
+    OSRM_impl(ServerPaths paths, const bool use_shared_memory);
     OSRM_impl(const OSRM_impl &) = delete;
     virtual ~OSRM_impl();
     void RunQuery(RouteParameters &route_parameters, http::Reply &reply);
@@ -56,8 +57,8 @@ class OSRM_impl
   private:
     void RegisterPlugin(BasePlugin *plugin);
     PluginMap plugin_map;
-    bool use_shared_memory;
-    SharedBarriers *barrier;
+    // will only be initialized if shared memory is used
+    std::unique_ptr<SharedBarriers> barrier;
     // base class pointer to the objects
     BaseDataFacade<QueryEdge::EdgeData> *query_data_facade;
 };

Plugins/HelloWorldPlugin.h

@@ -1,115 +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 HELLOWORLDPLUGIN_H_
-#define HELLOWORLDPLUGIN_H_
-
-#include "BasePlugin.h"
-#include "../Util/StringUtil.h"
-
-#include <string>
-
-class HelloWorldPlugin : public BasePlugin
-{
-  private:
-    std::string temp_string;
-
-  public:
-    HelloWorldPlugin() : descriptor_string("hello") {}
-    virtual ~HelloWorldPlugin() {}
-    const std::string GetDescriptor() const { return descriptor_string; }
-
-    void HandleRequest(const RouteParameters &routeParameters, http::Reply &reply)
-    {
-        reply.status = http::Reply::ok;
-        reply.content.emplace_back("<html><head><title>Hello World Demonstration "
-                                   "Document</title></head><body><h1>Hello, World!</h1>");
-        reply.content.emplace_back("<pre>");
-        reply.content.emplace_back("zoom level: ");
-        intToString(routeParameters.zoom_level, temp_string);
-        reply.content.emplace_back(temp_string);
-        reply.content.emplace_back("\nchecksum: ");
-        intToString(routeParameters.check_sum, temp_string);
-        reply.content.emplace_back(temp_string);
-        reply.content.emplace_back("\ninstructions: ");
-        reply.content.emplace_back((routeParameters.print_instructions ? "yes" : "no"));
-        reply.content.emplace_back(temp_string);
-        reply.content.emplace_back("\ngeometry: ");
-        reply.content.emplace_back((routeParameters.geometry ? "yes" : "no"));
-        reply.content.emplace_back("\ncompression: ");
-        reply.content.emplace_back((routeParameters.compression ? "yes" : "no"));
-        reply.content.emplace_back("\noutput format: ");
-        reply.content.emplace_back(routeParameters.output_format);
-        reply.content.emplace_back("\njson parameter: ");
-        reply.content.emplace_back(routeParameters.jsonp_parameter);
-        reply.content.emplace_back("\nlanguage: ");
-        reply.content.emplace_back(routeParameters.language);
-        reply.content.emplace_back("\nNumber of locations: ");
-        intToString(routeParameters.coordinates.size(), temp_string);
-        reply.content.emplace_back(temp_string);
-        reply.content.emplace_back("\n");
-
-        unsigned counter = 0;
-        for (const FixedPointCoordinate &coordinate : routeParameters.coordinates)
-        {
-            reply.content.emplace_back("  [");
-            intToString(counter, temp_string);
-            reply.content.emplace_back(temp_string);
-            reply.content.emplace_back("] ");
-            doubleToString(coordinate.lat / COORDINATE_PRECISION, temp_string);
-            reply.content.emplace_back(temp_string);
-            reply.content.emplace_back(",");
-            doubleToString(coordinate.lon / COORDINATE_PRECISION, temp_string);
-            reply.content.emplace_back(temp_string);
-            reply.content.emplace_back("\n");
-            ++counter;
-        }
-
-        reply.content.emplace_back("Number of hints: ");
-        intToString(routeParameters.hints.size(), temp_string);
-        reply.content.emplace_back(temp_string);
-        reply.content.emplace_back("\n");
-
-        counter = 0;
-        for (const std::string &current_string : routeParameters.hints)
-        {
-            reply.content.emplace_back("  [");
-            intToString(counter, temp_string);
-            reply.content.emplace_back(temp_string);
-            reply.content.emplace_back("] ");
-            reply.content.emplace_back(current_string);
-            reply.content.emplace_back("\n");
-            ++counter;
-        }
-        reply.content.emplace_back("</pre></body></html>");
-    }
-
-  private:
-    std::string descriptor_string;
-};
-
-#endif /* HELLOWORLDPLUGIN_H_ */

Plugins/LocatePlugin.h

@@ -1,116 +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 LOCATE_PLUGIN_H
-#define LOCATE_PLUGIN_H
-
-#include "BasePlugin.h"
-#include "../Util/StringUtil.h"
-
-// locates the nearest node in the road network for a given coordinate.
-
-template <class DataFacadeT> class LocatePlugin : public BasePlugin
-{
-  public:
-    explicit LocatePlugin(DataFacadeT *facade) : descriptor_string("locate"), facade(facade) {}
-    const std::string GetDescriptor() const { return descriptor_string; }
-
-    void HandleRequest(const RouteParameters &route_parameters, http::Reply &reply)
-    {
-        // check number of parameters
-        if (route_parameters.coordinates.empty() || !route_parameters.coordinates.front().isValid())
-        {
-            reply = http::Reply::StockReply(http::Reply::badRequest);
-            return;
-        }
-
-        // query to helpdesk
-        FixedPointCoordinate result;
-        std::string tmp;
-        // json
-
-        if (!route_parameters.jsonp_parameter.empty())
-        {
-            reply.content.emplace_back(route_parameters.jsonp_parameter);
-            reply.content.emplace_back("(");
-        }
-        reply.status = http::Reply::ok;
-        reply.content.emplace_back("{");
-        if (!facade->LocateClosestEndPointForCoordinate(route_parameters.coordinates.front(),
-                                                        result))
-        {
-            reply.content.emplace_back("\"status\":207,");
-            reply.content.emplace_back("\"mapped_coordinate\":[]");
-        }
-        else
-        {
-            // Write coordinate to stream
-            reply.status = http::Reply::ok;
-            reply.content.emplace_back("\"status\":0,");
-            reply.content.emplace_back("\"mapped_coordinate\":");
-            FixedPointCoordinate::convertInternalLatLonToString(result.lat, tmp);
-            reply.content.emplace_back("[");
-            reply.content.emplace_back(tmp);
-            FixedPointCoordinate::convertInternalLatLonToString(result.lon, tmp);
-            reply.content.emplace_back(",");
-            reply.content.emplace_back(tmp);
-            reply.content.emplace_back("]");
-        }
-        reply.content.emplace_back("}");
-        reply.headers.resize(3);
-        if (!route_parameters.jsonp_parameter.empty())
-        {
-            reply.content.emplace_back(")");
-            reply.headers[1].name = "Content-Type";
-            reply.headers[1].value = "text/javascript";
-            reply.headers[2].name = "Content-Disposition";
-            reply.headers[2].value = "attachment; filename=\"location.js\"";
-        }
-        else
-        {
-            reply.headers[1].name = "Content-Type";
-            reply.headers[1].value = "application/x-javascript";
-            reply.headers[2].name = "Content-Disposition";
-            reply.headers[2].value = "attachment; filename=\"location.json\"";
-        }
-        reply.headers[0].name = "Content-Length";
-        unsigned content_length = 0;
-        for (const std::string &snippet : reply.content)
-        {
-            content_length += snippet.length();
-        }
-        intToString(content_length, tmp);
-        reply.headers[0].value = tmp;
-        return;
-    }
-
-  private:
-    std::string descriptor_string;
-    DataFacadeT *facade;
-};
-
-#endif /* LOCATE_PLUGIN_H */

Plugins/NearestPlugin.h

@@ -1,138 +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 NEAREST_PLUGIN_H
-#define NEAREST_PLUGIN_H
-
-#include "BasePlugin.h"
-#include "../DataStructures/PhantomNodes.h"
-#include "../Util/StringUtil.h"
-
-#include <unordered_map>
-
-/*
- * This Plugin locates the nearest point on a street in the road network for a given coordinate.
- */
-
-template <class DataFacadeT> class NearestPlugin : public BasePlugin
-{
-  public:
-    explicit NearestPlugin(DataFacadeT *facade) : facade(facade), descriptor_string("nearest")
-    {
-        descriptor_table.emplace("", 0); // default descriptor
-        descriptor_table.emplace("json", 1);
-    }
-
-    const std::string GetDescriptor() const { return descriptor_string; }
-
-    void HandleRequest(const RouteParameters &route_parameters, http::Reply &reply)
-    {
-        // check number of parameters
-        if (route_parameters.coordinates.empty())
-        {
-            reply = http::Reply::StockReply(http::Reply::badRequest);
-            return;
-        }
-        if (!route_parameters.coordinates.front().isValid())
-        {
-            reply = http::Reply::StockReply(http::Reply::badRequest);
-            return;
-        }
-
-        PhantomNode result;
-        facade->FindPhantomNodeForCoordinate(
-            route_parameters.coordinates.front(), result, route_parameters.zoom_level);
-
-        // json
-
-        if (!route_parameters.jsonp_parameter.empty())
-        {
-            reply.content.emplace_back(route_parameters.jsonp_parameter);
-            reply.content.emplace_back("(");
-        }
-
-        reply.status = http::Reply::ok;
-        reply.content.emplace_back("{\"status\":");
-        if (SPECIAL_NODEID != result.forward_node_id)
-        {
-            reply.content.emplace_back("0,");
-        }
-        else
-        {
-            reply.content.emplace_back("207,");
-        }
-        reply.content.emplace_back("\"mapped_coordinate\":[");
-        std::string temp_string;
-
-        if (SPECIAL_NODEID != result.forward_node_id)
-        {
-            FixedPointCoordinate::convertInternalLatLonToString(result.location.lat, temp_string);
-            reply.content.emplace_back(temp_string);
-            FixedPointCoordinate::convertInternalLatLonToString(result.location.lon, temp_string);
-            reply.content.emplace_back(",");
-            reply.content.emplace_back(temp_string);
-        }
-        reply.content.emplace_back("],\"name\":\"");
-        if (SPECIAL_NODEID != result.forward_node_id)
-        {
-            facade->GetName(result.name_id, temp_string);
-            reply.content.emplace_back(temp_string);
-        }
-        reply.content.emplace_back("\"}");
-        reply.headers.resize(3);
-        if (!route_parameters.jsonp_parameter.empty())
-        {
-            reply.content.emplace_back(")");
-            reply.headers[1].name = "Content-Type";
-            reply.headers[1].value = "text/javascript";
-            reply.headers[2].name = "Content-Disposition";
-            reply.headers[2].value = "attachment; filename=\"location.js\"";
-        }
-        else
-        {
-            reply.headers[1].name = "Content-Type";
-            reply.headers[1].value = "application/x-javascript";
-            reply.headers[2].name = "Content-Disposition";
-            reply.headers[2].value = "attachment; filename=\"location.json\"";
-        }
-        reply.headers[0].name = "Content-Length";
-        unsigned content_length = 0;
-        for (const std::string &snippet : reply.content)
-        {
-            content_length += snippet.length();
-        }
-        intToString(content_length, temp_string);
-        reply.headers[0].value = temp_string;
-    }
-
-  private:
-    DataFacadeT *facade;
-    std::unordered_map<std::string, unsigned> descriptor_table;
-    std::string descriptor_string;
-};
-
-#endif /* NEAREST_PLUGIN_H */

Plugins/TimestampPlugin.h

@@ -1,90 +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 TIMESTAMP_PLUGIN_H
-#define TIMESTAMP_PLUGIN_H
-
-#include "BasePlugin.h"
-
-template <class DataFacadeT> class TimestampPlugin : public BasePlugin
-{
-  public:
-    explicit TimestampPlugin(const DataFacadeT *facade)
-        : facade(facade), descriptor_string("timestamp")
-    {
-    }
-    const std::string GetDescriptor() const { return descriptor_string; }
-    void HandleRequest(const RouteParameters &route_parameters, http::Reply &reply)
-    {
-        std::string tmp;
-
-        // json
-        if (!route_parameters.jsonp_parameter.empty())
-        {
-            reply.content.emplace_back(route_parameters.jsonp_parameter);
-            reply.content.emplace_back("(");
-        }
-
-        reply.status = http::Reply::ok;
-        reply.content.emplace_back("{");
-        reply.content.emplace_back("\"status\":");
-        reply.content.emplace_back("0,");
-        reply.content.emplace_back("\"timestamp\":\"");
-        reply.content.emplace_back(facade->GetTimestamp());
-        reply.content.emplace_back("\"");
-        reply.content.emplace_back("}");
-        reply.headers.resize(3);
-        if (!route_parameters.jsonp_parameter.empty())
-        {
-            reply.content.emplace_back(")");
-            reply.headers[1].name = "Content-Type";
-            reply.headers[1].value = "text/javascript";
-            reply.headers[2].name = "Content-Disposition";
-            reply.headers[2].value = "attachment; filename=\"timestamp.js\"";
-        }
-        else
-        {
-            reply.headers[1].name = "Content-Type";
-            reply.headers[1].value = "application/x-javascript";
-            reply.headers[2].name = "Content-Disposition";
-            reply.headers[2].value = "attachment; filename=\"timestamp.json\"";
-        }
-        unsigned content_length = 0;
-        for (const std::string &snippet : reply.content)
-        {
-            content_length += snippet.length();
-        }
-        intToString(content_length, tmp);
-        reply.headers[0].value = tmp;
-    }
-
-  private:
-    const DataFacadeT *facade;
-    std::string descriptor_string;
-};
-
-#endif /* TIMESTAMP_PLUGIN_H */

Plugins/ViaRoutePlugin.h

@@ -1,241 +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 VIAROUTEPLUGIN_H_
-#define VIAROUTEPLUGIN_H_
-
-#include "BasePlugin.h"
-
-#include "../Algorithms/ObjectToBase64.h"
-#include "../DataStructures/QueryEdge.h"
-#include "../DataStructures/SearchEngine.h"
-#include "../Descriptors/BaseDescriptor.h"
-#include "../Descriptors/GPXDescriptor.h"
-#include "../Descriptors/JSONDescriptor.h"
-#include "../Util/SimpleLogger.h"
-#include "../Util/StringUtil.h"
-
-#include <cstdlib>
-
-#include <algorithm>
-#include <memory>
-#include <unordered_map>
-#include <string>
-#include <vector>
-
-template <class DataFacadeT> class ViaRoutePlugin : public BasePlugin
-{
-  private:
-    std::unordered_map<std::string, unsigned> descriptorTable;
-    std::shared_ptr<SearchEngine<DataFacadeT>> search_engine_ptr;
-
-  public:
-    explicit ViaRoutePlugin(DataFacadeT *facade) : descriptor_string("viaroute"), facade(facade)
-    {
-        search_engine_ptr = std::make_shared<SearchEngine<DataFacadeT>>(facade);
-
-        descriptorTable.emplace("json", 0);
-        descriptorTable.emplace("gpx", 1);
-    }
-
-    virtual ~ViaRoutePlugin() {}
-
-    const std::string GetDescriptor() const { return descriptor_string; }
-
-    void HandleRequest(const RouteParameters &routeParameters, http::Reply &reply)
-    {
-        // check number of parameters
-        if (2 > routeParameters.coordinates.size())
-        {
-            reply = http::Reply::StockReply(http::Reply::badRequest);
-            return;
-        }
-
-        RawRouteData raw_route;
-        raw_route.check_sum = facade->GetCheckSum();
-
-        if (std::any_of(begin(routeParameters.coordinates),
-                        end(routeParameters.coordinates),
-                        [&](FixedPointCoordinate coordinate)
-                        { return !coordinate.isValid(); }))
-        {
-            reply = http::Reply::StockReply(http::Reply::badRequest);
-            return;
-        }
-
-        for (const FixedPointCoordinate &coordinate : routeParameters.coordinates)
-        {
-            raw_route.raw_via_node_coordinates.emplace_back(coordinate);
-        }
-
-        std::vector<PhantomNode> phantom_node_vector(raw_route.raw_via_node_coordinates.size());
-        const bool checksum_OK = (routeParameters.check_sum == raw_route.check_sum);
-
-        for (unsigned i = 0; i < raw_route.raw_via_node_coordinates.size(); ++i)
-        {
-            if (checksum_OK && i < routeParameters.hints.size() &&
-                !routeParameters.hints[i].empty())
-            {
-                DecodeObjectFromBase64(routeParameters.hints[i], phantom_node_vector[i]);
-                if (phantom_node_vector[i].isValid(facade->GetNumberOfNodes()))
-                {
-                    continue;
-                }
-            }
-            facade->FindPhantomNodeForCoordinate(raw_route.raw_via_node_coordinates[i],
-                                                 phantom_node_vector[i],
-                                                 routeParameters.zoom_level);
-        }
-
-        PhantomNodes current_phantom_node_pair;
-        for (unsigned i = 0; i < phantom_node_vector.size() - 1; ++i)
-        {
-            current_phantom_node_pair.source_phantom = phantom_node_vector[i];
-            current_phantom_node_pair.target_phantom = phantom_node_vector[i + 1];
-            raw_route.segment_end_coordinates.emplace_back(current_phantom_node_pair);
-        }
-
-        if ((routeParameters.alternate_route) && (1 == raw_route.segment_end_coordinates.size()))
-        {
-            search_engine_ptr->alternative_path(raw_route.segment_end_coordinates.front(),
-                                                raw_route);
-        }
-        else
-        {
-            search_engine_ptr->shortest_path(raw_route.segment_end_coordinates, raw_route);
-        }
-
-        if (INVALID_EDGE_WEIGHT == raw_route.shortest_path_length)
-        {
-            SimpleLogger().Write(logDEBUG) << "Error occurred, single path not found";
-        }
-        reply.status = http::Reply::ok;
-
-        if (!routeParameters.jsonp_parameter.empty())
-        {
-            reply.content.emplace_back(routeParameters.jsonp_parameter);
-            reply.content.emplace_back("(");
-        }
-
-        DescriptorConfig descriptor_config;
-
-        auto iter = descriptorTable.find(routeParameters.output_format);
-        unsigned descriptor_type = (iter != descriptorTable.end() ? iter->second : 0);
-
-        descriptor_config.zoom_level = routeParameters.zoom_level;
-        descriptor_config.instructions = routeParameters.print_instructions;
-        descriptor_config.geometry = routeParameters.geometry;
-        descriptor_config.encode_geometry = routeParameters.compression;
-
-        std::shared_ptr<BaseDescriptor<DataFacadeT>> descriptor;
-        switch (descriptor_type)
-        {
-        // case 0:
-        //     descriptor = std::make_shared<JSONDescriptor<DataFacadeT>>();
-        //     break;
-        case 1:
-            descriptor = std::make_shared<GPXDescriptor<DataFacadeT>>();
-            break;
-        default:
-            descriptor = std::make_shared<JSONDescriptor<DataFacadeT>>();
-            break;
-        }
-
-        PhantomNodes phantom_nodes;
-        phantom_nodes.source_phantom = raw_route.segment_end_coordinates.front().source_phantom;
-        phantom_nodes.target_phantom = raw_route.segment_end_coordinates.back().target_phantom;
-        descriptor->SetConfig(descriptor_config);
-        descriptor->Run(raw_route, phantom_nodes, facade, reply);
-
-        if (!routeParameters.jsonp_parameter.empty())
-        {
-            reply.content.emplace_back(")\n");
-        }
-        reply.headers.resize(3);
-        reply.headers[0].name = "Content-Length";
-
-        unsigned content_length = 0;
-        for (const std::string &snippet : reply.content)
-        {
-            content_length += snippet.length();
-        }
-        std::string tmp_string;
-        intToString(content_length, tmp_string);
-        reply.headers[0].value = tmp_string;
-
-        switch (descriptor_type)
-        {
-        case 0:
-            if (!routeParameters.jsonp_parameter.empty())
-            {
-                reply.headers[1].name = "Content-Type";
-                reply.headers[1].value = "text/javascript";
-                reply.headers[2].name = "Content-Disposition";
-                reply.headers[2].value = "attachment; filename=\"route.js\"";
-            }
-            else
-            {
-                reply.headers[1].name = "Content-Type";
-                reply.headers[1].value = "application/x-javascript";
-                reply.headers[2].name = "Content-Disposition";
-                reply.headers[2].value = "attachment; filename=\"route.json\"";
-            }
-
-            break;
-        case 1:
-            reply.headers[1].name = "Content-Type";
-            reply.headers[1].value = "application/gpx+xml; charset=UTF-8";
-            reply.headers[2].name = "Content-Disposition";
-            reply.headers[2].value = "attachment; filename=\"route.gpx\"";
-
-            break;
-        default:
-            if (!routeParameters.jsonp_parameter.empty())
-            {
-                reply.headers[1].name = "Content-Type";
-                reply.headers[1].value = "text/javascript";
-                reply.headers[2].name = "Content-Disposition";
-                reply.headers[2].value = "attachment; filename=\"route.js\"";
-            }
-            else
-            {
-                reply.headers[1].name = "Content-Type";
-                reply.headers[1].value = "application/x-javascript";
-                reply.headers[2].name = "Content-Disposition";
-                reply.headers[2].value = "attachment; filename=\"route.json\"";
-            }
-            break;
-        }
-        return;
-    }
-
-  private:
-    std::string descriptor_string;
-    DataFacadeT *facade;
-};
-
-#endif /* VIAROUTEPLUGIN_H_ */

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) |
+| Linux        | 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) |

Rakefile

@@ -6,7 +6,7 @@ require 'sys/proctable'
 
 BUILD_FOLDER = 'build'
 DATA_FOLDER = 'sandbox'
-PROFILE = 'examples/postgis'
+PROFILE = 'bicycle'
 OSRM_PORT = 5000
 PROFILES_FOLDER = '../profiles'
 
@@ -181,3 +181,10 @@ end
 desc "Stop, reprocess and restart."
 task :update => [:down,:process,:up] do
 end
+
+
+desc "Remove test cache files."
+task :sweep do
+  system "rm test/cache/*"
+end
+

Server/APIGrammar.h

@@ -39,21 +39,24 @@ 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 | num_results) ) ;
 
         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)];
         jsonp       = (-qi::lit('&')) >> qi::lit("jsonp")        >> '=' >> stringwithPercent[boost::bind(&HandlerT::setJSONpParameter, handler, ::_1)];
-        checksum    = (-qi::lit('&')) >> qi::lit("checksum")     >> '=' >> qi::int_[boost::bind(&HandlerT::setChecksum, handler, ::_1)];
+        checksum    = (-qi::lit('&')) >> qi::lit("checksum")     >> '=' >> qi::uint_[boost::bind(&HandlerT::setChecksum, handler, ::_1)];
         instruction = (-qi::lit('&')) >> qi::lit("instructions") >> '=' >> qi::bool_[boost::bind(&HandlerT::setInstructionFlag, handler, ::_1)];
         geometry    = (-qi::lit('&')) >> qi::lit("geometry")     >> '=' >> qi::bool_[boost::bind(&HandlerT::setGeometryFlag, handler, ::_1)];
         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)];
+        num_results = (-qi::lit('&')) >> qi::lit("num_results")  >> '=' >> qi::short_[boost::bind(&HandlerT::setNumberOfResults, handler, ::_1)];
 
         string            = +(qi::char_("a-zA-Z"));
         stringwithDot     = +(qi::char_("a-zA-Z0-9_.-"));
@@ -63,7 +66,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, num_results;
 
     HandlerT * handler;
 };

Server/Connection.cpp

@@ -41,13 +41,10 @@ namespace http
 {
 
 Connection::Connection(boost::asio::io_service &io_service, RequestHandler &handler)
-    : strand(io_service), TCP_socket(io_service), request_handler(handler),
-      request_parser(new RequestParser())
+    : strand(io_service), TCP_socket(io_service), request_handler(handler)
 {
 }
 
-Connection::~Connection() { delete request_parser; }
-
 boost::asio::ip::tcp::socket &Connection::socket() { return TCP_socket; }
 
 /// Start the first asynchronous operation for the connection.
@@ -61,126 +58,117 @@ void Connection::start()
                                 boost::asio::placeholders::bytes_transferred)));
 }
 
-void Connection::handle_read(const boost::system::error_code &e, std::size_t bytes_transferred)
+void Connection::handle_read(const boost::system::error_code &error, std::size_t bytes_transferred)
 {
-    if (!e)
+    if (error)
     {
-        CompressionType compression_type(noCompression);
-        boost::tribool result;
-        boost::tie(result, boost::tuples::ignore) =
-            request_parser->Parse(request,
-                                  incoming_data_buffer.data(),
-                                  incoming_data_buffer.data() + bytes_transferred,
-                                  &compression_type);
+        return;
+    }
 
-        if (result)
-        {
-            request.endpoint = TCP_socket.remote_endpoint().address();
-            request_handler.handle_request(request, reply);
+    // no error detected, let's parse the request
+    CompressionType compression_type(noCompression);
+    boost::tribool result;
+    boost::tie(result, boost::tuples::ignore) =
+        RequestParser().Parse(request,
+                              incoming_data_buffer.data(),
+                              incoming_data_buffer.data() + bytes_transferred,
+                              compression_type);
 
-            Header compression_header;
-            std::vector<char> compressed_output;
-            std::vector<boost::asio::const_buffer> output_buffer;
-            switch (compression_type)
-            {
-            case deflateRFC1951:
-                compression_header.name = "Content-Encoding";
-                compression_header.value = "deflate";
-                reply.headers.insert(reply.headers.begin(), compression_header);
-                compressBufferCollection(reply.content, compression_type, compressed_output);
-                reply.setSize(compressed_output.size());
-                output_buffer = reply.HeaderstoBuffers();
-                output_buffer.push_back(boost::asio::buffer(compressed_output));
-                boost::asio::async_write(
-                    TCP_socket,
-                    output_buffer,
-                    strand.wrap(boost::bind(&Connection::handle_write,
-                                            this->shared_from_this(),
-                                            boost::asio::placeholders::error)));
-                break;
-            case gzipRFC1952:
-                compression_header.name = "Content-Encoding";
-                compression_header.value = "gzip";
-                reply.headers.insert(reply.headers.begin(), compression_header);
-                compressBufferCollection(reply.content, compression_type, compressed_output);
-                reply.setSize(compressed_output.size());
-                output_buffer = reply.HeaderstoBuffers();
-                output_buffer.push_back(boost::asio::buffer(compressed_output));
-                boost::asio::async_write(
-                    TCP_socket,
-                    output_buffer,
-                    strand.wrap(boost::bind(&Connection::handle_write,
-                                            this->shared_from_this(),
-                                            boost::asio::placeholders::error)));
-                break;
-            case noCompression:
-                reply.SetUncompressedSize();
-                output_buffer = reply.toBuffers();
-                boost::asio::async_write(
-                    TCP_socket,
-                    output_buffer,
-                    strand.wrap(boost::bind(&Connection::handle_write,
-                                            this->shared_from_this(),
-                                            boost::asio::placeholders::error)));
-                break;
-            }
-        }
-        else if (!result)
-        {
-            reply = Reply::StockReply(Reply::badRequest);
+    // the request has been parsed
+    if (result)
+    {
+        request.endpoint = TCP_socket.remote_endpoint().address();
+        request_handler.handle_request(request, reply);
 
-            boost::asio::async_write(TCP_socket,
-                                     reply.toBuffers(),
-                                     strand.wrap(boost::bind(&Connection::handle_write,
-                                                             this->shared_from_this(),
-                                                             boost::asio::placeholders::error)));
-        }
-        else
+        // Header compression_header;
+        std::vector<char> compressed_output;
+        std::vector<boost::asio::const_buffer> output_buffer;
+
+        // compress the result w/ gzip/deflate if requested
+        switch (compression_type)
         {
-            TCP_socket.async_read_some(
-                boost::asio::buffer(incoming_data_buffer),
-                strand.wrap(boost::bind(&Connection::handle_read,
-                                        this->shared_from_this(),
-                                        boost::asio::placeholders::error,
-                                        boost::asio::placeholders::bytes_transferred)));
+        case deflateRFC1951:
+            // use deflate for compression
+            reply.headers.insert(reply.headers.begin(), {"Content-Encoding", "deflate"});
+            CompressBufferCollection(reply.content, compression_type, compressed_output);
+            reply.SetSize(static_cast<unsigned>(compressed_output.size()));
+            output_buffer = reply.HeaderstoBuffers();
+            output_buffer.push_back(boost::asio::buffer(compressed_output));
+            break;
+        case gzipRFC1952:
+            // use gzip for compression
+            reply.headers.insert(reply.headers.begin(), {"Content-Encoding", "gzip"});
+            CompressBufferCollection(reply.content, compression_type, compressed_output);
+            reply.SetSize(static_cast<unsigned>(compressed_output.size()));
+            output_buffer = reply.HeaderstoBuffers();
+            output_buffer.push_back(boost::asio::buffer(compressed_output));
+            break;
+        case noCompression:
+            // don't use any compression
+            reply.SetUncompressedSize();
+            output_buffer = reply.ToBuffers();
+            break;
         }
+        // write result to stream
+        boost::asio::async_write(TCP_socket,
+                                 output_buffer,
+                                 strand.wrap(boost::bind(&Connection::handle_write,
+                                                         this->shared_from_this(),
+                                                         boost::asio::placeholders::error)));
+    }
+    else if (!result)
+    { // request is not parseable
+        reply = Reply::StockReply(Reply::badRequest);
+
+        boost::asio::async_write(TCP_socket,
+                                 reply.ToBuffers(),
+                                 strand.wrap(boost::bind(&Connection::handle_write,
+                                                         this->shared_from_this(),
+                                                         boost::asio::placeholders::error)));
+    }
+    else
+    {
+        // we don't have a result yet, so continue reading
+        TCP_socket.async_read_some(
+            boost::asio::buffer(incoming_data_buffer),
+            strand.wrap(boost::bind(&Connection::handle_read,
+                                    this->shared_from_this(),
+                                    boost::asio::placeholders::error,
+                                    boost::asio::placeholders::bytes_transferred)));
     }
 }
 
 /// Handle completion of a write operation.
-void Connection::handle_write(const boost::system::error_code &e)
+void Connection::handle_write(const boost::system::error_code &error)
 {
-    if (!e)
+    if (!error)
     {
         // Initiate graceful connection closure.
-        boost::system::error_code ignoredEC;
-        TCP_socket.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignoredEC);
+        boost::system::error_code ignore_error;
+        TCP_socket.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignore_error);
     }
 }
 
-void Connection::compressBufferCollection(std::vector<std::string> uncompressed_data,
+void Connection::CompressBufferCollection(std::vector<char> uncompressed_data,
                                           CompressionType compression_type,
                                           std::vector<char> &compressed_data)
 {
     boost::iostreams::gzip_params compression_parameters;
 
+    // there's a trade-off between speed and size. speed wins
     compression_parameters.level = boost::iostreams::zlib::best_speed;
+    // check which compression flavor is used
     if (deflateRFC1951 == compression_type)
     {
         compression_parameters.noheader = true;
     }
 
     BOOST_ASSERT(compressed_data.empty());
-    boost::iostreams::filtering_ostream compressing_stream;
-
-    compressing_stream.push(boost::iostreams::gzip_compressor(compression_parameters));
-    compressing_stream.push(boost::iostreams::back_inserter(compressed_data));
-
-    for (const std::string &line : uncompressed_data)
-    {
-        compressing_stream << line;
-    }
-
-    compressing_stream.reset();
+    // plug data into boost's compression stream
+    boost::iostreams::filtering_ostream gzip_stream;
+    gzip_stream.push(boost::iostreams::gzip_compressor(compression_parameters));
+    gzip_stream.push(boost::iostreams::back_inserter(compressed_data));
+    gzip_stream.write(&uncompressed_data[0], uncompressed_data.size());
+    boost::iostreams::close(gzip_stream);
 }
 }

Server/Connection.h

@@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef CONNECTION_H
 #define CONNECTION_H
 
+// #include "RequestParser.h"
 #include "Http/CompressionType.h"
 #include "Http/Request.h"
 
@@ -39,7 +40,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <boost/version.hpp>
 
  #include <memory>
- #include <string>
  #include <vector>
 
 //workaround for incomplete std::shared_ptr compatibility in old boost versions
@@ -68,15 +68,13 @@ class RequestHandler;
 namespace http
 {
 
-class RequestParser;
-
 /// Represents a single connection from a client.
 class Connection : public std::enable_shared_from_this<Connection>
 {
   public:
     explicit Connection(boost::asio::io_service &io_service, RequestHandler &handler);
     Connection(const Connection &) = delete;
-    ~Connection();
+    Connection() = delete;
 
     boost::asio::ip::tcp::socket &socket();
 
@@ -89,7 +87,7 @@ class Connection : public std::enable_shared_from_this<Connection>
     /// Handle completion of a write operation.
     void handle_write(const boost::system::error_code &e);
 
-    void compressBufferCollection(std::vector<std::string> uncompressed_data,
+    void CompressBufferCollection(std::vector<char> uncompressed_data,
                                   CompressionType compression_type,
                                   std::vector<char> &compressed_data);
 
@@ -98,7 +96,6 @@ class Connection : public std::enable_shared_from_this<Connection>
     RequestHandler &request_handler;
     boost::array<char, 8192> incoming_data_buffer;
     Request request;
-    RequestParser *request_parser;
     Reply reply;
 };
 

Server/DataStructures/BaseDataFacade.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -30,10 +30,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // Exposes all data access interfaces to the algorithms via base class ptr
 
-#include "../../DataStructures/EdgeBasedNode.h"
-#include "../../DataStructures/ImportNode.h"
-#include "../../DataStructures/PhantomNodes.h"
-#include "../../DataStructures/TurnInstructions.h"
+#include "../../data_structures/edge_based_node.hpp"
+#include "../../data_structures/external_memory_node.hpp"
+#include "../../data_structures/phantom_node.hpp"
+#include "../../data_structures/turn_instructions.hpp"
+#include "../../Util/integer_range.hpp"
 #include "../../Util/OSRMException.h"
 #include "../../Util/StringUtil.h"
 #include "../../typedefs.h"
@@ -42,6 +43,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <string>
 
+typedef osrm::range<EdgeID> EdgeRange;
+
 template <class EdgeDataT> class BaseDataFacade
 {
   public:
@@ -59,14 +62,16 @@ template <class EdgeDataT> class BaseDataFacade
 
     virtual NodeID GetTarget(const EdgeID e) const = 0;
 
-    virtual EdgeDataT &GetEdgeData(const EdgeID e) = 0;
+    // virtual EdgeDataT &GetEdgeData(const EdgeID e) = 0;
 
-    // virtual const EdgeDataT &GetEdgeData( const EdgeID e ) const = 0;
+    virtual const EdgeDataT &GetEdgeData(const EdgeID e) const = 0;
 
     virtual EdgeID BeginEdges(const NodeID n) const = 0;
 
     virtual EdgeID EndEdges(const NodeID n) const = 0;
 
+    virtual EdgeRange GetAdjacentEdgeRange(const NodeID node) const = 0;
+
     // searches for a specific edge
     virtual EdgeID FindEdge(const NodeID from, const NodeID to) const = 0;
 
@@ -87,13 +92,26 @@ template <class EdgeDataT> class BaseDataFacade
 
     virtual TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const = 0;
 
+    virtual TravelMode GetTravelModeForEdgeID(const unsigned id) const = 0;
+
     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) = 0;
+
+    virtual bool
+    IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                            PhantomNode &resulting_phantom_node,
+                                            const unsigned zoom_leve) = 0;
 
     virtual unsigned GetCheckSum() const = 0;
 

Server/DataStructures/InternalDataFacade.h

@@ -32,18 +32,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseDataFacade.h"
 
-#include "../../DataStructures/OriginalEdgeData.h"
-#include "../../DataStructures/QueryNode.h"
-#include "../../DataStructures/QueryEdge.h"
-#include "../../DataStructures/SharedMemoryVectorWrapper.h"
-#include "../../DataStructures/StaticGraph.h"
-#include "../../DataStructures/StaticRTree.h"
+#include "../../data_structures/original_edge_data.hpp"
+#include "../../data_structures/query_node.hpp"
+#include "../../data_structures/query_edge.hpp"
+#include "../../data_structures/shared_memory_vector_wrapper.hpp"
+#include "../../data_structures/static_graph.hpp"
+#include "../../data_structures/static_rtree.hpp"
+#include "../../data_structures/range_table.hpp"
 #include "../../Util/BoostFileSystemFix.h"
-#include "../../Util/GraphLoader.h"
-#include "../../Util/ProgramOptions.h"
-#include "../../Util/SimpleLogger.h"
+#include "../../Util/graph_loader.hpp"
+#include "../../Util/simple_logger.hpp"
 
 #include <osrm/Coordinate.h>
+#include <osrm/ServerPaths.h>
 
 template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<EdgeDataT>
 {
@@ -65,27 +66,30 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
     ShM<NodeID, false>::vector m_via_node_list;
     ShM<unsigned, false>::vector m_name_ID_list;
     ShM<TurnInstruction, false>::vector m_turn_instruction_list;
+    ShM<TravelMode, false>::vector m_travel_mode_list;
     ShM<char, false>::vector m_names_char_list;
-    ShM<unsigned, false>::vector m_name_begin_indices;
-    ShM<bool, false>::vector m_egde_is_compressed;
+    ShM<bool, false>::vector m_edge_is_compressed;
     ShM<unsigned, false>::vector m_geometry_indices;
     ShM<unsigned, false>::vector m_geometry_list;
 
-    std::shared_ptr<StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, false>::vector, false>>
-    m_static_rtree;
+    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)
     {
         if (boost::filesystem::exists(timestamp_path))
         {
             SimpleLogger().Write() << "Loading Timestamp";
-            boost::filesystem::ifstream timestampInStream(timestamp_path);
-            if (!timestampInStream)
+            boost::filesystem::ifstream timestamp_stream(timestamp_path);
+            if (!timestamp_stream)
             {
                 SimpleLogger().Write(logWARNING) << timestamp_path << " not found";
             }
-            getline(timestampInStream, m_timestamp);
-            timestampInStream.close();
+            getline(timestamp_stream, m_timestamp);
+            timestamp_stream.close();
         }
         if (m_timestamp.empty())
         {
@@ -122,14 +126,14 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
     {
         boost::filesystem::ifstream nodes_input_stream(nodes_file, std::ios::binary);
 
-        NodeInfo current_node;
+        QueryNode current_node;
         unsigned number_of_coordinates = 0;
         nodes_input_stream.read((char *)&number_of_coordinates, sizeof(unsigned));
         m_coordinate_list =
             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));
+            nodes_input_stream.read((char *)&current_node, sizeof(QueryNode));
             m_coordinate_list->at(i) = FixedPointCoordinate(current_node.lat, current_node.lon);
             BOOST_ASSERT((std::abs(m_coordinate_list->at(i).lat) >> 30) == 0);
             BOOST_ASSERT((std::abs(m_coordinate_list->at(i).lon) >> 30) == 0);
@@ -142,7 +146,8 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
         m_via_node_list.resize(number_of_edges);
         m_name_ID_list.resize(number_of_edges);
         m_turn_instruction_list.resize(number_of_edges);
-        m_egde_is_compressed.resize(number_of_edges);
+        m_travel_mode_list.resize(number_of_edges);
+        m_edge_is_compressed.resize(number_of_edges);
 
         unsigned compressed = 0;
 
@@ -153,8 +158,9 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
             m_via_node_list[i] = current_edge_data.via_node;
             m_name_ID_list[i] = current_edge_data.name_id;
             m_turn_instruction_list[i] = current_edge_data.turn_instruction;
-            m_egde_is_compressed[i] = current_edge_data.compressed_geometry;
-            if (m_egde_is_compressed[i])
+            m_travel_mode_list[i] = current_edge_data.travel_mode;
+            m_edge_is_compressed[i] = current_edge_data.compressed_geometry;
+            if (m_edge_is_compressed[i])
             {
                 ++compressed;
             }
@@ -165,56 +171,60 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
 
     void LoadGeometries(const boost::filesystem::path &geometry_file)
     {
-        std::ifstream geometry_stream(geometry_file.c_str(), std::ios::binary);
+        std::ifstream geometry_stream(geometry_file.string().c_str(), std::ios::binary);
         unsigned number_of_indices = 0;
         unsigned number_of_compressed_geometries = 0;
 
         geometry_stream.read((char *)&number_of_indices, sizeof(unsigned));
 
         m_geometry_indices.resize(number_of_indices);
-        geometry_stream.read((char *)&(m_geometry_indices[0]),
-                             number_of_indices * sizeof(unsigned));
+        if (number_of_indices > 0)
+        {
+            geometry_stream.read((char *)&(m_geometry_indices[0]),
+                                 number_of_indices * sizeof(unsigned));
+        }
 
         geometry_stream.read((char *)&number_of_compressed_geometries, sizeof(unsigned));
 
         BOOST_ASSERT(m_geometry_indices.back() == number_of_compressed_geometries);
         m_geometry_list.resize(number_of_compressed_geometries);
 
-        geometry_stream.read((char *)&(m_geometry_list[0]),
-                             number_of_compressed_geometries * sizeof(unsigned));
+        if (number_of_compressed_geometries > 0)
+        {
+            geometry_stream.read((char *)&(m_geometry_list[0]),
+                                 number_of_compressed_geometries * sizeof(unsigned));
+        }
         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)
     {
         boost::filesystem::ifstream name_stream(names_file, std::ios::binary);
-        unsigned number_of_names = 0;
+
+        name_stream >> m_name_table;
+
         unsigned number_of_chars = 0;
-        name_stream.read((char *)&number_of_names, sizeof(unsigned));
         name_stream.read((char *)&number_of_chars, sizeof(unsigned));
-        BOOST_ASSERT_MSG(0 != number_of_names, "name file broken");
         BOOST_ASSERT_MSG(0 != number_of_chars, "name file broken");
-
-        m_name_begin_indices.resize(number_of_names);
-        name_stream.read((char *)&m_name_begin_indices[0], number_of_names * sizeof(unsigned));
-
         m_names_char_list.resize(number_of_chars + 1); //+1 gives sentinel element
         name_stream.read((char *)&m_names_char_list[0], number_of_chars * sizeof(char));
-        BOOST_ASSERT_MSG(0 != m_names_char_list.size(), "could not load any names");
+        if (0 == m_names_char_list.size())
+        {
+            SimpleLogger().Write(logWARNING) << "list of street names is empty";
+        }
         name_stream.close();
     }
 
   public:
-    ~InternalDataFacade()
+    virtual ~InternalDataFacade()
     {
         delete m_query_graph;
         m_static_rtree.reset();
@@ -260,10 +270,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;
@@ -279,117 +289,173 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
 
         // load data
         SimpleLogger().Write() << "loading graph data";
+        AssertPathExists(hsgr_path);
         LoadGraph(hsgr_path);
-        SimpleLogger().Write() << "loading egde information";
+        SimpleLogger().Write() << "loading edge information";
+        AssertPathExists(nodes_data_path);
+        AssertPathExists(edges_data_path);
         LoadNodeAndEdgeInformation(nodes_data_path, edges_data_path);
         SimpleLogger().Write() << "loading geometries";
+        AssertPathExists(geometries_path);
         LoadGeometries(geometries_path);
         SimpleLogger().Write() << "loading r-tree";
-        LoadRTree(ram_index_path, file_index_path);
+        AssertPathExists(ram_index_path);
+        AssertPathExists(file_index_path);
         SimpleLogger().Write() << "loading timestamp";
         LoadTimestamp(timestamp_path);
         SimpleLogger().Write() << "loading street names";
+        AssertPathExists(names_data_path);
         LoadStreetNames(names_data_path);
     }
 
     // search graph access
-    unsigned GetNumberOfNodes() const { return m_query_graph->GetNumberOfNodes(); }
+    unsigned GetNumberOfNodes() const final { return m_query_graph->GetNumberOfNodes(); }
 
-    unsigned GetNumberOfEdges() const { return m_query_graph->GetNumberOfEdges(); }
+    unsigned GetNumberOfEdges() const final { return m_query_graph->GetNumberOfEdges(); }
 
-    unsigned GetOutDegree(const NodeID n) const { return m_query_graph->GetOutDegree(n); }
+    unsigned GetOutDegree(const NodeID n) const final { return m_query_graph->GetOutDegree(n); }
 
-    NodeID GetTarget(const EdgeID e) const { return m_query_graph->GetTarget(e); }
+    NodeID GetTarget(const EdgeID e) const final { return m_query_graph->GetTarget(e); }
 
-    EdgeDataT &GetEdgeData(const EdgeID e) { return m_query_graph->GetEdgeData(e); }
+    // EdgeDataT &GetEdgeData(const EdgeID e) final { return m_query_graph->GetEdgeData(e); }
 
-    const EdgeDataT &GetEdgeData(const EdgeID e) const { return m_query_graph->GetEdgeData(e); }
+    EdgeDataT &GetEdgeData(const EdgeID e) const final { return m_query_graph->GetEdgeData(e); }
 
-    EdgeID BeginEdges(const NodeID n) const { return m_query_graph->BeginEdges(n); }
+    EdgeID BeginEdges(const NodeID n) const final { return m_query_graph->BeginEdges(n); }
 
-    EdgeID EndEdges(const NodeID n) const { return m_query_graph->EndEdges(n); }
+    EdgeID EndEdges(const NodeID n) const final { return m_query_graph->EndEdges(n); }
+
+    EdgeRange GetAdjacentEdgeRange(const NodeID node) const final
+    {
+        return m_query_graph->GetAdjacentEdgeRange(node);
+    };
 
     // searches for a specific edge
-    EdgeID FindEdge(const NodeID from, const NodeID to) const
+    EdgeID FindEdge(const NodeID from, const NodeID to) const final
     {
         return m_query_graph->FindEdge(from, to);
     }
 
-    EdgeID FindEdgeInEitherDirection(const NodeID from, const NodeID to) const
+    EdgeID FindEdgeInEitherDirection(const NodeID from, const NodeID to) const final
     {
         return m_query_graph->FindEdgeInEitherDirection(from, to);
     }
 
-    EdgeID FindEdgeIndicateIfReverse(const NodeID from, const NodeID to, bool &result) const
+    EdgeID FindEdgeIndicateIfReverse(const NodeID from, const NodeID to, bool &result) const final
     {
         return m_query_graph->FindEdgeIndicateIfReverse(from, to, result);
     }
 
     // node and edge information access
-    FixedPointCoordinate GetCoordinateOfNode(const unsigned id) const
+    FixedPointCoordinate GetCoordinateOfNode(const unsigned id) const final
     {
         return m_coordinate_list->at(id);
     };
 
-    bool EdgeIsCompressed(const unsigned id) const { return m_egde_is_compressed.at(id); }
+    bool EdgeIsCompressed(const unsigned id) const { return m_edge_is_compressed.at(id); }
 
-    TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const
+    TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const final
     {
         return m_turn_instruction_list.at(id);
     }
 
+    TravelMode GetTravelModeForEdgeID(const unsigned id) const
+    {
+      return m_travel_mode_list.at(id);
+    }
+
     bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate,
                                             FixedPointCoordinate &result,
-                                            const unsigned zoom_level = 18) const
+                                            const unsigned zoom_level = 18) final
     {
+        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) final
     {
-        const bool found = m_static_rtree->FindPhantomNodeForCoordinate(
+        if (!m_static_rtree.get())
+        {
+            LoadRTree();
+        }
+
+        return m_static_rtree->FindPhantomNodeForCoordinate(
             input_coordinate, resulting_phantom_node, zoom_level);
-        return found;
     }
 
-    unsigned GetCheckSum() const { return m_check_sum; }
+    bool
+    IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                            PhantomNode &resulting_phantom_node,
+                                            const unsigned zoom_level) final
+    {
+        std::vector<PhantomNode> resulting_phantom_node_vector;
+        auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate,
+                                                              resulting_phantom_node_vector,
+                                                              zoom_level,
+                                                              1);
+        if (result)
+        {
+            BOOST_ASSERT(!resulting_phantom_node_vector.empty());
+            resulting_phantom_node = resulting_phantom_node_vector.front();
+        }
+        return result;
+    }
 
-    unsigned GetNameIndexFromEdgeID(const unsigned id) const
+    bool
+    IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                            std::vector<PhantomNode> &resulting_phantom_node_vector,
+                                            const unsigned zoom_level,
+                                            const unsigned number_of_results) final
+    {
+        if (!m_static_rtree.get())
+        {
+            LoadRTree();
+        }
+
+        return m_static_rtree->IncrementalFindPhantomNodeForCoordinate(
+            input_coordinate, resulting_phantom_node_vector, zoom_level, number_of_results);
+    }
+
+    unsigned GetCheckSum() const final { return m_check_sum; }
+
+    unsigned GetNameIndexFromEdgeID(const unsigned id) const final
     {
         return m_name_ID_list.at(id);
     };
 
-    void GetName(const unsigned name_id, std::string &result) const
+    void GetName(const unsigned name_id, std::string &result) const final
     {
         if (UINT_MAX == name_id)
         {
             result = "";
             return;
         }
-        BOOST_ASSERT_MSG(name_id < m_name_begin_indices.size(), "name id too high");
-        const unsigned begin_index = m_name_begin_indices[name_id];
-        const unsigned end_index = m_name_begin_indices[name_id + 1];
-        BOOST_ASSERT_MSG(begin_index < m_names_char_list.size(), "begin index of name too high");
-        BOOST_ASSERT_MSG(end_index < m_names_char_list.size(), "end index of name too high");
+        auto range = m_name_table.GetRange(name_id);
 
-        BOOST_ASSERT_MSG(begin_index <= end_index, "string ends before begin");
         result.clear();
-        result.resize(end_index - begin_index);
-        std::copy(m_names_char_list.begin() + begin_index,
-                  m_names_char_list.begin() + end_index,
-                  result.begin());
+        if (range.begin() != range.end())
+        {
+            result.resize(range.back() - range.front() + 1);
+            std::copy(m_names_char_list.begin() + range.front(),
+                      m_names_char_list.begin() + range.back() + 1,
+                      result.begin());
+        }
     }
 
-    virtual unsigned GetGeometryIndexForEdgeID(const unsigned id) const
+    virtual unsigned GetGeometryIndexForEdgeID(const unsigned id) const final
     {
         return m_via_node_list.at(id);
     }
 
-    virtual void GetUncompressedGeometry(const unsigned id, std::vector<unsigned> &result_nodes)
-        const
+    virtual void GetUncompressedGeometry(const unsigned id,
+                                         std::vector<unsigned> &result_nodes) const final
     {
         const unsigned begin = m_geometry_indices.at(id);
         const unsigned end = m_geometry_indices.at(id + 1);
@@ -399,7 +465,7 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
             result_nodes.begin(), m_geometry_list.begin() + begin, m_geometry_list.begin() + end);
     }
 
-    std::string GetTimestamp() const { return m_timestamp; }
+    std::string GetTimestamp() const final { return m_timestamp; }
 };
 
 #endif // INTERNAL_DATA_FACADE

Server/DataStructures/SharedDataFacade.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -33,11 +33,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseDataFacade.h"
 #include "SharedDataType.h"
 
-#include "../../DataStructures/StaticGraph.h"
-#include "../../DataStructures/StaticRTree.h"
+#include "../../data_structures/range_table.hpp"
+#include "../../data_structures/static_graph.hpp"
+#include "../../data_structures/static_rtree.hpp"
 #include "../../Util/BoostFileSystemFix.h"
-#include "../../Util/ProgramOptions.h"
-#include "../../Util/SimpleLogger.h"
+#include "../../Util/make_unique.hpp"
+#include "../../Util/simple_logger.hpp"
 
 #include <algorithm>
 #include <memory>
@@ -51,10 +52,12 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
     typedef StaticGraph<EdgeData, true> QueryGraph;
     typedef typename StaticGraph<EdgeData, true>::NodeArrayEntry GraphNode;
     typedef typename StaticGraph<EdgeData, true>::EdgeArrayEntry GraphEdge;
+    typedef typename RangeTable<16, true>::BlockT NameIndexBlock;
     typedef typename QueryGraph::InputEdge InputEdge;
     typedef typename super::RTreeLeaf RTreeLeaf;
-    typedef typename StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, true>::vector, true>::TreeNode
-    RTreeNode;
+    using SharedRTree = StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, true>::vector, true>;
+    using TimeStampedRTreePair = std::pair<unsigned, std::shared_ptr<SharedRTree>>;
+    using RTreeNode = typename SharedRTree::TreeNode;
 
     SharedDataLayout *data_layout;
     char *shared_memory;
@@ -65,129 +68,161 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
     unsigned CURRENT_TIMESTAMP;
 
     unsigned m_check_sum;
-    unsigned m_number_of_nodes;
-    std::shared_ptr<QueryGraph> m_query_graph;
-    std::shared_ptr<SharedMemory> m_layout_memory;
-    std::shared_ptr<SharedMemory> m_large_memory;
+    std::unique_ptr<QueryGraph> m_query_graph;
+    std::unique_ptr<SharedMemory> m_layout_memory;
+    std::unique_ptr<SharedMemory> m_large_memory;
     std::string m_timestamp;
 
     std::shared_ptr<ShM<FixedPointCoordinate, true>::vector> m_coordinate_list;
     ShM<NodeID, true>::vector m_via_node_list;
     ShM<unsigned, true>::vector m_name_ID_list;
     ShM<TurnInstruction, true>::vector m_turn_instruction_list;
+    ShM<TravelMode, true>::vector m_travel_mode_list;
     ShM<char, true>::vector m_names_char_list;
     ShM<unsigned, true>::vector m_name_begin_indices;
-    ShM<bool, true>::vector m_egde_is_compressed;
+    ShM<bool, true>::vector m_edge_is_compressed;
     ShM<unsigned, true>::vector m_geometry_indices;
     ShM<unsigned, true>::vector m_geometry_list;
 
-    std::shared_ptr<StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, true>::vector, true>>
-    m_static_rtree;
+    boost::thread_specific_ptr<std::pair<unsigned, std::shared_ptr<SharedRTree>>> m_static_rtree;
+    boost::filesystem::path file_index_path;
+
+    std::shared_ptr<RangeTable<16, true>> m_name_table;
+
+    void LoadChecksum()
+    {
+        m_check_sum =
+            *data_layout->GetBlockPtr<unsigned>(shared_memory, SharedDataLayout::HSGR_CHECKSUM);
+        SimpleLogger().Write() << "set checksum: " << m_check_sum;
+    }
 
     void LoadTimestamp()
     {
-        char *timestamp_ptr = shared_memory + data_layout->GetTimeStampOffset();
-        m_timestamp.resize(data_layout->timestamp_length);
-        std::copy(
-            timestamp_ptr, timestamp_ptr + data_layout->timestamp_length, m_timestamp.begin());
+        char *timestamp_ptr =
+            data_layout->GetBlockPtr<char>(shared_memory, SharedDataLayout::TIMESTAMP);
+        m_timestamp.resize(data_layout->GetBlockSize(SharedDataLayout::TIMESTAMP));
+        std::copy(timestamp_ptr,
+                  timestamp_ptr + data_layout->GetBlockSize(SharedDataLayout::TIMESTAMP),
+                  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 = (RTreeNode *)(shared_memory + data_layout->GetRSearchTreeOffset());
-        m_static_rtree =
-            std::make_shared<StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, true>::vector, true>>(
-                tree_ptr, data_layout->r_search_tree_size, file_index_path, m_coordinate_list);
+        RTreeNode *tree_ptr =
+            data_layout->GetBlockPtr<RTreeNode>(shared_memory, SharedDataLayout::R_SEARCH_TREE);
+        m_static_rtree.reset(new TimeStampedRTreePair(CURRENT_TIMESTAMP,
+            osrm::make_unique<SharedRTree>(
+                tree_ptr,
+                data_layout->num_entries[SharedDataLayout::R_SEARCH_TREE],
+                file_index_path,
+                m_coordinate_list)));
     }
 
     void LoadGraph()
     {
-        m_number_of_nodes = data_layout->graph_node_list_size;
         GraphNode *graph_nodes_ptr =
-            (GraphNode *)(shared_memory + data_layout->GetGraphNodeListOffset());
+            data_layout->GetBlockPtr<GraphNode>(shared_memory, SharedDataLayout::GRAPH_NODE_LIST);
 
         GraphEdge *graph_edges_ptr =
-            (GraphEdge *)(shared_memory + data_layout->GetGraphEdgeListOffset());
+            data_layout->GetBlockPtr<GraphEdge>(shared_memory, SharedDataLayout::GRAPH_EDGE_LIST);
 
-        typename ShM<GraphNode, true>::vector node_list(graph_nodes_ptr,
-                                                        data_layout->graph_node_list_size);
-        typename ShM<GraphEdge, true>::vector edge_list(graph_edges_ptr,
-                                                        data_layout->graph_edge_list_size);
+        typename ShM<GraphNode, true>::vector node_list(
+            graph_nodes_ptr, data_layout->num_entries[SharedDataLayout::GRAPH_NODE_LIST]);
+        typename ShM<GraphEdge, true>::vector edge_list(
+            graph_edges_ptr, data_layout->num_entries[SharedDataLayout::GRAPH_EDGE_LIST]);
         m_query_graph.reset(new QueryGraph(node_list, edge_list));
     }
 
     void LoadNodeAndEdgeInformation()
     {
 
-        FixedPointCoordinate *coordinate_list_ptr =
-            (FixedPointCoordinate *)(shared_memory + data_layout->GetCoordinateListOffset());
-        m_coordinate_list = std::make_shared<ShM<FixedPointCoordinate, true>::vector>(
-            coordinate_list_ptr, data_layout->coordinate_list_size);
+        FixedPointCoordinate *coordinate_list_ptr = data_layout->GetBlockPtr<FixedPointCoordinate>(
+            shared_memory, SharedDataLayout::COORDINATE_LIST);
+        m_coordinate_list = osrm::make_unique<ShM<FixedPointCoordinate, true>::vector>(
+            coordinate_list_ptr, data_layout->num_entries[SharedDataLayout::COORDINATE_LIST]);
 
-        TurnInstruction *turn_instruction_list_ptr =
-            (TurnInstruction *)(shared_memory + data_layout->GetTurnInstructionListOffset());
+        TravelMode *travel_mode_list_ptr = data_layout->GetBlockPtr<TravelMode>(
+            shared_memory, SharedDataLayout::TRAVEL_MODE);
+        typename ShM<TravelMode, true>::vector travel_mode_list(
+            travel_mode_list_ptr,
+            data_layout->num_entries[SharedDataLayout::TRAVEL_MODE]);
+        m_travel_mode_list.swap(travel_mode_list);
+
+        TurnInstruction *turn_instruction_list_ptr = data_layout->GetBlockPtr<TurnInstruction>(
+            shared_memory, SharedDataLayout::TURN_INSTRUCTION);
         typename ShM<TurnInstruction, true>::vector turn_instruction_list(
-            turn_instruction_list_ptr, data_layout->turn_instruction_list_size);
+            turn_instruction_list_ptr,
+            data_layout->num_entries[SharedDataLayout::TURN_INSTRUCTION]);
         m_turn_instruction_list.swap(turn_instruction_list);
 
         unsigned *name_id_list_ptr =
-            (unsigned *)(shared_memory + data_layout->GetNameIDListOffset());
-        typename ShM<unsigned, true>::vector name_id_list(name_id_list_ptr,
-                                                          data_layout->name_id_list_size);
+            data_layout->GetBlockPtr<unsigned>(shared_memory, SharedDataLayout::NAME_ID_LIST);
+        typename ShM<unsigned, true>::vector name_id_list(
+            name_id_list_ptr, data_layout->num_entries[SharedDataLayout::NAME_ID_LIST]);
         m_name_ID_list.swap(name_id_list);
     }
 
     void LoadViaNodeList()
     {
-        NodeID *via_node_list_ptr = (NodeID *)(shared_memory + data_layout->GetViaNodeListOffset());
-        typename ShM<NodeID, true>::vector via_node_list(via_node_list_ptr,
-                                                         data_layout->via_node_list_size);
+        NodeID *via_node_list_ptr =
+            data_layout->GetBlockPtr<NodeID>(shared_memory, SharedDataLayout::VIA_NODE_LIST);
+        typename ShM<NodeID, true>::vector via_node_list(
+            via_node_list_ptr, data_layout->num_entries[SharedDataLayout::VIA_NODE_LIST]);
         m_via_node_list.swap(via_node_list);
     }
 
     void LoadNames()
     {
-        unsigned *street_names_index_ptr =
-            (unsigned *)(shared_memory + data_layout->GetNameIndexOffset());
-        typename ShM<unsigned, true>::vector name_begin_indices(street_names_index_ptr,
-                                                                data_layout->name_index_list_size);
-        m_name_begin_indices.swap(name_begin_indices);
+        unsigned *offsets_ptr =
+            data_layout->GetBlockPtr<unsigned>(shared_memory, SharedDataLayout::NAME_OFFSETS);
+        NameIndexBlock *blocks_ptr =
+            data_layout->GetBlockPtr<NameIndexBlock>(shared_memory, SharedDataLayout::NAME_BLOCKS);
+        typename ShM<unsigned, true>::vector name_offsets(
+            offsets_ptr, data_layout->num_entries[SharedDataLayout::NAME_OFFSETS]);
+        typename ShM<NameIndexBlock, true>::vector name_blocks(
+            blocks_ptr, data_layout->num_entries[SharedDataLayout::NAME_BLOCKS]);
+
+        char *names_list_ptr =
+            data_layout->GetBlockPtr<char>(shared_memory, SharedDataLayout::NAME_CHAR_LIST);
+        typename ShM<char, true>::vector names_char_list(
+            names_list_ptr, data_layout->num_entries[SharedDataLayout::NAME_CHAR_LIST]);
+        m_name_table = osrm::make_unique<RangeTable<16, true>>(
+            name_offsets, name_blocks, static_cast<unsigned>(names_char_list.size()));
 
-        char *names_list_ptr = (char *)(shared_memory + data_layout->GetNameListOffset());
-        typename ShM<char, true>::vector names_char_list(names_list_ptr,
-                                                         data_layout->name_char_list_size);
         m_names_char_list.swap(names_char_list);
     }
 
     void LoadGeometries()
     {
-        unsigned *geometries_compressed_ptr =
-            (unsigned *)(shared_memory + data_layout->GetGeometriesIndicatorOffset());
-        typename ShM<bool, true>::vector egde_is_compressed(geometries_compressed_ptr,
-                                                            data_layout->geometries_indicators);
-        m_egde_is_compressed.swap(egde_is_compressed);
+        unsigned *geometries_compressed_ptr = data_layout->GetBlockPtr<unsigned>(
+            shared_memory, SharedDataLayout::GEOMETRIES_INDICATORS);
+        typename ShM<bool, true>::vector edge_is_compressed(
+            geometries_compressed_ptr,
+            data_layout->num_entries[SharedDataLayout::GEOMETRIES_INDICATORS]);
+        m_edge_is_compressed.swap(edge_is_compressed);
 
         unsigned *geometries_index_ptr =
-            (unsigned *)(shared_memory + data_layout->GetGeometriesIndexListOffset());
+            data_layout->GetBlockPtr<unsigned>(shared_memory, SharedDataLayout::GEOMETRIES_INDEX);
         typename ShM<unsigned, true>::vector geometry_begin_indices(
-            geometries_index_ptr, data_layout->geometries_index_list_size);
+            geometries_index_ptr, data_layout->num_entries[SharedDataLayout::GEOMETRIES_INDEX]);
         m_geometry_indices.swap(geometry_begin_indices);
 
         unsigned *geometries_list_ptr =
-            (unsigned *)(shared_memory + data_layout->GetGeometryListOffset());
-        typename ShM<unsigned, true>::vector geometry_list(geometries_list_ptr,
-                                                           data_layout->geometries_list_size);
+            data_layout->GetBlockPtr<unsigned>(shared_memory, SharedDataLayout::GEOMETRIES_LIST);
+        typename ShM<unsigned, true>::vector geometry_list(
+            geometries_list_ptr, data_layout->num_entries[SharedDataLayout::GEOMETRIES_LIST]);
         m_geometry_list.swap(geometry_list);
     }
 
   public:
+    virtual ~SharedDataFacade() {}
+
     SharedDataFacade()
     {
         data_timestamp_ptr = (SharedDataTimestamp *)SharedMemoryFactory::Get(
                                  CURRENT_REGIONS, sizeof(SharedDataTimestamp), false, false)->Ptr();
-
         CURRENT_LAYOUT = LAYOUT_NONE;
         CURRENT_DATA = DATA_NONE;
         CURRENT_TIMESTAMP = 0;
@@ -213,73 +248,90 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
             m_layout_memory.reset(SharedMemoryFactory::Get(CURRENT_LAYOUT));
 
             data_layout = (SharedDataLayout *)(m_layout_memory->Ptr());
-            boost::filesystem::path ram_index_path(data_layout->ram_index_file_name);
-            if (!boost::filesystem::exists(ram_index_path))
-            {
-                throw OSRMException("no leaf index file given. "
-                                    "Is any data loaded into shared memory?");
-            }
 
             m_large_memory.reset(SharedMemoryFactory::Get(CURRENT_DATA));
             shared_memory = (char *)(m_large_memory->Ptr());
 
+            const char *file_index_ptr =
+                data_layout->GetBlockPtr<char>(shared_memory, SharedDataLayout::FILE_INDEX_PATH);
+            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();
+                throw OSRMException("Could not load leaf index file."
+                                    "Is any data loaded into shared memory?");
+            }
+
             LoadGraph();
+            LoadChecksum();
             LoadNodeAndEdgeInformation();
             LoadGeometries();
-            LoadRTree(ram_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).is_valid())
+                {
+                    SimpleLogger().Write() << "coordinate " << i << " not valid";
+                }
+            }
         }
     }
 
     // search graph access
-    unsigned GetNumberOfNodes() const { return m_query_graph->GetNumberOfNodes(); }
+    unsigned GetNumberOfNodes() const final { return m_query_graph->GetNumberOfNodes(); }
 
-    unsigned GetNumberOfEdges() const { return m_query_graph->GetNumberOfEdges(); }
+    unsigned GetNumberOfEdges() const final { return m_query_graph->GetNumberOfEdges(); }
 
-    unsigned GetOutDegree(const NodeID n) const { return m_query_graph->GetOutDegree(n); }
+    unsigned GetOutDegree(const NodeID n) const final { return m_query_graph->GetOutDegree(n); }
 
-    NodeID GetTarget(const EdgeID e) const { return m_query_graph->GetTarget(e); }
+    NodeID GetTarget(const EdgeID e) const final { return m_query_graph->GetTarget(e); }
 
-    EdgeDataT &GetEdgeData(const EdgeID e) { return m_query_graph->GetEdgeData(e); }
+    EdgeDataT &GetEdgeData(const EdgeID e) const final { return m_query_graph->GetEdgeData(e); }
 
-    // const EdgeDataT &GetEdgeData( const EdgeID e ) const {
-    //     return m_query_graph->GetEdgeData(e);
-    // }
+    EdgeID BeginEdges(const NodeID n) const final { return m_query_graph->BeginEdges(n); }
 
-    EdgeID BeginEdges(const NodeID n) const { return m_query_graph->BeginEdges(n); }
+    EdgeID EndEdges(const NodeID n) const final { return m_query_graph->EndEdges(n); }
 
-    EdgeID EndEdges(const NodeID n) const { return m_query_graph->EndEdges(n); }
+    EdgeRange GetAdjacentEdgeRange(const NodeID node) const final
+    {
+        return m_query_graph->GetAdjacentEdgeRange(node);
+    };
 
     // searches for a specific edge
-    EdgeID FindEdge(const NodeID from, const NodeID to) const
+    EdgeID FindEdge(const NodeID from, const NodeID to) const final
     {
         return m_query_graph->FindEdge(from, to);
     }
 
-    EdgeID FindEdgeInEitherDirection(const NodeID from, const NodeID to) const
+    EdgeID FindEdgeInEitherDirection(const NodeID from, const NodeID to) const final
     {
         return m_query_graph->FindEdgeInEitherDirection(from, to);
     }
 
-    EdgeID FindEdgeIndicateIfReverse(const NodeID from, const NodeID to, bool &result) const
+    EdgeID FindEdgeIndicateIfReverse(const NodeID from, const NodeID to, bool &result) const final
     {
         return m_query_graph->FindEdgeIndicateIfReverse(from, to, result);
     }
 
     // node and edge information access
-    FixedPointCoordinate GetCoordinateOfNode(const unsigned id) const
+    FixedPointCoordinate GetCoordinateOfNode(const NodeID id) const final
     {
         return m_coordinate_list->at(id);
     };
 
-    virtual bool EdgeIsCompressed(const unsigned id) const { return m_egde_is_compressed.at(id); }
+    virtual bool EdgeIsCompressed(const unsigned id) const final
+    {
+        return m_edge_is_compressed.at(id);
+    }
 
-    virtual void GetUncompressedGeometry(const unsigned id, std::vector<unsigned> &result_nodes)
-        const
+    virtual void GetUncompressedGeometry(const unsigned id,
+                                         std::vector<unsigned> &result_nodes) const final
     {
         const unsigned begin = m_geometry_indices.at(id);
         const unsigned end = m_geometry_indices.at(id + 1);
@@ -289,62 +341,107 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
             result_nodes.begin(), m_geometry_list.begin() + begin, m_geometry_list.begin() + end);
     }
 
-    virtual unsigned GetGeometryIndexForEdgeID(const unsigned id) const
+    virtual unsigned GetGeometryIndexForEdgeID(const unsigned id) const final
     {
         return m_via_node_list.at(id);
     }
 
-    TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const
+    TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const final
     {
         return m_turn_instruction_list.at(id);
     }
 
+    TravelMode GetTravelModeForEdgeID(const unsigned id) const
+    {
+        return m_travel_mode_list.at(id);
+    }
+
     bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate,
                                             FixedPointCoordinate &result,
-                                            const unsigned zoom_level = 18) const
+                                            const unsigned zoom_level = 18) final
     {
-        return m_static_rtree->LocateClosestEndPointForCoordinate(
+        if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
+        {
+            LoadRTree();
+        }
+
+        return m_static_rtree->second->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) final
     {
-        const bool found = m_static_rtree->FindPhantomNodeForCoordinate(
+        if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
+        {
+            LoadRTree();
+        }
+
+        return m_static_rtree->second->FindPhantomNodeForCoordinate(
             input_coordinate, resulting_phantom_node, zoom_level);
-        return found;
     }
 
-    unsigned GetCheckSum() const { return m_check_sum; }
+    bool
+    IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                            PhantomNode &resulting_phantom_node,
+                                            const unsigned zoom_level) final
+    {
+        std::vector<PhantomNode> resulting_phantom_node_vector;
+        auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate,
+                                                              resulting_phantom_node_vector,
+                                                              zoom_level,
+                                                              1);
+        if (result)
+        {
+            BOOST_ASSERT(!resulting_phantom_node_vector.empty());
+            resulting_phantom_node = resulting_phantom_node_vector.front();
+        }
+        return result;
+    }
 
-    unsigned GetNameIndexFromEdgeID(const unsigned id) const
+    bool
+    IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                            std::vector<PhantomNode> &resulting_phantom_node_vector,
+                                            const unsigned zoom_level,
+                                            const unsigned number_of_results) final
+    {
+        if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
+        {
+            LoadRTree();
+        }
+
+        return m_static_rtree->second->IncrementalFindPhantomNodeForCoordinate(
+            input_coordinate, resulting_phantom_node_vector, zoom_level, number_of_results);
+    }
+
+    unsigned GetCheckSum() const final { return m_check_sum; }
+
+    unsigned GetNameIndexFromEdgeID(const unsigned id) const final
     {
         return m_name_ID_list.at(id);
     };
 
-    void GetName(const unsigned name_id, std::string &result) const
+    void GetName(const unsigned name_id, std::string &result) const final
     {
         if (UINT_MAX == name_id)
         {
             result = "";
             return;
         }
-        BOOST_ASSERT_MSG(name_id < m_name_begin_indices.size(), "name id too high");
-        const unsigned begin_index = m_name_begin_indices[name_id];
-        const unsigned end_index = m_name_begin_indices[name_id + 1];
-        BOOST_ASSERT_MSG(begin_index <= m_names_char_list.size(), "begin index of name too high");
-        BOOST_ASSERT_MSG(end_index <= m_names_char_list.size(), "end index of name too high");
+        auto range = m_name_table->GetRange(name_id);
 
-        BOOST_ASSERT_MSG(begin_index <= end_index, "string ends before begin");
         result.clear();
-        result.resize(end_index - begin_index);
-        std::copy(m_names_char_list.begin() + begin_index,
-                  m_names_char_list.begin() + end_index,
-                  result.begin());
+        if (range.begin() != range.end())
+        {
+            result.resize(range.back() - range.front() + 1);
+            std::copy(m_names_char_list.begin() + range.front(),
+                      m_names_char_list.begin() + range.back() + 1,
+                      result.begin());
+        }
     }
 
-    std::string GetTimestamp() const { return m_timestamp; }
+    std::string GetTimestamp() const final { return m_timestamp; }
 };
 
 #endif // SHARED_DATA_FACADE_H

Server/DataStructures/SharedDataType.h

@@ -28,229 +28,149 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef SHARED_DATA_TYPE_H_
 #define SHARED_DATA_TYPE_H_
 
-#include "BaseDataFacade.h"
-
-#include "../../DataStructures/QueryEdge.h"
-#include "../../DataStructures/StaticGraph.h"
-#include "../../DataStructures/StaticRTree.h"
-#include "../../DataStructures/TurnInstructions.h"
-
-#include "../../typedefs.h"
-
-#include <osrm/Coordinate.h>
+#include "../../Util/OSRMException.h"
+#include "../../Util/simple_logger.hpp"
 
 #include <cstdint>
 
-typedef BaseDataFacade<QueryEdge::EdgeData>::RTreeLeaf RTreeLeaf;
-typedef StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, true>::vector, true>::TreeNode RTreeNode;
-typedef StaticGraph<QueryEdge::EdgeData> QueryGraph;
+#include <array>
+
+// Added at the start and end of each block as sanity check
+static const char CANARY[] = "OSRM";
 
 struct SharedDataLayout
 {
-    uint64_t name_index_list_size;
-    uint64_t name_char_list_size;
-    uint64_t name_id_list_size;
-    uint64_t via_node_list_size;
-    uint64_t graph_node_list_size;
-    uint64_t graph_edge_list_size;
-    uint64_t coordinate_list_size;
-    uint64_t turn_instruction_list_size;
-    uint64_t r_search_tree_size;
-    uint64_t geometries_index_list_size;
-    uint64_t geometries_list_size;
-    uint64_t geometries_indicators;
+    enum BlockID {
+        NAME_OFFSETS = 0,
+        NAME_BLOCKS,
+        NAME_CHAR_LIST,
+        NAME_ID_LIST,
+        VIA_NODE_LIST,
+        GRAPH_NODE_LIST,
+        GRAPH_EDGE_LIST,
+        COORDINATE_LIST,
+        TURN_INSTRUCTION,
+        TRAVEL_MODE,
+        R_SEARCH_TREE,
+        GEOMETRIES_INDEX,
+        GEOMETRIES_LIST,
+        GEOMETRIES_INDICATORS,
+        HSGR_CHECKSUM,
+        TIMESTAMP,
+        FILE_INDEX_PATH,
+        NUM_BLOCKS
+    };
 
-    unsigned checksum;
-    unsigned timestamp_length;
-
-    char ram_index_file_name[1024];
+    std::array<uint64_t, NUM_BLOCKS> num_entries;
+    std::array<uint64_t, NUM_BLOCKS> entry_size;
 
     SharedDataLayout()
-        : name_index_list_size(0), name_char_list_size(0), name_id_list_size(0),
-          via_node_list_size(0), graph_node_list_size(0), graph_edge_list_size(0),
-          coordinate_list_size(0), turn_instruction_list_size(0), r_search_tree_size(0),
-          geometries_index_list_size(0), geometries_list_size(0), geometries_indicators(0),
-          checksum(0), timestamp_length(0)
-
+    : num_entries()
+    , entry_size()
     {
-        ram_index_file_name[0] = '\0';
     }
 
     void PrintInformation() const
     {
         SimpleLogger().Write(logDEBUG) << "-";
-        SimpleLogger().Write(logDEBUG) << "name_index_list_size:       " << name_index_list_size;
-        SimpleLogger().Write(logDEBUG) << "name_char_list_size:        " << name_char_list_size;
-        SimpleLogger().Write(logDEBUG) << "name_id_list_size:          " << name_id_list_size;
-        SimpleLogger().Write(logDEBUG) << "via_node_list_size:         " << via_node_list_size;
-        SimpleLogger().Write(logDEBUG) << "graph_node_list_size:       " << graph_node_list_size;
-        SimpleLogger().Write(logDEBUG) << "graph_edge_list_size:       " << graph_edge_list_size;
-        SimpleLogger().Write(logDEBUG) << "timestamp_length:           " << timestamp_length;
-        SimpleLogger().Write(logDEBUG) << "coordinate_list_size:       " << coordinate_list_size;
-        SimpleLogger().Write(logDEBUG)
-            << "turn_instruction_list_size: " << turn_instruction_list_size;
-        SimpleLogger().Write(logDEBUG) << "r_search_tree_size:         " << r_search_tree_size;
-        SimpleLogger().Write(logDEBUG) << "geometries_indicators:      " << geometries_indicators
-                                       << "/" << ((geometries_indicators / 8) + 1);
-        SimpleLogger().Write(logDEBUG)
-            << "geometries_index_list_size: " << geometries_index_list_size;
-        SimpleLogger().Write(logDEBUG) << "geometries_list_size:       " << geometries_list_size;
-        SimpleLogger().Write(logDEBUG) << "sizeof(checksum):           " << sizeof(checksum);
-        SimpleLogger().Write(logDEBUG) << "ram index file name:        " << ram_index_file_name;
+        SimpleLogger().Write(logDEBUG) << "name_offsets_size:          " << num_entries[NAME_OFFSETS];
+        SimpleLogger().Write(logDEBUG) << "name_blocks_size:           " << num_entries[NAME_BLOCKS];
+        SimpleLogger().Write(logDEBUG) << "name_char_list_size:        " << num_entries[NAME_CHAR_LIST];
+        SimpleLogger().Write(logDEBUG) << "name_id_list_size:          " << num_entries[NAME_ID_LIST];
+        SimpleLogger().Write(logDEBUG) << "via_node_list_size:         " << num_entries[VIA_NODE_LIST];
+        SimpleLogger().Write(logDEBUG) << "graph_node_list_size:       " << num_entries[GRAPH_NODE_LIST];
+        SimpleLogger().Write(logDEBUG) << "graph_edge_list_size:       " << num_entries[GRAPH_EDGE_LIST];
+        SimpleLogger().Write(logDEBUG) << "timestamp_length:           " << num_entries[TIMESTAMP];
+        SimpleLogger().Write(logDEBUG) << "coordinate_list_size:       " << num_entries[COORDINATE_LIST];
+        SimpleLogger().Write(logDEBUG) << "turn_instruction_list_size: " << num_entries[TURN_INSTRUCTION];
+        SimpleLogger().Write(logDEBUG) << "travel_mode_list_size:      " << num_entries[TRAVEL_MODE];
+        SimpleLogger().Write(logDEBUG) << "r_search_tree_size:         " << num_entries[R_SEARCH_TREE];
+        SimpleLogger().Write(logDEBUG) << "geometries_indicators:      " << num_entries[GEOMETRIES_INDICATORS]
+                                       << "/" << ((num_entries[GEOMETRIES_INDICATORS] / 8) + 1);
+        SimpleLogger().Write(logDEBUG) << "geometries_index_list_size: " << num_entries[GEOMETRIES_INDEX];
+        SimpleLogger().Write(logDEBUG) << "geometries_list_size:       " << num_entries[GEOMETRIES_LIST];
+        SimpleLogger().Write(logDEBUG) << "sizeof(checksum):           " << entry_size[HSGR_CHECKSUM];
+
+        SimpleLogger().Write(logDEBUG) << "NAME_OFFSETS         " << ": " << GetBlockSize(NAME_OFFSETS         );
+        SimpleLogger().Write(logDEBUG) << "NAME_BLOCKS          " << ": " << GetBlockSize(NAME_BLOCKS          );
+        SimpleLogger().Write(logDEBUG) << "NAME_CHAR_LIST       " << ": " << GetBlockSize(NAME_CHAR_LIST       );
+        SimpleLogger().Write(logDEBUG) << "NAME_ID_LIST         " << ": " << GetBlockSize(NAME_ID_LIST         );
+        SimpleLogger().Write(logDEBUG) << "VIA_NODE_LIST        " << ": " << GetBlockSize(VIA_NODE_LIST        );
+        SimpleLogger().Write(logDEBUG) << "GRAPH_NODE_LIST      " << ": " << GetBlockSize(GRAPH_NODE_LIST      );
+        SimpleLogger().Write(logDEBUG) << "GRAPH_EDGE_LIST      " << ": " << GetBlockSize(GRAPH_EDGE_LIST      );
+        SimpleLogger().Write(logDEBUG) << "COORDINATE_LIST      " << ": " << GetBlockSize(COORDINATE_LIST      );
+        SimpleLogger().Write(logDEBUG) << "TURN_INSTRUCTION     " << ": " << GetBlockSize(TURN_INSTRUCTION     );
+        SimpleLogger().Write(logDEBUG) << "TRAVEL_MODE          " << ": " << GetBlockSize(TRAVEL_MODE          );
+        SimpleLogger().Write(logDEBUG) << "R_SEARCH_TREE        " << ": " << GetBlockSize(R_SEARCH_TREE        );
+        SimpleLogger().Write(logDEBUG) << "GEOMETRIES_INDEX     " << ": " << GetBlockSize(GEOMETRIES_INDEX     );
+        SimpleLogger().Write(logDEBUG) << "GEOMETRIES_LIST      " << ": " << GetBlockSize(GEOMETRIES_LIST      );
+        SimpleLogger().Write(logDEBUG) << "GEOMETRIES_INDICATORS" << ": " << GetBlockSize(GEOMETRIES_INDICATORS);
+        SimpleLogger().Write(logDEBUG) << "HSGR_CHECKSUM        " << ": " << GetBlockSize(HSGR_CHECKSUM        );
+        SimpleLogger().Write(logDEBUG) << "TIMESTAMP            " << ": " << GetBlockSize(TIMESTAMP            );
+        SimpleLogger().Write(logDEBUG) << "FILE_INDEX_PATH      " << ": " << GetBlockSize(FILE_INDEX_PATH      );
     }
 
-    uint64_t GetSizeOfLayout() const
+    template<typename T>
+    inline void SetBlockSize(BlockID bid, uint64_t entries)
     {
-        uint64_t result =
-            (name_index_list_size * sizeof(unsigned)) + (name_char_list_size * sizeof(char)) +
-            (name_id_list_size * sizeof(unsigned)) + (via_node_list_size * sizeof(NodeID)) +
-            (graph_node_list_size * sizeof(QueryGraph::NodeArrayEntry)) +
-            (graph_edge_list_size * sizeof(QueryGraph::EdgeArrayEntry)) +
-            (timestamp_length * sizeof(char)) +
-            (coordinate_list_size * sizeof(FixedPointCoordinate)) +
-            (turn_instruction_list_size * sizeof(TurnInstructionsClass)) +
-            (r_search_tree_size * sizeof(RTreeNode)) +
-            (geometries_indicators / 32 + 1) * sizeof(unsigned) +
-            (geometries_index_list_size * sizeof(unsigned)) +
-            (geometries_list_size * sizeof(unsigned)) + sizeof(checksum) + 1024 * sizeof(char);
+        num_entries[bid] = entries;
+        entry_size[bid] = sizeof(T);
+    }
+
+    inline uint64_t GetBlockSize(BlockID bid) const
+    {
+        // special encoding
+        if (bid == GEOMETRIES_INDICATORS)
+        {
+            return (num_entries[GEOMETRIES_INDICATORS]/32 + 1) * entry_size[GEOMETRIES_INDICATORS];
+        }
+
+        return num_entries[bid] * entry_size[bid];
+    }
+
+    inline uint64_t GetSizeOfLayout() const
+    {
+        return GetBlockOffset(NUM_BLOCKS) + NUM_BLOCKS*2*sizeof(CANARY);
+    }
+
+    inline uint64_t GetBlockOffset(BlockID bid) const
+    {
+        uint64_t result = sizeof(CANARY);
+        for (auto i = 0; i < bid; i++)
+        {
+            result += GetBlockSize((BlockID) i) + 2*sizeof(CANARY);
+        }
         return result;
     }
 
-    uint64_t GetNameIndexOffset() const { return 0; }
-    uint64_t GetNameListOffset() const
+    template<typename T, bool WRITE_CANARY=false>
+    inline T* GetBlockPtr(char* shared_memory, BlockID bid)
     {
-        uint64_t result = (name_index_list_size * sizeof(unsigned));
-        return result;
-    }
-    uint64_t GetNameIDListOffset() const
-    {
-        uint64_t result =
-            (name_index_list_size * sizeof(unsigned)) + (name_char_list_size * sizeof(char));
-        return result;
-    }
-    uint64_t GetViaNodeListOffset() const
-    {
-        uint64_t result = (name_index_list_size * sizeof(unsigned)) +
-                          (name_char_list_size * sizeof(char)) +
-                          (name_id_list_size * sizeof(unsigned));
-        return result;
-    }
-    uint64_t GetGraphNodeListOffset() const
-    {
-        uint64_t result =
-            (name_index_list_size * sizeof(unsigned)) + (name_char_list_size * sizeof(char)) +
-            (name_id_list_size * sizeof(unsigned)) + (via_node_list_size * sizeof(NodeID));
-        return result;
-    }
-    uint64_t GetGraphEdgeListOffset() const
-    {
-        uint64_t result =
-            (name_index_list_size * sizeof(unsigned)) + (name_char_list_size * sizeof(char)) +
-            (name_id_list_size * sizeof(unsigned)) + (via_node_list_size * sizeof(NodeID)) +
-            (graph_node_list_size * sizeof(QueryGraph::NodeArrayEntry));
-        return result;
-    }
-    uint64_t GetTimeStampOffset() const
-    {
-        uint64_t result =
-            (name_index_list_size * sizeof(unsigned)) + (name_char_list_size * sizeof(char)) +
-            (name_id_list_size * sizeof(unsigned)) + (via_node_list_size * sizeof(NodeID)) +
-            (graph_node_list_size * sizeof(QueryGraph::NodeArrayEntry)) +
-            (graph_edge_list_size * sizeof(QueryGraph::EdgeArrayEntry));
-        return result;
-    }
-    uint64_t GetCoordinateListOffset() const
-    {
-        uint64_t result =
-            (name_index_list_size * sizeof(unsigned)) + (name_char_list_size * sizeof(char)) +
-            (name_id_list_size * sizeof(unsigned)) + (via_node_list_size * sizeof(NodeID)) +
-            (graph_node_list_size * sizeof(QueryGraph::NodeArrayEntry)) +
-            (graph_edge_list_size * sizeof(QueryGraph::EdgeArrayEntry)) +
-            (timestamp_length * sizeof(char));
-        return result;
-    }
-    uint64_t GetTurnInstructionListOffset() const
-    {
-        uint64_t result =
-            (name_index_list_size * sizeof(unsigned)) + (name_char_list_size * sizeof(char)) +
-            (name_id_list_size * sizeof(unsigned)) + (via_node_list_size * sizeof(NodeID)) +
-            (graph_node_list_size * sizeof(QueryGraph::NodeArrayEntry)) +
-            (graph_edge_list_size * sizeof(QueryGraph::EdgeArrayEntry)) +
-            (timestamp_length * sizeof(char)) +
-            (coordinate_list_size * sizeof(FixedPointCoordinate));
-        return result;
-    }
-    uint64_t GetRSearchTreeOffset() const
-    {
-        uint64_t result =
-            (name_index_list_size * sizeof(unsigned)) + (name_char_list_size * sizeof(char)) +
-            (name_id_list_size * sizeof(unsigned)) + (via_node_list_size * sizeof(NodeID)) +
-            (graph_node_list_size * sizeof(QueryGraph::NodeArrayEntry)) +
-            (graph_edge_list_size * sizeof(QueryGraph::EdgeArrayEntry)) +
-            (timestamp_length * sizeof(char)) +
-            (coordinate_list_size * sizeof(FixedPointCoordinate)) +
-            (turn_instruction_list_size * sizeof(TurnInstructionsClass));
-        return result;
-    }
-    uint64_t GetGeometriesIndicatorOffset() const
-    {
-        uint64_t result =
-            (name_index_list_size * sizeof(unsigned)) + (name_char_list_size * sizeof(char)) +
-            (name_id_list_size * sizeof(unsigned)) + (via_node_list_size * sizeof(NodeID)) +
-            (graph_node_list_size * sizeof(QueryGraph::NodeArrayEntry)) +
-            (graph_edge_list_size * sizeof(QueryGraph::EdgeArrayEntry)) +
-            (timestamp_length * sizeof(char)) +
-            (coordinate_list_size * sizeof(FixedPointCoordinate)) +
-            (turn_instruction_list_size * sizeof(TurnInstructionsClass)) +
-            (r_search_tree_size * sizeof(RTreeNode));
-        return result;
-    }
+        T* ptr = (T*)(shared_memory + GetBlockOffset(bid));
+        if (WRITE_CANARY)
+        {
+            char* start_canary_ptr = shared_memory + GetBlockOffset(bid) - sizeof(CANARY);
+            char* end_canary_ptr = shared_memory + GetBlockOffset(bid) + GetBlockSize(bid);
+            std::copy(CANARY, CANARY + sizeof(CANARY), start_canary_ptr);
+            std::copy(CANARY, CANARY + sizeof(CANARY), end_canary_ptr);
+        }
+        else
+        {
+            char* start_canary_ptr = shared_memory + GetBlockOffset(bid) - sizeof(CANARY);
+            char* end_canary_ptr = shared_memory + GetBlockOffset(bid) + GetBlockSize(bid);
+            bool start_canary_alive = std::equal(CANARY, CANARY + sizeof(CANARY), start_canary_ptr);
+            bool end_canary_alive = std::equal(CANARY, CANARY + sizeof(CANARY), end_canary_ptr);
+            if (!start_canary_alive)
+            {
+                throw OSRMException("Start canary of block corrupted.");
+            }
+            if (!end_canary_alive)
+            {
+                throw OSRMException("End canary of block corrupted.");
+            }
+        }
 
-    uint64_t GetGeometriesIndexListOffset() const
-    {
-        uint64_t result =
-            (name_index_list_size * sizeof(unsigned)) + (name_char_list_size * sizeof(char)) +
-            (name_id_list_size * sizeof(unsigned)) + (via_node_list_size * sizeof(NodeID)) +
-            (graph_node_list_size * sizeof(QueryGraph::NodeArrayEntry)) +
-            (graph_edge_list_size * sizeof(QueryGraph::EdgeArrayEntry)) +
-            (timestamp_length * sizeof(char)) +
-            (coordinate_list_size * sizeof(FixedPointCoordinate)) +
-            (turn_instruction_list_size * sizeof(TurnInstructionsClass)) +
-            (r_search_tree_size * sizeof(RTreeNode)) +
-            (geometries_indicators / 32 + 1) * sizeof(unsigned);
-        return result;
-    }
-
-    uint64_t GetGeometryListOffset() const
-    {
-        uint64_t result =
-            (name_index_list_size * sizeof(unsigned)) + (name_char_list_size * sizeof(char)) +
-            (name_id_list_size * sizeof(unsigned)) + (via_node_list_size * sizeof(NodeID)) +
-            (graph_node_list_size * sizeof(QueryGraph::NodeArrayEntry)) +
-            (graph_edge_list_size * sizeof(QueryGraph::EdgeArrayEntry)) +
-            (timestamp_length * sizeof(char)) +
-            (coordinate_list_size * sizeof(FixedPointCoordinate)) +
-            (turn_instruction_list_size * sizeof(TurnInstructionsClass)) +
-            (r_search_tree_size * sizeof(RTreeNode)) +
-            (geometries_indicators / 32 + 1) * sizeof(unsigned) +
-            (geometries_index_list_size * sizeof(unsigned));
-        return result;
-    }
-    uint64_t GetChecksumOffset() const
-    {
-        uint64_t result =
-            (name_index_list_size * sizeof(unsigned)) + (name_char_list_size * sizeof(char)) +
-            (name_id_list_size * sizeof(unsigned)) + (via_node_list_size * sizeof(NodeID)) +
-            (graph_node_list_size * sizeof(QueryGraph::NodeArrayEntry)) +
-            (graph_edge_list_size * sizeof(QueryGraph::EdgeArrayEntry)) +
-            (timestamp_length * sizeof(char)) +
-            (coordinate_list_size * sizeof(FixedPointCoordinate)) +
-            (turn_instruction_list_size * sizeof(TurnInstructionsClass)) +
-            (r_search_tree_size * sizeof(RTreeNode)) +
-            (geometries_indicators / 32 + 1) * sizeof(unsigned) +
-            (geometries_index_list_size * sizeof(unsigned)) +
-            (geometries_list_size * sizeof(unsigned));
-        return result;
+        return ptr;
     }
 };
 

Server/Http/CompressionType.h

@@ -36,6 +36,6 @@ enum CompressionType
   gzipRFC1952,
   deflateRFC1951 };
 
-} // namespace http
+}
 
 #endif // COMPRESSION_TYPE_H

Server/Http/Reply.cpp

@@ -27,34 +27,26 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <osrm/Reply.h>
 
-#include "../../Util/StringUtil.h"
+#include "../../Util/cast.hpp"
 
 namespace http
 {
 
-void Reply::setSize(const unsigned size)
+void Reply::SetSize(const unsigned size)
 {
     for (Header &h : headers)
     {
         if ("Content-Length" == h.name)
         {
-            intToString(size, h.value);
+            h.value = cast::integral_to_string(size);
         }
     }
 }
 
 // Sets the size of the uncompressed output.
-void Reply::SetUncompressedSize()
-{
-    unsigned uncompressed_size = 0;
-    for (const std::string &current_line : content)
-    {
-        uncompressed_size += current_line.size();
-    }
-    setSize(uncompressed_size);
-}
+void Reply::SetUncompressedSize() { SetSize(static_cast<unsigned>(content.size())); }
 
-std::vector<boost::asio::const_buffer> Reply::toBuffers()
+std::vector<boost::asio::const_buffer> Reply::ToBuffers()
 {
     std::vector<boost::asio::const_buffer> buffers;
     buffers.push_back(ToBuffer(status));
@@ -66,10 +58,7 @@ std::vector<boost::asio::const_buffer> Reply::toBuffers()
         buffers.push_back(boost::asio::buffer(crlf));
     }
     buffers.push_back(boost::asio::buffer(crlf));
-    for (const std::string &line : content)
-    {
-        buffers.push_back(boost::asio::buffer(line));
-    }
+    buffers.push_back(boost::asio::buffer(content));
     return buffers;
 }
 
@@ -91,22 +80,16 @@ std::vector<boost::asio::const_buffer> Reply::HeaderstoBuffers()
 
 Reply Reply::StockReply(Reply::status_type status)
 {
-    Reply rep;
-    rep.status = status;
-    rep.content.clear();
-    rep.content.push_back(rep.ToString(status));
-    rep.headers.resize(3);
-    rep.headers[0].name = "Access-Control-Allow-Origin";
-    rep.headers[0].value = "*";
-    rep.headers[1].name = "Content-Length";
+    Reply reply;
+    reply.status = status;
+    reply.content.clear();
 
-    std::string size_string;
-    intToString(rep.content.size(), size_string);
-
-    rep.headers[1].value = size_string;
-    rep.headers[2].name = "Content-Type";
-    rep.headers[2].value = "text/html";
-    return rep;
+    const std::string status_string = reply.ToString(status);
+    reply.content.insert(reply.content.end(), status_string.begin(), status_string.end());
+    reply.headers.emplace_back("Access-Control-Allow-Origin", "*");
+    reply.headers.emplace_back("Content-Length", cast::integral_to_string(reply.content.size()));
+    reply.headers.emplace_back("Content-Type", "text/html");
+    return reply;
 }
 
 std::string Reply::ToString(Reply::status_type status)

Server/RequestHandler.cpp

@@ -25,12 +25,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "APIGrammar.h"
 #include "RequestHandler.h"
+
+#include "APIGrammar.h"
 #include "Http/Request.h"
 
+#include "../data_structures/json_container.hpp"
 #include "../Library/OSRM.h"
-#include "../Util/SimpleLogger.h"
+#include "../Util/json_renderer.hpp"
+#include "../Util/simple_logger.hpp"
 #include "../Util/StringUtil.h"
 #include "../typedefs.h"
 
@@ -60,16 +63,17 @@ void RequestHandler::handle_request(const http::Request &req, http::Reply &reply
         //     req.agent << ( 0 == req.agent.length() ? "- " :" ") << request;
 
         time_t ltime;
-        struct tm *Tm;
+        struct tm *time_stamp;
 
         ltime = time(nullptr);
-        Tm = localtime(&ltime);
+        time_stamp = localtime(&ltime);
 
-        SimpleLogger().Write() << (Tm->tm_mday < 10 ? "0" : "") << Tm->tm_mday << "-"
-                               << (Tm->tm_mon + 1 < 10 ? "0" : "") << (Tm->tm_mon + 1) << "-"
-                               << 1900 + Tm->tm_year << " " << (Tm->tm_hour < 10 ? "0" : "")
-                               << Tm->tm_hour << ":" << (Tm->tm_min < 10 ? "0" : "") << Tm->tm_min
-                               << ":" << (Tm->tm_sec < 10 ? "0" : "") << Tm->tm_sec << " "
+        // log timestamp
+        SimpleLogger().Write() << (time_stamp->tm_mday < 10 ? "0" : "") << time_stamp->tm_mday << "-"
+                               << (time_stamp->tm_mon + 1 < 10 ? "0" : "") << (time_stamp->tm_mon + 1) << "-"
+                               << 1900 + time_stamp->tm_year << " " << (time_stamp->tm_hour < 10 ? "0" : "")
+                               << time_stamp->tm_hour << ":" << (time_stamp->tm_min < 10 ? "0" : "") << time_stamp->tm_min
+                               << ":" << (time_stamp->tm_sec < 10 ? "0" : "") << time_stamp->tm_sec << " "
                                << req.endpoint.to_string() << " " << req.referrer
                                << (0 == req.referrer.length() ? "- " : " ") << req.agent
                                << (0 == req.agent.length() ? "- " : " ") << request;
@@ -77,27 +81,54 @@ void RequestHandler::handle_request(const http::Request &req, http::Reply &reply
         RouteParameters route_parameters;
         APIGrammarParser api_parser(&route_parameters);
 
-        auto it = request.begin();
-        const bool result = boost::spirit::qi::parse(it, request.end(), api_parser);
+        auto iter = request.begin();
+        const bool result = boost::spirit::qi::parse(iter, request.end(), api_parser);
 
-        if (!result || (it != request.end()))
+        // check if the was an error with the request
+        if (!result || (iter != request.end()))
         {
             reply = http::Reply::StockReply(http::Reply::badRequest);
             reply.content.clear();
-            const int position = std::distance(request.begin(), it);
-            reply.content.push_back(
-                "{\"status\":400,\"status_message\":\"Query string malformed close to position ");
-            std::string tmp_position_string;
-            intToString(position, tmp_position_string);
-            reply.content.push_back(tmp_position_string);
-            reply.content.push_back("\"}");
+            const auto position = std::distance(request.begin(), iter);
+            JSON::Object json_result;
+            json_result.values["status"] = 400;
+            std::string message = "Query string malformed close to position ";
+            message += cast::integral_to_string(position);
+            json_result.values["status_message"] = message;
+            JSON::render(reply.content, json_result);
+            return;
+        }
+
+        // parsing done, lets call the right plugin to handle the request
+        BOOST_ASSERT_MSG(routing_machine != nullptr, "pointer not init'ed");
+
+        if (!route_parameters.jsonp_parameter.empty())
+        { // prepend response with jsonp parameter
+            const std::string json_p = (route_parameters.jsonp_parameter + "(");
+            reply.content.insert(reply.content.end(), json_p.begin(), json_p.end());
+        }
+        routing_machine->RunQuery(route_parameters, reply);
+        if (!route_parameters.jsonp_parameter.empty())
+        { // append brace to jsonp response
+            reply.content.push_back(')');
+        }
+
+        // set headers
+        reply.headers.emplace_back("Content-Length", cast::integral_to_string(reply.content.size()));
+        if ("gpx" == route_parameters.output_format)
+        { // gpx file
+            reply.headers.emplace_back("Content-Type", "application/gpx+xml; charset=UTF-8");
+            reply.headers.emplace_back("Content-Disposition", "attachment; filename=\"route.gpx\"");
+        }
+        else if (route_parameters.jsonp_parameter.empty())
+        { // json file
+            reply.headers.emplace_back("Content-Type", "application/json; charset=UTF-8");
+            reply.headers.emplace_back("Content-Disposition", "inline; filename=\"response.json\"");
         }
         else
-        {
-            // parsing done, lets call the right plugin to handle the request
-            BOOST_ASSERT_MSG(routing_machine != nullptr, "pointer not init'ed");
-            routing_machine->RunQuery(route_parameters, reply);
-            return;
+        { // jsonp
+            reply.headers.emplace_back("Content-Type", "text/javascript; charset=UTF-8");
+            reply.headers.emplace_back("Content-Disposition", "inline; filename=\"response.js\"");
         }
     }
     catch (const std::exception &e)

Server/RequestHandler.h

@@ -44,7 +44,7 @@ class RequestHandler
 {
 
   public:
-    typedef APIGrammar<std::string::iterator, RouteParameters> APIGrammarParser;
+    using APIGrammarParser = APIGrammar<std::string::iterator, RouteParameters>;
 
     RequestHandler();
     RequestHandler(const RequestHandler &) = delete;

Server/RequestParser.cpp

@@ -25,22 +25,23 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "Http/Request.h"
 #include "RequestParser.h"
 
+#include "Http/Request.h"
+
 namespace http
 {
 
-RequestParser::RequestParser() : state_(method_start) {}
+RequestParser::RequestParser() : state_(method_start), header({"", ""}) {}
 
 void RequestParser::Reset() { state_ = method_start; }
 
 boost::tuple<boost::tribool, char *>
-RequestParser::Parse(Request &req, char *begin, char *end, http::CompressionType *compressionType)
+RequestParser::Parse(Request &req, char *begin, char *end, http::CompressionType &compression_type)
 {
     while (begin != end)
     {
-        boost::tribool result = consume(req, *begin++, compressionType);
+        boost::tribool result = consume(req, *begin++, compression_type);
         if (result || !result)
         {
             return boost::make_tuple(result, begin);
@@ -51,7 +52,7 @@ RequestParser::Parse(Request &req, char *begin, char *end, http::CompressionType
 }
 
 boost::tribool
-RequestParser::consume(Request &req, char input, http::CompressionType *compressionType)
+RequestParser::consume(Request &req, char input, http::CompressionType &compression_type)
 {
     switch (state_)
     {
@@ -177,11 +178,11 @@ RequestParser::consume(Request &req, char input, http::CompressionType *compress
             /* giving gzip precedence over deflate */
             if (header.value.find("deflate") != std::string::npos)
             {
-                *compressionType = deflateRFC1951;
+                compression_type = deflateRFC1951;
             }
             if (header.value.find("gzip") != std::string::npos)
             {
-                *compressionType = gzipRFC1952;
+                compression_type = gzipRFC1952;
             }
         }
 
@@ -262,20 +263,23 @@ RequestParser::consume(Request &req, char input, http::CompressionType *compress
             return boost::indeterminate;
         }
         return false;
-    case expecting_newline_3:
+    default: // expecting_newline_3:
         return (input == '\n');
-    default:
-        return false;
+        // default:
+        //     return false;
     }
 }
 
-inline bool RequestParser::isChar(int c) { return c >= 0 && c <= 127; }
+inline bool RequestParser::isChar(int character) { return character >= 0 && character <= 127; }
 
-inline bool RequestParser::isCTL(int c) { return (c >= 0 && c <= 31) || (c == 127); }
-
-inline bool RequestParser::isTSpecial(int c)
+inline bool RequestParser::isCTL(int character)
 {
-    switch (c)
+    return (character >= 0 && character <= 31) || (character == 127);
+}
+
+inline bool RequestParser::isTSpecial(int character)
+{
+    switch (character)
     {
     case '(':
     case ')':
@@ -302,5 +306,5 @@ inline bool RequestParser::isTSpecial(int c)
     }
 }
 
-inline bool RequestParser::isDigit(int c) { return c >= '0' && c <= '9'; }
+inline bool RequestParser::isDigit(int character) { return character >= '0' && character <= '9'; }
 }

Server/RequestParser.h

@@ -46,10 +46,10 @@ class RequestParser
     void Reset();
 
     boost::tuple<boost::tribool, char *>
-    Parse(Request &req, char *begin, char *end, CompressionType *compressionType);
+    Parse(Request &req, char *begin, char *end, CompressionType &compression_type);
 
   private:
-    boost::tribool consume(Request &req, char input, CompressionType *compressionType);
+    boost::tribool consume(Request &req, char input, CompressionType &compression_type);
 
     inline bool isChar(int c);
 

Server/Server.h

@@ -31,23 +31,41 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "Connection.h"
 #include "RequestHandler.h"
 
+#include "../Util/cast.hpp"
+#include "../Util/make_unique.hpp"
+#include "../Util/simple_logger.hpp"
+
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
-#include <boost/thread.hpp>
+
+#include <zlib.h>
 
 #include <functional>
 #include <memory>
+#include <thread>
 #include <vector>
 
 class Server
 {
   public:
-    explicit Server(const std::string &address, const std::string &port, unsigned thread_pool_size)
-        : thread_pool_size(thread_pool_size), acceptor(io_service),
-          new_connection(new http::Connection(io_service, request_handler)), request_handler()
+
+    // Note: returns a shared instead of a unique ptr as it is captured in a lambda somewhere else
+    static std::shared_ptr<Server> CreateServer(std::string &ip_address, int ip_port, unsigned requested_num_threads)
     {
+        SimpleLogger().Write() << "http 1.1 compression handled by zlib version " << zlibVersion();
+        const unsigned hardware_threads = std::max(1u, std::thread::hardware_concurrency());
+        const unsigned real_num_threads = std::min(hardware_threads, requested_num_threads);
+        return std::make_shared<Server>(ip_address, ip_port, real_num_threads);
+    }
+
+    explicit Server(const std::string &address, const int port, const unsigned thread_pool_size)
+        : thread_pool_size(thread_pool_size), acceptor(io_service),
+          new_connection(std::make_shared<http::Connection>(io_service, request_handler)), request_handler()
+    {
+        const std::string port_string = cast::integral_to_string(port);
+
         boost::asio::ip::tcp::resolver resolver(io_service);
-        boost::asio::ip::tcp::resolver::query query(address, port);
+        boost::asio::ip::tcp::resolver::query query(address, port_string);
         boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
 
         acceptor.open(endpoint.protocol());
@@ -59,19 +77,19 @@ class Server
             boost::bind(&Server::HandleAccept, this, boost::asio::placeholders::error));
     }
 
-    Server(const Server &) = delete;
-
     void Run()
     {
-        std::vector<std::shared_ptr<boost::thread>> threads;
+        std::vector<std::shared_ptr<std::thread>> threads;
         for (unsigned i = 0; i < thread_pool_size; ++i)
         {
-            std::shared_ptr<boost::thread> thread = std::make_shared<boost::thread>(
+            std::shared_ptr<std::thread> thread = std::make_shared<std::thread>(
                 boost::bind(&boost::asio::io_service::run, &io_service));
             threads.push_back(thread);
         }
-        for (unsigned i = 0; i < threads.size(); ++i)
-            threads[i]->join();
+        for (auto thread : threads)
+        {
+            thread->join();
+        }
     }
 
     void Stop() { io_service.stop(); }
@@ -84,7 +102,7 @@ class Server
         if (!e)
         {
             new_connection->start();
-            new_connection.reset(new http::Connection(io_service, request_handler));
+            new_connection = std::make_shared<http::Connection>(io_service, request_handler);
             acceptor.async_accept(
                 new_connection->socket(),
                 boost::bind(&Server::HandleAccept, this, boost::asio::placeholders::error));

Tools/components.cpp

@@ -1,133 +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 "../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"
-#include "../Util/UUID.h"
-
-#include <fstream>
-#include <memory>
-#include <string>
-#include <vector>
-
-typedef QueryEdge::EdgeData EdgeData;
-typedef DynamicGraph<EdgeData>::InputEdge InputEdge;
-
-std::vector<NodeInfo> internal_to_external_node_map;
-std::vector<TurnRestriction> restrictions_vector;
-std::vector<NodeID> bollard_node_IDs_vector;
-std::vector<NodeID> traffic_light_node_IDs_vector;
-
-int main(int argc, char *argv[])
-{
-    LogPolicy::GetInstance().Unmute();
-    if (argc < 3)
-    {
-        SimpleLogger().Write(logWARNING) << "usage:\n" << argv[0] << " <osrm> <osrm.restrictions>";
-        return -1;
-    }
-
-    try
-    {
-        SimpleLogger().Write() << "Using restrictions from file: " << argv[2];
-        std::ifstream restriction_ifstream(argv[2], std::ios::binary);
-        const UUID uuid_orig;
-        UUID uuid_loaded;
-        restriction_ifstream.read((char *)&uuid_loaded, sizeof(UUID));
-
-        if (!uuid_loaded.TestGraphUtil(uuid_orig))
-        {
-            SimpleLogger().Write(logWARNING) << argv[2] << " was prepared with a different build. "
-                                                           "Reprocess to get rid of this warning.";
-        }
-
-        if (!restriction_ifstream.good())
-        {
-            throw OSRMException("Could not access <osrm-restrictions> files");
-        }
-        uint32_t usable_restriction_count = 0;
-        restriction_ifstream.read((char *)&usable_restriction_count, sizeof(uint32_t));
-        restrictions_vector.resize(usable_restriction_count);
-
-        restriction_ifstream.read((char *)&(restrictions_vector[0]),
-                                  usable_restriction_count * sizeof(TurnRestriction));
-        restriction_ifstream.close();
-
-        std::ifstream input_stream;
-        input_stream.open(argv[1], std::ifstream::in | std::ifstream::binary);
-
-        if (!input_stream.is_open())
-        {
-            throw OSRMException("Cannot open osrm file");
-        }
-
-        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,
-                                                                     restrictions_vector);
-        input_stream.close();
-
-        BOOST_ASSERT_MSG(restrictions_vector.size() == usable_restriction_count,
-                         "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
-         */
-
-        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,
-                                        restrictions_vector,
-                                        internal_to_external_node_map);
-        std::vector<ImportEdge>().swap(edge_list);
-
-        tarjan->Run();
-        SimpleLogger().Write() << "finished component analysis";
-    }
-    catch (const std::exception &e)
-    {
-        SimpleLogger().Write(logWARNING) << "[exception] " << e.what();
-    }
-    return 0;
-}

UnitTests/Algorithms/DouglasPeuckerTest.cpp

@@ -0,0 +1,109 @@
+/*
+
+Copyright (c) 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.
+
+*/
+
+#include "../../algorithms/douglas_peucker.hpp"
+#include "../../data_structures/segment_information.hpp"
+#include "../../Include/osrm/Coordinate.h"
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/test_case_template.hpp>
+#include <boost/mpl/list.hpp>
+
+#include <iostream>
+
+BOOST_AUTO_TEST_SUITE(douglas_peucker)
+
+SegmentInformation getTestInfo(int lat, int lon, bool necessary)
+{
+    return SegmentInformation(FixedPointCoordinate(lat, lon),
+                              0, 0, 0, TurnInstruction::HeadOn, necessary, false, 0);
+}
+
+BOOST_AUTO_TEST_CASE(all_necessary_test)
+{
+    /*
+     *     x
+     *    / \
+     *   x   \
+     *  /     \
+     * x       x
+     */
+    std::vector<SegmentInformation> info = {
+        getTestInfo(5, 5, true),
+        getTestInfo(6, 6, true),
+        getTestInfo(10, 10, true),
+        getTestInfo(5, 15, true)
+    };
+    DouglasPeucker dp;
+    for (unsigned z = 0; z < DOUGLAS_PEUCKER_THRESHOLDS.size(); z++)
+    {
+        dp.Run(info, z);
+        for (const auto& i : info)
+        {
+            BOOST_CHECK_EQUAL(i.necessary, true);
+        }
+    }
+}
+
+BOOST_AUTO_TEST_CASE(remove_second_node_test)
+{
+    DouglasPeucker dp;
+    for (unsigned z = 0; z < DOUGLAS_PEUCKER_THRESHOLDS.size(); z++)
+    {
+        /*
+         *   x--x
+         *   |   \
+         * x-x    x
+         *        |
+         *        x
+         */
+        std::vector<SegmentInformation> info = {
+            getTestInfo(5  * COORDINATE_PRECISION,
+                        5  * COORDINATE_PRECISION, true),
+            getTestInfo(5  * COORDINATE_PRECISION,
+                        5  * COORDINATE_PRECISION + DOUGLAS_PEUCKER_THRESHOLDS[z], false),
+            getTestInfo(10 * COORDINATE_PRECISION,
+                        10 * COORDINATE_PRECISION, false),
+            getTestInfo(10 * COORDINATE_PRECISION,
+                        10 + COORDINATE_PRECISION + DOUGLAS_PEUCKER_THRESHOLDS[z] * 2, false),
+            getTestInfo(5  * COORDINATE_PRECISION,
+                        15 * COORDINATE_PRECISION, false),
+            getTestInfo(5  * COORDINATE_PRECISION + DOUGLAS_PEUCKER_THRESHOLDS[z],
+                        15 * COORDINATE_PRECISION, true),
+        };
+        BOOST_TEST_MESSAGE("Threshold (" << z << "): " << DOUGLAS_PEUCKER_THRESHOLDS[z]);
+        dp.Run(info, z);
+        BOOST_CHECK_EQUAL(info[0].necessary, true);
+        BOOST_CHECK_EQUAL(info[1].necessary, false);
+        BOOST_CHECK_EQUAL(info[2].necessary, true);
+        BOOST_CHECK_EQUAL(info[3].necessary, true);
+        BOOST_CHECK_EQUAL(info[4].necessary, false);
+        BOOST_CHECK_EQUAL(info[5].necessary, true);
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()

UnitTests/algorithm_tests.cpp

@@ -0,0 +1,35 @@
+/*
+
+Copyright (c) 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.
+
+*/
+
+#define BOOST_TEST_MODULE algorithm tests
+
+#include <boost/test/unit_test.hpp>
+
+/*
+ * This file will contain an automatically generated main function.
+ */
+

UnitTests/data_structures/BinaryHeapTest.cpp

@@ -0,0 +1,178 @@
+/*
+
+Copyright (c) 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.
+
+*/
+
+#include "../../data_structures/binary_heap.hpp"
+#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/data_structures/RangeTableTest.cpp

@@ -0,0 +1,131 @@
+/*
+
+Copyright (c) 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.
+
+*/
+
+#include "../../data_structures/range_table.hpp"
+#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/data_structures/StaticGraphTest.cpp

@@ -0,0 +1,191 @@
+/*
+
+Copyright (c) 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.
+
+*/
+
+#include "../../data_structures/static_graph.hpp"
+#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/data_structures/StaticRTreeTest.cpp

@@ -0,0 +1,494 @@
+/*
+
+Copyright (c) 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.
+
+*/
+
+#include "../../data_structures/static_rtree.hpp"
+#include "../../data_structures/query_node.hpp"
+#include "../../data_structures/edge_based_node.hpp"
+#include "../../Util/floating_point.hpp"
+#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 = 42;
+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.is_valid();
+    }
+
+    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) &&
+                !osrm::epsilon_compare(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,
+                                       e.forward_travel_mode,
+                                       e.backward_travel_mode};
+                nearest_edge = e;
+            }
+        }
+
+        if (result_phantom_node.location.is_valid())
+        {
+            // 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.is_valid();
+    }
+
+  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(QueryNode(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<QueryNode> 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(QueryNode(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<QueryNode> 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(QueryNode));
+    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,34 @@
+/*
+
+Copyright (c) 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.
+
+*/
+
+#define BOOST_TEST_MODULE datastructure tests
+
+#include <boost/test/unit_test.hpp>
+
+/*
+ * This file will contain an automatically generated main function.
+ */

Util/Azimuth.h

@@ -1,73 +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 AZIMUTH_H
-#define AZIMUTH_H
-
-#include <string>
-
-struct Azimuth
-{
-    static std::string Get(const double heading)
-    {
-        if (heading <= 202.5)
-        {
-            if (heading >= 0 && heading <= 22.5)
-            {
-                return "N";
-            }
-            if (heading > 22.5 && heading <= 67.5)
-            {
-                return "NE";
-            }
-            if (heading > 67.5 && heading <= 112.5)
-            {
-                return "E";
-            }
-            if (heading > 112.5 && heading <= 157.5)
-            {
-                return "SE";
-            }
-            return "S";
-        }
-        if (heading > 202.5 && heading <= 247.5)
-        {
-            return "SW";
-        }
-        if (heading > 247.5 && heading <= 292.5)
-        {
-            return "W";
-        }
-        if (heading > 292.5 && heading <= 337.5)
-        {
-            return "NW";
-        }
-        return "N";
-    }
-};
-
-#endif // AZIMUTH_H

Util/BoostFileSystemFix.h

@@ -30,9 +30,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "OSRMException.h"
 
-#include <boost/any.hpp>
+// #include <boost/any.hpp>
 #include <boost/filesystem.hpp>
-#include <boost/program_options.hpp>
+// #include <boost/program_options.hpp>
 
 // This is one big workaround for latest boost renaming woes.
 
@@ -59,8 +59,6 @@ namespace filesystem
 //     boost::program_options::validators::check_first_occurrence(v);
 //     const std::string & input_string =
 //         boost::program_options::validators::get_single_string(values);
-//     // SimpleLogger().Write() << "validator called for " << input_string;
-//     // SimpleLogger().Write() << "validator called for " << input_string;
 //     if(boost::filesystem::is_regular_file(input_string)) {
 //         v = boost::any(boost::filesystem::path(input_string));
 //     } else {
@@ -120,7 +118,7 @@ portable_canonical(const boost::filesystem::path &relative_path,
 inline path temp_directory_path()
 {
     char *buffer;
-    buffer = tmpnam(NULL);
+    buffer = tmpnam(nullptr);
 
     return path(buffer);
 }
@@ -135,4 +133,12 @@ inline path unique_path(const path &) { return temp_directory_path(); }
 #define BOOST_FILESYSTEM_VERSION 3
 #endif
 
+inline void AssertPathExists(const boost::filesystem::path &path)
+{
+    if (!boost::filesystem::is_regular_file(path))
+    {
+        throw OSRMException(path.string() + " not found.");
+    }
+}
+
 #endif /* BOOST_FILE_SYSTEM_FIX_H */

Util/DataStoreOptions.h

@@ -30,115 +30,62 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BoostFileSystemFix.h"
 #include "GitDescription.h"
+#include "IniFileUtil.h"
 #include "OSRMException.h"
-#include "SimpleLogger.h"
+#include "simple_logger.hpp"
 
 #include <osrm/ServerPaths.h>
 
 #include <boost/any.hpp>
 #include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
 #include <boost/program_options.hpp>
-#include <boost/regex.hpp>
 
 #include <string>
 
-void AssertPathExists(const boost::filesystem::path& path)
-{
-    if (!boost::filesystem::is_regular_file(path))
-    {
-        SimpleLogger().Write(logDEBUG) << path << " check failed";
-        throw OSRMException(path.string() + " not found.");
-    } else {
-        SimpleLogger().Write(logDEBUG) << path << " exists";
-    }
-}
-
-// support old capitalized option names by down-casing them with a regex replace
-inline void PrepareConfigFile(
-    const boost::filesystem::path & path,
-    std::string & output
-) {
-    boost::filesystem::fstream config_stream(path);
-    std::string input_str(
-        (std::istreambuf_iterator<char>(config_stream)),
-        std::istreambuf_iterator<char>()
-    );
-    boost::regex regex("^([^=]*)");    //match from start of line to '='
-    std::string format("\\L$1\\E");    //replace with downcased substring
-    output = boost::regex_replace( input_str, regex, format );
-}
-
 // generate boost::program_options object for the routing part
-inline bool GenerateDataStoreOptions(const int argc, const char * argv[], ServerPaths & paths)
+bool GenerateDataStoreOptions(const int argc, const char *argv[], ServerPaths &paths)
 {
     // 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>(
-                &paths["config"]
-            )->default_value("server.ini"),
-            "Path to a configuration file"
-        );
+    generic_options.add_options()("version,v", "Show version")("help,h", "Show this help message")
+        ("springclean,s", "Remove all regions in shared memory")("config,c",
+        boost::program_options::value<boost::filesystem::path>(&paths["config"])
+            ->default_value("server.ini"),
+        "Path to a configuration file");
 
     // declare a group of options that will be allowed both on command line
     // as well as in a config file
     boost::program_options::options_description config_options("Configuration");
-    config_options.add_options()
-        (
-            "hsgrdata",
-            boost::program_options::value<boost::filesystem::path>(&paths["hsgrdata"]),
-            ".hsgr file"
-        )
-        (
-            "nodesdata",
-            boost::program_options::value<boost::filesystem::path>(&paths["nodesdata"]),
-            ".nodes file"
-        )
-        (
-            "edgesdata",
-            boost::program_options::value<boost::filesystem::path>(&paths["edgesdata"]),
-            ".edges file"
-        )
-        (
-            "geometry",
-            boost::program_options::value<boost::filesystem::path>(&paths["geometry"]),
-            ".geometry file"
-        )
-        (
-            "ramindex",
-            boost::program_options::value<boost::filesystem::path>(&paths["ramindex"]),
-            ".ramIndex file"
-        )
-        (
-            "fileindex",
-            boost::program_options::value<boost::filesystem::path>(&paths["fileindex"]),
-            ".fileIndex file"
-        )
-        (
-            "namesdata",
-            boost::program_options::value<boost::filesystem::path>(&paths["namesdata"]),
-            ".names file"
-        )
-        (
-            "timestamp",
-            boost::program_options::value<boost::filesystem::path>(&paths["timestamp"]),
-            ".timestamp file"
-        );
+    config_options.add_options()(
+        "hsgrdata",
+        boost::program_options::value<boost::filesystem::path>(&paths["hsgrdata"]),
+        ".hsgr file")("nodesdata",
+                      boost::program_options::value<boost::filesystem::path>(&paths["nodesdata"]),
+                      ".nodes file")(
+        "edgesdata",
+        boost::program_options::value<boost::filesystem::path>(&paths["edgesdata"]),
+        ".edges file")("geometry",
+                       boost::program_options::value<boost::filesystem::path>(&paths["geometry"]),
+                       ".geometry file")(
+        "ramindex",
+        boost::program_options::value<boost::filesystem::path>(&paths["ramindex"]),
+        ".ramIndex file")(
+        "fileindex",
+        boost::program_options::value<boost::filesystem::path>(&paths["fileindex"]),
+        ".fileIndex file")(
+        "namesdata",
+        boost::program_options::value<boost::filesystem::path>(&paths["namesdata"]),
+        ".names file")("timestamp",
+                       boost::program_options::value<boost::filesystem::path>(&paths["timestamp"]),
+                       ".timestamp file");
 
     // 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()
-        (
-            "base,b",
-            boost::program_options::value<boost::filesystem::path>(&paths["base"]),
-            "base path to .osrm file"
-        );
+    hidden_options.add_options()(
+        "base,b",
+        boost::program_options::value<boost::filesystem::path>(&paths["base"]),
+        "base path to .osrm file");
 
     // positional option
     boost::program_options::positional_options_description positional_options;
@@ -152,25 +99,24 @@ inline bool GenerateDataStoreOptions(const int argc, const char * argv[], Server
     config_file_options.add(config_options).add(hidden_options);
 
     boost::program_options::options_description visible_options(
-        boost::filesystem::basename(argv[0]) + " [<options>] <configuration>"
-    );
+        boost::filesystem::basename(argv[0]) + " [<options>] <configuration>");
     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
-    );
+    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"))
+    if (option_variables.count("version"))
     {
         SimpleLogger().Write() << g_GIT_DESCRIPTION;
         return false;
     }
 
-    if(option_variables.count("help"))
+    if (option_variables.count("help"))
     {
         SimpleLogger().Write() << visible_options;
         return false;
@@ -178,22 +124,26 @@ inline bool GenerateDataStoreOptions(const int argc, const char * argv[], Server
 
     boost::program_options::notify(option_variables);
 
-    const bool parameter_present =
-        (paths.find("hsgrdata")  != paths.end() && !paths.find("hsgrdata" )->second.string().empty()) ||
-        (paths.find("nodesdata") != paths.end() && !paths.find("nodesdata")->second.string().empty()) ||
-        (paths.find("edgesdata") != paths.end() && !paths.find("edgesdata")->second.string().empty()) ||
-        (paths.find("geometry")  != paths.end() && !paths.find("geometry" )->second.string().empty()) ||
-        (paths.find("ramindex")  != paths.end() && !paths.find("ramindex" )->second.string().empty()) ||
-        (paths.find("fileindex") != paths.end() && !paths.find("fileindex")->second.string().empty()) ||
-        (paths.find("timestamp") != paths.end() && !paths.find("timestamp")->second.string().empty());
+    const bool parameter_present = (paths.find("hsgrdata") != paths.end() &&
+                                    !paths.find("hsgrdata")->second.string().empty()) ||
+                                   (paths.find("nodesdata") != paths.end() &&
+                                    !paths.find("nodesdata")->second.string().empty()) ||
+                                   (paths.find("edgesdata") != paths.end() &&
+                                    !paths.find("edgesdata")->second.string().empty()) ||
+                                   (paths.find("geometry") != paths.end() &&
+                                    !paths.find("geometry")->second.string().empty()) ||
+                                   (paths.find("ramindex") != paths.end() &&
+                                    !paths.find("ramindex")->second.string().empty()) ||
+                                   (paths.find("fileindex") != paths.end() &&
+                                    !paths.find("fileindex")->second.string().empty()) ||
+                                   (paths.find("timestamp") != paths.end() &&
+                                    !paths.find("timestamp")->second.string().empty());
 
     if (parameter_present)
     {
-        if  (
-                (   paths.find("config") != paths.end() &&
-                    boost::filesystem::is_regular_file(paths.find("config")->second)
-                ) || option_variables.count("base")
-            )
+        if ((paths.find("config") != paths.end() &&
+             boost::filesystem::is_regular_file(paths.find("config")->second)) ||
+            option_variables.count("base"))
         {
             SimpleLogger().Write(logWARNING) << "conflicting parameters";
             SimpleLogger().Write() << visible_options;
@@ -203,26 +153,20 @@ inline bool GenerateDataStoreOptions(const int argc, const char * argv[], Server
 
     // parse config file
     ServerPaths::iterator path_iterator = paths.find("config");
-    if  (
-            path_iterator != paths.end() &&
-            boost::filesystem::is_regular_file(path_iterator->second) &&
-            !option_variables.count("base")
-        )
+    if (path_iterator != paths.end() && boost::filesystem::is_regular_file(path_iterator->second) &&
+        !option_variables.count("base"))
     {
         SimpleLogger().Write() << "Reading options from: " << path_iterator->second.string();
-        std::string config_str;
-        PrepareConfigFile( path_iterator->second, config_str );
-        std::stringstream config_stream( config_str );
-        boost::program_options::store(
-            parse_config_file(config_stream, config_file_options),
-            option_variables
-        );
+        std::string ini_file_contents = ReadIniFileAndLowerContents(path_iterator->second);
+        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);
     }
     else if (option_variables.count("base"))
     {
         path_iterator = paths.find("base");
-        BOOST_ASSERT( paths.end() != path_iterator );
+        BOOST_ASSERT(paths.end() != path_iterator);
         std::string base_string = path_iterator->second.string();
 
         path_iterator = paths.find("hsgrdata");

Util/FingerPrint.h

@@ -25,25 +25,24 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifndef UUID_H
-#define UUID_H
+#ifndef FINGERPRINT_H
+#define FINGERPRINT_H
 
 #include <boost/uuid/uuid.hpp>
 
 // implements a singleton, i.e. there is one and only one conviguration object
-class UUID
+class FingerPrint
 {
   public:
-    UUID();
-    UUID(const UUID&) = delete;
-    ~UUID();
-    const boost::uuids::uuid &GetUUID() const;
+    FingerPrint();
+    FingerPrint(const FingerPrint&) = delete;
+    ~FingerPrint();
+    const boost::uuids::uuid &GetFingerPrint() const;
     bool IsMagicNumberOK() const;
-    bool TestGraphUtil(const UUID &other) const;
-    bool TestPrepare(const UUID &other) const;
-    bool TestRTree(const UUID &other) const;
-    bool TestNodeInfo(const UUID &other) const;
-    bool TestQueryObjects(const UUID &other) const;
+    bool TestGraphUtil(const FingerPrint &other) const;
+    bool TestPrepare(const FingerPrint &other) const;
+    bool TestRTree(const FingerPrint &other) const;
+    bool TestQueryObjects(const FingerPrint &other) const;
 
   private:
     const unsigned magic_number;
@@ -57,4 +56,4 @@ class UUID
     bool has_64_bits;
 };
 
-#endif /* UUID_H */
+#endif /* FingerPrint_H */

Util/IniFileUtil.h

@@ -0,0 +1,49 @@
+/*
+
+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 INI_FILE_UTIL_H
+#define INI_FILE_UTIL_H
+
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
+#include <boost/regex.hpp>
+
+#include <regex>
+#include <string>
+
+// support old capitalized option names by down-casing them with a regex replace
+inline std::string ReadIniFileAndLowerContents(const boost::filesystem::path &path)
+{
+    boost::filesystem::fstream config_stream(path);
+    std::string ini_file_content((std::istreambuf_iterator<char>(config_stream)),
+                          std::istreambuf_iterator<char>());
+    boost::regex regex( "^([^=]*)" ); //match from start of line to '='
+    std::string format( "\\L$1\\E" ); //replace with downcased substring
+    return boost::regex_replace( ini_file_content, regex, format );
+}
+
+#endif // INI_FILE_UTIL_H

Util/MercatorUtil.h

@@ -30,18 +30,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <cmath>
 
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
 inline double y2lat(const double a)
 {
-    return 180. / M_PI * (2. * atan(exp(a * M_PI / 180.)) - M_PI / 2.);
+    return 180. * M_1_PI * (2. * std::atan(std::exp(a * M_PI / 180.)) - M_PI_2);
 }
 
 inline double lat2y(const double a)
 {
-    return 180. / M_PI * log(tan(M_PI / 4. + a * (M_PI / 180.) / 2.));
+    return 180. * M_1_PI * std::log(std::tan(M_PI_4 + a * (M_PI / 180.) / 2.));
 }
 
 #endif // MERCATOR_UTIL_H

Util/ProgramOptions.h

@@ -29,32 +29,118 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define PROGAM_OPTIONS_H
 
 #include "GitDescription.h"
+#include "IniFileUtil.h"
 #include "OSRMException.h"
-#include "SimpleLogger.h"
+#include "simple_logger.hpp"
 
 #include <osrm/ServerPaths.h>
 
 #include <boost/any.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
 
 #include <fstream>
-#include <regex>
 #include <string>
 
 const static unsigned INIT_OK_START_ENGINE = 0;
 const static unsigned INIT_OK_DO_NOT_START_ENGINE = 1;
 const static unsigned INIT_FAILED = -1;
 
-// support old capitalized option names by down-casing them with a regex replace
-inline void PrepareConfigFile(const boost::filesystem::path &path, std::string &output)
+inline void populate_base_path(ServerPaths &server_paths)
 {
-    std::ifstream config_stream(path.string().c_str());
-    std::string input_str((std::istreambuf_iterator<char>(config_stream)),
-                          std::istreambuf_iterator<char>());
-    std::regex regex("^([^=]*)"); // match from start of line to '='
-    std::string format("\\L$1\\E"); // replace with downcased substring
-    output = std::regex_replace(input_str, regex, format);
+    // populate the server_path object
+    auto path_iterator = server_paths.find("base");
+
+    // if a base path has been set, we populate it.
+    if (path_iterator != server_paths.end())
+    {
+        const std::string base_string = path_iterator->second.string();
+        SimpleLogger().Write() << "populating base path: " << base_string;
+
+        server_paths["hsgrdata"] = base_string + ".hsgr";
+        BOOST_ASSERT(server_paths.find("hsgrdata") != server_paths.end());
+        server_paths["nodesdata"] = base_string + ".nodes";
+        BOOST_ASSERT(server_paths.find("nodesdata") != server_paths.end());
+        server_paths["edgesdata"] = base_string + ".edges";
+        BOOST_ASSERT(server_paths.find("edgesdata") != server_paths.end());
+        server_paths["geometries"] = base_string + ".geometry";
+        BOOST_ASSERT(server_paths.find("geometries") != server_paths.end());
+        server_paths["ramindex"] = base_string + ".ramIndex";
+        BOOST_ASSERT(server_paths.find("ramindex") != server_paths.end());
+        server_paths["fileindex"] = base_string + ".fileIndex";
+        BOOST_ASSERT(server_paths.find("fileindex") != server_paths.end());
+        server_paths["namesdata"] = base_string + ".names";
+        BOOST_ASSERT(server_paths.find("namesdata") != server_paths.end());
+        server_paths["timestamp"] = base_string + ".timestamp";
+        BOOST_ASSERT(server_paths.find("timestamp") != server_paths.end());
+    }
+
+    // check if files are give and whether they exist at all
+    path_iterator = server_paths.find("hsgrdata");
+    if (path_iterator == server_paths.end() ||
+        !boost::filesystem::is_regular_file(path_iterator->second))
+    {
+        if (path_iterator == server_paths.end())
+        {
+            SimpleLogger().Write() << "hsgrdata unset";
+        }
+        if (!boost::filesystem::is_regular_file(path_iterator->second))
+        {
+            SimpleLogger().Write() << "not a regular file";
+        }
+
+        throw OSRMException(".hsgr not found: " + path_iterator->second.string());
+    }
+
+    path_iterator = server_paths.find("nodesdata");
+    if (path_iterator == server_paths.end() ||
+        !boost::filesystem::is_regular_file(path_iterator->second))
+    {
+        throw OSRMException(".nodes not found");
+    }
+
+    path_iterator = server_paths.find("edgesdata");
+    if (path_iterator == server_paths.end() ||
+        !boost::filesystem::is_regular_file(path_iterator->second))
+    {
+        throw OSRMException(".edges not found");
+    }
+
+    path_iterator = server_paths.find("geometries");
+    if (path_iterator == server_paths.end() ||
+        !boost::filesystem::is_regular_file(path_iterator->second))
+    {
+        throw OSRMException(".geometry not found");
+    }
+
+    path_iterator = server_paths.find("ramindex");
+    if (path_iterator == server_paths.end() ||
+        !boost::filesystem::is_regular_file(path_iterator->second))
+    {
+        throw OSRMException(".ramIndex not found");
+    }
+
+    path_iterator = server_paths.find("fileindex");
+    if (path_iterator == server_paths.end() ||
+        !boost::filesystem::is_regular_file(path_iterator->second))
+    {
+        throw OSRMException(".fileIndex not found");
+    }
+
+    path_iterator = server_paths.find("namesdata");
+    if (path_iterator == server_paths.end() ||
+        !boost::filesystem::is_regular_file(path_iterator->second))
+    {
+        throw OSRMException(".namesIndex not found");
+    }
+
+    SimpleLogger().Write() << "HSGR file:\t" << server_paths["hsgrdata"];
+    SimpleLogger().Write(logDEBUG) << "Nodes file:\t" << server_paths["nodesdata"];
+    SimpleLogger().Write(logDEBUG) << "Edges file:\t" << server_paths["edgesdata"];
+    SimpleLogger().Write(logDEBUG) << "Geometry file:\t" << server_paths["geometries"];
+    SimpleLogger().Write(logDEBUG) << "RAM file:\t" << server_paths["ramindex"];
+    SimpleLogger().Write(logDEBUG) << "Index file:\t" << server_paths["fileindex"];
+    SimpleLogger().Write(logDEBUG) << "Names file:\t" << server_paths["namesdata"];
+    SimpleLogger().Write(logDEBUG) << "Timestamp file:\t" << server_paths["timestamp"];
 }
 
 // generate boost::program_options object for the routing part
@@ -67,7 +153,6 @@ inline unsigned GenerateServerProgramOptions(const int argc,
                                              bool &use_shared_memory,
                                              bool &trial)
 {
-
     // 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")(
@@ -166,12 +251,12 @@ inline unsigned GenerateServerProgramOptions(const int argc,
         !option_variables.count("base"))
     {
         SimpleLogger().Write() << "Reading options from: " << path_iterator->second.string();
-        std::string config_str;
-        PrepareConfigFile(path_iterator->second, config_str);
-        std::stringstream config_stream(config_str);
+        std::string ini_file_contents = ReadIniFileAndLowerContents(path_iterator->second);
+        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);
+        return INIT_OK_START_ENGINE;
     }
 
     if (1 > requested_num_threads)
@@ -181,94 +266,6 @@ inline unsigned GenerateServerProgramOptions(const int argc,
 
     if (!use_shared_memory && option_variables.count("base"))
     {
-        path_iterator = paths.find("base");
-        BOOST_ASSERT(paths.end() != path_iterator);
-        std::string base_string = path_iterator->second.string();
-
-        path_iterator = paths.find("hsgrdata");
-        if (path_iterator != paths.end() &&
-            !boost::filesystem::is_regular_file(path_iterator->second))
-        {
-            path_iterator->second = base_string + ".hsgr";
-        }
-        else
-        {
-            throw OSRMException(base_string + ".hsgr not found");
-        }
-
-        path_iterator = paths.find("nodesdata");
-        if (path_iterator != paths.end() &&
-            !boost::filesystem::is_regular_file(path_iterator->second))
-        {
-            path_iterator->second = base_string + ".nodes";
-        }
-        else
-        {
-            throw OSRMException(base_string + ".nodes not found");
-        }
-
-        path_iterator = paths.find("edgesdata");
-        if (path_iterator != paths.end() &&
-            !boost::filesystem::is_regular_file(path_iterator->second))
-        {
-            path_iterator->second = base_string + ".edges";
-        }
-        else
-        {
-            throw OSRMException(base_string + ".edges not found");
-        }
-
-        path_iterator = paths.find("geometries");
-        if (path_iterator != paths.end() &&
-            !boost::filesystem::is_regular_file(path_iterator->second))
-        {
-            path_iterator->second = base_string + ".geometry";
-        }
-        else
-        {
-            throw OSRMException(base_string + ".geometry not found");
-        }
-
-        path_iterator = paths.find("ramindex");
-        if (path_iterator != paths.end() &&
-            !boost::filesystem::is_regular_file(path_iterator->second))
-        {
-            path_iterator->second = base_string + ".ramIndex";
-        }
-        else
-        {
-            throw OSRMException(base_string + ".ramIndex not found");
-        }
-
-        path_iterator = paths.find("fileindex");
-        if (path_iterator != paths.end() &&
-            !boost::filesystem::is_regular_file(path_iterator->second))
-        {
-            path_iterator->second = base_string + ".fileIndex";
-        }
-        else
-        {
-            throw OSRMException(base_string + ".fileIndex not found");
-        }
-
-        path_iterator = paths.find("namesdata");
-        if (path_iterator != paths.end() &&
-            !boost::filesystem::is_regular_file(path_iterator->second))
-        {
-            path_iterator->second = base_string + ".names";
-        }
-        else
-        {
-            throw OSRMException(base_string + ".namesIndex not found");
-        }
-
-        path_iterator = paths.find("timestamp");
-        if (path_iterator != paths.end() &&
-            !boost::filesystem::is_regular_file(path_iterator->second))
-        {
-            path_iterator->second = base_string + ".timestamp";
-        }
-
         return INIT_OK_START_ENGINE;
     }
     if (use_shared_memory && !option_variables.count("base"))

Util/SimpleLogger.h

@@ -1,151 +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 SIMPLE_LOGGER_H
-#define SIMPLE_LOGGER_H
-
-#include <boost/assert.hpp>
-
-#include <cstdio>
-#include <unistd.h>
-
-#include <ostream>
-#include <iostream>
-#include <mutex>
-#include <sstream>
-
-enum LogLevel
-{ logINFO,
-  logWARNING,
-  logDEBUG };
-
-const char COL_RESET[] = "\x1b[0m";
-const char RED[] = "\x1b[31m";
-const char GREEN[] = "\x1b[32m";
-const char YELLOW[] = "\x1b[33m";
-const char BLUE[] = "\x1b[34m";
-const char MAGENTA[] = "\x1b[35m";
-const char CYAN[] = "\x1b[36m";
-
-class LogPolicy
-{
-  public:
-    void Unmute() { m_is_mute = false; }
-
-    void Mute() { m_is_mute = true; }
-
-    bool IsMute() const { return m_is_mute; }
-
-    static LogPolicy &GetInstance()
-    {
-        static LogPolicy runningInstance;
-        return runningInstance;
-    }
-
-    LogPolicy(const LogPolicy &) = delete;
-
-  private:
-    LogPolicy() : m_is_mute(true) {}
-    bool m_is_mute;
-};
-
-class SimpleLogger
-{
-  public:
-    SimpleLogger() : level(logINFO) {}
-
-    std::mutex& get_mutex()
-    {
-        static std::mutex m;
-        return m;
-    }
-
-
-    std::ostringstream &Write(LogLevel l = logINFO)
-    {
-        std::lock_guard<std::mutex> lock(get_mutex());
-        try
-        {
-            level = l;
-            os << "[";
-            switch (level)
-            {
-            case logINFO:
-                os << "info";
-                break;
-            case logWARNING:
-                os << "warn";
-                break;
-            case logDEBUG:
-#ifndef NDEBUG
-                os << "debug";
-#endif
-                break;
-            default:
-                BOOST_ASSERT_MSG(false, "should not happen");
-                break;
-            }
-            os << "] ";
-        }
-        catch (...) {}
-        return os;
-    }
-
-    virtual ~SimpleLogger()
-    {
-        std::lock_guard<std::mutex> lock(get_mutex());
-        if (!LogPolicy::GetInstance().IsMute())
-        {
-            const bool is_terminal = isatty(fileno(stdout));
-            switch (level)
-            {
-            case logINFO:
-                std::cout << os.str() << (is_terminal ? COL_RESET : "") << std::endl;
-                break;
-            case logWARNING:
-                std::cerr << (is_terminal ? RED : "") << os.str() << (is_terminal ? COL_RESET : "")
-                          << std::endl;
-                break;
-            case logDEBUG:
-#ifndef NDEBUG
-                std::cout << (is_terminal ? YELLOW : "") << os.str()
-                          << (is_terminal ? COL_RESET : "") << std::endl;
-#endif
-                break;
-            default:
-                BOOST_ASSERT_MSG(false, "should not happen");
-                break;
-            }
-        }
-    }
-
-  private:
-    LogLevel level;
-    std::ostringstream os;
-};
-
-#endif /* SIMPLE_LOGGER_H */

Util/StringUtil.h

@@ -29,8 +29,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define STRINGUTIL_H
 
 #include <boost/algorithm/string.hpp>
-#include <boost/spirit/include/karma.hpp>
-#include <boost/spirit/include/qi.hpp>
 
 #include <cstdio>
 #include <cctype>
@@ -39,18 +37,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // precision:  position after decimal point
 // length: maximum number of digits including comma and decimals
+// work with negative values to prevent overflowing when taking -value
 template <int length, int precision> static inline char *printInt(char *buffer, int value)
 {
-    bool minus = false;
-    if (value < 0)
+    bool minus = true;
+    if (value > 0)
     {
-        minus = true;
+        minus = false;
         value = -value;
     }
     buffer += length - 1;
     for (int i = 0; i < precision; i++)
     {
-        *buffer = '0' + (value % 10);
+        *buffer = '0' - (value % 10);
         value /= 10;
         buffer--;
     }
@@ -58,7 +57,7 @@ template <int length, int precision> static inline char *printInt(char *buffer,
     buffer--;
     for (int i = precision + 1; i < length; i++)
     {
-        *buffer = '0' + (value % 10);
+        *buffer = '0' - (value % 10);
         value /= 10;
         if (value == 0)
             break;
@@ -72,118 +71,6 @@ template <int length, int precision> static inline char *printInt(char *buffer,
     return buffer;
 }
 
-// convert scoped enums to integers
-template <typename Enumeration>
-auto as_integer(Enumeration const value)
-    -> typename std::underlying_type<Enumeration>::type
-{
-    return static_cast<typename std::underlying_type<Enumeration>::type>(value);
-}
-
-static inline void intToString(const int value, std::string &output)
-{
-    output.clear();
-    std::back_insert_iterator<std::string> sink(output);
-    boost::spirit::karma::generate(sink, boost::spirit::karma::int_, value);
-}
-
-static inline void int64ToString(const int64_t value, std::string &output)
-{
-    output.clear();
-    std::back_insert_iterator<std::string> sink(output);
-    boost::spirit::karma::generate(sink, boost::spirit::karma::long_long, value);
-}
-
-static inline int stringToInt(const std::string &input)
-{
-    auto first_digit = input.begin();
-    // Delete any trailing white-spaces
-    while (first_digit != input.end() && std::isspace(*first_digit))
-    {
-        ++first_digit;
-    }
-    int value = 0;
-    boost::spirit::qi::parse(first_digit, input.end(), boost::spirit::int_, value);
-    return value;
-}
-
-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))
-    {
-        ++first_digit;
-    }
-    int value = 0;
-    boost::spirit::qi::parse(first_digit, input.end(), boost::spirit::uint_, value);
-    return value;
-}
-
-static inline uint64_t stringToInt64(const std::string &input)
-{
-    auto first_digit = input.begin();
-    // Delete any trailing white-spaces
-    while (first_digit != input.end() && std::isspace(*first_digit))
-    {
-        ++first_digit;
-    }
-    uint64_t value = 0;
-    boost::spirit::qi::parse(first_digit, input.end(), boost::spirit::long_long, value);
-    return value;
-}
-
-// source: http://tinodidriksen.com/2011/05/28/cpp-convert-string-to-double-speed/
-static inline double StringToDouble(const char *p)
-{
-    double r = 0.0;
-    bool neg = false;
-    if (*p == '-')
-    {
-        neg = true;
-        ++p;
-    }
-    while (*p >= '0' && *p <= '9')
-    {
-        r = (r * 10.0) + (*p - '0');
-        ++p;
-    }
-    if (*p == '.')
-    {
-        double f = 0.0;
-        int n = 0;
-        ++p;
-        while (*p >= '0' && *p <= '9')
-        {
-            f = (f * 10.0) + (*p - '0');
-            ++p;
-            ++n;
-        }
-        r += f / std::pow(10.0, n);
-    }
-    if (neg)
-    {
-        r = -r;
-    }
-    return r;
-}
-
-static inline void doubleToString(const double value, std::string &output)
-{
-    output.clear();
-    std::back_insert_iterator<std::string> sink(output);
-    boost::spirit::karma::generate(sink, boost::spirit::karma::double_, value);
-}
-
-static inline void doubleToStringWithTwoDigitsBehindComma(const double value, std::string &output)
-{
-    // The largest 32-bit integer is 4294967295, that is 10 chars
-    // On the safe side, add 1 for sign, and 1 for trailing zero
-    char buffer[12];
-    sprintf(buffer, "%g", value);
-    output = buffer;
-}
-
 inline void replaceAll(std::string &s, const std::string &sub, const std::string &other)
 {
     boost::replace_all(s, sub, other);
@@ -230,8 +117,8 @@ inline std::string EscapeJSONString(const std::string &input)
 }
 
 static std::string originals[] = {"&", "\"", "<", ">", "'", "[", "]", "\\"};
-static std::string entities[] = {"&amp;", "&quot;", "&lt;", "&gt;",
-                                 "&#39;", "&91;",   "&93;", " &#92;"};
+static std::string entities[] = {
+    "&amp;", "&quot;", "&lt;", "&gt;", "&#39;", "&91;", "&93;", " &#92;"};
 
 inline std::size_t URIDecode(const std::string &input, std::string &output)
 {
@@ -259,11 +146,6 @@ inline std::size_t URIDecode(const std::string &input, std::string &output)
 
 inline std::size_t URIDecodeInPlace(std::string &URI) { return URIDecode(URI, URI); }
 
-inline bool StringStartsWith(const std::string &input, const std::string &prefix)
-{
-    return boost::starts_with(input, prefix);
-}
-
 inline std::string GetRandomString()
 {
     std::string s;

Util/TimingUtil.h

@@ -1,39 +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 TIMINGUTIL_H
-#define TIMINGUTIL_H
-
-#include <chrono>
-
-#define TIMER_START(_X) std::chrono::time_point<std::chrono::steady_clock> _X##_start, _X##_stop; _X##_start = std::chrono::steady_clock::now()
-#define TIMER_STOP(_X) _X##_stop = std::chrono::steady_clock::now()
-#define TIMER_MSEC(_X) std::chrono::duration_cast<std::chrono::milliseconds>(_X##_stop - _X##_start).count()
-#define TIMER_SEC(_X) std::chrono::duration_cast<std::chrono::seconds>(_X##_stop - _X##_start).count()
-#define TIMER_MIN(_X) std::chrono::duration_cast<std::chrono::minutes>(_X##_stop - _X##_start).count()
-
-#endif // TIMINGUTIL_H

Util/TrigonometryTables.h

@@ -0,0 +1,790 @@
+/*
+
+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 TRIGONOMETRY_TABLES_H
+#define TRIGONOMETRY_TABLES_H
+
+#include "../typedefs.h"
+#include <cmath>
+
+#include <limits>
+
+constexpr unsigned short atan_table[4096] = {
+0x0000,  0x0014,  0x0028,  0x003d,  0x0051,  0x0065,
+0x007a,  0x008e,  0x00a3,  0x00b7,  0x00cb,  0x00e0,
+0x00f4,  0x0108,  0x011d,  0x0131,  0x0146,  0x015a,
+0x016e,  0x0183,  0x0197,  0x01ab,  0x01c0,  0x01d4,
+0x01e9,  0x01fd,  0x0211,  0x0226,  0x023a,  0x024e,
+0x0263,  0x0277,  0x028c,  0x02a0,  0x02b4,  0x02c9,
+0x02dd,  0x02f1,  0x0306,  0x031a,  0x032f,  0x0343,
+0x0357,  0x036c,  0x0380,  0x0394,  0x03a9,  0x03bd,
+0x03d2,  0x03e6,  0x03fa,  0x040f,  0x0423,  0x0437,
+0x044c,  0x0460,  0x0475,  0x0489,  0x049d,  0x04b2,
+0x04c6,  0x04da,  0x04ef,  0x0503,  0x0517,  0x052c,
+0x0540,  0x0555,  0x0569,  0x057d,  0x0592,  0x05a6,
+0x05ba,  0x05cf,  0x05e3,  0x05f8,  0x060c,  0x0620,
+0x0635,  0x0649,  0x065d,  0x0672,  0x0686,  0x069b,
+0x06af,  0x06c3,  0x06d8,  0x06ec,  0x0700,  0x0715,
+0x0729,  0x073d,  0x0752,  0x0766,  0x077b,  0x078f,
+0x07a3,  0x07b8,  0x07cc,  0x07e0,  0x07f5,  0x0809,
+0x081d,  0x0832,  0x0846,  0x085b,  0x086f,  0x0883,
+0x0898,  0x08ac,  0x08c0,  0x08d5,  0x08e9,  0x08fd,
+0x0912,  0x0926,  0x093b,  0x094f,  0x0963,  0x0978,
+0x098c,  0x09a0,  0x09b5,  0x09c9,  0x09dd,  0x09f2,
+0x0a06,  0x0a1a,  0x0a2f,  0x0a43,  0x0a58,  0x0a6c,
+0x0a80,  0x0a95,  0x0aa9,  0x0abd,  0x0ad2,  0x0ae6,
+0x0afa,  0x0b0f,  0x0b23,  0x0b37,  0x0b4c,  0x0b60,
+0x0b75,  0x0b89,  0x0b9d,  0x0bb2,  0x0bc6,  0x0bda,
+0x0bef,  0x0c03,  0x0c17,  0x0c2c,  0x0c40,  0x0c54,
+0x0c69,  0x0c7d,  0x0c91,  0x0ca6,  0x0cba,  0x0cce,
+0x0ce3,  0x0cf7,  0x0d0b,  0x0d20,  0x0d34,  0x0d48,
+0x0d5d,  0x0d71,  0x0d86,  0x0d9a,  0x0dae,  0x0dc3,
+0x0dd7,  0x0deb,  0x0e00,  0x0e14,  0x0e28,  0x0e3d,
+0x0e51,  0x0e65,  0x0e7a,  0x0e8e,  0x0ea2,  0x0eb7,
+0x0ecb,  0x0edf,  0x0ef4,  0x0f08,  0x0f1c,  0x0f31,
+0x0f45,  0x0f59,  0x0f6e,  0x0f82,  0x0f96,  0x0fab,
+0x0fbf,  0x0fd3,  0x0fe8,  0x0ffc,  0x1010,  0x1025,
+0x1039,  0x104d,  0x1062,  0x1076,  0x108a,  0x109e,
+0x10b3,  0x10c7,  0x10db,  0x10f0,  0x1104,  0x1118,
+0x112d,  0x1141,  0x1155,  0x116a,  0x117e,  0x1192,
+0x11a7,  0x11bb,  0x11cf,  0x11e4,  0x11f8,  0x120c,
+0x1221,  0x1235,  0x1249,  0x125d,  0x1272,  0x1286,
+0x129a,  0x12af,  0x12c3,  0x12d7,  0x12ec,  0x1300,
+0x1314,  0x1329,  0x133d,  0x1351,  0x1365,  0x137a,
+0x138e,  0x13a2,  0x13b7,  0x13cb,  0x13df,  0x13f4,
+0x1408,  0x141c,  0x1431,  0x1445,  0x1459,  0x146d,
+0x1482,  0x1496,  0x14aa,  0x14bf,  0x14d3,  0x14e7,
+0x14fb,  0x1510,  0x1524,  0x1538,  0x154d,  0x1561,
+0x1575,  0x1589,  0x159e,  0x15b2,  0x15c6,  0x15db,
+0x15ef,  0x1603,  0x1617,  0x162c,  0x1640,  0x1654,
+0x1669,  0x167d,  0x1691,  0x16a5,  0x16ba,  0x16ce,
+0x16e2,  0x16f7,  0x170b,  0x171f,  0x1733,  0x1748,
+0x175c,  0x1770,  0x1784,  0x1799,  0x17ad,  0x17c1,
+0x17d6,  0x17ea,  0x17fe,  0x1812,  0x1827,  0x183b,
+0x184f,  0x1863,  0x1878,  0x188c,  0x18a0,  0x18b4,
+0x18c9,  0x18dd,  0x18f1,  0x1905,  0x191a,  0x192e,
+0x1942,  0x1957,  0x196b,  0x197f,  0x1993,  0x19a8,
+0x19bc,  0x19d0,  0x19e4,  0x19f9,  0x1a0d,  0x1a21,
+0x1a35,  0x1a49,  0x1a5e,  0x1a72,  0x1a86,  0x1a9a,
+0x1aaf,  0x1ac3,  0x1ad7,  0x1aeb,  0x1b00,  0x1b14,
+0x1b28,  0x1b3c,  0x1b51,  0x1b65,  0x1b79,  0x1b8d,
+0x1ba2,  0x1bb6,  0x1bca,  0x1bde,  0x1bf2,  0x1c07,
+0x1c1b,  0x1c2f,  0x1c43,  0x1c58,  0x1c6c,  0x1c80,
+0x1c94,  0x1ca8,  0x1cbd,  0x1cd1,  0x1ce5,  0x1cf9,
+0x1d0e,  0x1d22,  0x1d36,  0x1d4a,  0x1d5e,  0x1d73,
+0x1d87,  0x1d9b,  0x1daf,  0x1dc3,  0x1dd8,  0x1dec,
+0x1e00,  0x1e14,  0x1e28,  0x1e3d,  0x1e51,  0x1e65,
+0x1e79,  0x1e8d,  0x1ea2,  0x1eb6,  0x1eca,  0x1ede,
+0x1ef2,  0x1f07,  0x1f1b,  0x1f2f,  0x1f43,  0x1f57,
+0x1f6c,  0x1f80,  0x1f94,  0x1fa8,  0x1fbc,  0x1fd1,
+0x1fe5,  0x1ff9,  0x200d,  0x2021,  0x2035,  0x204a,
+0x205e,  0x2072,  0x2086,  0x209a,  0x20ae,  0x20c3,
+0x20d7,  0x20eb,  0x20ff,  0x2113,  0x2127,  0x213c,
+0x2150,  0x2164,  0x2178,  0x218c,  0x21a0,  0x21b5,
+0x21c9,  0x21dd,  0x21f1,  0x2205,  0x2219,  0x222e,
+0x2242,  0x2256,  0x226a,  0x227e,  0x2292,  0x22a6,
+0x22bb,  0x22cf,  0x22e3,  0x22f7,  0x230b,  0x231f,
+0x2333,  0x2348,  0x235c,  0x2370,  0x2384,  0x2398,
+0x23ac,  0x23c0,  0x23d5,  0x23e9,  0x23fd,  0x2411,
+0x2425,  0x2439,  0x244d,  0x2461,  0x2476,  0x248a,
+0x249e,  0x24b2,  0x24c6,  0x24da,  0x24ee,  0x2502,
+0x2517,  0x252b,  0x253f,  0x2553,  0x2567,  0x257b,
+0x258f,  0x25a3,  0x25b7,  0x25cb,  0x25e0,  0x25f4,
+0x2608,  0x261c,  0x2630,  0x2644,  0x2658,  0x266c,
+0x2680,  0x2694,  0x26a9,  0x26bd,  0x26d1,  0x26e5,
+0x26f9,  0x270d,  0x2721,  0x2735,  0x2749,  0x275d,
+0x2771,  0x2785,  0x279a,  0x27ae,  0x27c2,  0x27d6,
+0x27ea,  0x27fe,  0x2812,  0x2826,  0x283a,  0x284e,
+0x2862,  0x2876,  0x288a,  0x289e,  0x28b3,  0x28c7,
+0x28db,  0x28ef,  0x2903,  0x2917,  0x292b,  0x293f,
+0x2953,  0x2967,  0x297b,  0x298f,  0x29a3,  0x29b7,
+0x29cb,  0x29df,  0x29f3,  0x2a07,  0x2a1b,  0x2a2f,
+0x2a43,  0x2a58,  0x2a6c,  0x2a80,  0x2a94,  0x2aa8,
+0x2abc,  0x2ad0,  0x2ae4,  0x2af8,  0x2b0c,  0x2b20,
+0x2b34,  0x2b48,  0x2b5c,  0x2b70,  0x2b84,  0x2b98,
+0x2bac,  0x2bc0,  0x2bd4,  0x2be8,  0x2bfc,  0x2c10,
+0x2c24,  0x2c38,  0x2c4c,  0x2c60,  0x2c74,  0x2c88,
+0x2c9c,  0x2cb0,  0x2cc4,  0x2cd8,  0x2cec,  0x2d00,
+0x2d14,  0x2d28,  0x2d3c,  0x2d50,  0x2d64,  0x2d78,
+0x2d8c,  0x2da0,  0x2db4,  0x2dc8,  0x2ddc,  0x2df0,
+0x2e04,  0x2e18,  0x2e2c,  0x2e40,  0x2e54,  0x2e68,
+0x2e7c,  0x2e90,  0x2ea3,  0x2eb7,  0x2ecb,  0x2edf,
+0x2ef3,  0x2f07,  0x2f1b,  0x2f2f,  0x2f43,  0x2f57,
+0x2f6b,  0x2f7f,  0x2f93,  0x2fa7,  0x2fbb,  0x2fcf,
+0x2fe3,  0x2ff7,  0x300b,  0x301e,  0x3032,  0x3046,
+0x305a,  0x306e,  0x3082,  0x3096,  0x30aa,  0x30be,
+0x30d2,  0x30e6,  0x30fa,  0x310e,  0x3122,  0x3135,
+0x3149,  0x315d,  0x3171,  0x3185,  0x3199,  0x31ad,
+0x31c1,  0x31d5,  0x31e9,  0x31fd,  0x3210,  0x3224,
+0x3238,  0x324c,  0x3260,  0x3274,  0x3288,  0x329c,
+0x32b0,  0x32c3,  0x32d7,  0x32eb,  0x32ff,  0x3313,
+0x3327,  0x333b,  0x334f,  0x3363,  0x3376,  0x338a,
+0x339e,  0x33b2,  0x33c6,  0x33da,  0x33ee,  0x3401,
+0x3415,  0x3429,  0x343d,  0x3451,  0x3465,  0x3479,
+0x348c,  0x34a0,  0x34b4,  0x34c8,  0x34dc,  0x34f0,
+0x3504,  0x3517,  0x352b,  0x353f,  0x3553,  0x3567,
+0x357b,  0x358e,  0x35a2,  0x35b6,  0x35ca,  0x35de,
+0x35f2,  0x3605,  0x3619,  0x362d,  0x3641,  0x3655,
+0x3668,  0x367c,  0x3690,  0x36a4,  0x36b8,  0x36cb,
+0x36df,  0x36f3,  0x3707,  0x371b,  0x372f,  0x3742,
+0x3756,  0x376a,  0x377e,  0x3791,  0x37a5,  0x37b9,
+0x37cd,  0x37e1,  0x37f4,  0x3808,  0x381c,  0x3830,
+0x3844,  0x3857,  0x386b,  0x387f,  0x3893,  0x38a6,
+0x38ba,  0x38ce,  0x38e2,  0x38f5,  0x3909,  0x391d,
+0x3931,  0x3944,  0x3958,  0x396c,  0x3980,  0x3993,
+0x39a7,  0x39bb,  0x39cf,  0x39e2,  0x39f6,  0x3a0a,
+0x3a1e,  0x3a31,  0x3a45,  0x3a59,  0x3a6d,  0x3a80,
+0x3a94,  0x3aa8,  0x3abb,  0x3acf,  0x3ae3,  0x3af7,
+0x3b0a,  0x3b1e,  0x3b32,  0x3b45,  0x3b59,  0x3b6d,
+0x3b81,  0x3b94,  0x3ba8,  0x3bbc,  0x3bcf,  0x3be3,
+0x3bf7,  0x3c0b,  0x3c1e,  0x3c32,  0x3c46,  0x3c59,
+0x3c6d,  0x3c81,  0x3c94,  0x3ca8,  0x3cbc,  0x3ccf,
+0x3ce3,  0x3cf7,  0x3d0a,  0x3d1e,  0x3d32,  0x3d45,
+0x3d59,  0x3d6d,  0x3d80,  0x3d94,  0x3da8,  0x3dbb,
+0x3dcf,  0x3de3,  0x3df6,  0x3e0a,  0x3e1e,  0x3e31,
+0x3e45,  0x3e59,  0x3e6c,  0x3e80,  0x3e93,  0x3ea7,
+0x3ebb,  0x3ece,  0x3ee2,  0x3ef6,  0x3f09,  0x3f1d,
+0x3f30,  0x3f44,  0x3f58,  0x3f6b,  0x3f7f,  0x3f93,
+0x3fa6,  0x3fba,  0x3fcd,  0x3fe1,  0x3ff5,  0x4008,
+0x401c,  0x402f,  0x4043,  0x4057,  0x406a,  0x407e,
+0x4091,  0x40a5,  0x40b8,  0x40cc,  0x40e0,  0x40f3,
+0x4107,  0x411a,  0x412e,  0x4142,  0x4155,  0x4169,
+0x417c,  0x4190,  0x41a3,  0x41b7,  0x41ca,  0x41de,
+0x41f2,  0x4205,  0x4219,  0x422c,  0x4240,  0x4253,
+0x4267,  0x427a,  0x428e,  0x42a1,  0x42b5,  0x42c9,
+0x42dc,  0x42f0,  0x4303,  0x4317,  0x432a,  0x433e,
+0x4351,  0x4365,  0x4378,  0x438c,  0x439f,  0x43b3,
+0x43c6,  0x43da,  0x43ed,  0x4401,  0x4414,  0x4428,
+0x443b,  0x444f,  0x4462,  0x4476,  0x4489,  0x449d,
+0x44b0,  0x44c4,  0x44d7,  0x44eb,  0x44fe,  0x4512,
+0x4525,  0x4539,  0x454c,  0x4560,  0x4573,  0x4586,
+0x459a,  0x45ad,  0x45c1,  0x45d4,  0x45e8,  0x45fb,
+0x460f,  0x4622,  0x4636,  0x4649,  0x465c,  0x4670,
+0x4683,  0x4697,  0x46aa,  0x46be,  0x46d1,  0x46e5,
+0x46f8,  0x470b,  0x471f,  0x4732,  0x4746,  0x4759,
+0x476c,  0x4780,  0x4793,  0x47a7,  0x47ba,  0x47cd,
+0x47e1,  0x47f4,  0x4808,  0x481b,  0x482e,  0x4842,
+0x4855,  0x4869,  0x487c,  0x488f,  0x48a3,  0x48b6,
+0x48ca,  0x48dd,  0x48f0,  0x4904,  0x4917,  0x492a,
+0x493e,  0x4951,  0x4965,  0x4978,  0x498b,  0x499f,
+0x49b2,  0x49c5,  0x49d9,  0x49ec,  0x49ff,  0x4a13,
+0x4a26,  0x4a39,  0x4a4d,  0x4a60,  0x4a73,  0x4a87,
+0x4a9a,  0x4aad,  0x4ac1,  0x4ad4,  0x4ae7,  0x4afb,
+0x4b0e,  0x4b21,  0x4b35,  0x4b48,  0x4b5b,  0x4b6f,
+0x4b82,  0x4b95,  0x4ba8,  0x4bbc,  0x4bcf,  0x4be2,
+0x4bf6,  0x4c09,  0x4c1c,  0x4c2f,  0x4c43,  0x4c56,
+0x4c69,  0x4c7d,  0x4c90,  0x4ca3,  0x4cb6,  0x4cca,
+0x4cdd,  0x4cf0,  0x4d03,  0x4d17,  0x4d2a,  0x4d3d,
+0x4d50,  0x4d64,  0x4d77,  0x4d8a,  0x4d9d,  0x4db1,
+0x4dc4,  0x4dd7,  0x4dea,  0x4dfe,  0x4e11,  0x4e24,
+0x4e37,  0x4e4b,  0x4e5e,  0x4e71,  0x4e84,  0x4e97,
+0x4eab,  0x4ebe,  0x4ed1,  0x4ee4,  0x4ef7,  0x4f0b,
+0x4f1e,  0x4f31,  0x4f44,  0x4f57,  0x4f6b,  0x4f7e,
+0x4f91,  0x4fa4,  0x4fb7,  0x4fcb,  0x4fde,  0x4ff1,
+0x5004,  0x5017,  0x502a,  0x503e,  0x5051,  0x5064,
+0x5077,  0x508a,  0x509d,  0x50b1,  0x50c4,  0x50d7,
+0x50ea,  0x50fd,  0x5110,  0x5123,  0x5137,  0x514a,
+0x515d,  0x5170,  0x5183,  0x5196,  0x51a9,  0x51bc,
+0x51d0,  0x51e3,  0x51f6,  0x5209,  0x521c,  0x522f,
+0x5242,  0x5255,  0x5268,  0x527c,  0x528f,  0x52a2,
+0x52b5,  0x52c8,  0x52db,  0x52ee,  0x5301,  0x5314,
+0x5327,  0x533a,  0x534e,  0x5361,  0x5374,  0x5387,
+0x539a,  0x53ad,  0x53c0,  0x53d3,  0x53e6,  0x53f9,
+0x540c,  0x541f,  0x5432,  0x5445,  0x5458,  0x546b,
+0x547e,  0x5491,  0x54a5,  0x54b8,  0x54cb,  0x54de,
+0x54f1,  0x5504,  0x5517,  0x552a,  0x553d,  0x5550,
+0x5563,  0x5576,  0x5589,  0x559c,  0x55af,  0x55c2,
+0x55d5,  0x55e8,  0x55fb,  0x560e,  0x5621,  0x5634,
+0x5647,  0x565a,  0x566d,  0x5680,  0x5693,  0x56a6,
+0x56b9,  0x56cb,  0x56de,  0x56f1,  0x5704,  0x5717,
+0x572a,  0x573d,  0x5750,  0x5763,  0x5776,  0x5789,
+0x579c,  0x57af,  0x57c2,  0x57d5,  0x57e8,  0x57fb,
+0x580e,  0x5820,  0x5833,  0x5846,  0x5859,  0x586c,
+0x587f,  0x5892,  0x58a5,  0x58b8,  0x58cb,  0x58de,
+0x58f0,  0x5903,  0x5916,  0x5929,  0x593c,  0x594f,
+0x5962,  0x5975,  0x5988,  0x599a,  0x59ad,  0x59c0,
+0x59d3,  0x59e6,  0x59f9,  0x5a0c,  0x5a1f,  0x5a31,
+0x5a44,  0x5a57,  0x5a6a,  0x5a7d,  0x5a90,  0x5aa2,
+0x5ab5,  0x5ac8,  0x5adb,  0x5aee,  0x5b01,  0x5b13,
+0x5b26,  0x5b39,  0x5b4c,  0x5b5f,  0x5b72,  0x5b84,
+0x5b97,  0x5baa,  0x5bbd,  0x5bd0,  0x5be2,  0x5bf5,
+0x5c08,  0x5c1b,  0x5c2e,  0x5c40,  0x5c53,  0x5c66,
+0x5c79,  0x5c8c,  0x5c9e,  0x5cb1,  0x5cc4,  0x5cd7,
+0x5ce9,  0x5cfc,  0x5d0f,  0x5d22,  0x5d34,  0x5d47,
+0x5d5a,  0x5d6d,  0x5d7f,  0x5d92,  0x5da5,  0x5db8,
+0x5dca,  0x5ddd,  0x5df0,  0x5e03,  0x5e15,  0x5e28,
+0x5e3b,  0x5e4d,  0x5e60,  0x5e73,  0x5e86,  0x5e98,
+0x5eab,  0x5ebe,  0x5ed0,  0x5ee3,  0x5ef6,  0x5f09,
+0x5f1b,  0x5f2e,  0x5f41,  0x5f53,  0x5f66,  0x5f79,
+0x5f8b,  0x5f9e,  0x5fb1,  0x5fc3,  0x5fd6,  0x5fe9,
+0x5ffb,  0x600e,  0x6021,  0x6033,  0x6046,  0x6059,
+0x606b,  0x607e,  0x6091,  0x60a3,  0x60b6,  0x60c8,
+0x60db,  0x60ee,  0x6100,  0x6113,  0x6126,  0x6138,
+0x614b,  0x615d,  0x6170,  0x6183,  0x6195,  0x61a8,
+0x61ba,  0x61cd,  0x61e0,  0x61f2,  0x6205,  0x6217,
+0x622a,  0x623d,  0x624f,  0x6262,  0x6274,  0x6287,
+0x6299,  0x62ac,  0x62bf,  0x62d1,  0x62e4,  0x62f6,
+0x6309,  0x631b,  0x632e,  0x6340,  0x6353,  0x6366,
+0x6378,  0x638b,  0x639d,  0x63b0,  0x63c2,  0x63d5,
+0x63e7,  0x63fa,  0x640c,  0x641f,  0x6431,  0x6444,
+0x6456,  0x6469,  0x647b,  0x648e,  0x64a0,  0x64b3,
+0x64c5,  0x64d8,  0x64ea,  0x64fd,  0x650f,  0x6522,
+0x6534,  0x6547,  0x6559,  0x656c,  0x657e,  0x6591,
+0x65a3,  0x65b5,  0x65c8,  0x65da,  0x65ed,  0x65ff,
+0x6612,  0x6624,  0x6637,  0x6649,  0x665b,  0x666e,
+0x6680,  0x6693,  0x66a5,  0x66b8,  0x66ca,  0x66dc,
+0x66ef,  0x6701,  0x6714,  0x6726,  0x6738,  0x674b,
+0x675d,  0x6770,  0x6782,  0x6794,  0x67a7,  0x67b9,
+0x67cc,  0x67de,  0x67f0,  0x6803,  0x6815,  0x6827,
+0x683a,  0x684c,  0x685e,  0x6871,  0x6883,  0x6896,
+0x68a8,  0x68ba,  0x68cd,  0x68df,  0x68f1,  0x6904,
+0x6916,  0x6928,  0x693b,  0x694d,  0x695f,  0x6972,
+0x6984,  0x6996,  0x69a8,  0x69bb,  0x69cd,  0x69df,
+0x69f2,  0x6a04,  0x6a16,  0x6a29,  0x6a3b,  0x6a4d,
+0x6a5f,  0x6a72,  0x6a84,  0x6a96,  0x6aa9,  0x6abb,
+0x6acd,  0x6adf,  0x6af2,  0x6b04,  0x6b16,  0x6b28,
+0x6b3b,  0x6b4d,  0x6b5f,  0x6b71,  0x6b84,  0x6b96,
+0x6ba8,  0x6bba,  0x6bcd,  0x6bdf,  0x6bf1,  0x6c03,
+0x6c15,  0x6c28,  0x6c3a,  0x6c4c,  0x6c5e,  0x6c70,
+0x6c83,  0x6c95,  0x6ca7,  0x6cb9,  0x6ccb,  0x6cde,
+0x6cf0,  0x6d02,  0x6d14,  0x6d26,  0x6d39,  0x6d4b,
+0x6d5d,  0x6d6f,  0x6d81,  0x6d93,  0x6da6,  0x6db8,
+0x6dca,  0x6ddc,  0x6dee,  0x6e00,  0x6e12,  0x6e25,
+0x6e37,  0x6e49,  0x6e5b,  0x6e6d,  0x6e7f,  0x6e91,
+0x6ea3,  0x6eb6,  0x6ec8,  0x6eda,  0x6eec,  0x6efe,
+0x6f10,  0x6f22,  0x6f34,  0x6f46,  0x6f58,  0x6f6b,
+0x6f7d,  0x6f8f,  0x6fa1,  0x6fb3,  0x6fc5,  0x6fd7,
+0x6fe9,  0x6ffb,  0x700d,  0x701f,  0x7031,  0x7043,
+0x7055,  0x7068,  0x707a,  0x708c,  0x709e,  0x70b0,
+0x70c2,  0x70d4,  0x70e6,  0x70f8,  0x710a,  0x711c,
+0x712e,  0x7140,  0x7152,  0x7164,  0x7176,  0x7188,
+0x719a,  0x71ac,  0x71be,  0x71d0,  0x71e2,  0x71f4,
+0x7206,  0x7218,  0x722a,  0x723c,  0x724e,  0x7260,
+0x7272,  0x7284,  0x7296,  0x72a8,  0x72ba,  0x72cc,
+0x72dd,  0x72ef,  0x7301,  0x7313,  0x7325,  0x7337,
+0x7349,  0x735b,  0x736d,  0x737f,  0x7391,  0x73a3,
+0x73b5,  0x73c7,  0x73d8,  0x73ea,  0x73fc,  0x740e,
+0x7420,  0x7432,  0x7444,  0x7456,  0x7468,  0x747a,
+0x748b,  0x749d,  0x74af,  0x74c1,  0x74d3,  0x74e5,
+0x74f7,  0x7509,  0x751a,  0x752c,  0x753e,  0x7550,
+0x7562,  0x7574,  0x7585,  0x7597,  0x75a9,  0x75bb,
+0x75cd,  0x75df,  0x75f0,  0x7602,  0x7614,  0x7626,
+0x7638,  0x764a,  0x765b,  0x766d,  0x767f,  0x7691,
+0x76a3,  0x76b4,  0x76c6,  0x76d8,  0x76ea,  0x76fb,
+0x770d,  0x771f,  0x7731,  0x7743,  0x7754,  0x7766,
+0x7778,  0x778a,  0x779b,  0x77ad,  0x77bf,  0x77d1,
+0x77e2,  0x77f4,  0x7806,  0x7818,  0x7829,  0x783b,
+0x784d,  0x785e,  0x7870,  0x7882,  0x7894,  0x78a5,
+0x78b7,  0x78c9,  0x78da,  0x78ec,  0x78fe,  0x7910,
+0x7921,  0x7933,  0x7945,  0x7956,  0x7968,  0x797a,
+0x798b,  0x799d,  0x79af,  0x79c0,  0x79d2,  0x79e4,
+0x79f5,  0x7a07,  0x7a19,  0x7a2a,  0x7a3c,  0x7a4e,
+0x7a5f,  0x7a71,  0x7a82,  0x7a94,  0x7aa6,  0x7ab7,
+0x7ac9,  0x7adb,  0x7aec,  0x7afe,  0x7b0f,  0x7b21,
+0x7b33,  0x7b44,  0x7b56,  0x7b67,  0x7b79,  0x7b8b,
+0x7b9c,  0x7bae,  0x7bbf,  0x7bd1,  0x7be2,  0x7bf4,
+0x7c06,  0x7c17,  0x7c29,  0x7c3a,  0x7c4c,  0x7c5d,
+0x7c6f,  0x7c81,  0x7c92,  0x7ca4,  0x7cb5,  0x7cc7,
+0x7cd8,  0x7cea,  0x7cfb,  0x7d0d,  0x7d1e,  0x7d30,
+0x7d41,  0x7d53,  0x7d64,  0x7d76,  0x7d87,  0x7d99,
+0x7daa,  0x7dbc,  0x7dcd,  0x7ddf,  0x7df0,  0x7e02,
+0x7e13,  0x7e25,  0x7e36,  0x7e48,  0x7e59,  0x7e6b,
+0x7e7c,  0x7e8e,  0x7e9f,  0x7eb0,  0x7ec2,  0x7ed3,
+0x7ee5,  0x7ef6,  0x7f08,  0x7f19,  0x7f2b,  0x7f3c,
+0x7f4d,  0x7f5f,  0x7f70,  0x7f82,  0x7f93,  0x7fa4,
+0x7fb6,  0x7fc7,  0x7fd9,  0x7fea,  0x7ffb,  0x800d,
+0x801e,  0x8030,  0x8041,  0x8052,  0x8064,  0x8075,
+0x8086,  0x8098,  0x80a9,  0x80bb,  0x80cc,  0x80dd,
+0x80ef,  0x8100,  0x8111,  0x8123,  0x8134,  0x8145,
+0x8157,  0x8168,  0x8179,  0x818b,  0x819c,  0x81ad,
+0x81bf,  0x81d0,  0x81e1,  0x81f3,  0x8204,  0x8215,
+0x8226,  0x8238,  0x8249,  0x825a,  0x826c,  0x827d,
+0x828e,  0x829f,  0x82b1,  0x82c2,  0x82d3,  0x82e5,
+0x82f6,  0x8307,  0x8318,  0x832a,  0x833b,  0x834c,
+0x835d,  0x836f,  0x8380,  0x8391,  0x83a2,  0x83b3,
+0x83c5,  0x83d6,  0x83e7,  0x83f8,  0x840a,  0x841b,
+0x842c,  0x843d,  0x844e,  0x8460,  0x8471,  0x8482,
+0x8493,  0x84a4,  0x84b6,  0x84c7,  0x84d8,  0x84e9,
+0x84fa,  0x850b,  0x851d,  0x852e,  0x853f,  0x8550,
+0x8561,  0x8572,  0x8584,  0x8595,  0x85a6,  0x85b7,
+0x85c8,  0x85d9,  0x85ea,  0x85fb,  0x860d,  0x861e,
+0x862f,  0x8640,  0x8651,  0x8662,  0x8673,  0x8684,
+0x8695,  0x86a7,  0x86b8,  0x86c9,  0x86da,  0x86eb,
+0x86fc,  0x870d,  0x871e,  0x872f,  0x8740,  0x8751,
+0x8762,  0x8773,  0x8784,  0x8796,  0x87a7,  0x87b8,
+0x87c9,  0x87da,  0x87eb,  0x87fc,  0x880d,  0x881e,
+0x882f,  0x8840,  0x8851,  0x8862,  0x8873,  0x8884,
+0x8895,  0x88a6,  0x88b7,  0x88c8,  0x88d9,  0x88ea,
+0x88fb,  0x890c,  0x891d,  0x892e,  0x893f,  0x8950,
+0x8961,  0x8972,  0x8983,  0x8994,  0x89a5,  0x89b6,
+0x89c6,  0x89d7,  0x89e8,  0x89f9,  0x8a0a,  0x8a1b,
+0x8a2c,  0x8a3d,  0x8a4e,  0x8a5f,  0x8a70,  0x8a81,
+0x8a92,  0x8aa3,  0x8ab3,  0x8ac4,  0x8ad5,  0x8ae6,
+0x8af7,  0x8b08,  0x8b19,  0x8b2a,  0x8b3b,  0x8b4b,
+0x8b5c,  0x8b6d,  0x8b7e,  0x8b8f,  0x8ba0,  0x8bb1,
+0x8bc1,  0x8bd2,  0x8be3,  0x8bf4,  0x8c05,  0x8c16,
+0x8c27,  0x8c37,  0x8c48,  0x8c59,  0x8c6a,  0x8c7b,
+0x8c8c,  0x8c9c,  0x8cad,  0x8cbe,  0x8ccf,  0x8ce0,
+0x8cf0,  0x8d01,  0x8d12,  0x8d23,  0x8d34,  0x8d44,
+0x8d55,  0x8d66,  0x8d77,  0x8d87,  0x8d98,  0x8da9,
+0x8dba,  0x8dca,  0x8ddb,  0x8dec,  0x8dfd,  0x8e0d,
+0x8e1e,  0x8e2f,  0x8e40,  0x8e50,  0x8e61,  0x8e72,
+0x8e83,  0x8e93,  0x8ea4,  0x8eb5,  0x8ec5,  0x8ed6,
+0x8ee7,  0x8ef8,  0x8f08,  0x8f19,  0x8f2a,  0x8f3a,
+0x8f4b,  0x8f5c,  0x8f6c,  0x8f7d,  0x8f8e,  0x8f9e,
+0x8faf,  0x8fc0,  0x8fd0,  0x8fe1,  0x8ff2,  0x9002,
+0x9013,  0x9024,  0x9034,  0x9045,  0x9056,  0x9066,
+0x9077,  0x9088,  0x9098,  0x90a9,  0x90b9,  0x90ca,
+0x90db,  0x90eb,  0x90fc,  0x910c,  0x911d,  0x912e,
+0x913e,  0x914f,  0x915f,  0x9170,  0x9181,  0x9191,
+0x91a2,  0x91b2,  0x91c3,  0x91d3,  0x91e4,  0x91f5,
+0x9205,  0x9216,  0x9226,  0x9237,  0x9247,  0x9258,
+0x9268,  0x9279,  0x9289,  0x929a,  0x92aa,  0x92bb,
+0x92cc,  0x92dc,  0x92ed,  0x92fd,  0x930e,  0x931e,
+0x932f,  0x933f,  0x9350,  0x9360,  0x9370,  0x9381,
+0x9391,  0x93a2,  0x93b2,  0x93c3,  0x93d3,  0x93e4,
+0x93f4,  0x9405,  0x9415,  0x9426,  0x9436,  0x9447,
+0x9457,  0x9467,  0x9478,  0x9488,  0x9499,  0x94a9,
+0x94ba,  0x94ca,  0x94da,  0x94eb,  0x94fb,  0x950c,
+0x951c,  0x952c,  0x953d,  0x954d,  0x955e,  0x956e,
+0x957e,  0x958f,  0x959f,  0x95af,  0x95c0,  0x95d0,
+0x95e1,  0x95f1,  0x9601,  0x9612,  0x9622,  0x9632,
+0x9643,  0x9653,  0x9663,  0x9674,  0x9684,  0x9694,
+0x96a5,  0x96b5,  0x96c5,  0x96d6,  0x96e6,  0x96f6,
+0x9707,  0x9717,  0x9727,  0x9738,  0x9748,  0x9758,
+0x9768,  0x9779,  0x9789,  0x9799,  0x97aa,  0x97ba,
+0x97ca,  0x97da,  0x97eb,  0x97fb,  0x980b,  0x981b,
+0x982c,  0x983c,  0x984c,  0x985c,  0x986d,  0x987d,
+0x988d,  0x989d,  0x98ad,  0x98be,  0x98ce,  0x98de,
+0x98ee,  0x98ff,  0x990f,  0x991f,  0x992f,  0x993f,
+0x9950,  0x9960,  0x9970,  0x9980,  0x9990,  0x99a0,
+0x99b1,  0x99c1,  0x99d1,  0x99e1,  0x99f1,  0x9a01,
+0x9a12,  0x9a22,  0x9a32,  0x9a42,  0x9a52,  0x9a62,
+0x9a72,  0x9a83,  0x9a93,  0x9aa3,  0x9ab3,  0x9ac3,
+0x9ad3,  0x9ae3,  0x9af3,  0x9b04,  0x9b14,  0x9b24,
+0x9b34,  0x9b44,  0x9b54,  0x9b64,  0x9b74,  0x9b84,
+0x9b94,  0x9ba4,  0x9bb5,  0x9bc5,  0x9bd5,  0x9be5,
+0x9bf5,  0x9c05,  0x9c15,  0x9c25,  0x9c35,  0x9c45,
+0x9c55,  0x9c65,  0x9c75,  0x9c85,  0x9c95,  0x9ca5,
+0x9cb5,  0x9cc5,  0x9cd5,  0x9ce5,  0x9cf5,  0x9d05,
+0x9d15,  0x9d25,  0x9d35,  0x9d45,  0x9d55,  0x9d65,
+0x9d75,  0x9d85,  0x9d95,  0x9da5,  0x9db5,  0x9dc5,
+0x9dd5,  0x9de5,  0x9df5,  0x9e05,  0x9e15,  0x9e25,
+0x9e35,  0x9e45,  0x9e55,  0x9e65,  0x9e74,  0x9e84,
+0x9e94,  0x9ea4,  0x9eb4,  0x9ec4,  0x9ed4,  0x9ee4,
+0x9ef4,  0x9f04,  0x9f14,  0x9f23,  0x9f33,  0x9f43,
+0x9f53,  0x9f63,  0x9f73,  0x9f83,  0x9f93,  0x9fa3,
+0x9fb2,  0x9fc2,  0x9fd2,  0x9fe2,  0x9ff2,  0xa002,
+0xa012,  0xa021,  0xa031,  0xa041,  0xa051,  0xa061,
+0xa071,  0xa080,  0xa090,  0xa0a0,  0xa0b0,  0xa0c0,
+0xa0cf,  0xa0df,  0xa0ef,  0xa0ff,  0xa10f,  0xa11e,
+0xa12e,  0xa13e,  0xa14e,  0xa15e,  0xa16d,  0xa17d,
+0xa18d,  0xa19d,  0xa1ac,  0xa1bc,  0xa1cc,  0xa1dc,
+0xa1eb,  0xa1fb,  0xa20b,  0xa21b,  0xa22a,  0xa23a,
+0xa24a,  0xa25a,  0xa269,  0xa279,  0xa289,  0xa298,
+0xa2a8,  0xa2b8,  0xa2c8,  0xa2d7,  0xa2e7,  0xa2f7,
+0xa306,  0xa316,  0xa326,  0xa335,  0xa345,  0xa355,
+0xa364,  0xa374,  0xa384,  0xa393,  0xa3a3,  0xa3b3,
+0xa3c2,  0xa3d2,  0xa3e2,  0xa3f1,  0xa401,  0xa411,
+0xa420,  0xa430,  0xa440,  0xa44f,  0xa45f,  0xa46e,
+0xa47e,  0xa48e,  0xa49d,  0xa4ad,  0xa4bc,  0xa4cc,
+0xa4dc,  0xa4eb,  0xa4fb,  0xa50a,  0xa51a,  0xa52a,
+0xa539,  0xa549,  0xa558,  0xa568,  0xa577,  0xa587,
+0xa597,  0xa5a6,  0xa5b6,  0xa5c5,  0xa5d5,  0xa5e4,
+0xa5f4,  0xa603,  0xa613,  0xa622,  0xa632,  0xa641,
+0xa651,  0xa660,  0xa670,  0xa67f,  0xa68f,  0xa69e,
+0xa6ae,  0xa6bd,  0xa6cd,  0xa6dc,  0xa6ec,  0xa6fb,
+0xa70b,  0xa71a,  0xa72a,  0xa739,  0xa749,  0xa758,
+0xa768,  0xa777,  0xa787,  0xa796,  0xa7a5,  0xa7b5,
+0xa7c4,  0xa7d4,  0xa7e3,  0xa7f3,  0xa802,  0xa812,
+0xa821,  0xa830,  0xa840,  0xa84f,  0xa85f,  0xa86e,
+0xa87d,  0xa88d,  0xa89c,  0xa8ac,  0xa8bb,  0xa8ca,
+0xa8da,  0xa8e9,  0xa8f8,  0xa908,  0xa917,  0xa927,
+0xa936,  0xa945,  0xa955,  0xa964,  0xa973,  0xa983,
+0xa992,  0xa9a1,  0xa9b1,  0xa9c0,  0xa9cf,  0xa9df,
+0xa9ee,  0xa9fd,  0xaa0d,  0xaa1c,  0xaa2b,  0xaa3b,
+0xaa4a,  0xaa59,  0xaa69,  0xaa78,  0xaa87,  0xaa96,
+0xaaa6,  0xaab5,  0xaac4,  0xaad4,  0xaae3,  0xaaf2,
+0xab01,  0xab11,  0xab20,  0xab2f,  0xab3e,  0xab4e,
+0xab5d,  0xab6c,  0xab7b,  0xab8b,  0xab9a,  0xaba9,
+0xabb8,  0xabc7,  0xabd7,  0xabe6,  0xabf5,  0xac04,
+0xac14,  0xac23,  0xac32,  0xac41,  0xac50,  0xac60,
+0xac6f,  0xac7e,  0xac8d,  0xac9c,  0xacab,  0xacbb,
+0xacca,  0xacd9,  0xace8,  0xacf7,  0xad06,  0xad16,
+0xad25,  0xad34,  0xad43,  0xad52,  0xad61,  0xad70,
+0xad80,  0xad8f,  0xad9e,  0xadad,  0xadbc,  0xadcb,
+0xadda,  0xade9,  0xadf8,  0xae08,  0xae17,  0xae26,
+0xae35,  0xae44,  0xae53,  0xae62,  0xae71,  0xae80,
+0xae8f,  0xae9e,  0xaead,  0xaebd,  0xaecc,  0xaedb,
+0xaeea,  0xaef9,  0xaf08,  0xaf17,  0xaf26,  0xaf35,
+0xaf44,  0xaf53,  0xaf62,  0xaf71,  0xaf80,  0xaf8f,
+0xaf9e,  0xafad,  0xafbc,  0xafcb,  0xafda,  0xafe9,
+0xaff8,  0xb007,  0xb016,  0xb025,  0xb034,  0xb043,
+0xb052,  0xb061,  0xb070,  0xb07f,  0xb08e,  0xb09d,
+0xb0ac,  0xb0bb,  0xb0ca,  0xb0d9,  0xb0e8,  0xb0f6,
+0xb105,  0xb114,  0xb123,  0xb132,  0xb141,  0xb150,
+0xb15f,  0xb16e,  0xb17d,  0xb18c,  0xb19b,  0xb1aa,
+0xb1b8,  0xb1c7,  0xb1d6,  0xb1e5,  0xb1f4,  0xb203,
+0xb212,  0xb221,  0xb22f,  0xb23e,  0xb24d,  0xb25c,
+0xb26b,  0xb27a,  0xb289,  0xb297,  0xb2a6,  0xb2b5,
+0xb2c4,  0xb2d3,  0xb2e2,  0xb2f1,  0xb2ff,  0xb30e,
+0xb31d,  0xb32c,  0xb33b,  0xb349,  0xb358,  0xb367,
+0xb376,  0xb385,  0xb393,  0xb3a2,  0xb3b1,  0xb3c0,
+0xb3cf,  0xb3dd,  0xb3ec,  0xb3fb,  0xb40a,  0xb418,
+0xb427,  0xb436,  0xb445,  0xb453,  0xb462,  0xb471,
+0xb480,  0xb48e,  0xb49d,  0xb4ac,  0xb4bb,  0xb4c9,
+0xb4d8,  0xb4e7,  0xb4f6,  0xb504,  0xb513,  0xb522,
+0xb530,  0xb53f,  0xb54e,  0xb55c,  0xb56b,  0xb57a,
+0xb588,  0xb597,  0xb5a6,  0xb5b5,  0xb5c3,  0xb5d2,
+0xb5e1,  0xb5ef,  0xb5fe,  0xb60d,  0xb61b,  0xb62a,
+0xb638,  0xb647,  0xb656,  0xb664,  0xb673,  0xb682,
+0xb690,  0xb69f,  0xb6ae,  0xb6bc,  0xb6cb,  0xb6d9,
+0xb6e8,  0xb6f7,  0xb705,  0xb714,  0xb722,  0xb731,
+0xb740,  0xb74e,  0xb75d,  0xb76b,  0xb77a,  0xb788,
+0xb797,  0xb7a6,  0xb7b4,  0xb7c3,  0xb7d1,  0xb7e0,
+0xb7ee,  0xb7fd,  0xb80b,  0xb81a,  0xb829,  0xb837,
+0xb846,  0xb854,  0xb863,  0xb871,  0xb880,  0xb88e,
+0xb89d,  0xb8ab,  0xb8ba,  0xb8c8,  0xb8d7,  0xb8e5,
+0xb8f4,  0xb902,  0xb911,  0xb91f,  0xb92e,  0xb93c,
+0xb94b,  0xb959,  0xb968,  0xb976,  0xb984,  0xb993,
+0xb9a1,  0xb9b0,  0xb9be,  0xb9cd,  0xb9db,  0xb9ea,
+0xb9f8,  0xba06,  0xba15,  0xba23,  0xba32,  0xba40,
+0xba4f,  0xba5d,  0xba6b,  0xba7a,  0xba88,  0xba97,
+0xbaa5,  0xbab3,  0xbac2,  0xbad0,  0xbade,  0xbaed,
+0xbafb,  0xbb0a,  0xbb18,  0xbb26,  0xbb35,  0xbb43,
+0xbb51,  0xbb60,  0xbb6e,  0xbb7c,  0xbb8b,  0xbb99,
+0xbba8,  0xbbb6,  0xbbc4,  0xbbd3,  0xbbe1,  0xbbef,
+0xbbfd,  0xbc0c,  0xbc1a,  0xbc28,  0xbc37,  0xbc45,
+0xbc53,  0xbc62,  0xbc70,  0xbc7e,  0xbc8c,  0xbc9b,
+0xbca9,  0xbcb7,  0xbcc6,  0xbcd4,  0xbce2,  0xbcf0,
+0xbcff,  0xbd0d,  0xbd1b,  0xbd29,  0xbd38,  0xbd46,
+0xbd54,  0xbd62,  0xbd71,  0xbd7f,  0xbd8d,  0xbd9b,
+0xbdaa,  0xbdb8,  0xbdc6,  0xbdd4,  0xbde2,  0xbdf1,
+0xbdff,  0xbe0d,  0xbe1b,  0xbe29,  0xbe38,  0xbe46,
+0xbe54,  0xbe62,  0xbe70,  0xbe7f,  0xbe8d,  0xbe9b,
+0xbea9,  0xbeb7,  0xbec5,  0xbed4,  0xbee2,  0xbef0,
+0xbefe,  0xbf0c,  0xbf1a,  0xbf28,  0xbf37,  0xbf45,
+0xbf53,  0xbf61,  0xbf6f,  0xbf7d,  0xbf8b,  0xbf99,
+0xbfa7,  0xbfb6,  0xbfc4,  0xbfd2,  0xbfe0,  0xbfee,
+0xbffc,  0xc00a,  0xc018,  0xc026,  0xc034,  0xc042,
+0xc051,  0xc05f,  0xc06d,  0xc07b,  0xc089,  0xc097,
+0xc0a5,  0xc0b3,  0xc0c1,  0xc0cf,  0xc0dd,  0xc0eb,
+0xc0f9,  0xc107,  0xc115,  0xc123,  0xc131,  0xc13f,
+0xc14d,  0xc15b,  0xc169,  0xc177,  0xc185,  0xc193,
+0xc1a1,  0xc1af,  0xc1bd,  0xc1cb,  0xc1d9,  0xc1e7,
+0xc1f5,  0xc203,  0xc211,  0xc21f,  0xc22d,  0xc23b,
+0xc249,  0xc257,  0xc265,  0xc273,  0xc281,  0xc28f,
+0xc29d,  0xc2ab,  0xc2b8,  0xc2c6,  0xc2d4,  0xc2e2,
+0xc2f0,  0xc2fe,  0xc30c,  0xc31a,  0xc328,  0xc336,
+0xc344,  0xc352,  0xc35f,  0xc36d,  0xc37b,  0xc389,
+0xc397,  0xc3a5,  0xc3b3,  0xc3c1,  0xc3ce,  0xc3dc,
+0xc3ea,  0xc3f8,  0xc406,  0xc414,  0xc422,  0xc42f,
+0xc43d,  0xc44b,  0xc459,  0xc467,  0xc475,  0xc482,
+0xc490,  0xc49e,  0xc4ac,  0xc4ba,  0xc4c7,  0xc4d5,
+0xc4e3,  0xc4f1,  0xc4ff,  0xc50d,  0xc51a,  0xc528,
+0xc536,  0xc544,  0xc551,  0xc55f,  0xc56d,  0xc57b,
+0xc589,  0xc596,  0xc5a4,  0xc5b2,  0xc5c0,  0xc5cd,
+0xc5db,  0xc5e9,  0xc5f7,  0xc604,  0xc612,  0xc620,
+0xc62d,  0xc63b,  0xc649,  0xc657,  0xc664,  0xc672,
+0xc680,  0xc68d,  0xc69b,  0xc6a9,  0xc6b7,  0xc6c4,
+0xc6d2,  0xc6e0,  0xc6ed,  0xc6fb,  0xc709,  0xc716,
+0xc724,  0xc732,  0xc73f,  0xc74d,  0xc75b,  0xc768,
+0xc776,  0xc784,  0xc791,  0xc79f,  0xc7ad,  0xc7ba,
+0xc7c8,  0xc7d6,  0xc7e3,  0xc7f1,  0xc7fe,  0xc80c,
+0xc81a,  0xc827,  0xc835,  0xc842,  0xc850,  0xc85e,
+0xc86b,  0xc879,  0xc886,  0xc894,  0xc8a2,  0xc8af,
+0xc8bd,  0xc8ca,  0xc8d8,  0xc8e5,  0xc8f3,  0xc901,
+0xc90e,  0xc91c,  0xc929,  0xc937,  0xc944,  0xc952,
+0xc95f,  0xc96d,  0xc97b,  0xc988,  0xc996,  0xc9a3,
+0xc9b1,  0xc9be,  0xc9cc,  0xc9d9,  0xc9e7,  0xc9f4,
+0xca02,  0xca0f,  0xca1d,  0xca2a,  0xca38,  0xca45,
+0xca53,  0xca60,  0xca6e,  0xca7b,  0xca89,  0xca96,
+0xcaa4,  0xcab1,  0xcabe,  0xcacc,  0xcad9,  0xcae7,
+0xcaf4,  0xcb02,  0xcb0f,  0xcb1d,  0xcb2a,  0xcb37,
+0xcb45,  0xcb52,  0xcb60,  0xcb6d,  0xcb7b,  0xcb88,
+0xcb95,  0xcba3,  0xcbb0,  0xcbbe,  0xcbcb,  0xcbd8,
+0xcbe6,  0xcbf3,  0xcc01,  0xcc0e,  0xcc1b,  0xcc29,
+0xcc36,  0xcc43,  0xcc51,  0xcc5e,  0xcc6c,  0xcc79,
+0xcc86,  0xcc94,  0xcca1,  0xccae,  0xccbc,  0xccc9,
+0xccd6,  0xcce4,  0xccf1,  0xccfe,  0xcd0c,  0xcd19,
+0xcd26,  0xcd34,  0xcd41,  0xcd4e,  0xcd5b,  0xcd69,
+0xcd76,  0xcd83,  0xcd91,  0xcd9e,  0xcdab,  0xcdb9,
+0xcdc6,  0xcdd3,  0xcde0,  0xcdee,  0xcdfb,  0xce08,
+0xce15,  0xce23,  0xce30,  0xce3d,  0xce4a,  0xce58,
+0xce65,  0xce72,  0xce7f,  0xce8d,  0xce9a,  0xcea7,
+0xceb4,  0xcec2,  0xcecf,  0xcedc,  0xcee9,  0xcef6,
+0xcf04,  0xcf11,  0xcf1e,  0xcf2b,  0xcf38,  0xcf46,
+0xcf53,  0xcf60,  0xcf6d,  0xcf7a,  0xcf87,  0xcf95,
+0xcfa2,  0xcfaf,  0xcfbc,  0xcfc9,  0xcfd6,  0xcfe4,
+0xcff1,  0xcffe,  0xd00b,  0xd018,  0xd025,  0xd032,
+0xd040,  0xd04d,  0xd05a,  0xd067,  0xd074,  0xd081,
+0xd08e,  0xd09b,  0xd0a9,  0xd0b6,  0xd0c3,  0xd0d0,
+0xd0dd,  0xd0ea,  0xd0f7,  0xd104,  0xd111,  0xd11e,
+0xd12b,  0xd139,  0xd146,  0xd153,  0xd160,  0xd16d,
+0xd17a,  0xd187,  0xd194,  0xd1a1,  0xd1ae,  0xd1bb,
+0xd1c8,  0xd1d5,  0xd1e2,  0xd1ef,  0xd1fc,  0xd209,
+0xd216,  0xd223,  0xd230,  0xd23d,  0xd24a,  0xd257,
+0xd264,  0xd271,  0xd27e,  0xd28b,  0xd298,  0xd2a5,
+0xd2b2,  0xd2bf,  0xd2cc,  0xd2d9,  0xd2e6,  0xd2f3,
+0xd300,  0xd30d,  0xd31a,  0xd327,  0xd334,  0xd341,
+0xd34e,  0xd35b,  0xd368,  0xd375,  0xd382,  0xd38f,
+0xd39c,  0xd3a8,  0xd3b5,  0xd3c2,  0xd3cf,  0xd3dc,
+0xd3e9,  0xd3f6,  0xd403,  0xd410,  0xd41d,  0xd42a,
+0xd436,  0xd443,  0xd450,  0xd45d,  0xd46a,  0xd477,
+0xd484,  0xd491,  0xd49e,  0xd4aa,  0xd4b7,  0xd4c4,
+0xd4d1,  0xd4de,  0xd4eb,  0xd4f8,  0xd504,  0xd511,
+0xd51e,  0xd52b,  0xd538,  0xd545,  0xd551,  0xd55e,
+0xd56b,  0xd578,  0xd585,  0xd591,  0xd59e,  0xd5ab,
+0xd5b8,  0xd5c5,  0xd5d1,  0xd5de,  0xd5eb,  0xd5f8,
+0xd605,  0xd611,  0xd61e,  0xd62b,  0xd638,  0xd645,
+0xd651,  0xd65e,  0xd66b,  0xd678,  0xd684,  0xd691,
+0xd69e,  0xd6ab,  0xd6b7,  0xd6c4,  0xd6d1,  0xd6de,
+0xd6ea,  0xd6f7,  0xd704,  0xd710,  0xd71d,  0xd72a,
+0xd737,  0xd743,  0xd750,  0xd75d,  0xd769,  0xd776,
+0xd783,  0xd78f,  0xd79c,  0xd7a9,  0xd7b6,  0xd7c2,
+0xd7cf,  0xd7dc,  0xd7e8,  0xd7f5,  0xd802,  0xd80e,
+0xd81b,  0xd828,  0xd834,  0xd841,  0xd84e,  0xd85a,
+0xd867,  0xd873,  0xd880,  0xd88d,  0xd899,  0xd8a6,
+0xd8b3,  0xd8bf,  0xd8cc,  0xd8d8,  0xd8e5,  0xd8f2,
+0xd8fe,  0xd90b,  0xd917,  0xd924,  0xd931,  0xd93d,
+0xd94a,  0xd956,  0xd963,  0xd970,  0xd97c,  0xd989,
+0xd995,  0xd9a2,  0xd9ae,  0xd9bb,  0xd9c8,  0xd9d4,
+0xd9e1,  0xd9ed,  0xd9fa,  0xda06,  0xda13,  0xda1f,
+0xda2c,  0xda38,  0xda45,  0xda51,  0xda5e,  0xda6a,
+0xda77,  0xda84,  0xda90,  0xda9d,  0xdaa9,  0xdab6,
+0xdac2,  0xdacf,  0xdadb,  0xdae7,  0xdaf4,  0xdb00,
+0xdb0d,  0xdb19,  0xdb26,  0xdb32,  0xdb3f,  0xdb4b,
+0xdb58,  0xdb64,  0xdb71,  0xdb7d,  0xdb8a,  0xdb96,
+0xdba2,  0xdbaf,  0xdbbb,  0xdbc8,  0xdbd4,  0xdbe1,
+0xdbed,  0xdbf9,  0xdc06,  0xdc12,  0xdc1f,  0xdc2b,
+0xdc38,  0xdc44,  0xdc50,  0xdc5d,  0xdc69,  0xdc76,
+0xdc82,  0xdc8e,  0xdc9b,  0xdca7,  0xdcb3,  0xdcc0,
+0xdccc,  0xdcd9,  0xdce5,  0xdcf1,  0xdcfe,  0xdd0a,
+0xdd16,  0xdd23,  0xdd2f,  0xdd3b,  0xdd48,  0xdd54,
+0xdd60,  0xdd6d,  0xdd79,  0xdd85,  0xdd92,  0xdd9e,
+0xddaa,  0xddb7,  0xddc3,  0xddcf,  0xdddc,  0xdde8,
+0xddf4,  0xde01,  0xde0d,  0xde19,  0xde25,  0xde32,
+0xde3e,  0xde4a,  0xde57,  0xde63,  0xde6f,  0xde7b,
+0xde88,  0xde94,  0xdea0,  0xdeac,  0xdeb9,  0xdec5,
+0xded1,  0xdedd,  0xdeea,  0xdef6,  0xdf02,  0xdf0e,
+0xdf1b,  0xdf27,  0xdf33,  0xdf3f,  0xdf4c,  0xdf58,
+0xdf64,  0xdf70,  0xdf7c,  0xdf89,  0xdf95,  0xdfa1,
+0xdfad,  0xdfb9,  0xdfc6,  0xdfd2,  0xdfde,  0xdfea,
+0xdff6,  0xe003,  0xe00f,  0xe01b,  0xe027,  0xe033,
+0xe03f,  0xe04c,  0xe058,  0xe064,  0xe070,  0xe07c,
+0xe088,  0xe094,  0xe0a1,  0xe0ad,  0xe0b9,  0xe0c5,
+0xe0d1,  0xe0dd,  0xe0e9,  0xe0f5,  0xe102,  0xe10e,
+0xe11a,  0xe126,  0xe132,  0xe13e,  0xe14a,  0xe156,
+0xe162,  0xe16e,  0xe17b,  0xe187,  0xe193,  0xe19f,
+0xe1ab,  0xe1b7,  0xe1c3,  0xe1cf,  0xe1db,  0xe1e7,
+0xe1f3,  0xe1ff,  0xe20b,  0xe217,  0xe223,  0xe22f,
+0xe23c,  0xe248,  0xe254,  0xe260,  0xe26c,  0xe278,
+0xe284,  0xe290,  0xe29c,  0xe2a8,  0xe2b4,  0xe2c0,
+0xe2cc,  0xe2d8,  0xe2e4,  0xe2f0,  0xe2fc,  0xe308,
+0xe314,  0xe320,  0xe32c,  0xe338,  0xe344,  0xe350,
+0xe35c,  0xe368,  0xe374,  0xe380,  0xe38b,  0xe397,
+0xe3a3,  0xe3af,  0xe3bb,  0xe3c7,  0xe3d3,  0xe3df,
+0xe3eb,  0xe3f7,  0xe403,  0xe40f,  0xe41b,  0xe427,
+0xe433,  0xe43f,  0xe44a,  0xe456,  0xe462,  0xe46e,
+0xe47a,  0xe486,  0xe492,  0xe49e,  0xe4aa,  0xe4b6,
+0xe4c1,  0xe4cd,  0xe4d9,  0xe4e5,  0xe4f1,  0xe4fd,
+0xe509,  0xe515,  0xe520,  0xe52c,  0xe538,  0xe544,
+0xe550,  0xe55c,  0xe567,  0xe573,  0xe57f,  0xe58b,
+0xe597,  0xe5a3,  0xe5af,  0xe5ba,  0xe5c6,  0xe5d2,
+0xe5de,  0xe5ea,  0xe5f5,  0xe601,  0xe60d,  0xe619,
+0xe625,  0xe630,  0xe63c,  0xe648,  0xe654,  0xe660,
+0xe66b,  0xe677,  0xe683,  0xe68f,  0xe69a,  0xe6a6,
+0xe6b2,  0xe6be,  0xe6ca,  0xe6d5,  0xe6e1,  0xe6ed,
+0xe6f9,  0xe704,  0xe710,  0xe71c,  0xe727,  0xe733,
+0xe73f,  0xe74b,  0xe756,  0xe762,  0xe76e,  0xe77a,
+0xe785,  0xe791,  0xe79d,  0xe7a8,  0xe7b4,  0xe7c0,
+0xe7cb,  0xe7d7,  0xe7e3,  0xe7ef,  0xe7fa,  0xe806,
+0xe812,  0xe81d,  0xe829,  0xe835,  0xe840,  0xe84c,
+0xe858,  0xe863,  0xe86f,  0xe87b,  0xe886,  0xe892,
+0xe89e,  0xe8a9,  0xe8b5,  0xe8c0,  0xe8cc,  0xe8d8,
+0xe8e3,  0xe8ef,  0xe8fb,  0xe906,  0xe912,  0xe91d,
+0xe929,  0xe935,  0xe940,  0xe94c,  0xe958,  0xe963,
+0xe96f,  0xe97a,  0xe986,  0xe991,  0xe99d,  0xe9a9,
+0xe9b4,  0xe9c0,  0xe9cb,  0xe9d7,  0xe9e3,  0xe9ee,
+0xe9fa,  0xea05,  0xea11,  0xea1c,  0xea28,  0xea33,
+0xea3f,  0xea4a,  0xea56,  0xea62,  0xea6d,  0xea79,
+0xea84,  0xea90,  0xea9b,  0xeaa7,  0xeab2,  0xeabe,
+0xeac9,  0xead5,  0xeae0,  0xeaec,  0xeaf7,  0xeb03,
+0xeb0e,  0xeb1a,  0xeb25,  0xeb31,  0xeb3c,  0xeb48,
+0xeb53,  0xeb5f,  0xeb6a,  0xeb76,  0xeb81,  0xeb8d,
+0xeb98,  0xeba3,  0xebaf,  0xebba,  0xebc6,  0xebd1,
+0xebdd,  0xebe8,  0xebf4,  0xebff,  0xec0a,  0xec16,
+0xec21,  0xec2d,  0xec38,  0xec44,  0xec4f,  0xec5a,
+0xec66,  0xec71,  0xec7d,  0xec88,  0xec93,  0xec9f,
+0xecaa,  0xecb6,  0xecc1,  0xeccc,  0xecd8,  0xece3,
+0xecef,  0xecfa,  0xed05,  0xed11,  0xed1c,  0xed27,
+0xed33,  0xed3e,  0xed4a,  0xed55,  0xed60,  0xed6c,
+0xed77,  0xed82,  0xed8e,  0xed99,  0xeda4,  0xedb0,
+0xedbb,  0xedc6,  0xedd2,  0xeddd,  0xede8,  0xedf4,
+0xedff,  0xee0a,  0xee15,  0xee21,  0xee2c,  0xee37,
+0xee43,  0xee4e,  0xee59,  0xee65,  0xee70,  0xee7b,
+0xee86,  0xee92,  0xee9d,  0xeea8,  0xeeb3,  0xeebf,
+0xeeca,  0xeed5,  0xeee1,  0xeeec,  0xeef7,  0xef02,
+0xef0e,  0xef19,  0xef24,  0xef2f,  0xef3a,  0xef46,
+0xef51,  0xef5c,  0xef67,  0xef73,  0xef7e,  0xef89,
+0xef94,  0xef9f,  0xefab,  0xefb6,  0xefc1,  0xefcc,
+0xefd7,  0xefe3,  0xefee,  0xeff9,  0xf004,  0xf00f,
+0xf01b,  0xf026,  0xf031,  0xf03c,  0xf047,  0xf052,
+0xf05e,  0xf069,  0xf074,  0xf07f,  0xf08a,  0xf095,
+0xf0a1,  0xf0ac,  0xf0b7,  0xf0c2,  0xf0cd,  0xf0d8,
+0xf0e3,  0xf0ef,  0xf0fa,  0xf105,  0xf110,  0xf11b,
+0xf126,  0xf131,  0xf13c,  0xf147,  0xf153,  0xf15e,
+0xf169,  0xf174,  0xf17f,  0xf18a,  0xf195,  0xf1a0,
+0xf1ab,  0xf1b6,  0xf1c2,  0xf1cd,  0xf1d8,  0xf1e3,
+0xf1ee,  0xf1f9,  0xf204,  0xf20f,  0xf21a,  0xf225,
+0xf230,  0xf23b,  0xf246,  0xf251,  0xf25c,  0xf267,
+0xf272,  0xf27d,  0xf288,  0xf293,  0xf29f,  0xf2aa,
+0xf2b5,  0xf2c0,  0xf2cb,  0xf2d6,  0xf2e1,  0xf2ec,
+0xf2f7,  0xf302,  0xf30d,  0xf318,  0xf323,  0xf32e,
+0xf339,  0xf344,  0xf34f,  0xf35a,  0xf364,  0xf36f,
+0xf37a,  0xf385,  0xf390,  0xf39b,  0xf3a6,  0xf3b1,
+0xf3bc,  0xf3c7,  0xf3d2,  0xf3dd,  0xf3e8,  0xf3f3,
+0xf3fe,  0xf409,  0xf414,  0xf41f,  0xf42a,  0xf435,
+0xf43f,  0xf44a,  0xf455,  0xf460,  0xf46b,  0xf476,
+0xf481,  0xf48c,  0xf497,  0xf4a2,  0xf4ad,  0xf4b7,
+0xf4c2,  0xf4cd,  0xf4d8,  0xf4e3,  0xf4ee,  0xf4f9,
+0xf504,  0xf50f,  0xf519,  0xf524,  0xf52f,  0xf53a,
+0xf545,  0xf550,  0xf55b,  0xf565,  0xf570,  0xf57b,
+0xf586,  0xf591,  0xf59c,  0xf5a6,  0xf5b1,  0xf5bc,
+0xf5c7,  0xf5d2,  0xf5dd,  0xf5e7,  0xf5f2,  0xf5fd,
+0xf608,  0xf613,  0xf61d,  0xf628,  0xf633,  0xf63e,
+0xf649,  0xf653,  0xf65e,  0xf669,  0xf674,  0xf67f,
+0xf689,  0xf694,  0xf69f,  0xf6aa,  0xf6b4,  0xf6bf,
+0xf6ca,  0xf6d5,  0xf6e0,  0xf6ea,  0xf6f5,  0xf700,
+0xf70b,  0xf715,  0xf720,  0xf72b,  0xf736,  0xf740,
+0xf74b,  0xf756,  0xf760,  0xf76b,  0xf776,  0xf781,
+0xf78b,  0xf796,  0xf7a1,  0xf7ab,  0xf7b6,  0xf7c1,
+0xf7cc,  0xf7d6,  0xf7e1,  0xf7ec,  0xf7f6,  0xf801,
+0xf80c,  0xf816,  0xf821,  0xf82c,  0xf836,  0xf841,
+0xf84c,  0xf856,  0xf861,  0xf86c,  0xf876,  0xf881,
+0xf88c,  0xf896,  0xf8a1,  0xf8ac,  0xf8b6,  0xf8c1,
+0xf8cc,  0xf8d6,  0xf8e1,  0xf8ec,  0xf8f6,  0xf901,
+0xf90b,  0xf916,  0xf921,  0xf92b,  0xf936,  0xf941,
+0xf94b,  0xf956,  0xf960,  0xf96b,  0xf976,  0xf980,
+0xf98b,  0xf995,  0xf9a0,  0xf9aa,  0xf9b5,  0xf9c0,
+0xf9ca,  0xf9d5,  0xf9df,  0xf9ea,  0xf9f4,  0xf9ff,
+0xfa0a,  0xfa14,  0xfa1f,  0xfa29,  0xfa34,  0xfa3e,
+0xfa49,  0xfa53,  0xfa5e,  0xfa69,  0xfa73,  0xfa7e,
+0xfa88,  0xfa93,  0xfa9d,  0xfaa8,  0xfab2,  0xfabd,
+0xfac7,  0xfad2,  0xfadc,  0xfae7,  0xfaf1,  0xfafc,
+0xfb06,  0xfb11,  0xfb1b,  0xfb26,  0xfb30,  0xfb3b,
+0xfb45,  0xfb50,  0xfb5a,  0xfb65,  0xfb6f,  0xfb7a,
+0xfb84,  0xfb8f,  0xfb99,  0xfba4,  0xfbae,  0xfbb8,
+0xfbc3,  0xfbcd,  0xfbd8,  0xfbe2,  0xfbed,  0xfbf7,
+0xfc02,  0xfc0c,  0xfc16,  0xfc21,  0xfc2b,  0xfc36,
+0xfc40,  0xfc4b,  0xfc55,  0xfc5f,  0xfc6a,  0xfc74,
+0xfc7f,  0xfc89,  0xfc93,  0xfc9e,  0xfca8,  0xfcb3,
+0xfcbd,  0xfcc7,  0xfcd2,  0xfcdc,  0xfce7,  0xfcf1,
+0xfcfb,  0xfd06,  0xfd10,  0xfd1a,  0xfd25,  0xfd2f,
+0xfd3a,  0xfd44,  0xfd4e,  0xfd59,  0xfd63,  0xfd6d,
+0xfd78,  0xfd82,  0xfd8c,  0xfd97,  0xfda1,  0xfdab,
+0xfdb6,  0xfdc0,  0xfdca,  0xfdd5,  0xfddf,  0xfde9,
+0xfdf4,  0xfdfe,  0xfe08,  0xfe13,  0xfe1d,  0xfe27,
+0xfe32,  0xfe3c,  0xfe46,  0xfe50,  0xfe5b,  0xfe65,
+0xfe6f,  0xfe7a,  0xfe84,  0xfe8e,  0xfe98,  0xfea3,
+0xfead,  0xfeb7,  0xfec1,  0xfecc,  0xfed6,  0xfee0,
+0xfeeb,  0xfef5,  0xfeff,  0xff09,  0xff14,  0xff1e,
+0xff28,  0xff32,  0xff3c,  0xff47,  0xff51,  0xff5b,
+0xff65,  0xff70,  0xff7a,  0xff84,  0xff8e,  0xff98,
+0xffa3,  0xffad,  0xffb7,  0xffc1,  0xffcc,  0xffd6,
+0xffe0,  0xffea,  0xfff4,  0xffff
+};
+
+// max value is pi/4
+constexpr double SCALING_FACTOR = 4. / M_PI * 0xFFFF;
+
+inline double atan2_lookup(double y, double x)
+{
+    if (std::abs(x) < std::numeric_limits<double>::epsilon())
+    {
+        if (y >= 0.)
+        {
+            return M_PI / 2.;
+        }
+        else
+        {
+            return -M_PI / 2.;
+        }
+    }
+
+    unsigned octant = 0;
+
+    if (x < 0.)
+    {
+        octant = 1;
+        x = -x;
+    }
+    if (y < 0.)
+    {
+        octant |= 2;
+        y = -y;
+    }
+
+    double t = y / x;
+    if (t > 1.0)
+    {
+        octant |= 4;
+        t = 1.0 / t;
+    }
+
+    double angle = atan_table[(unsigned)(t * 4095)] / SCALING_FACTOR;
+
+    switch (octant)
+    {
+    case 0:
+        break;
+    case 1:
+        angle = M_PI - angle;
+        break;
+    case 2:
+        angle = -angle;
+        break;
+    case 3:
+        angle = -M_PI + angle;
+        break;
+    case 4:
+        angle = M_PI / 2.0 - angle;
+        break;
+    case 5:
+        angle = M_PI / 2.0 + angle;
+        break;
+    case 6:
+        angle = -M_PI / 2.0 + angle;
+        break;
+    case 7:
+        angle = -M_PI / 2.0 - angle;
+        break;
+    }
+    return angle;
+}
+
+#endif // TRIGONOMETRY_TABLES_H

Util/bearing.cpp

@@ -25,33 +25,41 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifndef MACHINE_INFO_H
-#define MACHINE_INFO_H
+#include "bearing.hpp"
 
-enum Endianness
-{ LittleEndian = 1,
-  BigEndian = 2 };
-
-// Function is optimized to a single 'mov eax,1' on GCC, clang and icc using -O3
-inline Endianness GetMachineEndianness()
+std::string Bearing::Get(const double heading)
 {
-    int i(1);
-    char *p = (char *)&i;
-    if (1 == p[0])
+    if (heading <= 202.5)
     {
-        return LittleEndian;
+        if (heading >= 0. && heading <= 22.5)
+        {
+            return "N";
+        }
+        if (heading > 22.5 && heading <= 67.5)
+        {
+            return "NE";
+        }
+        if (heading > 67.5 && heading <= 112.5)
+        {
+            return "E";
+        }
+        if (heading > 112.5 && heading <= 157.5)
+        {
+            return "SE";
+        }
+        return "S";
     }
-    return BigEndian;
-}
-
-// Reverses Network Byte Order into something usable, compiles down to a bswap-mov combination
-inline unsigned SwapEndian(unsigned x)
-{
-    if (GetMachineEndianness() == LittleEndian)
+    if (heading > 202.5 && heading <= 247.5)
     {
-        return ((x >> 24) | ((x << 8) & 0x00FF0000) | ((x >> 8) & 0x0000FF00) | (x << 24));
+        return "SW";
     }
-    return x;
+    if (heading > 247.5 && heading <= 292.5)
+    {
+        return "W";
+    }
+    if (heading > 292.5 && heading <= 337.5)
+    {
+        return "NW";
+    }
+    return "N";
 }
-
-#endif // MACHINE_INFO_H

Util/bearing.hpp

@@ -25,17 +25,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifndef OPENMP_WRAPPER_H
-#define OPENMP_WRAPPER_H
+#ifndef BEARING_HPP_
+#define BEARING_HPP_
 
-#ifdef _OPENMP
-extern "C" {
-#include <omp.h>
-}
-#else
-inline int omp_get_num_procs() { return 1; }
-inline int omp_get_max_threads() { return 1; }
-inline int omp_get_thread_num() { return 0; }
-inline void omp_set_num_threads(int i) {}
-#endif // _OPENMP
-#endif // OPENMP_WRAPPER_H
+#include <string>
+
+struct Bearing
+{
+    static std::string Get(const double heading);
+};
+
+#endif // BEARING_HPP_

Util/cast.hpp

@@ -0,0 +1,188 @@
+/*
+
+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 CAST_HPP
+#define CAST_HPP
+
+#include <boost/spirit/include/karma.hpp>
+#include <boost/spirit/include/qi.hpp>
+
+#include <string>
+#include <type_traits>
+
+struct cast
+{
+    // convert scoped enums to integers
+    template <typename Enumeration>
+    static auto enum_to_underlying(Enumeration const value) -> typename std::underlying_type<Enumeration>::type
+    {
+        return static_cast<typename std::underlying_type<Enumeration>::type>(value);
+    }
+
+    template <typename Number>
+    static typename std::enable_if<std::is_integral<Number>::value, std::string>::type
+    integral_to_string(const Number value)
+    {
+        std::string output;
+        std::back_insert_iterator<std::string> sink(output);
+
+        if (8 == sizeof(Number))
+        {
+            boost::spirit::karma::generate(sink, boost::spirit::karma::long_long, value);
+        }
+        else
+        {
+            if (std::is_signed<Number>::value)
+            {
+                boost::spirit::karma::generate(sink, boost::spirit::karma::int_, value);
+            }
+            else
+            {
+                boost::spirit::karma::generate(sink, boost::spirit::karma::uint_, value);
+            }
+        }
+        return output;
+    }
+
+    static int string_to_int(const std::string &input)
+    {
+        auto first_digit = input.begin();
+        // Delete any trailing white-spaces
+        while (first_digit != input.end() && std::isspace(*first_digit))
+        {
+            ++first_digit;
+        }
+        int value = 0;
+        boost::spirit::qi::parse(first_digit, input.end(), boost::spirit::int_, value);
+        return value;
+    }
+
+    static unsigned string_to_uint(const std::string &input)
+    {
+        auto first_digit = input.begin();
+        // Delete any trailing white-spaces
+        while (first_digit != input.end() && (std::isspace(*first_digit) || '-' == *first_digit))
+        {
+            ++first_digit;
+        }
+        unsigned value = 0;
+        boost::spirit::qi::parse(first_digit, input.end(), boost::spirit::uint_, value);
+        return value;
+    }
+
+    static uint64_t string_to_uint64(const std::string &input)
+    {
+        auto first_digit = input.begin();
+        // Delete any trailing white-spaces
+        while (first_digit != input.end() && std::isspace(*first_digit))
+        {
+            ++first_digit;
+        }
+        uint64_t value = 0;
+        boost::spirit::qi::parse(first_digit, input.end(), boost::spirit::long_long, value);
+        return value;
+    }
+
+    // source: http://tinodidriksen.com/2011/05/28/cpp-convert-string-to-double-speed/
+    static double string_to_double(const char *p)
+    {
+        double r = 0.0;
+        bool neg = false;
+        if (*p == '-')
+        {
+            neg = true;
+            ++p;
+        }
+        while (*p >= '0' && *p <= '9')
+        {
+            r = (r * 10.0) + (*p - '0');
+            ++p;
+        }
+        if (*p == '.')
+        {
+            double f = 0.0;
+            int n = 0;
+            ++p;
+            while (*p >= '0' && *p <= '9')
+            {
+                f = (f * 10.0) + (*p - '0');
+                ++p;
+                ++n;
+            }
+            r += f / std::pow(10.0, n);
+        }
+        if (neg)
+        {
+            r = -r;
+        }
+        return r;
+    }
+
+    template <typename T> struct scientific_policy : boost::spirit::karma::real_policies<T>
+    {
+        //  we want the numbers always to be in fixed format
+        static int floatfield(T n)
+        {
+            return boost::spirit::karma::real_policies<T>::fmtflags::fixed;
+        }
+        static unsigned int precision(T) { return 6; }
+    };
+    typedef boost::spirit::karma::real_generator<double, scientific_policy<double>> science_type;
+
+    static std::string double_fixed_to_string(const double value)
+    {
+        std::string output;
+        std::back_insert_iterator<std::string> sink(output);
+        boost::spirit::karma::generate(sink, science_type(), value);
+        if (output.size() >= 2 && output[output.size() - 2] == '.' &&
+            output[output.size() - 1] == '0')
+        {
+            output.resize(output.size() - 2);
+        }
+        return output;
+    }
+
+    static std::string double_to_string(const double value)
+    {
+        std::string output;
+        std::back_insert_iterator<std::string> sink(output);
+        boost::spirit::karma::generate(sink, value);
+        return output;
+    }
+
+    static void double_with_two_digits_to_string(const double value,
+                                                              std::string &output)
+    {
+        // The largest 32-bit integer is 4294967295, that is 10 chars
+        // On the safe side, add 1 for sign, and 1 for trailing zero
+        char buffer[12];
+        sprintf(buffer, "%g", value);
+        output = buffer;
+    }
+};
+
+#endif // CAST_HPP

Util/compute_angle.cpp

@@ -25,30 +25,27 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifndef COMPUTE_ANGLE_H
-#define COMPUTE_ANGLE_H
+#include "compute_angle.hpp"
 
+#include "TrigonometryTables.h"
 #include "../Util/MercatorUtil.h"
 #include <osrm/Coordinate.h>
 
-#include <boost/assert.hpp>
 #include <cmath>
 
-/* Get angle of line segment (A,C)->(C,B), atan2 magic, formerly cosine theorem*/
-template <class CoordinateT>
-inline static double GetAngleBetweenThreeFixedPointCoordinates(const CoordinateT &A,
-                                                               const CoordinateT &C,
-                                                               const CoordinateT &B)
+double ComputeAngle::OfThreeFixedPointCoordinates(const FixedPointCoordinate &A,
+                                                  const FixedPointCoordinate &C,
+                                                  const FixedPointCoordinate &B)
 {
     const double v1x = (A.lon - C.lon) / COORDINATE_PRECISION;
     const double v1y = lat2y(A.lat / COORDINATE_PRECISION) - lat2y(C.lat / COORDINATE_PRECISION);
     const double v2x = (B.lon - C.lon) / COORDINATE_PRECISION;
     const double v2y = lat2y(B.lat / COORDINATE_PRECISION) - lat2y(C.lat / COORDINATE_PRECISION);
 
-    double angle = (atan2(v2y, v2x) - atan2(v1y, v1x)) * 180 / M_PI;
-    while (angle < 0)
-        angle += 360;
+    double angle = (atan2_lookup(v2y, v2x) - atan2_lookup(v1y, v1x)) * 180. / M_PI;
+    while (angle < 0.)
+    {
+        angle += 360.;
+    }
     return angle;
 }
-
-#endif // COMPUTE_ANGLE_H

Util/compute_angle.hpp

@@ -25,26 +25,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifndef XMLPARSER_H_
-#define XMLPARSER_H_
+#ifndef COMPUTE_ANGLE_HPP
+#define COMPUTE_ANGLE_HPP
 
-#include "ExtractorCallbacks.h"
-#include "BaseParser.h"
+struct FixedPointCoordinate;
+struct NodeInfo;
 
-#include <libxml/xmlreader.h>
-
-class XMLParser : public BaseParser
+struct ComputeAngle
 {
-  public:
-    XMLParser(const char *filename, ExtractorCallbacks *ec, ScriptingEnvironment &se);
-    bool ReadHeader();
-    bool Parse();
-
-  private:
-    InputRestrictionContainer ReadXMLRestriction();
-    ExtractionWay ReadXMLWay();
-    ImportNode ReadXMLNode();
-    xmlTextReaderPtr inputReader;
+    /* Get angle of line segment (A,C)->(C,B), atan2 magic, formerly cosine theorem*/
+    static double OfThreeFixedPointCoordinates(const FixedPointCoordinate &A,
+                                               const FixedPointCoordinate &C,
+                                               const FixedPointCoordinate &B);
 };
-
-#endif /* XMLPARSER_H_ */
+#endif // COMPUTE_ANGLE_HPP

Util/container.hpp

@@ -25,47 +25,58 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifndef CONTAINERUTILS_H_
-#define CONTAINERUTILS_H_
+#ifndef CONTAINER_HPP_
+#define CONTAINER_HPP_
 
 #include <algorithm>
+#include <iterator>
 #include <vector>
 
-template <typename T> inline void sort_unique_resize(std::vector<T> &vector)
+namespace osrm
+{
+template <typename T> void sort_unique_resize(std::vector<T> &vector)
 {
     std::sort(vector.begin(), vector.end());
-    unsigned number_of_unique_elements = std::unique(vector.begin(), vector.end()) - vector.begin();
+    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 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)
-{
-    unsigned 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;
+    auto next = begin;
+    next = std::next(next);
 
-    for (; iter_next != iter_end; ++iter_begin, ++iter_next)
+    while (next != end)
     {
-        func(*iter_begin, *iter_next);
+        function(*begin, *next);
+        begin = std::next(begin); next = std::next(next);
     }
-    return func;
+    return function;
 }
 
-#endif /* CONTAINERUTILS_H_ */
+template <class ContainerT, typename Function>
+Function for_each_pair(ContainerT &container, Function function)
+{
+    return for_each_pair(std::begin(container), std::end(container), function);
+}
+
+}
+#endif /* CONTAINER_HPP_ */

Util/finger_print.cpp.in

@@ -25,18 +25,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "UUID.h"
+#include "FingerPrint.h"
 
 #include "OSRMException.h"
-#include "../typedefs.h"
 
-#include <boost/uuid/uuid_generators.hpp> // generators
-#include <boost/uuid/uuid_io.hpp>         // streaming operators etc.
-
-#include <cstring>
+#include <boost/uuid/name_generator.hpp>
 
 #include <algorithm>
-#include <iostream>
 #include <string>
 
 #cmakedefine01 HAS64BITS
@@ -45,34 +40,33 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #cmakedefine MD5GRAPH "${MD5GRAPH}"
 #cmakedefine MD5OBJECTS "${MD5OBJECTS}"
 
-UUID::UUID() : magic_number(1297240911)
+FingerPrint::FingerPrint() : magic_number(1297240911)
 {
     md5_prepare[32] = md5_tree[32] = md5_graph[32] = md5_objects[32] = '\0';
 
     boost::uuids::name_generator gen(named_uuid);
-    std::string temp_string(__DATE__);
-    temp_string += __TIME__;
+    std::string temp_string;
 
-    std::copy(MD5PREPARE, MD5PREPARE + strlen(MD5PREPARE), md5_prepare);
+    std::memcpy(md5_prepare, MD5PREPARE, strlen(MD5PREPARE));
     temp_string += md5_prepare;
-    std::copy(MD5RTREE, MD5RTREE + 32, md5_tree);
+    std::memcpy(md5_tree, MD5RTREE, 32);
     temp_string += md5_tree;
-    std::copy(MD5GRAPH, MD5GRAPH + 32, md5_graph);
+    std::memcpy(md5_graph, MD5GRAPH, 32);
     temp_string += md5_graph;
-    std::copy(MD5OBJECTS, MD5OBJECTS + 32, md5_objects);
+    std::memcpy(md5_objects, MD5OBJECTS, 32);
     temp_string += md5_objects;
 
     named_uuid = gen(temp_string);
     has_64_bits = HAS64BITS;
 }
 
-UUID::~UUID() {}
+FingerPrint::~FingerPrint() {}
 
-const boost::uuids::uuid &UUID::GetUUID() const { return named_uuid; }
+const boost::uuids::uuid &FingerPrint::GetFingerPrint() const { return named_uuid; }
 
-bool UUID::IsMagicNumberOK() const { return 1297240911 == magic_number; }
+bool FingerPrint::IsMagicNumberOK() const { return 1297240911 == magic_number; }
 
-bool UUID::TestGraphUtil(const UUID &other) const
+bool FingerPrint::TestGraphUtil(const FingerPrint &other) const
 {
     if (!other.IsMagicNumberOK())
     {
@@ -81,7 +75,7 @@ bool UUID::TestGraphUtil(const UUID &other) const
     return std::equal(md5_graph, md5_graph + 32, other.md5_graph);
 }
 
-bool UUID::TestPrepare(const UUID &other) const
+bool FingerPrint::TestPrepare(const FingerPrint &other) const
 {
     if (!other.IsMagicNumberOK())
     {
@@ -90,7 +84,7 @@ bool UUID::TestPrepare(const UUID &other) const
     return std::equal(md5_prepare, md5_prepare + 32, other.md5_prepare);
 }
 
-bool UUID::TestRTree(const UUID &other) const
+bool FingerPrint::TestRTree(const FingerPrint &other) const
 {
     if (!other.IsMagicNumberOK())
     {
@@ -99,7 +93,7 @@ bool UUID::TestRTree(const UUID &other) const
     return std::equal(md5_tree, md5_tree + 32, other.md5_tree);
 }
 
-bool UUID::TestQueryObjects(const UUID &other) const
+bool FingerPrint::TestQueryObjects(const FingerPrint &other) const
 {
     if (!other.IsMagicNumberOK())
     {

Util/floating_point.hpp

@@ -0,0 +1,44 @@
+/*
+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 FLOATING_POINT_HPP
+#define FLOATING_POINT_HPP
+
+#include <cmath>
+
+#include <limits>
+#include <type_traits>
+
+namespace osrm
+{
+template <typename FloatT> bool epsilon_compare(const FloatT number1, const FloatT number2)
+{
+    static_assert(std::is_floating_point<FloatT>::value, "type must be floating point");
+    return (std::abs(number1 - number2) < std::numeric_limits<FloatT>::epsilon());
+}
+}
+
+#endif // FLOATING_POINT_HPP

Util/graph_loader.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -29,18 +29,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define GRAPHLOADER_H
 
 #include "OSRMException.h"
-#include "../DataStructures/ImportNode.h"
-#include "../DataStructures/ImportEdge.h"
-#include "../DataStructures/QueryNode.h"
-#include "../DataStructures/Restriction.h"
-#include "../Util/SimpleLogger.h"
-#include "../Util/UUID.h"
+#include "../data_structures/external_memory_node.hpp"
+#include "../data_structures/import_edge.hpp"
+#include "../data_structures/query_node.hpp"
+#include "../data_structures/restriction.hpp"
+#include "../Util/simple_logger.hpp"
+#include "../Util/FingerPrint.h"
 #include "../typedefs.h"
 
 #include <boost/assert.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 
+#include <tbb/parallel_sort.h>
+
 #include <cmath>
 
 #include <algorithm>
@@ -55,36 +57,36 @@ NodeID readBinaryOSRMGraphFromStream(std::istream &input_stream,
                                      std::vector<EdgeT> &edge_list,
                                      std::vector<NodeID> &barrier_node_list,
                                      std::vector<NodeID> &traffic_light_node_list,
-                                     std::vector<NodeInfo> *int_to_ext_node_id_map,
+                                     std::vector<QueryNode> *int_to_ext_node_id_map,
                                      std::vector<TurnRestriction> &restriction_list)
 {
-    const UUID uuid_orig;
-    UUID uuid_loaded;
-    input_stream.read((char *)&uuid_loaded, sizeof(UUID));
+    const FingerPrint fingerprint_orig;
+    FingerPrint fingerprint_loaded;
+    input_stream.read((char *)&fingerprint_loaded, sizeof(FingerPrint));
 
-    if (!uuid_loaded.TestGraphUtil(uuid_orig))
+    if (!fingerprint_loaded.TestGraphUtil(fingerprint_orig))
     {
-        SimpleLogger().Write(logWARNING) << ".osrm was prepared with different build."
+        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;
+
+    NodeID n;
     input_stream.read((char *)&n, sizeof(NodeID));
     SimpleLogger().Write() << "Importing n = " << n << " nodes ";
-    ExternalMemoryNode node;
+
+    ExternalMemoryNode current_node;
     for (NodeID i = 0; i < n; ++i)
     {
-        input_stream.read((char *)&node, sizeof(ExternalMemoryNode));
-        int_to_ext_node_id_map->emplace_back(node.lat, node.lon, node.id);
-        ext_to_int_id_map.emplace(node.id, i);
-        if (node.bollard)
+        input_stream.read((char *)&current_node, sizeof(ExternalMemoryNode));
+        int_to_ext_node_id_map->emplace_back(current_node.lat, current_node.lon, current_node.node_id);
+        ext_to_int_id_map.emplace(current_node.node_id, i);
+        if (current_node.barrier)
         {
             barrier_node_list.emplace_back(i);
         }
-        if (node.trafficLight)
+        if (current_node.traffic_lights)
         {
             traffic_light_node_list.emplace_back(i);
         }
@@ -93,41 +95,47 @@ NodeID readBinaryOSRMGraphFromStream(std::istream &input_stream,
     // tighten vector sizes
     barrier_node_list.shrink_to_fit();
     traffic_light_node_list.shrink_to_fit();
-    input_stream.read((char *)&m, sizeof(unsigned));
-    SimpleLogger().Write() << " and " << m << " edges ";
+
+    // renumber nodes in turn restrictions
     for (TurnRestriction &current_restriction : restriction_list)
     {
-        auto internal_id_iter = ext_to_int_id_map.find(current_restriction.fromNode);
+        auto internal_id_iter = ext_to_int_id_map.find(current_restriction.from.node);
         if (internal_id_iter == ext_to_int_id_map.end())
         {
             SimpleLogger().Write(logDEBUG) << "Unmapped from Node of restriction";
             continue;
         }
-        current_restriction.fromNode = internal_id_iter->second;
+        current_restriction.from.node = internal_id_iter->second;
 
-        internal_id_iter = ext_to_int_id_map.find(current_restriction.viaNode);
+        internal_id_iter = ext_to_int_id_map.find(current_restriction.via.node);
         if (internal_id_iter == ext_to_int_id_map.end())
         {
             SimpleLogger().Write(logDEBUG) << "Unmapped via node of restriction";
             continue;
         }
-        current_restriction.viaNode = internal_id_iter->second;
+        current_restriction.via.node = internal_id_iter->second;
 
-        internal_id_iter = ext_to_int_id_map.find(current_restriction.toNode);
+        internal_id_iter = ext_to_int_id_map.find(current_restriction.to.node);
         if (internal_id_iter == ext_to_int_id_map.end())
         {
             SimpleLogger().Write(logDEBUG) << "Unmapped to node of restriction";
             continue;
         }
-        current_restriction.toNode = internal_id_iter->second;
+        current_restriction.to.node = internal_id_iter->second;
     }
 
-    edge_list.reserve(m);
     EdgeWeight weight;
-    short type;
-    NodeID nameID;
+    NodeID source, target;
+    unsigned nameID;
     int length;
-    bool is_roundabout, ignore_in_grid, is_access_restricted, is_contra_flow, is_split;
+    short dir; // direction (0 = open, 1 = forward, 2+ = open)
+    bool is_roundabout, ignore_in_grid, is_access_restricted, is_split;
+    TravelMode travel_mode;
+
+    EdgeID m;
+    input_stream.read((char *)&m, sizeof(unsigned));
+    edge_list.reserve(m);
+    SimpleLogger().Write() << " and " << m << " edges ";
 
     for (EdgeID i = 0; i < m; ++i)
     {
@@ -136,12 +144,11 @@ NodeID readBinaryOSRMGraphFromStream(std::istream &input_stream,
         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 *)&travel_mode, sizeof(TravelMode));
         input_stream.read((char *)&is_split, sizeof(bool));
 
         BOOST_ASSERT_MSG(length > 0, "loaded null length edge");
@@ -159,8 +166,6 @@ NodeID readBinaryOSRMGraphFromStream(std::istream &input_stream,
             forward = false;
         }
 
-        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())
@@ -180,7 +185,8 @@ NodeID readBinaryOSRMGraphFromStream(std::istream &input_stream,
             continue;
         }
         target = internal_id_iter->second;
-        BOOST_ASSERT_MSG(source != UINT_MAX && target != UINT_MAX, "nonexisting source or target");
+        BOOST_ASSERT_MSG(source != SPECIAL_NODEID && target != SPECIAL_NODEID,
+                         "nonexisting source or target");
 
         if (source > target)
         {
@@ -194,72 +200,73 @@ NodeID readBinaryOSRMGraphFromStream(std::istream &input_stream,
                                weight,
                                forward,
                                backward,
-                               type,
                                is_roundabout,
                                ignore_in_grid,
                                is_access_restricted,
-                               is_contra_flow,
+                               travel_mode,
                                is_split);
     }
+    ext_to_int_id_map.clear();
+
+    tbb::parallel_sort(edge_list.begin(), edge_list.end());
 
-    std::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()))
+        if ((edge_list[i - 1].target == edge_list[i].target) &&
+            (edge_list[i - 1].source == edge_list[i].source))
         {
             const bool edge_flags_equivalent =
-                (edge_list[i - 1].isForward() == edge_list[i].isForward()) &&
-                (edge_list[i - 1].isBackward() == edge_list[i].isBackward());
+                (edge_list[i - 1].forward == edge_list[i].forward) &&
+                (edge_list[i - 1].backward == edge_list[i].backward);
             const bool edge_flags_are_superset1 =
-                (edge_list[i - 1].isForward() && edge_list[i - 1].isBackward()) &&
-                (edge_list[i].isBackward() != edge_list[i].isBackward());
+                (edge_list[i - 1].forward && edge_list[i - 1].backward) &&
+                (edge_list[i].forward != edge_list[i].backward);
             const bool edge_flags_are_superset_2 =
-                (edge_list[i].isForward() && edge_list[i].isBackward()) &&
-                (edge_list[i - 1].isBackward() != edge_list[i - 1].isBackward());
+                (edge_list[i].forward && edge_list[i].backward) &&
+                (edge_list[i - 1].forward != edge_list[i - 1].backward);
 
             if (edge_flags_equivalent)
             {
-                edge_list[i]._weight = std::min(edge_list[i - 1].weight(), edge_list[i].weight());
-                edge_list[i - 1]._source = UINT_MAX;
+                edge_list[i].weight = std::min(edge_list[i - 1].weight, edge_list[i].weight);
+                edge_list[i - 1].source = SPECIAL_NODEID;
             }
             else if (edge_flags_are_superset1)
             {
-                if (edge_list[i - 1].weight() <= edge_list[i].weight())
+                if (edge_list[i - 1].weight <= edge_list[i].weight)
                 {
                     // edge i-1 is smaller and goes in both directions. Throw away the other edge
-                    edge_list[i]._source = UINT_MAX;
+                    edge_list[i].source = SPECIAL_NODEID;
                 }
                 else
                 {
                     // edge i-1 is open in both directions, but edge i is smaller in one direction.
                     // Close edge i-1 in this direction
-                    edge_list[i - 1].forward = !edge_list[i].isForward();
-                    edge_list[i - 1].backward = !edge_list[i].isBackward();
+                    edge_list[i - 1].forward = !edge_list[i].forward;
+                    edge_list[i - 1].backward = !edge_list[i].backward;
                 }
             }
             else if (edge_flags_are_superset_2)
             {
-                if (edge_list[i - 1].weight() <= edge_list[i].weight())
+                if (edge_list[i - 1].weight <= edge_list[i].weight)
                 {
                     // edge i-1 is smaller for one direction. edge i is open in both. close edge i
                     // in the other direction
-                    edge_list[i].forward = !edge_list[i - 1].isForward();
-                    edge_list[i].backward = !edge_list[i - 1].isBackward();
+                    edge_list[i].forward = !edge_list[i - 1].forward;
+                    edge_list[i].backward = !edge_list[i - 1].backward;
                 }
                 else
                 {
                     // edge i is smaller and goes in both direction. Throw away edge i-1
-                    edge_list[i - 1]._source = UINT_MAX;
+                    edge_list[i - 1].source = SPECIAL_NODEID;
                 }
             }
         }
     }
-    const auto new_end_iter = std::remove_if(edge_list.begin(),
-                                       edge_list.end(),
-                                       [](const EdgeT &edge)
-                                       { return edge.source() == UINT_MAX; });
-    ext_to_int_id_map.clear();
+    const auto new_end_iter = std::remove_if(edge_list.begin(), edge_list.end(), [] (const EdgeT &edge)
+                                        {
+                                            return edge.source == SPECIAL_NODEID ||
+                                                   edge.target == SPECIAL_NODEID;
+                                        });
     edge_list.erase(new_end_iter, edge_list.end()); // remove excess candidates.
     edge_list.shrink_to_fit();
     SimpleLogger().Write() << "Graph loaded ok and has " << edge_list.size() << " edges";
@@ -283,11 +290,11 @@ unsigned readHSGRFromStream(const boost::filesystem::path &hsgr_file,
 
     boost::filesystem::ifstream hsgr_input_stream(hsgr_file, std::ios::binary);
 
-    UUID uuid_loaded, uuid_orig;
-    hsgr_input_stream.read((char *)&uuid_loaded, sizeof(UUID));
-    if (!uuid_loaded.TestGraphUtil(uuid_orig))
+    FingerPrint fingerprint_loaded, fingerprint_orig;
+    hsgr_input_stream.read((char *)&fingerprint_loaded, sizeof(FingerPrint));
+    if (!fingerprint_loaded.TestGraphUtil(fingerprint_orig))
     {
-        SimpleLogger().Write(logWARNING) << ".hsgr was prepared with different build. "
+        SimpleLogger().Write(logWARNING) << ".hsgr was prepared with different build.\n"
                                             "Reprocess to get rid of this warning.";
     }
 
@@ -302,11 +309,14 @@ 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);
-    hsgr_input_stream.read((char *)&(edge_list[0]), number_of_edges * sizeof(EdgeT));
+    if (number_of_edges > 0)
+    {
+        hsgr_input_stream.read((char *)&(edge_list[0]), number_of_edges * sizeof(EdgeT));
+    }
     hsgr_input_stream.close();
 
     return number_of_nodes;

Util/integer_range.hpp

@@ -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

Util/iterator_range.hpp

@@ -0,0 +1,72 @@
+/*
+
+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 RANGE_HPP_
+#define RANGE_HPP_
+
+namespace osrm
+{
+namespace util
+{
+template <typename Iterator> class Range
+{
+  public:
+    Range(Iterator begin, Iterator end) : begin_(begin), end_(end) {}
+
+    Iterator begin() const { return begin_; }
+    Iterator end() const { return end_; }
+
+  private:
+    Iterator begin_;
+    Iterator end_;
+};
+
+// Convenience functions for template parameter inference,
+// akin to std::make_pair.
+
+template <typename Iterator> Range<Iterator> range(Iterator begin, Iterator end)
+{
+    return Range<Iterator>(begin, end);
+}
+
+template <typename Reversable>
+Range<typename Reversable::reverse_iterator> reverse(Reversable *reversable)
+{
+    return Range<typename Reversable::reverse_iterator>(reversable->rbegin(), reversable->rend());
+}
+
+template <typename ConstReversable>
+Range<typename ConstReversable::const_reverse_iterator>
+const_reverse(const ConstReversable *const_reversable)
+{
+    return Range<typename ConstReversable::const_reverse_iterator>(const_reversable->crbegin(),
+                                                                   const_reversable->crend());
+}
+}
+}
+
+#endif // RANGE_HPP_

Util/json_renderer.hpp

@@ -0,0 +1,182 @@
+/*
+
+Copyright (c) 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.
+
+*/
+
+// based on
+// https://svn.apache.org/repos/asf/mesos/tags/release-0.9.0-incubating-RC0/src/common/json.hpp
+
+#ifndef JSON_RENDERER_HPP
+#define JSON_RENDERER_HPP
+
+#include "../data_structures/json_container.hpp"
+#include "cast.hpp"
+
+namespace JSON {
+
+struct Renderer : mapbox::util::static_visitor<>
+{
+    explicit Renderer(std::ostream &_out) : out(_out) {}
+
+    void operator()(const String &string) const { out << "\"" << string.value << "\""; }
+
+    void operator()(const Number &number) const
+    {
+        out.precision(10);
+        out << number.value;
+    }
+
+    void operator()(const Object &object) const
+    {
+        out << "{";
+        auto iterator = object.values.begin();
+        while (iterator != object.values.end())
+        {
+            out << "\"" << (*iterator).first << "\":";
+            mapbox::util::apply_visitor(Renderer(out), (*iterator).second);
+            if (++iterator != object.values.end())
+            {
+                out << ",";
+            }
+        }
+        out << "}";
+    }
+
+    void operator()(const Array &array) const
+    {
+        out << "[";
+        std::vector<Value>::const_iterator iterator;
+        iterator = array.values.begin();
+        while (iterator != array.values.end())
+        {
+            mapbox::util::apply_visitor(Renderer(out), *iterator);
+            if (++iterator != array.values.end())
+            {
+                out << ",";
+            }
+        }
+        out << "]";
+    }
+
+    void operator()(const True &) const { out << "true"; }
+
+    void operator()(const False &) const { out << "false"; }
+
+    void operator()(const Null &) const { out << "null"; }
+
+  private:
+    std::ostream &out;
+};
+
+struct ArrayRenderer : mapbox::util::static_visitor<>
+{
+    explicit ArrayRenderer(std::vector<char> &_out) : out(_out) {}
+
+    void operator()(const String &string) const
+    {
+        out.push_back('\"');
+        out.insert(out.end(), string.value.begin(), string.value.end());
+        out.push_back('\"');
+    }
+
+    void operator()(const Number &number) const
+    {
+        const std::string number_string = cast::double_fixed_to_string(number.value);
+        out.insert(out.end(), number_string.begin(), number_string.end());
+    }
+
+    void operator()(const Object &object) const
+    {
+        out.push_back('{');
+        auto iterator = object.values.begin();
+        while (iterator != object.values.end())
+        {
+            out.push_back('\"');
+            out.insert(out.end(), (*iterator).first.begin(), (*iterator).first.end());
+            out.push_back('\"');
+            out.push_back(':');
+
+            mapbox::util::apply_visitor(ArrayRenderer(out), (*iterator).second);
+            if (++iterator != object.values.end())
+            {
+                out.push_back(',');
+            }
+        }
+        out.push_back('}');
+    }
+
+    void operator()(const Array &array) const
+    {
+        out.push_back('[');
+        std::vector<Value>::const_iterator iterator;
+        iterator = array.values.begin();
+        while (iterator != array.values.end())
+        {
+            mapbox::util::apply_visitor(ArrayRenderer(out), *iterator);
+            if (++iterator != array.values.end())
+            {
+                out.push_back(',');
+            }
+        }
+        out.push_back(']');
+    }
+
+    void operator()(const True &) const
+    {
+        const std::string temp("true");
+        out.insert(out.end(), temp.begin(), temp.end());
+    }
+
+    void operator()(const False &) const
+    {
+        const std::string temp("false");
+        out.insert(out.end(), temp.begin(), temp.end());
+    }
+
+    void operator()(const Null &) const
+    {
+        const std::string temp("null");
+        out.insert(out.end(), temp.begin(), temp.end());
+    }
+
+  private:
+    std::vector<char> &out;
+};
+
+inline void render(std::ostream &out, const Object &object)
+{
+    Value value = object;
+    mapbox::util::apply_visitor(Renderer(out), value);
+}
+
+inline void render(std::vector<char> &out, const Object &object)
+{
+    Value value = object;
+    mapbox::util::apply_visitor(ArrayRenderer(out), value);
+}
+
+} // namespace JSON
+
+#endif // JSON_RENDERER_HPP

Util/lua_util.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifndef LUA_UTIL_H
-#define LUA_UTIL_H
+#ifndef LUA_UTIL_HPP
+#define LUA_UTIL_HPP
 
 extern "C" {
 #include <lua.h>
@@ -36,6 +36,7 @@ extern "C" {
 
 #include <boost/filesystem/convenience.hpp>
 #include <luabind/luabind.hpp>
+
 #include <iostream>
 #include <string>
 
@@ -62,4 +63,4 @@ inline void luaAddScriptFolderToLoadPath(lua_State *lua_state, const char *file_
     luaL_dostring(lua_state, lua_code.c_str());
 }
 
-#endif // LUA_UTIL_H
+#endif // LUA_UTIL_HPP

Util/make_unique.hpp

@@ -0,0 +1,57 @@
+/*
+
+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 MAKE_UNIQUE_H_
+#define MAKE_UNIQUE_H_
+
+#include <cstdlib>
+#include <memory>
+#include <type_traits>
+
+namespace osrm
+{
+// Taken from http://msdn.microsoft.com/en-us/library/dn439780.asp
+// Note, that the snippet was broken there and needed minor massaging
+
+// make_unique<T>
+template <class T, class... Types> std::unique_ptr<T> make_unique(Types &&... Args)
+{
+    return (std::unique_ptr<T>(new T(std::forward<Types>(Args)...)));
+}
+
+// make_unique<T[]>
+template <class T> std::unique_ptr<T[]> make_unique(std::size_t Size)
+{
+    return (std::unique_ptr<T>(new T[Size]()));
+}
+
+// make_unique<T[N]> disallowed
+template <class T, class... Types>
+typename std::enable_if<std::extent<T>::value != 0, void>::type make_unique(Types &&...) = delete;
+}
+
+#endif //MAKE_UNIQUE_H_

Util/range_algorithms.hpp

@@ -0,0 +1,42 @@
+/*
+    open source routing machine
+    Copyright (C) Dennis Luxen, others 2010
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+ */
+
+#ifndef RANGE_ALGORITHMS_HPP
+#define RANGE_ALGORITHMS_HPP
+
+#include <algorithm>
+
+namespace osrm {
+
+template<class Container>
+auto max_element(const Container & c) -> decltype(std::max_element(c.begin(), c.end()))
+{
+    return std::max_element(c.begin(), c.end());
+}
+
+template<class Container>
+auto max_element(const Container & c) -> decltype(std::max_element(c.cbegin(), c.cend()))
+{
+    return std::max_element(c.cbegin(), c.cend());
+}
+
+}
+
+#endif // RANGE_ALGORITHMS_HPP

Util/simple_logger.cpp

@@ -0,0 +1,135 @@
+/*
+
+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 "simple_logger.hpp"
+
+#include "OSRMException.h"
+
+#include <boost/assert.hpp>
+
+#include <cstdio>
+
+#ifdef _MSC_VER
+#include <io.h>
+#define isatty _isatty
+#define fileno _fileno
+#else
+#include <unistd.h>
+#endif
+
+#include <ostream>
+#include <iostream>
+#include <mutex>
+
+namespace
+{
+static const char COL_RESET[] { "\x1b[0m"};
+static const char RED[] { "\x1b[31m"};
+#ifndef NDEBUG
+static const char YELLOW[] { "\x1b[33m"};
+#endif
+// static const char GREEN[] { "\x1b[32m"};
+// static const char BLUE[] { "\x1b[34m"};
+// static const char MAGENTA[] { "\x1b[35m"};
+// static const char CYAN[] { "\x1b[36m"};
+}
+
+void LogPolicy::Unmute() { m_is_mute = false; }
+
+void LogPolicy::Mute() { m_is_mute = true; }
+
+bool LogPolicy::IsMute() const { return m_is_mute; }
+
+LogPolicy &LogPolicy::GetInstance()
+{
+    static LogPolicy runningInstance;
+    return runningInstance;
+}
+
+SimpleLogger::SimpleLogger() : level(logINFO) {}
+
+std::mutex &SimpleLogger::get_mutex()
+{
+    static std::mutex mtx;
+    return mtx;
+}
+
+std::ostringstream &SimpleLogger::Write(LogLevel lvl)
+{
+    std::lock_guard<std::mutex> lock(get_mutex());
+    try
+    {
+        level = lvl;
+        os << "[";
+        switch (level)
+        {
+        case logWARNING:
+            os << "warn";
+            break;
+        case logDEBUG:
+#ifndef NDEBUG
+            os << "debug";
+#endif
+            break;
+        default: //logINFO:
+            os << "info";
+            break;
+        }
+        os << "] ";
+    }
+    catch (const std::exception &e)
+    {
+        // encapsulate in OSRMException
+        throw OSRMException(std::string(e.what()) + ", getting ostringstream");
+    }
+    return os;
+}
+
+SimpleLogger::~SimpleLogger()
+{
+    std::lock_guard<std::mutex> lock(get_mutex());
+    if (!LogPolicy::GetInstance().IsMute())
+    {
+        const bool is_terminal = static_cast<bool>(isatty(fileno(stdout)));
+        switch (level)
+        {
+        case logWARNING:
+            std::cerr << (is_terminal ? RED : "") << os.str() << (is_terminal ? COL_RESET : "")
+                      << std::endl;
+            break;
+        case logDEBUG:
+#ifndef NDEBUG
+            std::cout << (is_terminal ? YELLOW : "") << os.str() << (is_terminal ? COL_RESET : "")
+                      << std::endl;
+#endif
+            break;
+        default: //logINFO:
+            std::cout << os.str() << (is_terminal ? COL_RESET : "") << std::endl;
+            break;
+        }
+    }
+}

Util/simple_logger.hpp

@@ -0,0 +1,74 @@
+/*
+
+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 SIMPLE_LOGGER_HPP
+#define SIMPLE_LOGGER_HPP
+
+#include <atomic>
+#include <mutex>
+#include <sstream>
+
+enum LogLevel
+{
+    logINFO,
+    logWARNING,
+    logDEBUG
+};
+
+class LogPolicy
+{
+  public:
+    void Unmute();
+
+    void Mute();
+
+    bool IsMute() const;
+
+    static LogPolicy &GetInstance();
+
+    LogPolicy(const LogPolicy &) = delete;
+
+  private:
+    LogPolicy() : m_is_mute(true) {}
+    std::atomic<bool> m_is_mute;
+};
+
+class SimpleLogger
+{
+  public:
+    SimpleLogger();
+
+    virtual ~SimpleLogger();
+    std::mutex &get_mutex();
+    std::ostringstream &Write(LogLevel l = logINFO);
+
+  private:
+    LogLevel level;
+    std::ostringstream os;
+};
+
+#endif /* SIMPLE_LOGGER_HPP */

Util/std_hash.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -25,30 +25,53 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifndef SERVER_FACTORY_H
-#define SERVER_FACTORY_H
+#ifndef STD_HASH_HPP
+#define STD_HASH_HPP
 
-#include "Server.h"
-#include "../Util/OpenMPWrapper.h"
-#include "../Util/SimpleLogger.h"
-#include "../Util/StringUtil.h"
+#include <functional>
 
-#include <zlib.h>
+// this is largely inspired by boost's hash combine as can be found in
+// "The C++ Standard Library" 2nd Edition. Nicolai M. Josuttis. 2012.
 
-struct ServerFactory
+namespace {
+
+template<typename T>
+void hash_combine(std::size_t &seed, const T& val)
 {
-    ServerFactory() = delete;
-    ServerFactory(const ServerFactory &) = delete;
-    static Server *CreateServer(std::string &ip_address, int ip_port, int threads)
+    seed ^= std::hash<T>()(val) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
+}
+
+template<typename T>
+void hash_val(std::size_t &seed, const T& val)
+{
+    hash_combine(seed, val);
+}
+
+template<typename T, typename ... Types>
+void hash_val(std::size_t &seed, const T& val, const Types& ... args)
+{
+    hash_combine(seed, val);
+    hash_val(seed, args ...);
+}
+
+template<typename ... Types>
+std::size_t hash_val(const Types&... args)
+{
+    std::size_t seed = 0;
+    hash_val(seed, args...);
+    return seed;
+}
+}
+
+namespace std
+{
+template <typename T1, typename T2> struct hash<std::pair<T1, T2>>
+{
+    size_t operator()(const std::pair<T1, T2> &pair) const
     {
-
-        SimpleLogger().Write() << "http 1.1 compression handled by zlib version " << zlibVersion();
-
-        std::string port_stream;
-        intToString(ip_port, port_stream);
-
-        return new Server(ip_address, port_stream, std::min(omp_get_num_procs(), threads));
+        return hash_val(pair.first, pair.second);
     }
 };
+}
 
-#endif // SERVER_FACTORY_H
+#endif // STD_HASH_HPP

Util/timing_util.hpp

@@ -0,0 +1,80 @@
+/*
+
+Copyright (c) 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 TIMING_UTIL_HPP
+#define TIMING_UTIL_HPP
+
+#include <atomic>
+#include <chrono>
+#include <cstdint>
+#include <mutex>
+#include <unordered_map>
+
+struct GlobalTimer
+{
+    GlobalTimer() : time(0) {}
+    std::atomic<uint64_t> time;
+};
+
+class GlobalTimerFactory
+{
+public:
+    static GlobalTimerFactory& get()
+    {
+        static GlobalTimerFactory instance;
+        return instance;
+    }
+
+    GlobalTimer& getGlobalTimer(const std::string& name)
+    {
+        std::lock_guard<std::mutex> lock(map_mutex);
+        return timer_map[name];
+    }
+
+private:
+    std::mutex map_mutex;
+    std::unordered_map<std::string, GlobalTimer> timer_map;
+};
+
+#define GLOBAL_TIMER_AQUIRE(_X) auto& _X##_global_timer = GlobalTimerFactory::get().getGlobalTimer(#_X)
+#define GLOBAL_TIMER_RESET(_X) _X##_global_timer.time = 0
+#define GLOBAL_TIMER_START(_X) TIMER_START(_X)
+#define GLOBAL_TIMER_STOP(_X) TIMER_STOP(_X); _X##_global_timer.time += TIMER_NSEC(_X)
+#define GLOBAL_TIMER_NSEC(_X) static_cast<double>(_X##_global_timer.time)
+#define GLOBAL_TIMER_USEC(_X) (_X##_global_timer.time / 1000.0)
+#define GLOBAL_TIMER_MSEC(_X) (_X##_global_timer.time / 1000.0 / 1000.0)
+#define GLOBAL_TIMER_SEC(_X) (_X##_global_timer.time  / 1000.0 / 1000.0 / 1000.0)
+
+#define TIMER_START(_X) auto _X##_start = std::chrono::steady_clock::now(), _X##_stop = _X##_start
+#define TIMER_STOP(_X) _X##_stop = std::chrono::steady_clock::now()
+#define TIMER_NSEC(_X) std::chrono::duration_cast<std::chrono::nanoseconds>(_X##_stop - _X##_start).count()
+#define TIMER_USEC(_X) std::chrono::duration_cast<std::chrono::microseconds>(_X##_stop - _X##_start).count()
+#define TIMER_MSEC(_X) (0.000001*std::chrono::duration_cast<std::chrono::nanoseconds>(_X##_stop - _X##_start).count())
+#define TIMER_SEC(_X)  (0.000001*std::chrono::duration_cast<std::chrono::microseconds>(_X##_stop - _X##_start).count())
+#define TIMER_MIN(_X) std::chrono::duration_cast<std::chrono::minutes>(_X##_stop - _X##_start).count()
+
+#endif // TIMING_UTIL_HPP

Util/xml_renderer.hpp

@@ -0,0 +1,140 @@
+/*
+
+Copyright (c) 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 XML_RENDERER_HPP
+#define XML_RENDERER_HPP
+
+#include "../data_structures/json_container.hpp"
+#include "cast.hpp"
+
+namespace JSON {
+
+struct XMLToArrayRenderer : mapbox::util::static_visitor<>
+{
+    explicit XMLToArrayRenderer(std::vector<char> &_out) : out(_out) {}
+
+    void operator()(const String &string) const
+    {
+        out.push_back('\"');
+        out.insert(out.end(), string.value.begin(), string.value.end());
+        out.push_back('\"');
+    }
+
+    void operator()(const Number &number) const
+    {
+        const std::string number_string = cast::double_fixed_to_string(number.value);
+        out.insert(out.end(), number_string.begin(), number_string.end());
+    }
+
+    void operator()(const Object &object) const
+    {
+        auto iterator = object.values.begin();
+        while (iterator != object.values.end())
+        {
+            if (iterator->first.at(0) != '_')
+            {
+                out.push_back('<');
+                out.insert(out.end(), (*iterator).first.begin(), (*iterator).first.end());
+            }
+            else
+            {
+                out.push_back(' ');
+                out.insert(out.end(), ++(*iterator).first.begin(), (*iterator).first.end());
+                out.push_back('=');
+
+            }
+            mapbox::util::apply_visitor(XMLToArrayRenderer(out), (*iterator).second);
+            if (iterator->first.at(0) != '_')
+            {
+                out.push_back('/');
+                out.push_back('>');
+            }
+            ++iterator;
+        }
+    }
+
+    void operator()(const Array &array) const
+    {
+        std::vector<Value>::const_iterator iterator;
+        iterator = array.values.begin();
+        while (iterator != array.values.end())
+        {
+            mapbox::util::apply_visitor(XMLToArrayRenderer(out), *iterator);
+            ++iterator;
+        }
+    }
+
+    void operator()(const True &) const
+    {
+        const std::string temp("true");
+        out.insert(out.end(), temp.begin(), temp.end());
+    }
+
+    void operator()(const False &) const
+    {
+        const std::string temp("false");
+        out.insert(out.end(), temp.begin(), temp.end());
+    }
+
+    void operator()(const Null &) const
+    {
+        const std::string temp("null");
+        out.insert(out.end(), temp.begin(), temp.end());
+    }
+
+  private:
+    std::vector<char> &out;
+};
+
+template<class JSONObject>
+inline void xml_render(std::vector<char> &out, const JSONObject &object)
+{
+    Value value = object;
+    mapbox::util::apply_visitor(XMLToArrayRenderer(out), value);
+}
+
+template<class JSONObject>
+inline void gpx_render(std::vector<char> &out, const JSONObject &object)
+{
+    // add header
+
+    const std::string header {"<?xml version=\"1.0\" encoding=\"UTF-8\"?><gpx creator=\"OSRM Routing Engine\""
+     " version=\"1.1\" xmlns=\"http://www.topografix.com/GPX/1/1\" xmlns:xsi=\"http:"
+     "//www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.topogr"
+     "afix.com/GPX/1/1 gpx.xsd\"><metadata><copyright author=\"Project OSRM\"><lice"
+     "nse>Data (c) OpenStreetMap contributors (ODbL)</license></copyright></metadat"
+     "a><rte>"};
+    out.insert(out.end(), header.begin(), header.end());
+
+    xml_render(out, object);
+
+    const std::string footer {"</rte></gpx>"};
+    out.insert(out.end(), footer.begin(), footer.end());
+}
+} // namespace JSON
+
+#endif // XML_RENDERER_HPP

algorithms/bfs_components.hpp

@@ -1,9 +1,35 @@
-#ifndef __BFS_COMPONENT_EXPLORER_H__
-#define __BFS_COMPONENT_EXPLORER_H__
+/*
+
+Copyright (c) 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 BFS_COMPONENTS_HPP_
+#define BFS_COMPONENTS_HPP_
 
 #include "../typedefs.h"
-#include "../DataStructures/DynamicGraph.h"
-#include "../DataStructures/RestrictionMap.h"
+#include "../data_structures/restriction_map.hpp"
 
 #include <queue>
 #include <unordered_set>
@@ -13,10 +39,10 @@
 template <typename GraphT> class BFSComponentExplorer
 {
   public:
-    BFSComponentExplorer(const GraphT &dynamicGraph,
+    BFSComponentExplorer(const GraphT &dynamic_graph,
                          const RestrictionMap &restrictions,
                          const std::unordered_set<NodeID> &barrier_nodes)
-        : m_graph(dynamicGraph), m_restriction_map(restrictions), m_barrier_nodes(barrier_nodes)
+        : m_graph(dynamic_graph), m_restriction_map(restrictions), m_barrier_nodes(barrier_nodes)
     {
         BOOST_ASSERT(m_graph.GetNumberOfNodes() > 0);
     }
@@ -24,14 +50,14 @@ template <typename GraphT> class BFSComponentExplorer
     /*!
      * Returns the size of the component that the node belongs to.
      */
-    inline unsigned int GetComponentSize(NodeID node)
+    unsigned int GetComponentSize(const NodeID node) const
     {
         BOOST_ASSERT(node < m_component_index_list.size());
 
         return m_component_index_size[m_component_index_list[node]];
     }
 
-    inline unsigned int GetNumberOfComponents() { return m_component_index_size.size(); }
+    unsigned int GetNumberOfComponents() { return m_component_index_size.size(); }
 
     /*!
      * Computes the component sizes.
@@ -68,10 +94,18 @@ template <typename GraphT> class BFSComponentExplorer
     /*!
      * Explores the current component that starts at node using BFS.
      */
-    inline unsigned ExploreComponent(std::queue<std::pair<NodeID, NodeID>> &bfs_queue,
+    unsigned ExploreComponent(std::queue<std::pair<NodeID, NodeID>> &bfs_queue,
                                      NodeID node,
                                      unsigned current_component)
     {
+        /*
+           Graphical representation of variables:
+
+           u           v           w
+           *---------->*---------->*
+                            e2
+        */
+
         bfs_queue.emplace(node, node);
         // mark node as read
         m_component_index_list[node] = current_component;
@@ -94,7 +128,7 @@ template <typename GraphT> class BFSComponentExplorer
                 const NodeID to_node_of_only_restriction =
                     m_restriction_map.CheckForEmanatingIsOnlyTurn(u, v);
 
-                for (auto e2 = m_graph.BeginEdges(v); e2 < m_graph.EndEdges(v); ++e2)
+                for (auto e2 : m_graph.GetAdjacentEdgeRange(v))
                 {
                     const NodeID w = m_graph.GetTarget(e2);
 
@@ -137,4 +171,4 @@ template <typename GraphT> class BFSComponentExplorer
     const std::unordered_set<NodeID> &m_barrier_nodes;
 };
 
-#endif
+#endif // BFS_COMPONENTS_HPP_

algorithms/crc32_processor.hpp

@@ -28,44 +28,59 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ITERATOR_BASED_CRC32_H
 #define ITERATOR_BASED_CRC32_H
 
-#include "../Util/SimpleLogger.h"
-
-#include <iostream>
-
-#if defined(__x86_64__)
+#if defined(__x86_64__) && !defined(__MINGW64__)
 #include <cpuid.h>
-#else
+#endif
+
 #include <boost/crc.hpp> // for boost::crc_32_type
 
-inline void __get_cpuid(int param, unsigned *eax, unsigned *ebx, unsigned *ecx, unsigned *edx)
+#include <iterator>
+
+class IteratorbasedCRC32
 {
-    *ecx = 0;
-}
-#endif
+  public:
+    bool using_hardware() const { return use_hardware_implementation; }
 
-template <class ContainerT> class IteratorbasedCRC32
-{
-  private:
-    typedef typename ContainerT::iterator IteratorType;
-    unsigned crc;
+    IteratorbasedCRC32() : crc(0) { use_hardware_implementation = detect_hardware_support(); }
 
-    bool use_SSE42_CRC_function;
-
-#if !defined(__x86_64__)
-    boost::crc_optimal<32, 0x1EDC6F41, 0x0, 0x0, true, true> CRC32_processor;
-#endif
-    unsigned SoftwareBasedCRC32(char *str, unsigned len)
+    template <class Iterator> unsigned operator()(Iterator iter, const Iterator end)
     {
-#if !defined(__x86_64__)
-        CRC32_processor.process_bytes(str, len);
-        return CRC32_processor.checksum();
-#else
-        return 0;
-#endif
+        unsigned crc = 0;
+        while (iter != end)
+        {
+            using value_type = typename std::iterator_traits<Iterator>::value_type;
+            char *data = (char *)(&(*iter));
+
+            if (use_hardware_implementation)
+            {
+                crc = compute_in_hardware(data, sizeof(value_type));
+            }
+            else
+            {
+                crc = compute_in_software(data, sizeof(value_type));
+            }
+            ++iter;
+        }
+        return crc;
+    }
+
+  private:
+    bool detect_hardware_support() const
+    {
+        static const int sse42_bit = 0x00100000;
+        const unsigned ecx = cpuid();
+        const bool sse42_found = (ecx & sse42_bit) != 0;
+        return sse42_found;
+    }
+
+    unsigned compute_in_software(char *str, unsigned len)
+    {
+        crc_processor.process_bytes(str, len);
+        return crc_processor.checksum();
     }
 
     // adapted from http://byteworm.com/2010/10/13/crc32/
-    unsigned SSE42BasedCRC32(char *str, unsigned len)
+    unsigned compute_in_hardware(char *str, unsigned len)
     {
 #if defined(__x86_64__)
         unsigned q = len / sizeof(unsigned);
@@ -101,44 +116,31 @@ template <class ContainerT> class IteratorbasedCRC32
         return ecx;
     }
 
-    bool DetectNativeCRC32Support()
+#if defined(__MINGW64__) || defined(_MSC_VER)
+    inline void
+    __get_cpuid(int param, unsigned *eax, unsigned *ebx, unsigned *ecx, unsigned *edx) const
     {
-        static const int SSE42_BIT = 0x00100000;
-        const unsigned ecx = cpuid();
-        const bool has_SSE42 = ecx & SSE42_BIT;
-        if (has_SSE42)
-        {
-            SimpleLogger().Write() << "using hardware based CRC32 computation";
-        }
-        else
-        {
-            SimpleLogger().Write() << "using software based CRC32 computation";
-        }
-        return has_SSE42;
+        *ecx = 0;
+    }
+#endif
+
+    boost::crc_optimal<32, 0x1EDC6F41, 0x0, 0x0, true, true> crc_processor;
+    unsigned crc;
+    bool use_hardware_implementation;
+};
+
+struct RangebasedCRC32
+{
+    template<typename Iteratable>
+    unsigned operator()(const Iteratable &iterable)
+    {
+        return crc32(std::begin(iterable), std::end(iterable));
     }
 
-  public:
-    IteratorbasedCRC32() : crc(0) { use_SSE42_CRC_function = DetectNativeCRC32Support(); }
+    bool using_hardware() const { return crc32.using_hardware(); }
 
-    unsigned operator()(IteratorType iter, const IteratorType end)
-    {
-        unsigned crc = 0;
-        while (iter != end)
-        {
-            char *data = reinterpret_cast<char *>(&(*iter));
-
-            if (use_SSE42_CRC_function)
-            {
-                crc = SSE42BasedCRC32(data, sizeof(typename ContainerT::value_type));
-            }
-            else
-            {
-                crc = SoftwareBasedCRC32(data, sizeof(typename ContainerT::value_type));
-            }
-            ++iter;
-        }
-        return crc;
-    }
+  private:
+    IteratorbasedCRC32 crc32;
 };
 
 #endif /* ITERATOR_BASED_CRC32_H */

algorithms/douglas_peucker.cpp

@@ -0,0 +1,166 @@
+/*
+
+Copyright (c) 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.
+
+*/
+
+#include "douglas_peucker.hpp"
+
+#include "../data_structures/segment_information.hpp"
+#include "../Util/integer_range.hpp"
+
+#include <osrm/Coordinate.h>
+
+#include <boost/assert.hpp>
+
+#include <cmath>
+
+#include <algorithm>
+
+namespace
+{
+struct CoordinatePairCalculator
+{
+    CoordinatePairCalculator() = delete;
+    CoordinatePairCalculator(const FixedPointCoordinate &coordinate_a,
+                             const FixedPointCoordinate &coordinate_b)
+    {
+        // initialize distance calculator with two fixed coordinates a, b
+        const float RAD = 0.017453292519943295769236907684886f;
+        first_lat = (coordinate_a.lat / COORDINATE_PRECISION) * RAD;
+        first_lon = (coordinate_a.lon / COORDINATE_PRECISION) * RAD;
+        second_lat = (coordinate_b.lat / COORDINATE_PRECISION) * RAD;
+        second_lon = (coordinate_b.lon / COORDINATE_PRECISION) * RAD;
+    }
+
+    int operator()(FixedPointCoordinate &other) const
+    {
+        // set third coordinate c
+        const float RAD = 0.017453292519943295769236907684886f;
+        const float earth_radius = 6372797.560856f;
+        const float float_lat1 = (other.lat / COORDINATE_PRECISION) * RAD;
+        const float float_lon1 = (other.lon / COORDINATE_PRECISION) * RAD;
+
+        // compute distance (a,c)
+        const float x_value_1 = (first_lon - float_lon1) * cos((float_lat1 + first_lat) / 2.f);
+        const float y_value_1 = first_lat - float_lat1;
+        const float dist1 = sqrt(std::pow(x_value_1, 2) + std::pow(y_value_1, 2)) * earth_radius;
+
+        // compute distance (b,c)
+        const float x_value_2 = (second_lon - float_lon1) * cos((float_lat1 + second_lat) / 2.f);
+        const float y_value_2 = second_lat - float_lat1;
+        const float dist2 = sqrt(std::pow(x_value_2, 2) + std::pow(y_value_2, 2)) * earth_radius;
+
+        // return the minimum
+        return static_cast<int>(std::min(dist1, dist2));
+    }
+
+    float first_lat;
+    float first_lon;
+    float second_lat;
+    float second_lon;
+};
+}
+
+void DouglasPeucker::Run(std::vector<SegmentInformation> &input_geometry, const unsigned zoom_level)
+{
+    Run(std::begin(input_geometry), std::end(input_geometry), zoom_level);
+}
+
+void DouglasPeucker::Run(RandomAccessIt begin, RandomAccessIt end, const unsigned zoom_level)
+{
+    unsigned size = std::distance(begin, end);
+    if (size < 2)
+    {
+        return;
+    }
+
+    begin->necessary = true;
+    std::prev(end)->necessary = true;
+
+    {
+        BOOST_ASSERT_MSG(zoom_level < DOUGLAS_PEUCKER_THRESHOLDS.size(), "unsupported zoom level");
+        RandomAccessIt left_border = begin;
+        RandomAccessIt right_border = std::next(begin);
+        // Sweep over array and identify those ranges that need to be checked
+        do
+        {
+            // traverse list until new border element found
+            if (right_border->necessary)
+            {
+                // sanity checks
+                BOOST_ASSERT(left_border->necessary);
+                BOOST_ASSERT(right_border->necessary);
+                recursion_stack.emplace(left_border, right_border);
+                left_border = right_border;
+            }
+            ++right_border;
+        } while (right_border != end);
+    }
+
+    // mark locations as 'necessary' by divide-and-conquer
+    while (!recursion_stack.empty())
+    {
+        // pop next element
+        const GeometryRange pair = recursion_stack.top();
+        recursion_stack.pop();
+        // sanity checks
+        BOOST_ASSERT_MSG(pair.first->necessary, "left border must be necessary");
+        BOOST_ASSERT_MSG(pair.second->necessary, "right border must be necessary");
+        BOOST_ASSERT_MSG(std::distance(pair.second, end) > 0, "right border outside of geometry");
+        BOOST_ASSERT_MSG(std::distance(pair.first, pair.second) >= 0,
+                         "left border on the wrong side");
+
+        int max_int_distance = 0;
+        auto farthest_entry_it = pair.second;
+        const CoordinatePairCalculator dist_calc(pair.first->location, pair.second->location);
+
+        // sweep over range to find the maximum
+        for (auto it = std::next(pair.first); it != pair.second; ++it)
+        {
+            const int distance = dist_calc(it->location);
+            // found new feasible maximum?
+            if (distance > max_int_distance && distance > DOUGLAS_PEUCKER_THRESHOLDS[zoom_level])
+            {
+                farthest_entry_it = it;
+                max_int_distance = distance;
+            }
+        }
+
+        // check if maximum violates a zoom level dependent threshold
+        if (max_int_distance > DOUGLAS_PEUCKER_THRESHOLDS[zoom_level])
+        {
+            //  mark idx as necessary
+            farthest_entry_it->necessary = true;
+            if (1 < std::distance(pair.first, farthest_entry_it))
+            {
+                recursion_stack.emplace(pair.first, farthest_entry_it);
+            }
+            if (1 < std::distance(farthest_entry_it, pair.second))
+            {
+                recursion_stack.emplace(farthest_entry_it, pair.second);
+            }
+        }
+    }
+}

algorithms/douglas_peucker.hpp

@@ -25,11 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifndef DOUGLASPEUCKER_H_
-#define DOUGLASPEUCKER_H_
+#ifndef DOUGLAS_PEUCKER_HPP_
+#define DOUGLAS_PEUCKER_HPP_
 
 #include <stack>
 #include <vector>
+#include <array>
 
 /* This class object computes the bitvector of indicating generalized input
  * points according to the (Ramer-)Douglas-Peucker algorithm.
@@ -38,25 +39,42 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * bit indicating if the points is present in the generalization.
  * Note: points may also be pre-selected*/
 
-struct FixedPointCoordinate;
 struct SegmentInformation;
 
+static const std::array<int, 19> DOUGLAS_PEUCKER_THRESHOLDS {{
+    512440, // z0
+    256720, // z1
+    122560, // z2
+    56780,  // z3
+    28800,  // z4
+    14400,  // z5
+    7200,   // z6
+    3200,   // z7
+    2400,   // z8
+    1000,   // z9
+    600,    // z10
+    120,    // z11
+    60,     // z12
+    45,     // z13
+    36,     // z14
+    20,     // z15
+    8,      // z16
+    6,      // z17
+    4       // z18
+}};
+
 class DouglasPeucker
 {
-  private:
-    std::vector<double> douglas_peucker_thresholds;
+  public:
+    using RandomAccessIt = std::vector<SegmentInformation>::iterator;
 
-    typedef std::pair<unsigned, unsigned> GeometryRange;
+    using GeometryRange = std::pair<RandomAccessIt, RandomAccessIt>;
     // Stack to simulate the recursion
     std::stack<GeometryRange> recursion_stack;
 
-    double ComputeDistance(const FixedPointCoordinate &point,
-                           const FixedPointCoordinate &segA,
-                           const FixedPointCoordinate &segB) const;
-
   public:
-    DouglasPeucker();
+    void Run(RandomAccessIt begin, RandomAccessIt end, const unsigned zoom_level);
     void Run(std::vector<SegmentInformation> &input_geometry, const unsigned zoom_level);
 };
 
-#endif /* DOUGLASPEUCKER_H_ */
+#endif /* DOUGLAS_PEUCKER_HPP_ */