Merging changes from develop branch to prepare for v.0.3.6 branch

Conflicts:
	README.TXT

.gitignore

@@ -36,6 +36,8 @@ Thumbs.db
 # build related files #
 #######################
 /build/
+/Util/UUID.cpp
+/Util/GitDescription.cpp
 
 # Eclipse related files #
 #########################
@@ -72,6 +74,7 @@ stxxl.errlog
 /osrm-extract
 /osrm-routed
 /osrm-prepare
+/osrm-cli
 /nohup.out
 
 # Sandbox folder #
@@ -79,4 +82,7 @@ stxxl.errlog
 /sandbox/
 
 /test/profile.lua
-/profile.lua
+
+# Deprecated config file #
+##########################
+/server.ini

.travis.yml

@@ -0,0 +1,37 @@
+language: cpp
+compiler:
+  - gcc
+#  - clang
+install:
+ - sudo apt-get update >/dev/null
+ - sudo apt-get -q install libprotoc-dev libprotobuf7 protobuf-compiler libprotobuf-dev libosmpbf-dev libpng12-dev libbz2-dev libstxxl-dev libstxxl-doc libstxxl1 libxml2-dev libzip-dev libboost1.46-all-dev lua5.1 liblua5.1-0-dev libluabind-dev rubygems osmosis
+before_script:
+ - sudo gem install bundler
+ - bundle install
+ - mkdir build
+ - cd build
+ - cmake .. $CMAKEOPTIONS
+script: make
+after_script:
+ - cd ..
+ - cucumber -p verify
+branches:
+  only:
+    - master
+    - develop
+env:
+ - CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Release"
+ - CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Debug"
+notifications:
+ irc:
+  channels:
+    - irc.oftc.net#osrm
+  on_success: change
+  on_failure: always
+  use_notice: true
+  skip_join: false
+  recipients:
+    - dennis@mapbox.com
+  email:
+    on_success: change
+    on_failure: always

AUTHORS.TXT

@@ -1,11 +0,0 @@
-The following people contributed code to the Open Source Routing Machine:
-
-Christian Vetter 
-Dennis Luxen
-Ruslan Krenzler
-Frederik Ramm
-Bharath Vissapragada
-Pascal Neis
-Sasa Ivetic
-Emil Tin
-Henning Moll

Algorithms/Bresenham.h

@@ -1,31 +1,39 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 BRESENHAM_H_
 #define BRESENHAM_H_
 
 #include <cmath>
 #include <vector>
+
 typedef std::pair<unsigned, unsigned> BresenhamPixel;
 
-inline void Bresenham (int x0, int y0, int x1, int y1, std::vector<BresenhamPixel> &resultList) {
+inline void Bresenham (int x0, int y0, const int x1, int const y1, std::vector<BresenhamPixel> &resultList) {
     int dx = std::abs(x1-x0);
     int dy = std::abs(y1-y0);
     int sx = (x0 < x1 ? 1 : -1);

Algorithms/CRC32.cpp

@@ -1,22 +1,29 @@
 /*
- 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
- 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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
- 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.
- */
+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 "CRC32.h"
 
@@ -62,10 +69,10 @@ CRC32::CRC32CFunctionPtr CRC32::detectBestCRC32C() {
     unsigned ecx = cpuid(1);
     bool hasSSE42 = ecx & (1 << SSE42_BIT);
     if (hasSSE42) {
-        std::cout << "using hardware base sse computation" << std::endl;
+        SimpleLogger().Write() << "using hardware base sse computation";
         return &CRC32::SSEBasedCRC32; //crc32 hardware accelarated;
     } else {
-        std::cout << "using software base sse computation" << std::endl;
+        SimpleLogger().Write() << "using software base sse computation";
         return &CRC32::SoftwareBasedCRC32; //crc32cSlicingBy8;
     }
 }

Algorithms/CRC32.h

@@ -1,26 +1,35 @@
 /*
- 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
- 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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
- 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.
- */
+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 CRC32_H_
 #define CRC32_H_
 
+#include "../Util/SimpleLogger.h"
+
 #include <boost/crc.hpp>  // for boost::crc_32_type
 #include <iostream>
 

Algorithms/DouglasPeucker.h

@@ -1,33 +1,43 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 DOUGLASPEUCKER_H_
 #define DOUGLASPEUCKER_H_
 
-#include <cassert>
-#include <cmath>
-#include <cfloat>
-#include <stack>
-
 #include "../DataStructures/Coordinate.h"
 
+#include <boost/assert.hpp>
+
+#include <cmath>
+
+#include <limits>
+#include <stack>
+#include <vector>
+
 /*This class object computes the bitvector of indicating generalized input points
  * according to the (Ramer-)Douglas-Peucker algorithm.
  *
@@ -44,7 +54,7 @@ class DouglasPeucker {
 private:
     typedef std::pair<std::size_t, std::size_t> PairOfPoints;
     //Stack to simulate the recursion
-    std::stack<PairOfPoints > recursionStack;
+    std::stack<PairOfPoints > recursion_stack;
 
     /**
      * This distance computation does integer arithmetic only and is about twice as fast as
@@ -55,12 +65,13 @@ private:
         const int p2x = (segB.lon - segA.lat);
         const int p2y = (segB.lon - segA.lat);
         const int something = p2x*p2x + p2y*p2y;
-        int u = (something < FLT_EPSILON ? 0 : ((point.lon - segA.lon) * p2x + (point.lat - segA.lat) * p2y) / something);
+        int u = ( 0 == something  ? 0 : ((point.lon - segA.lon) * p2x + (point.lat - segA.lat) * p2y) / something);
 
-        if (u > 1)
+        if (u > 1) {
             u = 1;
-        else if (u < 0)
+        } else if (u < 0) {
             u = 0;
+        }
 
         const int x = segA.lon + u * p2x;
         const int y = segA.lat + u * p2y;
@@ -75,52 +86,82 @@ private:
 
 
 public:
-    void Run(std::vector<PointT> & inputVector, const unsigned zoomLevel) {
+    void Run(std::vector<PointT> & input_geometry, const unsigned zoom_level) {
         {
-            assert(zoomLevel < 19);
-            assert(1 < inputVector.size());
-            std::size_t leftBorderOfRange = 0;
-            std::size_t rightBorderOfRange = 1;
+            BOOST_ASSERT_MSG(zoom_level < 19, "unsupported zoom level");
+            BOOST_ASSERT_MSG(1 < input_geometry.size(), "geometry invalid");
+            std::size_t left_border = 0;
+            std::size_t right_border = 1;
             //Sweep linerarily over array and identify those ranges that need to be checked
-//            recursionStack.hint(inputVector.size());
             do {
-                assert(inputVector[leftBorderOfRange].necessary);
-                assert(inputVector.back().necessary);
+                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(inputVector[rightBorderOfRange].necessary) {
-                    recursionStack.push(std::make_pair(leftBorderOfRange, rightBorderOfRange));
-                    leftBorderOfRange = rightBorderOfRange;
+                if(input_geometry[right_border].necessary) {
+                    recursion_stack.push(std::make_pair(left_border, right_border));
+                    left_border = right_border;
                 }
-                ++rightBorderOfRange;
-            } while( rightBorderOfRange < inputVector.size());
+                ++right_border;
+            } while( right_border < input_geometry.size());
         }
-        while(!recursionStack.empty()) {
+        while(!recursion_stack.empty()) {
             //pop next element
-            const PairOfPoints pair = recursionStack.top();
-            recursionStack.pop();
-            assert(inputVector[pair.first].necessary);
-            assert(inputVector[pair.second].necessary);
-            assert(pair.second < inputVector.size());
-            assert(pair.first < pair.second);
-            int maxDistance = INT_MIN;
+            const PairOfPoints 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"
+            );
+            int max_distance = INT_MIN;
 
-            std::size_t indexOfFarthestElement = pair.second;
-            //find index idx of element with maxDistance
+            std::size_t farthest_element_index = pair.second;
+            //find index idx of element with max_distance
             for(std::size_t i = pair.first+1; i < pair.second; ++i){
-                const double distance = std::fabs(fastDistance(inputVector[i].location, inputVector[pair.first].location, inputVector[pair.second].location));
-                if(distance > DouglasPeuckerThresholds[zoomLevel] && distance > maxDistance) {
-                    indexOfFarthestElement = i;
-                    maxDistance = distance;
+                const int temp_dist = fastDistance(
+                                        input_geometry[i].location,
+                                        input_geometry[pair.first].location,
+                                        input_geometry[pair.second].location
+                                    );
+                const double distance = std::fabs(temp_dist);
+                if(
+                    distance > DouglasPeuckerThresholds[zoom_level] &&
+                    distance > max_distance
+                ) {
+                    farthest_element_index = i;
+                    max_distance = distance;
                 }
             }
-            if (maxDistance > DouglasPeuckerThresholds[zoomLevel]) {
+            if (max_distance > DouglasPeuckerThresholds[zoom_level]) {
                 //  mark idx as necessary
-                inputVector[indexOfFarthestElement].necessary = true;
-                if (1 < indexOfFarthestElement - pair.first) {
-                    recursionStack.push(std::make_pair(pair.first, indexOfFarthestElement) );
+                input_geometry[farthest_element_index].necessary = true;
+                if (1 < (farthest_element_index - pair.first) ) {
+                    recursion_stack.push(
+                        std::make_pair(pair.first, farthest_element_index)
+                    );
+                }
+                if (1 < (pair.second - farthest_element_index) ) {
+                    recursion_stack.push(
+                        std::make_pair(farthest_element_index, pair.second)
+                    );
                 }
-                if (1 < pair.second - indexOfFarthestElement)
-                    recursionStack.push(std::make_pair(indexOfFarthestElement, pair.second) );
             }
         }
     }

Algorithms/IteratorBasedCRC32.h

@@ -1,27 +1,35 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 ITERATORBASEDCRC32_H_
 #define ITERATORBASEDCRC32_H_
 
+#include "../Util/SimpleLogger.h"
+
 #include <boost/crc.hpp>  // for boost::crc_32_type
 #include <iostream>
 
@@ -80,10 +88,10 @@ private:
         unsigned ecx = cpuid(1);
         bool hasSSE42 = ecx & (1 << SSE42_BIT);
         if (hasSSE42) {
-            std::cout << "using hardware base sse computation" << std::endl;
+            SimpleLogger().Write() << "using hardware based CRC32 computation";
             return &IteratorbasedCRC32::SSEBasedCRC32; //crc32 hardware accelarated;
         } else {
-            std::cout << "using software base sse computation" << std::endl;
+            SimpleLogger().Write() << "using software based CRC32 computation";
             return &IteratorbasedCRC32::SoftwareBasedCRC32; //crc32cSlicingBy8;
         }
     }
@@ -93,7 +101,7 @@ public:
         crcFunction = detectBestCRC32C();
     }
 
-    virtual ~IteratorbasedCRC32() {};
+    virtual ~IteratorbasedCRC32() { }
 
     unsigned operator()( ContainerT_iterator iter, const ContainerT_iterator end) {
         unsigned crc = 0;

Algorithms/ObjectToBase64.h

@@ -1,26 +1,36 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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>
@@ -28,40 +38,63 @@ or see http://www.gnu.org/licenses/agpl.txt.
 
 #include <algorithm>
 #include <string>
-
-#include "../Util/StringUtil.h"
+#include <vector>
 
 typedef
         boost::archive::iterators::base64_from_binary<
-        boost::archive::iterators::transform_width<std::string::const_iterator, 6, 8>
-> base64_t;
+            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
+            boost::archive::iterators::binary_from_base64<
+            std::string::const_iterator>, 8, 6
         > binary_t;
 
-template<class ToEncodeT>
-static void EncodeObjectToBase64(const ToEncodeT & object, std::string& encoded) {
-    encoded.clear();
-    char * pointerToOriginalObject = (char *)&object;
-    encoded = std::string(base64_t(pointerToOriginalObject), base64_t(pointerToOriginalObject+sizeof(ToEncodeT)));
-    //replace "+" with "-" and "/" with "_"
+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 ToEncodeT>
-static void DecodeObjectFromBase64(ToEncodeT & object, const std::string& _encoded) {
+template<class ObjectT>
+static void DecodeObjectFromBase64(const std::string& input, ObjectT & object) {
     try {
-    	std::string encoded(_encoded);
+    	std::string encoded(input);
         //replace "-" with "+" and "_" with "/"
         replaceAll(encoded, "-", "+");
         replaceAll(encoded, "_", "/");
-        char * pointerToDecodedObject = (char *)&object;
-        std::string dec(binary_t(encoded.begin()), binary_t(encoded.begin() + encoded.length() - 1));
-        std::copy ( dec.begin(), dec.end(), pointerToDecodedObject );
-    } catch(...) {}
+
+        std::copy (
+            binary_t( encoded.begin() ),
+            binary_t( encoded.begin() + encoded.length() - 1),
+            (char *)&object
+        );
+
+    } catch(...) { }
 }
 
 #endif /* OBJECTTOBASE64_H_ */

Algorithms/PolylineCompressor.h

@@ -1,32 +1,38 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 POLYLINECOMPRESSOR_H_
 #define POLYLINECOMPRESSOR_H_
 
-#include <string>
-
-//#include "../DataStructures/ExtractorStructs.h"
 #include "../DataStructures/SegmentInformation.h"
 #include "../Util/StringUtil.h"
 
+#include <string>
+
 class PolylineCompressor {
 private:
 	inline void encodeVectorSignedNumber(std::vector<int> & numbers, std::string & output) const {
@@ -57,11 +63,14 @@ private:
 	}
 
 public:
-    inline void printEncodedString(const std::vector<SegmentInformation>& polyline, std::string &output) const {
+    inline void printEncodedString(
+        const std::vector<SegmentInformation> & polyline,
+        std::string & output
+    ) const {
     	std::vector<int> deltaNumbers;
         output += "\"";
         if(!polyline.empty()) {
-            _Coordinate lastCoordinate = polyline[0].location;
+            FixedPointCoordinate lastCoordinate = polyline[0].location;
             deltaNumbers.push_back( lastCoordinate.lat );
             deltaNumbers.push_back( lastCoordinate.lon );
             for(unsigned i = 1; i < polyline.size(); ++i) {
@@ -77,7 +86,7 @@ public:
 
     }
 
-	inline void printEncodedString(const std::vector<_Coordinate>& polyline, std::string &output) const {
+	inline void printEncodedString(const std::vector<FixedPointCoordinate>& polyline, std::string &output) const {
 		std::vector<int> deltaNumbers(2*polyline.size());
 		output += "\"";
 		if(!polyline.empty()) {
@@ -92,7 +101,7 @@ public:
 		output += "\"";
 	}
 
-    inline void printUnencodedString(std::vector<_Coordinate> & polyline, std::string & output) const {
+    inline void printUnencodedString(std::vector<FixedPointCoordinate> & polyline, std::string & output) const {
         output += "[";
         std::string tmp;
         for(unsigned i = 0; i < polyline.size(); i++) {

Algorithms/StronglyConnectedComponents.h

@@ -1,55 +1,75 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 <cassert>
-
-#include <stack>
-#include <vector>
-
-#include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/unordered_map.hpp>
-
-#include <gdal/gdal.h>
-#include <gdal/ogrsf_frmts.h>
-
+#include "../DataStructures/Coordinate.h"
 #include "../DataStructures/DeallocatingVector.h"
 #include "../DataStructures/DynamicGraph.h"
 #include "../DataStructures/ImportEdge.h"
-#include "../DataStructures/NodeCoords.h"
+#include "../DataStructures/QueryNode.h"
 #include "../DataStructures/Percent.h"
 #include "../DataStructures/Restriction.h"
 #include "../DataStructures/TurnInstructions.h"
 
-// Strongly connected components using Tarjan's Algorithm
+#include "../Util/SimpleLogger.h"
+
+#include <boost/assert.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/foreach.hpp>
+#include <boost/integer.hpp>
+#include <boost/make_shared.hpp>
+#include <boost/unordered_map.hpp>
+#include <boost/unordered_set.hpp>
+
+#ifdef __APPLE__
+    #include <gdal.h>
+    #include <ogrsf_frmts.h>
+#else
+    #include <gdal/gdal.h>
+    #include <gdal/ogrsf_frmts.h>
+#endif
+
+#include <stack>
+#include <vector>
 
 class TarjanSCC {
 private:
-    struct _NodeBasedEdgeData {
+
+    struct TarjanNode {
+        TarjanNode() : index(UINT_MAX), lowlink(UINT_MAX), onStack(false) {}
+        unsigned index;
+        unsigned lowlink;
+        bool onStack;
+    };
+
+    struct TarjanEdgeData {
         int distance;
-        unsigned edgeBasedNodeID;
         unsigned nameID:31;
         bool shortcut:1;
         short type;
@@ -58,25 +78,33 @@ private:
         bool backward:1;
         bool roundabout:1;
         bool ignoreInGrid:1;
+        bool reversedEdge:1;
     };
 
-    typedef DynamicGraph< _NodeBasedEdgeData > _NodeBasedDynamicGraph;
-    typedef _NodeBasedDynamicGraph::InputEdge _NodeBasedEdge;
-    std::vector<NodeInfo>               inputNodeInfoList;
-    unsigned numberOfTurnRestrictions;
-    boost::shared_ptr<_NodeBasedDynamicGraph>   _nodeBasedGraph;
-    boost::unordered_map<NodeID, bool>          _barrierNodes;
-    boost::unordered_map<NodeID, bool>          _trafficLights;
+    struct TarjanStackFrame {
+        explicit TarjanStackFrame(
+            NodeID v,
+            NodeID parent
+        ) : v(v), parent(parent) { }
+        NodeID v;
+        NodeID parent;
+    };
 
-    typedef std::pair<NodeID, NodeID> RestrictionSource;
-    typedef std::pair<NodeID, bool>   RestrictionTarget;
-    typedef std::vector<RestrictionTarget> EmanatingRestrictionsVector;
+    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 boost::unordered_map<RestrictionSource, unsigned > RestrictionMap;
-    std::vector<EmanatingRestrictionsVector> _restrictionBucketVector;
-    RestrictionMap _restrictionMap;
 
+    std::vector<NodeInfo>                       m_coordinate_list;
+    std::vector<EmanatingRestrictionsVector>    m_restriction_bucket_list;
+    boost::shared_ptr<TarjanDynamicGraph>       m_node_based_graph;
+    boost::unordered_set<NodeID>                m_barrier_node_list;
+    boost::unordered_set<NodeID>                m_traffic_light_list;
+    unsigned                                    m_restriction_counter;
+    RestrictionMap                              m_restriction_map;
 
-public:
     struct EdgeBasedNode {
         bool operator<(const EdgeBasedNode & other) const {
             return other.id < id;
@@ -95,241 +123,307 @@ public:
         bool ignoreInGrid:1;
     };
 
-private:
-    DeallocatingVector<EdgeBasedNode>   edgeBasedNodes;
-
-    struct TarjanNode {
-        TarjanNode() : index(UINT_MAX), lowlink(UINT_MAX), onStack(false) {}
-        unsigned index;
-        unsigned lowlink;
-        bool onStack;
-    };
-
-    struct TarjanStackFrame {
-        explicit TarjanStackFrame(NodeID _v, NodeID p) : v(_v), parent(p) {}
-        NodeID v;
-        NodeID parent;
-    };
 public:
-    TarjanSCC(int nodes, std::vector<NodeBasedEdge> & inputEdges, std::vector<NodeID> & bn, std::vector<NodeID> & tl, std::vector<_Restriction> & irs, std::vector<NodeInfo> & nI) : inputNodeInfoList(nI), numberOfTurnRestrictions(irs.size()) {
-        BOOST_FOREACH(_Restriction & restriction, irs) {
-            std::pair<NodeID, NodeID> restrictionSource = std::make_pair(restriction.fromNode, restriction.viaNode);
+    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())
+    {
+        BOOST_FOREACH(const TurnRestriction & restriction, irs) {
+            std::pair<NodeID, NodeID> restrictionSource = std::make_pair(
+                restriction.fromNode, restriction.viaNode
+            );
             unsigned index;
-            RestrictionMap::iterator restrIter = _restrictionMap.find(restrictionSource);
-            if(restrIter == _restrictionMap.end()) {
-                index = _restrictionBucketVector.size();
-                _restrictionBucketVector.resize(index+1);
-                _restrictionMap[restrictionSource] = 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[restrictionSource] = index;
             } else {
-                index = restrIter->second;
+                index = restriction_iterator->second;
                 //Map already contains an is_only_*-restriction
-                if(_restrictionBucketVector.at(index).begin()->second)
+                if(m_restriction_bucket_list.at(index).begin()->second) {
                     continue;
-                else if(restriction.flags.isOnly){
+                } else if(restriction.flags.isOnly) {
                     //We are going to insert an is_only_*-restriction. There can be only one.
-                    _restrictionBucketVector.at(index).clear();
+                    m_restriction_bucket_list.at(index).clear();
                 }
             }
 
-            _restrictionBucketVector.at(index).push_back(std::make_pair(restriction.toNode, restriction.flags.isOnly));
+            m_restriction_bucket_list.at(index).push_back(
+                std::make_pair(restriction.toNode, restriction.flags.isOnly)
+            );
         }
 
-        BOOST_FOREACH(NodeID id, bn) {
-            _barrierNodes[id] = true;
-        }
-        BOOST_FOREACH(NodeID id, tl) {
-            _trafficLights[id] = true;
-        }
+        m_barrier_node_list.insert(bn.begin(), bn.end());
+        m_traffic_light_list.insert(tl.begin(), tl.end());
 
-        DeallocatingVector< _NodeBasedEdge > edges;
-        for ( std::vector< NodeBasedEdge >::const_iterator i = inputEdges.begin(); i != inputEdges.end(); ++i ) {
-
-            _NodeBasedEdge edge;
-            if(!i->isForward()) {
-                edge.source = i->target();
-                edge.target = i->source();
-                edge.data.backward = i->isForward();
-                edge.data.forward = i->isBackward();
+        DeallocatingVector< TarjanEdge > edge_list;
+        BOOST_FOREACH(const NodeBasedEdge & input_edge, input_edges) {
+            TarjanEdge edge;
+            if(!input_edge.isForward()) {
+                edge.source = input_edge.target();
+                edge.target = input_edge.source();
+                edge.data.backward = input_edge.isForward();
+                edge.data.forward = input_edge.isBackward();
             } else {
-                edge.source = i->source();
-                edge.target = i->target();
-                edge.data.forward = i->isForward();
-                edge.data.backward = i->isBackward();
+                edge.source = input_edge.source();
+                edge.target = input_edge.target();
+                edge.data.forward = input_edge.isForward();
+                edge.data.backward = input_edge.isBackward();
             }
-            if(edge.source == edge.target)
+            if(edge.source == edge.target) {
                 continue;
+            }
 
-            edge.data.distance = (std::max)((int)i->weight(), 1 );
-            assert( edge.data.distance > 0 );
+            edge.data.distance = (std::max)((int)input_edge.weight(), 1 );
+            BOOST_ASSERT( edge.data.distance > 0 );
             edge.data.shortcut = false;
-            edge.data.roundabout = i->isRoundabout();
-            edge.data.ignoreInGrid = i->ignoreInGrid();
-            edge.data.nameID = i->name();
-            edge.data.type = i->type();
-            edge.data.isAccessRestricted = i->isAccessRestricted();
-            edge.data.edgeBasedNodeID = edges.size();
-            edges.push_back( edge );
+            edge.data.roundabout = input_edge.isRoundabout();
+            edge.data.ignoreInGrid = input_edge.ignoreInGrid();
+            edge.data.nameID = 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 = i->isBackward();
-                edge.data.backward = i->isForward();
-                edge.data.edgeBasedNodeID = edges.size();
-                edges.push_back( edge );
+                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(inputEdges);
-        std::sort( edges.begin(), edges.end() );
-        _nodeBasedGraph = boost::make_shared<_NodeBasedDynamicGraph>( nodes, edges );
+        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 = boost::make_shared<TarjanDynamicGraph>(
+            number_of_nodes,
+            edge_list
+        );
+    }
+
+    ~TarjanSCC() {
+        m_node_based_graph.reset();
     }
 
     void Run() {
-        Percent p(_nodeBasedGraph->GetNumberOfNodes());
+        //remove files from previous run if exist
+        DeleteFileIfExists("component.dbf");
+        DeleteFileIfExists("component.shx");
+        DeleteFileIfExists("component.shp");
 
-        const char *pszDriverName = "ESRI Shapefile";
-        OGRSFDriver *poDriver;
+        Percent p(m_node_based_graph->GetNumberOfNodes());
 
         OGRRegisterAll();
 
-        poDriver = OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName(
-                pszDriverName );
-        if( poDriver == NULL )
-        {
-            printf( "%s driver not available.\n", pszDriverName );
-            exit( 1 );
+        const char *pszDriverName = "ESRI Shapefile";
+        OGRSFDriver * poDriver = OGRSFDriverRegistrar::GetRegistrar()->
+            GetDriverByName( pszDriverName );
+        if( NULL == poDriver ) {
+            throw OSRMException("ESRI Shapefile driver not available");
         }
-        OGRDataSource *poDS;
+        OGRDataSource * poDS = poDriver->CreateDataSource(
+            "component.shp",
+            NULL
+        );
 
-        poDS = poDriver->CreateDataSource( "component.shp", NULL );
-        if( poDS == NULL ) {
-            printf( "Creation of output file failed.\n" );
-            exit( 1 );
+        if( NULL == poDS ) {
+            throw OSRMException("Creation of output file failed");
         }
 
-        OGRLayer *poLayer;
+        OGRLayer * poLayer = poDS->CreateLayer(
+            "component",
+            NULL,
+            wkbLineString,
+            NULL
+        );
 
-        poLayer = poDS->CreateLayer( "component", NULL, wkbLineString, NULL );
-        if( poLayer == NULL ) {
-            printf( "Layer creation failed.\n" );
-            exit( 1 );
+        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> > recursionStack; //true = stuff before, false = stuff after call
-        std::stack<NodeID> tarjanStack;
-        std::vector<unsigned> componentsIndex(_nodeBasedGraph->GetNumberOfNodes(), UINT_MAX);
-        std::vector<NodeID> vectorOfComponentSizes;
-        std::vector<TarjanNode> tarjanNodes(_nodeBasedGraph->GetNumberOfNodes());
-        unsigned currentComponent = 0, sizeOfCurrentComponent = 0;
+        //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;
-        for(NodeID node = 0, endNodes = _nodeBasedGraph->GetNumberOfNodes(); node < endNodes; ++node) {
-            if(UINT_MAX == componentsIndex[node]) {
-                recursionStack.push(std::make_pair(true, TarjanStackFrame(node,node)) );
+        for(
+            NodeID node = 0, last_node = m_node_based_graph->GetNumberOfNodes();
+            node < last_node;
+            ++node
+        ) {
+            if(UINT_MAX == components_index[node]) {
+                recursion_stack.push(
+                    std::make_pair(true, TarjanStackFrame(node,node))
+                );
             }
 
-            while(!recursionStack.empty()) {
-                bool beforeRecursion = recursionStack.top().first;
-                TarjanStackFrame currentFrame = recursionStack.top().second;
+            while(!recursion_stack.empty()) {
+                bool before_recursion = recursion_stack.top().first;
+                TarjanStackFrame currentFrame = recursion_stack.top().second;
                 NodeID v = currentFrame.v;
-//                INFO("popping node " << v << (beforeRecursion ? " before " : " after ") << "recursion");
-                recursionStack.pop();
+                recursion_stack.pop();
 
-                if(beforeRecursion) {
+                if(before_recursion) {
                     //Mark frame to handle tail of recursion
-                    recursionStack.push(std::make_pair(false, currentFrame));
+                    recursion_stack.push(std::make_pair(false, currentFrame));
 
                     //Mark essential information for SCC
-                    tarjanNodes[v].index = index;
-                    tarjanNodes[v].lowlink = index;
-                    tarjanStack.push(v);
-                    tarjanNodes[v].onStack = true;
+                    tarjan_node_list[v].index = index;
+                    tarjan_node_list[v].lowlink = index;
+                    tarjan_stack.push(v);
+                    tarjan_node_list[v].onStack = true;
                     ++index;
-//                    INFO("pushing " << v << " onto tarjan stack, idx[" << v << "]=" << tarjanNodes[v].index << ", lowlink["<< v << "]=" << tarjanNodes[v].lowlink);
 
                     //Traverse outgoing edges
-                    for(_NodeBasedDynamicGraph::EdgeIterator e2 = _nodeBasedGraph->BeginEdges(v); e2 < _nodeBasedGraph->EndEdges(v); ++e2) {
-                        _NodeBasedDynamicGraph::NodeIterator vprime = _nodeBasedGraph->GetTarget(e2);
-//                        INFO("traversing edge (" << v << "," << vprime << ")");
-                        if(UINT_MAX == tarjanNodes[vprime].index) {
-
-                            recursionStack.push(std::make_pair(true,TarjanStackFrame(vprime, v)));
+                    for(
+                        TarjanDynamicGraph::EdgeIterator e2 = m_node_based_graph->BeginEdges(v);
+                        e2 < m_node_based_graph->EndEdges(v);
+                        ++e2
+                    ) {
+                        const TarjanDynamicGraph::NodeIterator vprime =
+                            m_node_based_graph->GetTarget(e2);
+                        if(UINT_MAX == tarjan_node_list[vprime].index) {
+                            recursion_stack.push(
+                                std::make_pair(
+                                    true,
+                                    TarjanStackFrame(vprime, v)
+                                )
+                            );
                         } else {
-//                            INFO("Node " << vprime << " is already explored");
-                            if(tarjanNodes[vprime].onStack) {
-                                unsigned newLowlink = std::min(tarjanNodes[v].lowlink, tarjanNodes[vprime].index);
-//                                INFO("Setting lowlink[" << v << "] from " << tarjanNodes[v].lowlink << " to " << newLowlink);
-                                tarjanNodes[v].lowlink = newLowlink;
-//                            } else {
-//                                INFO("But node " << vprime << " is not on stack");
+                            if(
+                                tarjan_node_list[vprime].onStack &&
+                                tarjan_node_list[vprime].index < tarjan_node_list[v].lowlink
+                            ) {
+                                tarjan_node_list[v].lowlink = tarjan_node_list[vprime].index;
                             }
                         }
                     }
                 } else {
-
-//                    INFO("we are at the end of recursion and checking node " << v);
-                    { // setting lowlink in its own scope so it does not pollute namespace
-                        //                        NodeID parent = (UINT_MAX == tarjanNodes[v].parent ? v : tarjanNodes[v].parent );
-//                        INFO("parent=" << currentFrame.parent);
-//                        INFO("tarjanNodes[" << v  << "].lowlink=" << tarjanNodes[v].lowlink << ", tarjanNodes[" << currentFrame.parent << "].lowlink=" << tarjanNodes[currentFrame.parent].lowlink);
-                        //Note the index shift by 1 compared to the recursive version
-                        tarjanNodes[currentFrame.parent].lowlink = std::min(tarjanNodes[currentFrame.parent].lowlink, tarjanNodes[v].lowlink);
-//                        INFO("Setting tarjanNodes[" << currentFrame.parent  <<"].lowlink=" << tarjanNodes[currentFrame.parent].lowlink);
-                    }
-//                    INFO("tarjanNodes[" << v  << "].lowlink=" << tarjanNodes[v].lowlink << ", tarjanNodes[" << v  << "].index=" << tarjanNodes[v].index);
-
+                    tarjan_node_list[currentFrame.parent].lowlink =
+                        std::min(
+                            tarjan_node_list[currentFrame.parent].lowlink,
+                            tarjan_node_list[v].lowlink
+                        );
                     //after recursion, lets do cycle checking
                     //Check if we found a cycle. This is the bottom part of the recursion
-                    if(tarjanNodes[v].lowlink == tarjanNodes[v].index) {
+                    if(tarjan_node_list[v].lowlink == tarjan_node_list[v].index) {
                         NodeID vprime;
                         do {
-//                            INFO("identified component " << currentComponent << ": " << tarjanStack.top());
-                            vprime = tarjanStack.top(); tarjanStack.pop();
-                            tarjanNodes[vprime].onStack = false;
-                            componentsIndex[vprime] = currentComponent;
-                            ++sizeOfCurrentComponent;
+                            vprime = tarjan_stack.top(); tarjan_stack.pop();
+                            tarjan_node_list[vprime].onStack = false;
+                            components_index[vprime] = component_index;
+                            ++size_of_current_component;
                         } while( v != vprime);
-                        vectorOfComponentSizes.push_back(sizeOfCurrentComponent);
-                        if(sizeOfCurrentComponent > 1000)
-                            INFO("large component [" << currentComponent << "]=" << sizeOfCurrentComponent);
-                        ++currentComponent;
-                        sizeOfCurrentComponent = 0;
+
+                        component_size_vector.push_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;
                     }
                 }
             }
         }
 
-        INFO("identified: " << vectorOfComponentSizes.size() << " many components, marking small components");
+        SimpleLogger().Write() <<
+            "identified: " << component_size_vector.size() <<
+            " many components, marking small components";
 
-        int singleCounter = 0;
-        for(unsigned i = 0; i < vectorOfComponentSizes.size(); ++i){
-            if(1 == vectorOfComponentSizes[i])
-                ++singleCounter;
+        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;
+            }
         }
-        INFO("identified " << singleCounter << " SCCs of size 1");
 
-        p.reinit(_nodeBasedGraph->GetNumberOfNodes());
-        for(_NodeBasedDynamicGraph::NodeIterator u = 0; u < _nodeBasedGraph->GetNumberOfNodes(); ++u ) {
-            for(_NodeBasedDynamicGraph::EdgeIterator e1 = _nodeBasedGraph->BeginEdges(u); e1 < _nodeBasedGraph->EndEdges(u); ++e1) {
-                _NodeBasedDynamicGraph::NodeIterator v = _nodeBasedGraph->GetTarget(e1);
+        SimpleLogger().Write() <<
+            "identified " << size_one_counter << " SCCs of size 1";
+
+        uint64_t total_network_distance = 0;
+        p.reinit(m_node_based_graph->GetNumberOfNodes());
+        for(
+            TarjanDynamicGraph::NodeIterator u = 0, last_u_node = m_node_based_graph->GetNumberOfNodes();
+            u < last_u_node;
+            ++u
+         ) {
+            p.printIncrement();
+            for(
+                TarjanDynamicGraph::EdgeIterator e1 = m_node_based_graph->BeginEdges(u), last_edge = m_node_based_graph->EndEdges(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*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]]
+                        );
 
-                if(_nodeBasedGraph->GetEdgeData(e1).type != SHRT_MAX) {
-                    assert(e1 != UINT_MAX);
-                    assert(u != UINT_MAX);
-                    assert(v != UINT_MAX);
                     //edges that end on bollard nodes may actually be in two distinct components
-                    if(std::min(vectorOfComponentSizes[componentsIndex[u]], vectorOfComponentSizes[componentsIndex[v]]) < 10) {
-
-                        //INFO("(" << inputNodeInfoList[u].lat/100000. << ";" << inputNodeInfoList[u].lon/100000. << ") -> (" << inputNodeInfoList[v].lat/100000. << ";" << inputNodeInfoList[v].lon/100000. << ")");
+                    if(size_of_containing_component < 10) {
                         OGRLineString lineString;
-                        lineString.addPoint(inputNodeInfoList[u].lon/100000., inputNodeInfoList[u].lat/100000.);
-                        lineString.addPoint(inputNodeInfoList[v].lon/100000., inputNodeInfoList[v].lat/100000.);
+                        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()
+                        );
 
-                        OGRFeature *poFeature;
-                        poFeature = OGRFeature::CreateFeature( poLayer->GetLayerDefn() );
                         poFeature->SetGeometry( &lineString );
-                        if( poLayer->CreateFeature( poFeature ) != OGRERR_NONE )
-                        {
-                            ERR( "Failed to create feature in shapefile.\n" );
+                        if( OGRERR_NONE != poLayer->CreateFeature(poFeature) ) {
+                            throw OSRMException(
+                                "Failed to create feature in shapefile."
+                            );
                         }
                         OGRFeature::DestroyFeature( poFeature );
                     }
@@ -337,37 +431,70 @@ public:
             }
         }
         OGRDataSource::DestroyDataSource( poDS );
-        std::vector<NodeID>().swap(vectorOfComponentSizes);
-        std::vector<NodeID>().swap(componentsIndex);
+        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 > restrictionSource = std::make_pair(u, v);
-        RestrictionMap::const_iterator restrIter = _restrictionMap.find(restrictionSource);
-        if (restrIter != _restrictionMap.end()) {
-            unsigned index = restrIter->second;
-            BOOST_FOREACH(RestrictionSource restrictionTarget, _restrictionBucketVector.at(index)) {
-                if(restrictionTarget.second) {
-                    return restrictionTarget.first;
+        std::pair < NodeID, NodeID > restriction_source = std::make_pair(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;
+            BOOST_FOREACH(
+                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 {
+
+    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 > restrictionSource = std::make_pair(u, v);
-        RestrictionMap::const_iterator restrIter = _restrictionMap.find(restrictionSource);
-        if (restrIter != _restrictionMap.end()) {
-            unsigned index = restrIter->second;
-            BOOST_FOREACH(RestrictionTarget restrictionTarget, _restrictionBucketVector.at(index)) {
-                if(w == restrictionTarget.first)
+        std::pair < NodeID, NodeID > restriction_source = std::make_pair(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;
+            BOOST_FOREACH(
+                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,32 +1,69 @@
 cmake_minimum_required(VERSION 2.6)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 project(OSRM)
 include(FindPackageHandleStandardArgs)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-set(BOOST_COMPONENTS filesystem regex system thread)
+set(HUGO "${CMAKE_CURRENT_SOURCE_DIR}")
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+include(GetGitRevisionDescription)
+git_describe(GIT_DESCRIPTION)
+
+TRY_RUN(SHARED_LIBRARY_PATH_TYPE SHARED_LIBRARY_PATH_INFO_COMPILED ${PROJECT_BINARY_DIR}/CMakeTmp ${PROJECT_SOURCE_DIR}/cmake/size.cpp OUTPUT_VARIABLE IS_64_SYSTEM)
+if(IS_64_SYSTEM)
+	message(STATUS "System supports 64 bits.")
+	set( HAS64BITS 1 )
+else(IS_64_SYSTEM)
+	MESSAGE(WARNING "Compiling on a 32 bit system is unsupported!")
+	set( HAS64BITS 0 )
+endif(IS_64_SYSTEM)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/Util/UUID.cpp UUID.cpp.alwaysbuild
+  COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_SOURCE_DIR}
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/UUID-Config.cmake
+  DEPENDS
+    ${CMAKE_SOURCE_DIR}/Util/UUID.cpp.in
+  	${CMAKE_SOURCE_DIR}/cmake/UUID-Config.cmake
+  COMMENT "Configuring UUID.cpp"
+  VERBATIM)
+
+add_custom_target(UUIDConfigure DEPENDS ${CMAKE_SOURCE_DIR}/Util/UUID.cpp )
+
+set(BOOST_COMPONENTS filesystem program_options regex system thread)
+
+configure_file(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})
+set(ExtractorSources extractor.cpp ${ExtractorGlob} Util/GitDescription.cpp)
+add_executable(osrm-extract ${ExtractorSources} )
 
 file(GLOB PrepareGlob Contractor/*.cpp)
-set(PrepareSources createHierarchy.cpp ${PrepareGlob})
-add_executable(osrm-prepare ${PrepareSources})
+set(PrepareSources createHierarchy.cpp ${PrepareGlob} Util/GitDescription.cpp)
+add_executable(osrm-prepare ${PrepareSources} )
 
-file(GLOB RoutedGlob Server/DataStructures/*.cpp Descriptors/*.cpp DataStructures/SearchEngine*.cpp)
-set(RoutedSources routed.cpp ${RoutedGlob})
-add_executable(osrm-routed ${RoutedSources})
+add_executable(osrm-routed routed.cpp Util/GitDescription.cpp)
 set_target_properties(osrm-routed PROPERTIES COMPILE_FLAGS -DROUTED)
 
+file(GLOB DescriptorGlob Descriptors/*.cpp)
+file(GLOB LibOSRMGlob Library/*.cpp)
+file(GLOB SearchEngineSource DataStructures/SearchEngine*.cpp)
+file(GLOB ServerStructureGlob Server/DataStructures/*.cpp)
+
+set(OSRMSources ${LibOSRMGlob} ${DescriptorGlob} ${SearchEngineSource} ${ServerStructureGlob})
+add_library(OSRM SHARED ${OSRMSources})
+add_library(UUID STATIC Util/UUID.cpp)
+add_dependencies( UUID UUIDConfigure )
+
 # Check the release mode
 if(NOT CMAKE_BUILD_TYPE MATCHES Debug)
 	set(CMAKE_BUILD_TYPE Release)
-endif(NOT CMAKE_BUILD_TYPE MATCHES Debug) 
+endif(NOT CMAKE_BUILD_TYPE MATCHES Debug)
 if(CMAKE_BUILD_TYPE MATCHES Debug)
     message(STATUS "Configuring OSRM in debug mode")
-endif(CMAKE_BUILD_TYPE MATCHES Debug) 
+endif(CMAKE_BUILD_TYPE MATCHES Debug)
 if(CMAKE_BUILD_TYPE MATCHES Release)
     message(STATUS "Configuring OSRM in release mode")
-endif(CMAKE_BUILD_TYPE MATCHES Release) 
+endif(CMAKE_BUILD_TYPE MATCHES Release)
 
 #Configuring compilers
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
@@ -35,7 +72,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 	message(STATUS "OpenMP parallelization not available using clang++")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 	# using GCC
-	set(CMAKE_CXX_FLAGS "-Wall -fopenmp -pedantic") 
+	set(CMAKE_CXX_FLAGS "-Wall -fopenmp -pedantic")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
 	# using Intel C++
 	set(CMAKE_CXX_FLAGS "-static-intel -wd10237 -Wall -openmp -ipo")
@@ -55,25 +92,39 @@ if (NOT Boost_FOUND)
       message(FATAL_ERROR "Fatal error: Boost (version >= 1.44.0) required.\n")
 endif (NOT Boost_FOUND)
 include_directories(${Boost_INCLUDE_DIRS})
-target_link_libraries( osrm-extract ${Boost_LIBRARIES} )
-target_link_libraries( osrm-prepare ${Boost_LIBRARIES} )
-target_link_libraries( osrm-routed ${Boost_LIBRARIES} )
+
+IF( APPLE )
+	target_link_libraries( OSRM ${Boost_LIBRARIES} UUID )
+ELSE( APPLE )
+	target_link_libraries( OSRM ${Boost_LIBRARIES} )
+ENDIF( APPLE )
+target_link_libraries( osrm-extract ${Boost_LIBRARIES} UUID )
+target_link_libraries( osrm-prepare ${Boost_LIBRARIES} UUID )
+target_link_libraries( osrm-routed ${Boost_LIBRARIES} OSRM UUID )
 
 find_package ( BZip2 REQUIRED )
 include_directories(${BZIP_INCLUDE_DIRS})
 target_link_libraries (osrm-extract ${BZIP2_LIBRARIES})
 
 find_package( ZLIB REQUIRED )
+include_directories(${ZLIB_INCLUDE_DIRS})
 target_link_libraries (osrm-extract ${ZLIB_LIBRARY})
 target_link_libraries (osrm-routed ${ZLIB_LIBRARY})
 
 find_package( Threads REQUIRED )
 target_link_libraries (osrm-extract ${Threads_LIBRARY})
 
-find_package( Lua51 REQUIRED ) 
-include_directories(${LUA_INCLUDE_DIR})
-target_link_libraries( osrm-extract ${LUA_LIBRARY} )
-target_link_libraries( osrm-prepare ${LUA_LIBRARY} )
+find_package( LuaJIT )
+IF( NOT APPLE AND LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARIES)
+	include_directories(${LUAJIT_INCLUDE_DIR})
+	target_link_libraries( osrm-extract ${LUAJIT_LIBRARIES} )
+	target_link_libraries( osrm-prepare ${LUAJIT_LIBRARIES} )
+ELSE( LUAJIT_INCLUDE_DIR )
+	find_package( Lua51 REQUIRED AND LUAJIT_LIBRARIES )
+	include_directories(${LUA_INCLUDE_DIR})
+	target_link_libraries( osrm-extract ${LUA_LIBRARY} )
+	target_link_libraries( osrm-prepare ${LUA_LIBRARY} )
+ENDIF( NOT APPLE AND LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARIES )
 
 find_package( LibXml2 REQUIRED )
 include_directories(${LIBXML2_INCLUDE_DIR})
@@ -91,6 +142,7 @@ target_link_libraries (osrm-prepare ${PROTOBUF_LIBRARY})
 
 find_package( STXXL REQUIRED )
 include_directories(${STXXL_INCLUDE_DIR})
+target_link_libraries (OSRM ${STXXL_LIBRARY})
 target_link_libraries (osrm-extract ${STXXL_LIBRARY})
 target_link_libraries (osrm-prepare ${STXXL_LIBRARY})
 
@@ -105,7 +157,12 @@ if(WITH_TOOLS)
 	if(GDAL_FOUND)
 		add_executable(osrm-components Tools/componentAnalysis.cpp)
 		include_directories(${GDAL_INCLUDE_DIR})
-		target_link_libraries( osrm-components ${GDAL_LIBRARIES} )
-		target_link_libraries( osrm-components ${Boost_LIBRARIES} )
+		target_link_libraries(
+			osrm-components ${GDAL_LIBRARIES} ${Boost_LIBRARIES} UUID
+		)
 	endif(GDAL_FOUND)
+	add_executable ( osrm-cli Tools/simpleclient.cpp Util/GitDescription.cpp)
+	target_link_libraries( osrm-cli ${Boost_LIBRARIES} OSRM UUID )
+    add_executable ( osrm-io-benchmark Tools/io-benchmark.cpp )
+    target_link_libraries( osrm-io-benchmark ${Boost_LIBRARIES} )
 endif(WITH_TOOLS)

Contractor/ContractionCleanup.h

@@ -1,261 +0,0 @@
-/*
-    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 CONTRACTIONCLEANUP_H_INCLUDED
-#define CONTRACTIONCLEANUP_H_INCLUDED
-
-#include <algorithm>
-#ifndef _WIN32
-#include <sys/time.h>
-#endif
-#include "Contractor.h"
-
-class ContractionCleanup {
-private:
-
-    struct _CleanupHeapData {
-        NodeID parent;
-        _CleanupHeapData( NodeID p ) {
-            parent = p;
-        }
-    };
-    typedef BinaryHeap< NodeID, NodeID, int, _CleanupHeapData > _Heap;
-
-    struct _ThreadData {
-        _Heap* _heapForward;
-        _Heap* _heapBackward;
-        _ThreadData( NodeID nodes ) {
-            _heapBackward = new _Heap(nodes);
-            _heapForward = new _Heap(nodes);
-        }
-        ~_ThreadData() {
-            delete _heapBackward;
-            delete _heapForward;
-        }
-    };
-
-public:
-
-    struct Edge {
-        NodeID source;
-        NodeID target;
-        struct EdgeData {
-        	NodeID via;
-        	unsigned nameID;
-        	int distance;
-        	TurnInstruction turnInstruction;
-        	bool shortcut:1;
-        	bool forward:1;
-        	bool backward:1;
-        } data;
-        bool operator<( const Edge& right ) const {
-            if ( source != right.source )
-                return source < right.source;
-            return target < right.target;
-        }
-
-        //sorts by source and other attributes
-        static bool CompareBySource( const Edge& left, const Edge& right ) {
-            if ( left.source != right.source )
-                return left.source < right.source;
-            int l = ( left.data.forward ? -1 : 0 ) + ( left.data.backward ? -1 : 0 );
-            int r = ( right.data.forward ? -1 : 0 ) + ( right.data.backward ? -1 : 0 );
-            if ( l != r )
-                return l < r;
-            if ( left.target != right.target )
-                return left.target < right.target;
-            return left.data.distance < right.data.distance;
-        }
-
-        bool operator== ( const Edge& right ) const {
-            return ( source == right.source && target == right.target && data.distance == right.data.distance &&
-                    data.shortcut == right.data.shortcut && data.forward == right.data.forward && data.backward == right.data.backward
-                    && data.via == right.data.via && data.nameID == right.data.nameID
-                    );
-        }
-    };
-
-    ContractionCleanup( int numNodes, const std::vector< Edge >& edges ) {
-        _graph = edges;
-        _numNodes = numNodes;
-    }
-
-    ~ContractionCleanup() {
-
-    }
-
-    void Run() {
-        RemoveUselessShortcuts();
-    }
-
-    template< class EdgeT >
-    void GetData( std::vector< EdgeT >& edges ) {
-        for ( int edge = 0, endEdges = ( int ) _graph.size(); edge != endEdges; ++edge ) {
-            if(_graph[edge].data.forward || _graph[edge].data.backward) {
-                EdgeT newEdge;
-                newEdge.source = _graph[edge].source;
-                newEdge.target = _graph[edge].target;
-                newEdge.data = _graph[edge].data;
-                edges.push_back( newEdge );
-            }
-        }
-        sort( edges.begin(), edges.end() );
-    }
-
-private:
-
-    double _Timestamp() {
-        struct timeval tp;
-        gettimeofday(&tp, NULL);
-        return double(tp.tv_sec) + tp.tv_usec / 1000000.;
-    }
-
-    void BuildOutgoingGraph() {
-        //sort edges by source
-        sort( _graph.begin(), _graph.end(), Edge::CompareBySource );
-        try {
-            _firstEdge.resize( _numNodes + 1 );
-        } catch(...) {
-            ERR("Not enough RAM on machine");
-            return;
-        }
-        _firstEdge[0] = 0;
-        for ( NodeID i = 0, node = 0; i < ( NodeID ) _graph.size(); i++ ) {
-            while ( _graph[i].source != node )
-                _firstEdge[++node] = i;
-            if ( i == ( NodeID ) _graph.size() - 1 )
-                while ( node < _numNodes )
-                    _firstEdge[++node] = ( int ) _graph.size();
-        }
-    }
-
-    void RemoveUselessShortcuts() {
-        int maxThreads = omp_get_max_threads();
-        std::vector < _ThreadData* > threadData;
-        for ( int threadNum = 0; threadNum < maxThreads; ++threadNum ) {
-            threadData.push_back( new _ThreadData( _numNodes ) );
-        }
-
-        INFO("Scanning for useless shortcuts");
-        BuildOutgoingGraph();
-/*
-        #pragma omp parallel for
-        for ( int i = 0; i < ( int ) _graph.size(); i++ ) {
-            //only remove shortcuts
-            if ( !_graph[i].data.shortcut )
-                continue;
-
-            if ( _graph[i].data.forward ) {
-                int result = _ComputeDistance( _graph[i].source, _graph[i].target, threadData[omp_get_thread_num()] );
-                if ( result < _graph[i].data.distance ) {
-                    _graph[i].data.forward = false;
-                }
-            }
-            if ( _graph[i].data.backward ) {
-                int result = _ComputeDistance( _graph[i].target, _graph[i].source, threadData[omp_get_thread_num()] );
-                if ( result < _graph[i].data.distance ) {
-                    _graph[i].data.backward = false;
-                }
-            }
-        }
-*/
-        INFO("Removing edges");
-        int useful = 0;
-        for ( int i = 0; i < ( int ) _graph.size(); i++ ) {
-            if ( !_graph[i].data.forward && !_graph[i].data.backward && _graph[i].data.shortcut ) {
-                continue;
-            }
-            _graph[useful] = _graph[i];
-            useful++;
-        }
-        INFO("Removed " << _graph.size() - useful << " useless shortcuts");
-        _graph.resize( useful );
-
-        for ( int threadNum = 0; threadNum < maxThreads; ++threadNum ) {
-            delete threadData[threadNum];
-        }
-    }
-
-    void _ComputeStep( _Heap* heapForward, _Heap* heapBackward, bool forwardDirection, NodeID* middle, int* targetDistance ) {
-
-        const NodeID node = heapForward->DeleteMin();
-        const int distance = heapForward->GetKey( node );
-
-        if ( distance > *targetDistance ) {
-            heapForward->DeleteAll();
-            return;
-        }
-
-        if ( heapBackward->WasInserted( node ) ) {
-            const int newDistance = heapBackward->GetKey( node ) + distance;
-            if ( newDistance < *targetDistance ) {
-                *middle = node;
-                *targetDistance = newDistance;
-            }
-        }
-
-       for ( int edge = _firstEdge[node], endEdges = _firstEdge[node + 1]; edge != endEdges; ++edge ) {
-            const NodeID to = _graph[edge].target;
-            const int edgeWeight = _graph[edge].data.distance;
-            assert( edgeWeight > 0 );
-            const int toDistance = distance + edgeWeight;
-
-            if ( (forwardDirection ? _graph[edge].data.forward : _graph[edge].data.backward ) ) {
-                //New Node discovered -> Add to Heap + Node Info Storage
-                if ( !heapForward->WasInserted( to ) )
-                    heapForward->Insert( to, toDistance, node );
-
-                //Found a shorter Path -> Update distance
-                else if ( toDistance < heapForward->GetKey( to ) ) {
-                    heapForward->DecreaseKey( to, toDistance );
-                    //new parent
-                    heapForward->GetData( to ) = node;
-                }
-            }
-        }
-    }
-
-    int _ComputeDistance( NodeID source, NodeID target, _ThreadData * data ) {
-        data->_heapForward->Clear();
-        data->_heapBackward->Clear();
-        //insert source into heap
-        data->_heapForward->Insert( source, 0, source );
-        data->_heapBackward->Insert( target, 0, target );
-
-        int targetDistance = std::numeric_limits< int >::max();
-        NodeID middle = std::numeric_limits<NodeID>::max();
-
-        while ( data->_heapForward->Size() + data->_heapBackward->Size() > 0 ) {
-            if ( data->_heapForward->Size() > 0 ) {
-                _ComputeStep( data->_heapForward, data->_heapBackward, true, &middle, &targetDistance );
-            }
-
-            if ( data->_heapBackward->Size() > 0 ) {
-                _ComputeStep( data->_heapBackward, data->_heapForward, false, &middle, &targetDistance );
-            }
-        }
-        return targetDistance;
-    }
-    NodeID _numNodes;
-    std::vector< Edge > _graph;
-    std::vector< unsigned > _firstEdge;
-};
-
-#endif // CONTRACTIONCLEANUP_H_INCLUDED

Contractor/Contractor.h

@@ -1,22 +1,29 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 CONTRACTOR_H_INCLUDED
 #define CONTRACTOR_H_INCLUDED
@@ -29,6 +36,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include "../DataStructures/XORFastHash.h"
 #include "../DataStructures/XORFastHashStorage.h"
 #include "../Util/OpenMPWrapper.h"
+#include "../Util/SimpleLogger.h"
 #include "../Util/StringUtil.h"
 
 #include <boost/assert.hpp>
@@ -37,7 +45,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <cfloat>
 #include <ctime>
 
 #include <algorithm>
@@ -124,7 +131,8 @@ public:
             BOOST_ASSERT_MSG( newEdge.data.distance > 0, "edge distance < 1" );
 #ifndef NDEBUG
             if ( newEdge.data.distance > 24 * 60 * 60 * 10 ) {
-                WARN("Edge weight large -> " << newEdge.data.distance);
+                SimpleLogger().Write(logWARNING) <<
+                    "Edge weight large -> " << newEdge.data.distance;
             }
 #endif
             edges.push_back( newEdge );
@@ -198,9 +206,9 @@ public:
         //            }
         //        }
         //
-        //        INFO("edges at node with id " << highestNode << " has degree " << maxdegree);
+        //        SimpleLogger().Write() << "edges at node with id " << highestNode << " has degree " << maxdegree;
         //        for(unsigned i = _graph->BeginEdges(highestNode); i < _graph->EndEdges(highestNode); ++i) {
-        //            INFO(" ->(" << highestNode << "," << _graph->GetTarget(i) << "); via: " << _graph->GetEdgeData(i).via);
+        //            SimpleLogger().Write() << " ->(" << highestNode << "," << _graph->GetTarget(i) << "); via: " << _graph->GetEdgeData(i).via;
         //        }
 
         //Create temporary file
@@ -430,19 +438,20 @@ public:
             //            avgdegree /= std::max((unsigned)1,(unsigned)remainingNodes.size() );
             //            quaddegree /= std::max((unsigned)1,(unsigned)remainingNodes.size() );
             //
-            //            INFO("rest: " << remainingNodes.size() << ", max: " << maxdegree << ", min: " << mindegree << ", avg: " << avgdegree << ", quad: " << quaddegree);
+            //            SimpleLogger().Write() << "rest: " << remainingNodes.size() << ", max: " << maxdegree << ", min: " << mindegree << ", avg: " << avgdegree << ", quad: " << quaddegree;
 
             p.printStatus(numberOfContractedNodes);
         }
-        BOOST_FOREACH(_ThreadData * data, threadData)
+        BOOST_FOREACH(_ThreadData * data, threadData) {
         	delete data;
+        }
         threadData.clear();
     }
 
     template< class Edge >
     inline void GetEdges( DeallocatingVector< Edge >& edges ) {
         Percent p (_graph->GetNumberOfNodes());
-        INFO("Getting edges of minimized graph");
+        SimpleLogger().Write() << "Getting edges of minimized graph";
         NodeID numberOfNodes = _graph->GetNumberOfNodes();
         if(_graph->GetNumberOfNodes()) {
             for ( NodeID node = 0; node < numberOfNodes; ++node ) {
@@ -474,7 +483,7 @@ public:
                         newEdge.data.id = data.id;
                     }
                     BOOST_ASSERT_MSG(
-                        newEdge.data.id <= INT_MAX, //2^31
+                        newEdge.data.id != INT_MAX, //2^31
                         "edge id invalid"
                     );
                     newEdge.data.forward = data.forward;
@@ -729,7 +738,7 @@ private:
             if ( priority > targetPriority )
                 return false;
             //tie breaking
-            if ( fabs(priority - targetPriority) < FLT_EPSILON && bias(node, target) ) {
+            if ( fabs(priority - targetPriority) < std::numeric_limits<double>::epsilon() && bias(node, target) ) {
                 return false;
             }
             neighbours.push_back( target );
@@ -751,7 +760,7 @@ private:
                 if ( priority > targetPriority)
                     return false;
                 //tie breaking
-                if ( fabs(priority - targetPriority) < FLT_EPSILON && bias(node, target) ) {
+                if ( fabs(priority - targetPriority) < std::numeric_limits<double>::epsilon() && bias(node, target) ) {
                     return false;
                 }
             }

Contractor/EdgeBasedGraphFactory.cpp

@@ -1,207 +1,288 @@
 /*
- 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
- 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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
- 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.
- */
+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 "EdgeBasedGraphFactory.h"
 
-template<>
-EdgeBasedGraphFactory::EdgeBasedGraphFactory(int nodes, std::vector<NodeBasedEdge> & inputEdges, std::vector<NodeID> & bn, std::vector<NodeID> & tl, std::vector<_Restriction> & irs, std::vector<NodeInfo> & nI, SpeedProfileProperties sp) : speedProfile(sp), inputNodeInfoList(nI), numberOfTurnRestrictions(irs.size()) {
-	BOOST_FOREACH(const _Restriction & restriction, irs) {
-        std::pair<NodeID, NodeID> restrictionSource = std::make_pair(restriction.fromNode, restriction.viaNode);
+EdgeBasedGraphFactory::EdgeBasedGraphFactory(
+    int number_of_nodes,
+    std::vector<ImportEdge> & input_edge_list,
+    std::vector<NodeID> & barrier_node_list,
+    std::vector<NodeID> & traffic_light_node_list,
+    std::vector<TurnRestriction> & input_restrictions_list,
+    std::vector<NodeInfo> & m_node_info_list,
+    SpeedProfileProperties speed_profile
+) : speed_profile(speed_profile),
+    m_turn_restrictions_count(0),
+    m_node_info_list(m_node_info_list)
+{
+	BOOST_FOREACH(const TurnRestriction & restriction, input_restrictions_list) {
+        std::pair<NodeID, NodeID> restriction_source =
+            std::make_pair(restriction.fromNode, restriction.viaNode);
         unsigned index;
-        RestrictionMap::iterator restrIter = _restrictionMap.find(restrictionSource);
-        if(restrIter == _restrictionMap.end()) {
-            index = _restrictionBucketVector.size();
-            _restrictionBucketVector.resize(index+1);
-            _restrictionMap[restrictionSource] = index;
+        RestrictionMap::iterator 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 = restrIter->second;
+            index = restriction_iter->second;
             //Map already contains an is_only_*-restriction
-            if(_restrictionBucketVector.at(index).begin()->second)
+            if(m_restriction_bucket_list.at(index).begin()->second) {
                 continue;
-            else if(restriction.flags.isOnly){
+            } else if(restriction.flags.isOnly) {
                 //We are going to insert an is_only_*-restriction. There can be only one.
-                _restrictionBucketVector.at(index).clear();
+                m_turn_restrictions_count -= m_restriction_bucket_list.at(index).size();
+                m_restriction_bucket_list.at(index).clear();
             }
         }
-
-        _restrictionBucketVector.at(index).push_back(std::make_pair(restriction.toNode, restriction.flags.isOnly));
+        ++m_turn_restrictions_count;
+        m_restriction_bucket_list.at(index).push_back(
+            std::make_pair( restriction.toNode, restriction.flags.isOnly)
+        );
     }
 
-	_barrierNodes.insert(bn.begin(), bn.end());
-	_trafficLights.insert(tl.begin(), tl.end());
+	m_barrier_nodes.insert(
+        barrier_node_list.begin(),
+        barrier_node_list.end()
+    );
 
-    DeallocatingVector< _NodeBasedEdge > edges;
-    _NodeBasedEdge edge;
-    for ( std::vector< NodeBasedEdge >::const_iterator i = inputEdges.begin(); i != inputEdges.end(); ++i ) {
-        if(!i->isForward()) {
-            edge.source = i->target();
-            edge.target = i->source();
-            edge.data.backward = i->isForward();
-            edge.data.forward = i->isBackward();
+    m_traffic_lights.insert(
+        traffic_light_node_list.begin(),
+        traffic_light_node_list.end()
+    );
+
+    DeallocatingVector< NodeBasedEdge > edges_list;
+    NodeBasedEdge edge;
+    BOOST_FOREACH(const ImportEdge & import_edge, input_edge_list) {
+        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 = i->source();
-            edge.target = i->target();
-            edge.data.forward = i->isForward();
-            edge.data.backward = i->isBackward();
+            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)i->weight(), 1 );
+        edge.data.distance = (std::max)((int)import_edge.weight(), 1 );
         assert( edge.data.distance > 0 );
         edge.data.shortcut = false;
-        edge.data.roundabout = i->isRoundabout();
-        edge.data.ignoreInGrid = i->ignoreInGrid();
-        edge.data.nameID = i->name();
-        edge.data.type = i->type();
-        edge.data.isAccessRestricted = i->isAccessRestricted();
-        edge.data.edgeBasedNodeID = edges.size();
-        edge.data.contraFlow = i->isContraFlow();
-        edges.push_back( edge );
+        edge.data.roundabout = import_edge.isRoundabout();
+        edge.data.ignoreInGrid = import_edge.ignoreInGrid();
+        edge.data.nameID = import_edge.name();
+        edge.data.type = import_edge.type();
+        edge.data.isAccessRestricted = import_edge.isAccessRestricted();
+        edge.data.edgeBasedNodeID = edges_list.size();
+        edge.data.contraFlow = import_edge.isContraFlow();
+        edges_list.push_back( edge );
         if( edge.data.backward ) {
             std::swap( edge.source, edge.target );
-            edge.data.forward = i->isBackward();
-            edge.data.backward = i->isForward();
-            edge.data.edgeBasedNodeID = edges.size();
-            edges.push_back( edge );
+            edge.data.forward = import_edge.isBackward();
+            edge.data.backward = import_edge.isForward();
+            edge.data.edgeBasedNodeID = edges_list.size();
+            edges_list.push_back( edge );
         }
     }
-    std::vector<NodeBasedEdge>().swap(inputEdges);
-    std::sort( edges.begin(), edges.end() );
-    _nodeBasedGraph = boost::make_shared<_NodeBasedDynamicGraph>( nodes, edges );
+    std::vector<ImportEdge>().swap(input_edge_list);
+    std::sort( edges_list.begin(), edges_list.end() );
+    m_node_based_graph = boost::make_shared<NodeBasedDynamicGraph>(
+        number_of_nodes, edges_list
+    );
 }
 
-void EdgeBasedGraphFactory::GetEdgeBasedEdges(DeallocatingVector< EdgeBasedEdge >& outputEdgeList ) {
+void EdgeBasedGraphFactory::GetEdgeBasedEdges(
+    DeallocatingVector< EdgeBasedEdge >& output_edge_list
+) {
     BOOST_ASSERT_MSG(
-        0 == outputEdgeList.size(),
+        0 == output_edge_list.size(),
         "Vector is not empty"
     );
-    edgeBasedEdges.swap(outputEdgeList);
+    m_edge_based_edge_list.swap(output_edge_list);
 }
 
 void EdgeBasedGraphFactory::GetEdgeBasedNodes( std::vector<EdgeBasedNode> & nodes) {
 #ifndef NDEBUG
-    BOOST_FOREACH(EdgeBasedNode & node, edgeBasedNodes){
+    BOOST_FOREACH(const EdgeBasedNode & node, m_edge_based_node_list){
         assert(node.lat1 != INT_MAX); assert(node.lon1 != INT_MAX);
         assert(node.lat2 != INT_MAX); assert(node.lon2 != INT_MAX);
     }
 #endif
-    nodes.swap(edgeBasedNodes);
+    nodes.swap(m_edge_based_node_list);
 }
 
-NodeID EdgeBasedGraphFactory::CheckForEmanatingIsOnlyTurn(const NodeID u, const NodeID v) const {
-    std::pair < NodeID, NodeID > restrictionSource = std::make_pair(u, v);
-    RestrictionMap::const_iterator restrIter = _restrictionMap.find(restrictionSource);
-    if (restrIter != _restrictionMap.end()) {
-        unsigned index = restrIter->second;
-        BOOST_FOREACH(const RestrictionSource & restrictionTarget, _restrictionBucketVector.at(index)) {
-            if(restrictionTarget.second) {
-                return restrictionTarget.first;
+NodeID EdgeBasedGraphFactory::CheckForEmanatingIsOnlyTurn(
+    const NodeID u,
+    const NodeID v
+) const {
+    const std::pair < NodeID, NodeID > restriction_source = std::make_pair(u, v);
+    RestrictionMap::const_iterator restriction_iter = m_restriction_map.find(restriction_source);
+    if (restriction_iter != m_restriction_map.end()) {
+        const unsigned index = restriction_iter->second;
+        BOOST_FOREACH(
+            const RestrictionSource & restriction_target,
+            m_restriction_bucket_list.at(index)
+        ) {
+            if(restriction_target.second) {
+                return restriction_target.first;
             }
         }
     }
     return UINT_MAX;
 }
 
-bool EdgeBasedGraphFactory::CheckIfTurnIsRestricted(const NodeID u, const NodeID v, const NodeID w) const {
+bool EdgeBasedGraphFactory::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 > restrictionSource = std::make_pair(u, v);
-    RestrictionMap::const_iterator restrIter = _restrictionMap.find(restrictionSource);
-    if (restrIter != _restrictionMap.end()) {
-        unsigned index = restrIter->second;
-        BOOST_FOREACH(RestrictionTarget restrictionTarget, _restrictionBucketVector.at(index)) {
-            if(w == restrictionTarget.first)
+    const std::pair < NodeID, NodeID > restriction_source = std::make_pair(u, v);
+    RestrictionMap::const_iterator restriction_iter = m_restriction_map.find(restriction_source);
+    if (restriction_iter != m_restriction_map.end()) {
+        const unsigned index = restriction_iter->second;
+        BOOST_FOREACH(
+            const RestrictionTarget & restriction_target,
+            m_restriction_bucket_list.at(index)
+        ) {
+            if(w == restriction_target.first) {
                 return true;
+            }
         }
     }
     return false;
 }
 
 void EdgeBasedGraphFactory::InsertEdgeBasedNode(
-        _NodeBasedDynamicGraph::EdgeIterator e1,
-        _NodeBasedDynamicGraph::NodeIterator u,
-        _NodeBasedDynamicGraph::NodeIterator v,
+        EdgeIterator e1,
+        NodeIterator u,
+        NodeIterator v,
         bool belongsToTinyComponent) {
-    _NodeBasedDynamicGraph::EdgeData & data = _nodeBasedGraph->GetEdgeData(e1);
+    EdgeData & data = m_node_based_graph->GetEdgeData(e1);
     EdgeBasedNode currentNode;
     currentNode.nameID = data.nameID;
-    currentNode.lat1 = inputNodeInfoList[u].lat;
-    currentNode.lon1 = inputNodeInfoList[u].lon;
-    currentNode.lat2 = inputNodeInfoList[v].lat;
-    currentNode.lon2 = inputNodeInfoList[v].lon;
+    currentNode.lat1 = m_node_info_list[u].lat;
+    currentNode.lon1 = m_node_info_list[u].lon;
+    currentNode.lat2 = m_node_info_list[v].lat;
+    currentNode.lon2 = m_node_info_list[v].lon;
     currentNode.belongsToTinyComponent = belongsToTinyComponent;
     currentNode.id = data.edgeBasedNodeID;
     currentNode.ignoreInGrid = data.ignoreInGrid;
     currentNode.weight = data.distance;
-    edgeBasedNodes.push_back(currentNode);
+    m_edge_based_node_list.push_back(currentNode);
 }
 
-void EdgeBasedGraphFactory::Run(const char * originalEdgeDataFilename, lua_State *myLuaState) {
-    Percent p(_nodeBasedGraph->GetNumberOfNodes());
-    int numberOfSkippedTurns(0);
-    int nodeBasedEdgeCounter(0);
-    unsigned numberOfOriginalEdges(0);
-    std::ofstream originalEdgeDataOutFile(originalEdgeDataFilename, std::ios::binary);
-    originalEdgeDataOutFile.write((char*)&numberOfOriginalEdges, sizeof(unsigned));
+void EdgeBasedGraphFactory::Run(
+    const char * original_edge_data_filename,
+    lua_State *lua_state
+) {
+    SimpleLogger().Write() << "Identifying components of the road network";
 
+    Percent p(m_node_based_graph->GetNumberOfNodes());
+    unsigned skipped_turns_counter   = 0;
+    unsigned node_based_edge_counter = 0;
+    unsigned original_edges_counter  = 0;
 
-    INFO("Identifying small components");
+    std::ofstream edge_data_file(
+        original_edge_data_filename,
+        std::ios::binary
+    );
+
+    //writes a dummy value that is updated later
+    edge_data_file.write(
+        (char*)&original_edges_counter,
+        sizeof(unsigned)
+    );
+
+    unsigned current_component = 0, current_component_size = 0;
     //Run a BFS on the undirected graph and identify small components
-    std::queue<std::pair<NodeID, NodeID> > bfsQueue;
-    std::vector<unsigned> componentsIndex(_nodeBasedGraph->GetNumberOfNodes(), UINT_MAX);
-    std::vector<NodeID> vectorOfComponentSizes;
-    unsigned currentComponent = 0, sizeOfCurrentComponent = 0;
+    std::queue<std::pair<NodeID, NodeID> > bfs_queue;
+    std::vector<unsigned> component_index_list(
+        m_node_based_graph->GetNumberOfNodes(),
+        UINT_MAX
+    );
+
+    std::vector<NodeID> component_size_list;
     //put unexplorered node with parent pointer into queue
-    for(NodeID node = 0, endNodes = _nodeBasedGraph->GetNumberOfNodes(); node < endNodes; ++node) {
-        if(UINT_MAX == componentsIndex[node]) {
-            bfsQueue.push(std::make_pair(node, node));
+    for(
+        NodeID node = 0,
+            last_node = m_node_based_graph->GetNumberOfNodes();
+        node < last_node;
+        ++node
+    ) {
+        if(UINT_MAX == component_index_list[node]) {
+            bfs_queue.push(std::make_pair(node, node));
             //mark node as read
-            componentsIndex[node] = currentComponent;
+            component_index_list[node] = current_component;
             p.printIncrement();
-            while(!bfsQueue.empty()) {
+            while(!bfs_queue.empty()) {
                 //fetch element from BFS queue
-                std::pair<NodeID, NodeID> currentQueueItem = bfsQueue.front();
-                bfsQueue.pop();
-                //                INFO("sizeof queue: " << bfsQueue.size() <<  ", sizeOfCurrentComponents: " <<  sizeOfCurrentComponent << ", settled nodes: " << settledNodes++ << ", max: " << endNodes);
-                const NodeID v = currentQueueItem.first;  //current node
-                const NodeID u = currentQueueItem.second; //parent
+                std::pair<NodeID, NodeID> current_queue_item = bfs_queue.front();
+                bfs_queue.pop();
+                // SimpleLogger().Write() << "sizeof queue: " << bfs_queue.size() <<
+                //  ", current_component_sizes: " <<  current_component_size <<
+                //", settled nodes: " << settledNodes++ << ", max: " << endNodes;
+                const NodeID v = current_queue_item.first;  //current node
+                const NodeID u = current_queue_item.second; //parent
                 //increment size counter of current component
-                ++sizeOfCurrentComponent;
-                const bool isBollardNode = (_barrierNodes.find(v) != _barrierNodes.end());
-                if(!isBollardNode) {
-                    const NodeID onlyToNode = CheckForEmanatingIsOnlyTurn(u, v);
+                ++current_component_size;
+                const bool is_barrier_node = (m_barrier_nodes.find(v) != m_barrier_nodes.end());
+                if(!is_barrier_node) {
+                    const NodeID to_node_of_only_restriction = CheckForEmanatingIsOnlyTurn(u, v);
 
                     //relaxieren edge outgoing edge like below where edge-expanded graph
-                    for(_NodeBasedDynamicGraph::EdgeIterator e2 = _nodeBasedGraph->BeginEdges(v); e2 < _nodeBasedGraph->EndEdges(v); ++e2) {
-                        _NodeBasedDynamicGraph::NodeIterator w = _nodeBasedGraph->GetTarget(e2);
+                    for(
+                        EdgeIterator e2 = m_node_based_graph->BeginEdges(v);
+                        e2 < m_node_based_graph->EndEdges(v);
+                        ++e2
+                    ) {
+                        NodeIterator w = m_node_based_graph->GetTarget(e2);
 
-                        if(onlyToNode != UINT_MAX && w != onlyToNode) { //We are at an only_-restriction but not at the right turn.
+                        if(
+                            to_node_of_only_restriction != UINT_MAX &&
+                            w != to_node_of_only_restriction
+                        ) {
+                            //We are at an only_-restriction but not at the right turn.
                             continue;
                         }
-                        if( u != w ) { //only add an edge if turn is not a U-turn except it is the end of dead-end street.
-                            if (!CheckIfTurnIsRestricted(u, v, w) ) { //only add an edge if turn is not prohibited
-                                //insert next (node, parent) only if w has not yet been explored
-                                if(UINT_MAX == componentsIndex[w]) {
+                        if( u != w ) {
+                            //only add an edge if turn is not a U-turn except
+                            //when it is at the end of a dead-end street.
+                            if (!CheckIfTurnIsRestricted(u, v, w) ) {
+                                //only add an edge if turn is not prohibited
+                                if(UINT_MAX == component_index_list[w]) {
+                                    //insert next (node, parent) only if w has
+                                    //not yet been explored
                                     //mark node as read
-                                    componentsIndex[w] = currentComponent;
-                                    bfsQueue.push(std::make_pair(w,v));
+                                    component_index_list[w] = current_component;
+                                    bfs_queue.push(std::make_pair(w,v));
                                     p.printIncrement();
                                 }
                             }
@@ -210,149 +291,238 @@ void EdgeBasedGraphFactory::Run(const char * originalEdgeDataFilename, lua_State
                 }
             }
             //push size into vector
-            vectorOfComponentSizes.push_back(sizeOfCurrentComponent);
+            component_size_list.push_back(current_component_size);
             //reset counters;
-            sizeOfCurrentComponent = 0;
-            ++currentComponent;
+            current_component_size = 0;
+            ++current_component;
         }
     }
-    INFO("identified: " << vectorOfComponentSizes.size() << " many components");
+    SimpleLogger().Write() <<
+        "identified: " << component_size_list.size() << " many components";
+    SimpleLogger().Write() <<
+        "generating edge-expanded nodes";
 
-    p.reinit(_nodeBasedGraph->GetNumberOfNodes());
+    p.reinit(m_node_based_graph->GetNumberOfNodes());
     //loop over all edges and generate new set of nodes.
-    for(_NodeBasedDynamicGraph::NodeIterator u = 0; u < _nodeBasedGraph->GetNumberOfNodes(); ++u ) {
-        for(_NodeBasedDynamicGraph::EdgeIterator e1 = _nodeBasedGraph->BeginEdges(u); e1 < _nodeBasedGraph->EndEdges(u); ++e1) {
-            _NodeBasedDynamicGraph::NodeIterator v = _nodeBasedGraph->GetTarget(e1);
+    for(
+        NodeIterator u = 0,
+            number_of_nodes = m_node_based_graph->GetNumberOfNodes();
+        u < number_of_nodes;
+        ++u
+     ) {
+        p.printIncrement();
+        for(
+            EdgeIterator e1 = m_node_based_graph->BeginEdges(u),
+                last_edge = m_node_based_graph->EndEdges(u);
+            e1 < last_edge;
+            ++e1
+        ) {
+            NodeIterator v = m_node_based_graph->GetTarget(e1);
 
-            if(_nodeBasedGraph->GetEdgeData(e1).type != SHRT_MAX) {
-                assert(e1 != UINT_MAX);
-                assert(u != UINT_MAX);
-                assert(v != UINT_MAX);
-                //edges that end on bollard nodes may actually be in two distinct components
-                InsertEdgeBasedNode(e1, u, v, (std::min(vectorOfComponentSizes[componentsIndex[u]], vectorOfComponentSizes[componentsIndex[v]]) < 1000) );
+            if(m_node_based_graph->GetEdgeData(e1).type != SHRT_MAX) {
+                BOOST_ASSERT_MSG(e1 != UINT_MAX, "edge id invalid");
+                BOOST_ASSERT_MSG(u != UINT_MAX,  "souce node invalid");
+                BOOST_ASSERT_MSG(v != UINT_MAX,  "target node invalid");
+            //Note: edges that end on barrier nodes or on a turn restriction
+            //may actually be in two distinct components. We choose the smallest
+                const unsigned size_of_component = std::min(
+                    component_size_list[component_index_list[u]],
+                    component_size_list[component_index_list[v]]
+                );
+
+                InsertEdgeBasedNode( e1, u, v, size_of_component < 1000 );
             }
         }
     }
 
-    std::vector<NodeID>().swap(vectorOfComponentSizes);
-    std::vector<NodeID>().swap(componentsIndex);
+    SimpleLogger().Write()
+        << "Generated " << m_edge_based_node_list.size() << " nodes in " <<
+        "edge-expanded graph";
+    SimpleLogger().Write() <<
+        "generating edge-expanded edges";
 
+    std::vector<NodeID>().swap(component_size_list);
+    BOOST_ASSERT_MSG(
+        0 == component_size_list.capacity(),
+        "component size vector not deallocated"
+    );
+    std::vector<NodeID>().swap(component_index_list);
+    BOOST_ASSERT_MSG(
+        0 == component_index_list.capacity(),
+        "component index vector not deallocated"
+    );
     std::vector<OriginalEdgeData> original_edge_data_vector;
     original_edge_data_vector.reserve(10000);
 
     //Loop over all turns and generate new set of edges.
-    //Three nested loop look super-linear, but we are dealing with a linear number of turns only.
-    for(_NodeBasedDynamicGraph::NodeIterator u = 0; u < _nodeBasedGraph->GetNumberOfNodes(); ++u ) {
-        for(_NodeBasedDynamicGraph::EdgeIterator e1 = _nodeBasedGraph->BeginEdges(u); e1 < _nodeBasedGraph->EndEdges(u); ++e1) {
-            ++nodeBasedEdgeCounter;
-            _NodeBasedDynamicGraph::NodeIterator v = _nodeBasedGraph->GetTarget(e1);
-            bool isBollardNode = (_barrierNodes.find(v) != _barrierNodes.end());
-            //EdgeWeight heightPenalty = ComputeHeightPenalty(u, v);
-            NodeID onlyToNode = CheckForEmanatingIsOnlyTurn(u, v);
-            for(_NodeBasedDynamicGraph::EdgeIterator e2 = _nodeBasedGraph->BeginEdges(v); e2 < _nodeBasedGraph->EndEdges(v); ++e2) {
-                const _NodeBasedDynamicGraph::NodeIterator w = _nodeBasedGraph->GetTarget(e2);
-
-                if(onlyToNode != UINT_MAX && w != onlyToNode) { //We are at an only_-restriction but not at the right turn.
-                    ++numberOfSkippedTurns;
+    //Three nested loop look super-linear, but we are dealing with a (kind of)
+    //linear number of turns only.
+    p.reinit(m_node_based_graph->GetNumberOfNodes());
+    for(
+        NodeIterator u = 0,
+            last_node = m_node_based_graph->GetNumberOfNodes();
+        u < last_node;
+        ++u
+    ) {
+        for(
+            EdgeIterator e1 = m_node_based_graph->BeginEdges(u),
+                last_edge_u = m_node_based_graph->EndEdges(u);
+            e1 < last_edge_u;
+            ++e1
+        ) {
+            ++node_based_edge_counter;
+            NodeIterator v = m_node_based_graph->GetTarget(e1);
+            bool is_barrier_node = (m_barrier_nodes.find(v) != m_barrier_nodes.end());
+            NodeID to_node_of_only_restriction = CheckForEmanatingIsOnlyTurn(u, v);
+            for(
+                EdgeIterator e2 = m_node_based_graph->BeginEdges(v),
+                    last_edge_v = m_node_based_graph->EndEdges(v);
+                    e2 < last_edge_v;
+                    ++e2
+            ) {
+                const NodeIterator w = m_node_based_graph->GetTarget(e2);
+                if(
+                    to_node_of_only_restriction != UINT_MAX &&
+                    w != to_node_of_only_restriction
+                ) {
+                    //We are at an only_-restriction but not at the right turn.
+                    ++skipped_turns_counter;
                     continue;
                 }
 
-                if(u == w && 1 != _nodeBasedGraph->GetOutDegree(v) ) {
+                if(u == w && 1 != m_node_based_graph->GetOutDegree(v) ) {
                     continue;
                 }
 
-                if( !isBollardNode ) { //only add an edge if turn is not a U-turn except it is the end of dead-end street.
-                    if (!CheckIfTurnIsRestricted(u, v, w) || (onlyToNode != UINT_MAX && w == onlyToNode)) { //only add an edge if turn is not prohibited
-                        const _NodeBasedDynamicGraph::EdgeData edgeData1 = _nodeBasedGraph->GetEdgeData(e1);
-                        const _NodeBasedDynamicGraph::EdgeData edgeData2 = _nodeBasedGraph->GetEdgeData(e2);
-                        assert(edgeData1.edgeBasedNodeID < _nodeBasedGraph->GetNumberOfEdges());
-                        assert(edgeData2.edgeBasedNodeID < _nodeBasedGraph->GetNumberOfEdges());
+                if( !is_barrier_node ) {
+                    //only add an edge if turn is not a U-turn except when it is
+                    //at the end of a dead-end street
+                    if (
+                        !CheckIfTurnIsRestricted(u, v, w) ||
+                        (to_node_of_only_restriction != UINT_MAX && w == to_node_of_only_restriction)
+                    ) { //only add an edge if turn is not prohibited
+                        const EdgeData edge_data1 = m_node_based_graph->GetEdgeData(e1);
+                        const EdgeData edge_data2 = m_node_based_graph->GetEdgeData(e2);
+                        assert(edge_data1.edgeBasedNodeID < m_node_based_graph->GetNumberOfEdges());
+                        assert(edge_data2.edgeBasedNodeID < m_node_based_graph->GetNumberOfEdges());
 
-                        if(!edgeData1.forward || !edgeData2.forward) {
+                        if(!edge_data1.forward || !edge_data2.forward) {
                             continue;
                         }
 
-                        unsigned distance = edgeData1.distance;
-                        if(_trafficLights.find(v) != _trafficLights.end()) {
-                            distance += speedProfile.trafficSignalPenalty;
+                        unsigned distance = edge_data1.distance;
+                        if(m_traffic_lights.find(v) != m_traffic_lights.end()) {
+                            distance += speed_profile.trafficSignalPenalty;
+                        }
+                        const unsigned penalty =
+                            GetTurnPenalty(u, v, w, lua_state);
+                        TurnInstruction turnInstruction = AnalyzeTurn(u, v, w);
+                        if(turnInstruction == TurnInstructions.UTurn){
+                            distance += speed_profile.uTurnPenalty;
                         }
-                        unsigned penalty = 0;
-                        TurnInstruction turnInstruction = AnalyzeTurn(u, v, w, penalty, myLuaState);
-                        if(turnInstruction == TurnInstructions.UTurn)
-                            distance += speedProfile.uTurnPenalty;
-//                        if(!edgeData1.isAccessRestricted && edgeData2.isAccessRestricted) {
-//                            distance += TurnInstructions.AccessRestrictionPenalty;
-//                            turnInstruction |= TurnInstructions.AccessRestrictionFlag;
-//                        }
                         distance += penalty;
 
-
-                        //distance += heightPenalty;
-                        //distance += ComputeTurnPenalty(u, v, w);
-                        assert(edgeData1.edgeBasedNodeID != edgeData2.edgeBasedNodeID);
-                        OriginalEdgeData oed(v,edgeData2.nameID, turnInstruction);
-                        original_edge_data_vector.push_back(oed);
-                        ++numberOfOriginalEdges;
+                        assert(edge_data1.edgeBasedNodeID != edge_data2.edgeBasedNodeID);
+                        original_edge_data_vector.push_back(
+                            OriginalEdgeData(
+                                v,
+                                edge_data2.nameID,
+                                turnInstruction
+                            )
+                        );
+                        ++original_edges_counter;
 
                         if(original_edge_data_vector.size() > 100000) {
-                            originalEdgeDataOutFile.write((char*)&(original_edge_data_vector[0]), original_edge_data_vector.size()*sizeof(OriginalEdgeData));
+                            edge_data_file.write(
+                                (char*)&(original_edge_data_vector[0]),
+                                original_edge_data_vector.size()*sizeof(OriginalEdgeData)
+                            );
                             original_edge_data_vector.clear();
                         }
 
-                        EdgeBasedEdge newEdge(edgeData1.edgeBasedNodeID, edgeData2.edgeBasedNodeID, edgeBasedEdges.size(), distance, true, false );
-                        edgeBasedEdges.push_back(newEdge);
+                        m_edge_based_edge_list.push_back(
+                            EdgeBasedEdge(
+                                edge_data1.edgeBasedNodeID,
+                                edge_data2.edgeBasedNodeID,
+                                m_edge_based_edge_list.size(),
+                                distance,
+                                true,
+                                false
+                            )
+                        );
                     } else {
-                        ++numberOfSkippedTurns;
+                        ++skipped_turns_counter;
                     }
                 }
             }
         }
         p.printIncrement();
     }
-    originalEdgeDataOutFile.write((char*)&(original_edge_data_vector[0]), original_edge_data_vector.size()*sizeof(OriginalEdgeData));
-    originalEdgeDataOutFile.seekp(std::ios::beg);
-    originalEdgeDataOutFile.write((char*)&numberOfOriginalEdges, sizeof(unsigned));
-    originalEdgeDataOutFile.close();
+    edge_data_file.write(
+        (char*)&(original_edge_data_vector[0]),
+        original_edge_data_vector.size()*sizeof(OriginalEdgeData)
+    );
+    edge_data_file.seekp(std::ios::beg);
+    edge_data_file.write(
+        (char*)&original_edges_counter,
+        sizeof(unsigned)
+    );
+    edge_data_file.close();
 
-//    INFO("Sorting edge-based Nodes");
-//    std::sort(edgeBasedNodes.begin(), edgeBasedNodes.end());
-//    INFO("Removing duplicate nodes (if any)");
-//    edgeBasedNodes.erase( std::unique(edgeBasedNodes.begin(), edgeBasedNodes.end()), edgeBasedNodes.end() );
-//    INFO("Applying vector self-swap trick to free up memory");
-//    INFO("size: " << edgeBasedNodes.size() << ", cap: " << edgeBasedNodes.capacity());
-//    std::vector<EdgeBasedNode>(edgeBasedNodes).swap(edgeBasedNodes);
-//    INFO("size: " << edgeBasedNodes.size() << ", cap: " << edgeBasedNodes.capacity());
-    INFO("Node-based graph contains " << nodeBasedEdgeCounter     << " edges");
-    INFO("Edge-based graph contains " << edgeBasedEdges.size()    << " edges");
-//    INFO("Edge-based graph contains " << edgeBasedEdges.size()    << " edges, blowup is " << 2*((double)edgeBasedEdges.size()/(double)nodeBasedEdgeCounter));
-    INFO("Edge-based graph skipped "  << numberOfSkippedTurns     << " turns, defined by " << numberOfTurnRestrictions << " restrictions.");
-    INFO("Generated " << edgeBasedNodes.size() << " edge based nodes");
+    SimpleLogger().Write() <<
+        "Generated " << m_edge_based_node_list.size() << " edge based nodes";
+    SimpleLogger().Write() <<
+        "Node-based graph contains " << node_based_edge_counter << " edges";
+    SimpleLogger().Write() <<
+        "Edge-expanded graph ...";
+    SimpleLogger().Write() <<
+        "  contains " << m_edge_based_edge_list.size() << " edges";
+    SimpleLogger().Write() <<
+        "  skips "  << skipped_turns_counter << " turns, "
+        "defined by " << m_turn_restrictions_count << " restrictions";
 }
 
-TurnInstruction EdgeBasedGraphFactory::AnalyzeTurn(const NodeID u, const NodeID v, const NodeID w, unsigned& penalty, lua_State *myLuaState) const {
-    const double angle = GetAngleBetweenTwoEdges(inputNodeInfoList[u], inputNodeInfoList[v], inputNodeInfoList[w]);
+int EdgeBasedGraphFactory::GetTurnPenalty(
+    const NodeID u,
+    const NodeID v,
+    const NodeID w,
+    lua_State *lua_state
+) const {
+    const double angle = GetAngleBetweenThreeFixedPointCoordinates (
+        m_node_info_list[u],
+        m_node_info_list[v],
+        m_node_info_list[w]
+    );
 
-    if( speedProfile.has_turn_penalty_function ) {
-    	try {
+    if( speed_profile.has_turn_penalty_function ) {
+        try {
             //call lua profile to compute turn penalty
-            penalty = luabind::call_function<int>( myLuaState, "turn_function", 180-angle );
+            return luabind::call_function<int>(
+                lua_state,
+                "turn_function",
+                180.-angle
+            );
         } catch (const luabind::error &er) {
-            std::cerr << er.what() << std::endl;
-            //TODO handle lua errors
+            SimpleLogger().Write(logWARNING) << er.what();
         }
-    } else {
-        penalty = 0;
     }
+    return 0;
+}
 
+TurnInstruction EdgeBasedGraphFactory::AnalyzeTurn(
+    const NodeID u,
+    const NodeID v,
+    const NodeID w
+) const {
     if(u == w) {
         return TurnInstructions.UTurn;
     }
 
-    _NodeBasedDynamicGraph::EdgeIterator edge1 = _nodeBasedGraph->FindEdge(u, v);
-    _NodeBasedDynamicGraph::EdgeIterator edge2 = _nodeBasedGraph->FindEdge(v, w);
+    EdgeIterator edge1 = m_node_based_graph->FindEdge(u, v);
+    EdgeIterator edge2 = m_node_based_graph->FindEdge(v, w);
 
-    _NodeBasedDynamicGraph::EdgeData & data1 = _nodeBasedGraph->GetEdgeData(edge1);
-    _NodeBasedDynamicGraph::EdgeData & data2 = _nodeBasedGraph->GetEdgeData(edge2);
+    EdgeData & data1 = m_node_based_graph->GetEdgeData(edge1);
+    EdgeData & data2 = m_node_based_graph->GetEdgeData(edge2);
 
     if(!data1.contraFlow && data2.contraFlow) {
     	return TurnInstructions.EnterAgainstAllowedDirection;
@@ -364,7 +534,7 @@ TurnInstruction EdgeBasedGraphFactory::AnalyzeTurn(const NodeID u, const NodeID
     //roundabouts need to be handled explicitely
     if(data1.roundabout && data2.roundabout) {
         //Is a turn possible? If yes, we stay on the roundabout!
-        if( 1 == (_nodeBasedGraph->EndEdges(v) - _nodeBasedGraph->BeginEdges(v)) ) {
+        if( 1 == m_node_based_graph->GetOutDegree(v) ) {
             //No turn possible.
             return TurnInstructions.NoTurn;
         }
@@ -382,31 +552,27 @@ TurnInstruction EdgeBasedGraphFactory::AnalyzeTurn(const NodeID u, const NodeID
         }
     }
 
-    //If street names stay the same and if we are certain that it is not a roundabout, we skip it.
-    if( (data1.nameID == data2.nameID) && (0 != data1.nameID)) {
-        return TurnInstructions.NoTurn;
-    }
-    if( (data1.nameID == data2.nameID) && (0 == data1.nameID) && (_nodeBasedGraph->GetOutDegree(v) <= 2) ) {
-        return TurnInstructions.NoTurn;
+    //If street names stay the same and if we are certain that it is not a
+    //a segment of a roundabout, we skip it.
+    if( data1.nameID == data2.nameID ) {
+        //TODO: Here we should also do a small graph exploration to check for
+        //      more complex situations
+        if( 0 != data1.nameID ) {
+            return TurnInstructions.NoTurn;
+        } else if (m_node_based_graph->GetOutDegree(v) <= 2) {
+            return TurnInstructions.NoTurn;
+        }
     }
 
+    const double angle = GetAngleBetweenThreeFixedPointCoordinates (
+        m_node_info_list[u],
+        m_node_info_list[v],
+        m_node_info_list[w]
+    );
+
     return TurnInstructions.GetTurnDirectionOfInstruction(angle);
 }
 
 unsigned EdgeBasedGraphFactory::GetNumberOfNodes() const {
-    return _nodeBasedGraph->GetNumberOfEdges();
-}
-
-/* Get angle of line segment (A,C)->(C,B), atan2 magic, formerly cosine theorem*/
-template<class CoordinateT>
-double EdgeBasedGraphFactory::GetAngleBetweenTwoEdges(const CoordinateT& A, const CoordinateT& C, const CoordinateT& B) const {
-    const double v1x = (A.lon - C.lon)/100000.;
-    const double v1y = lat2y(A.lat/100000.) - lat2y(C.lat/100000.);
-    const double v2x = (B.lon - C.lon)/100000.;
-    const double v2y = lat2y(B.lat/100000.) - lat2y(C.lat/100000.);
-
-    double angle = (atan2(v2y,v2x) - atan2(v1y,v1x) )*180/M_PI;
-    while(angle < 0)
-        angle += 360;
-    return angle;
+    return m_node_based_graph->GetNumberOfEdges();
 }

Contractor/EdgeBasedGraphFactory.h

@@ -1,26 +1,31 @@
 /*
- 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
- 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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
- 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.
- */
+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 class constructs the edge base representation of a graph from a given node based edge list
- */
+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.
+
+*/
+
+//  This class constructs the edge-expanded routing graph
 
 #ifndef EDGEBASEDGRAPHFACTORY_H_
 #define EDGEBASEDGRAPHFACTORY_H_
@@ -31,14 +36,11 @@
 #include "../Extractor/ExtractorStructs.h"
 #include "../DataStructures/HashTable.h"
 #include "../DataStructures/ImportEdge.h"
-#include "../DataStructures/MercatorUtil.h"
 #include "../DataStructures/QueryEdge.h"
 #include "../DataStructures/Percent.h"
 #include "../DataStructures/TurnInstructions.h"
-#include "../Util/BaseConfiguration.h"
 #include "../Util/LuaUtil.h"
-
-#include <stxxl.h>
+#include "../Util/SimpleLogger.h"
 
 #include <boost/foreach.hpp>
 #include <boost/make_shared.hpp>
@@ -47,15 +49,26 @@
 #include <boost/unordered_map.hpp>
 #include <boost/unordered_set.hpp>
 
-#include <cstdlib>
-
 #include <algorithm>
+#include <fstream>
 #include <queue>
 #include <vector>
 
 class EdgeBasedGraphFactory : boost::noncopyable {
 public:
     struct EdgeBasedNode {
+        EdgeBasedNode() :
+            id(INT_MAX),
+            lat1(INT_MAX),
+            lat2(INT_MAX),
+            lon1(INT_MAX),
+            lon2(INT_MAX >> 1),
+            belongsToTinyComponent(false),
+            nameID(UINT_MAX),
+            weight(UINT_MAX >> 1),
+            ignoreInGrid(false)
+        { }
+
         bool operator<(const EdgeBasedNode & other) const {
             return other.id < id;
         }
@@ -64,8 +77,8 @@ public:
             return id == other.id;
         }
 
-        inline _Coordinate Centroid() const {
-            _Coordinate centroid;
+        inline FixedPointCoordinate Centroid() const {
+            FixedPointCoordinate centroid;
             //The coordinates of the midpoint are given by:
             //x = (x1 + x2) /2 and y = (y1 + y2) /2.
             centroid.lon = (std::min(lon1, lon2) + std::max(lon1, lon2))/2;
@@ -76,6 +89,7 @@ public:
         inline bool isIgnored() const {
             return ignoreInGrid;
         }
+
         NodeID id;
         int lat1;
         int lat2;
@@ -88,14 +102,47 @@ public:
     };
 
     struct SpeedProfileProperties{
-        SpeedProfileProperties()  : trafficSignalPenalty(0), uTurnPenalty(0), has_turn_penalty_function(false) {}
+        SpeedProfileProperties() :
+            trafficSignalPenalty(0),
+            uTurnPenalty(0),
+            has_turn_penalty_function(false)
+        { }
+
         int trafficSignalPenalty;
         int uTurnPenalty;
         bool has_turn_penalty_function;
-    } speedProfile;
+    } speed_profile;
+
+    explicit EdgeBasedGraphFactory(
+        int number_of_nodes,
+        std::vector<ImportEdge> & input_edge_list,
+        std::vector<NodeID> & barrier_node_list,
+        std::vector<NodeID> & traffic_light_node_list,
+        std::vector<TurnRestriction> & input_restrictions_list,
+        std::vector<NodeInfo> & m_node_info_list,
+        SpeedProfileProperties speed_profile
+    );
+
+    void Run(const char * originalEdgeDataFilename, lua_State *myLuaState);
+    void GetEdgeBasedEdges( DeallocatingVector< EdgeBasedEdge >& edges );
+    void GetEdgeBasedNodes( std::vector< EdgeBasedNode> & nodes);
+    void GetOriginalEdgeData( std::vector<OriginalEdgeData> & originalEdgeData);
+    TurnInstruction AnalyzeTurn(
+        const NodeID u,
+        const NodeID v,
+        const NodeID w
+    ) const;
+    int GetTurnPenalty(
+        const NodeID u,
+        const NodeID v,
+        const NodeID w,
+        lua_State *myLuaState
+    ) const;
+
+    unsigned GetNumberOfNodes() const;
 
 private:
-    struct _NodeBasedEdgeData {
+    struct NodeBasedEdgeData {
         int distance;
         unsigned edgeBasedNodeID;
         unsigned nameID;
@@ -118,45 +165,46 @@ private:
         TurnInstruction turnInstruction;
     };
 
-    typedef DynamicGraph< _NodeBasedEdgeData > _NodeBasedDynamicGraph;
-    typedef _NodeBasedDynamicGraph::InputEdge _NodeBasedEdge;
-    std::vector<NodeInfo>               inputNodeInfoList;
-    unsigned numberOfTurnRestrictions;
+    unsigned m_turn_restrictions_count;
 
-    boost::shared_ptr<_NodeBasedDynamicGraph>   _nodeBasedGraph;
-    boost::unordered_set<NodeID>          _barrierNodes;
-    boost::unordered_set<NodeID>          _trafficLights;
-
-    typedef std::pair<NodeID, NodeID> RestrictionSource;
-    typedef std::pair<NodeID, bool>   RestrictionTarget;
-    typedef std::vector<RestrictionTarget> EmanatingRestrictionsVector;
+    typedef DynamicGraph<NodeBasedEdgeData>     NodeBasedDynamicGraph;
+    typedef NodeBasedDynamicGraph::InputEdge    NodeBasedEdge;
+    typedef NodeBasedDynamicGraph::NodeIterator NodeIterator;
+    typedef NodeBasedDynamicGraph::EdgeIterator EdgeIterator;
+    typedef NodeBasedDynamicGraph::EdgeData     EdgeData;
+    typedef std::pair<NodeID, NodeID>           RestrictionSource;
+    typedef std::pair<NodeID, bool>             RestrictionTarget;
+    typedef std::vector<RestrictionTarget>      EmanatingRestrictionsVector;
     typedef boost::unordered_map<RestrictionSource, unsigned > RestrictionMap;
-    std::vector<EmanatingRestrictionsVector> _restrictionBucketVector;
-    RestrictionMap _restrictionMap;
 
-    DeallocatingVector<EdgeBasedEdge>   edgeBasedEdges;
-    std::vector<EdgeBasedNode>   edgeBasedNodes;
+    std::vector<NodeInfo>                       m_node_info_list;
+    std::vector<EmanatingRestrictionsVector>    m_restriction_bucket_list;
+    std::vector<EdgeBasedNode>                  m_edge_based_node_list;
+    DeallocatingVector<EdgeBasedEdge>           m_edge_based_edge_list;
+
+    boost::shared_ptr<NodeBasedDynamicGraph>    m_node_based_graph;
+    boost::unordered_set<NodeID>                m_barrier_nodes;
+    boost::unordered_set<NodeID>                m_traffic_lights;
+
+    RestrictionMap                              m_restriction_map;
+
+
+    NodeID CheckForEmanatingIsOnlyTurn(
+        const NodeID u,
+        const NodeID v
+    ) const;
+
+    bool CheckIfTurnIsRestricted(
+        const NodeID u,
+        const NodeID v,
+        const NodeID w
+    ) const;
 
-    NodeID CheckForEmanatingIsOnlyTurn(const NodeID u, const NodeID v) const;
-    bool CheckIfTurnIsRestricted(const NodeID u, const NodeID v, const NodeID w) const;
     void InsertEdgeBasedNode(
-            _NodeBasedDynamicGraph::EdgeIterator e1,
-            _NodeBasedDynamicGraph::NodeIterator u,
-            _NodeBasedDynamicGraph::NodeIterator v,
+            NodeBasedDynamicGraph::EdgeIterator e1,
+            NodeBasedDynamicGraph::NodeIterator u,
+            NodeBasedDynamicGraph::NodeIterator v,
             bool belongsToTinyComponent);
-    template<class CoordinateT>
-    double GetAngleBetweenTwoEdges(const CoordinateT& A, const CoordinateT& C, const CoordinateT& B) const;
-
-public:
-    template< class InputEdgeT >
-    explicit EdgeBasedGraphFactory(int nodes, std::vector<InputEdgeT> & inputEdges, std::vector<NodeID> & _bollardNodes, std::vector<NodeID> & trafficLights, std::vector<_Restriction> & inputRestrictions, std::vector<NodeInfo> & nI, SpeedProfileProperties speedProfile);
-
-    void Run(const char * originalEdgeDataFilename, lua_State *myLuaState);
-    void GetEdgeBasedEdges( DeallocatingVector< EdgeBasedEdge >& edges );
-    void GetEdgeBasedNodes( std::vector< EdgeBasedNode> & nodes);
-    void GetOriginalEdgeData( std::vector< OriginalEdgeData> & originalEdgeData);
-    TurnInstruction AnalyzeTurn(const NodeID u, const NodeID v, const NodeID w, unsigned& penalty, lua_State *myLuaState) const;
-    unsigned GetNumberOfNodes() const;
 };
 
 #endif /* EDGEBASEDGRAPHFACTORY_H_ */

Contractor/TemporaryStorage.cpp

@@ -1,33 +1,34 @@
 /*
- 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
- 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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
- 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.
- */
+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.
 
-#include <boost/foreach.hpp>
+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"
 
 TemporaryStorage::TemporaryStorage() {
-    try {
-        tempDirectory = boost::filesystem::temp_directory_path();
-    } catch(boost::filesystem::filesystem_error & e) {
-        ERR("could not retrieve location of temporary path: " << e.what());
-    }
+    tempDirectory = boost::filesystem::temp_directory_path();
 }
 
 TemporaryStorage & TemporaryStorage::GetInstance(){
@@ -41,12 +42,8 @@ TemporaryStorage::~TemporaryStorage() {
 
 void TemporaryStorage::removeAll() {
     boost::mutex::scoped_lock lock(mutex);
-    try {
-        for(unsigned slotID = 0; slotID < vectorOfStreamDatas.size(); ++slotID)
-            deallocateSlot(slotID);
-
-    } catch(boost::filesystem::filesystem_error & e) {
-        ERR("could not retrieve location of temporary path: " << e.what());
+    for(unsigned slot_id = 0; slot_id < vectorOfStreamDatas.size(); ++slot_id) {
+        deallocateSlot(slot_id);
     }
     vectorOfStreamDatas.clear();
 }
@@ -55,7 +52,7 @@ int TemporaryStorage::allocateSlot() {
     boost::mutex::scoped_lock lock(mutex);
     try {
         vectorOfStreamDatas.push_back(StreamData());
-        //INFO("created new temporary file: " << vectorOfStreamDatas.back().pathToTemporaryFile);
+        //SimpleLogger().Write() << "created new temporary file: " << vectorOfStreamDatas.back().pathToTemporaryFile;
     } catch(boost::filesystem::filesystem_error & e) {
         abort(e);
     }
@@ -66,13 +63,13 @@ void TemporaryStorage::deallocateSlot(int slotID) {
     try {
         StreamData & data = vectorOfStreamDatas[slotID];
         boost::mutex::scoped_lock lock(*data.readWriteMutex);
-                if(!boost::filesystem::exists(data.pathToTemporaryFile)) {
+        if(!boost::filesystem::exists(data.pathToTemporaryFile)) {
             return;
         }
-        if(data.streamToTemporaryFile->is_open())
+        if(data.streamToTemporaryFile->is_open()) {
             data.streamToTemporaryFile->close();
+        }
 
-        //INFO("deallocating slot " << slotID << " and its file: " << data.pathToTemporaryFile);
         boost::filesystem::remove(data.pathToTemporaryFile);
     } catch(boost::filesystem::filesystem_error & e) {
         abort(e);
@@ -83,8 +80,10 @@ void TemporaryStorage::writeToSlot(int slotID, char * pointer, std::streamsize s
     try {
         StreamData & data = vectorOfStreamDatas[slotID];
         boost::mutex::scoped_lock lock(*data.readWriteMutex);
-        if(!data.writeMode)
-            ERR("Writing after first read is not allowed");
+        BOOST_ASSERT_MSG(
+            data.writeMode,
+            "Writing after first read is not allowed"
+        );
         data.streamToTemporaryFile->write(pointer, size);
     } catch(boost::filesystem::filesystem_error & e) {
         abort(e);
@@ -123,13 +122,11 @@ boost::filesystem::fstream::pos_type TemporaryStorage::tell(int slotID) {
     } catch(boost::filesystem::filesystem_error & e) {
         abort(e);
    }
-//    INFO("telling position: " << position);
     return position;
 }
 
 void TemporaryStorage::abort(boost::filesystem::filesystem_error& ) {
     removeAll();
-//    ERR("I/O Error occured: " << e.what());
 }
 
 void TemporaryStorage::seek(int slotID, boost::filesystem::fstream::pos_type position) {
@@ -137,7 +134,6 @@ void TemporaryStorage::seek(int slotID, boost::filesystem::fstream::pos_type pos
         StreamData & data = vectorOfStreamDatas[slotID];
         boost::mutex::scoped_lock lock(*data.readWriteMutex);
         data.streamToTemporaryFile->seekg(position);
-//        INFO("seeking to position: " << position);
     } catch(boost::filesystem::filesystem_error & e) {
         abort(e);
     }

Contractor/TemporaryStorage.h

@@ -1,22 +1,29 @@
 /*
- 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
- 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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
- 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.
- */
+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_
@@ -24,11 +31,15 @@
 #include <vector>
 #include <fstream>
 
+#include <boost/assert.hpp>
+#include <boost/foreach.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 
+#include "../Util/OSRMException.h"
+#include "../Util/SimpleLogger.h"
 #include "../typedefs.h"
 
 //This is one big workaround for latest boost renaming woes.
@@ -101,8 +112,9 @@ private:
             streamToTemporaryFile(new boost::filesystem::fstream(pathToTemporaryFile, std::ios::in | std::ios::out | std::ios::trunc | std::ios::binary)),
             readWriteMutex(new boost::mutex)
         {
-            if(streamToTemporaryFile->fail())
-                ERR("Aborting, because temporary file at " << pathToTemporaryFile << " could not be created");
+            if(streamToTemporaryFile->fail()) {
+                throw OSRMException("temporary file could not be created");
+            }
         }
     };
     //vector of file streams that is used to store temporary data

DataStructures/BinaryHeap.h

@@ -1,35 +1,44 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 BINARYHEAP_H_INCLUDED
 #define BINARYHEAP_H_INCLUDED
 
 //Not compatible with non contiguous node ids
 
-#include <cassert>
-#include <limits>
-#include <vector>
-#include <algorithm>
-#include <map>
 #include <boost/unordered_map.hpp>
 
+#include <cassert>
+
+#include <algorithm>
+#include <limits>
+#include <map>
+#include <vector>
+
 template< typename NodeID, typename Key >
 class ArrayStorage {
 public:
@@ -145,13 +154,13 @@ public:
         return insertedNodes[index].weight;
     }
 
-    bool WasRemoved( NodeID node ) {
+    bool WasRemoved( const NodeID node ) {
         assert( WasInserted( node ) );
         const Key index = nodeIndex[node];
         return insertedNodes[index].key == 0;
     }
 
-    bool WasInserted( NodeID node ) {
+    bool WasInserted( const NodeID node ) {
         const Key index = nodeIndex[node];
         if ( index >= static_cast<Key> (insertedNodes.size()) )
             return false;
@@ -184,8 +193,8 @@ public:
 
     void DecreaseKey( NodeID node, Weight weight ) {
         assert( UINT_MAX != node );
-        const Key index = nodeIndex[node];
-        Key key = insertedNodes[index].key;
+        const Key & index = nodeIndex[node];
+        Key & key = insertedNodes[index].key;
         assert ( key >= 0 );
 
         insertedNodes[index].weight = weight;

DataStructures/ConcurrentQueue.h

@@ -1,25 +1,34 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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.
 
-#ifndef CONCURRENTQUEUE_H_INCLUDED
-#define CONCURRENTQUEUE_H_INCLUDED
+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 CONCURRENTQUEUE_H_
+#define CONCURRENTQUEUE_H_
+
+#include "../typedefs.h"
 
 #include <boost/bind.hpp>
 #include <boost/circular_buffer.hpp>
@@ -27,57 +36,64 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 
-#include "../typedefs.h"
-
 template<typename Data>
 class ConcurrentQueue {
 
-    typedef typename boost::circular_buffer<Data>::size_type size_t;
-
 public:
-    ConcurrentQueue(const size_t max_size) : internal_queue(max_size) { }
+    ConcurrentQueue(const size_t max_size) : m_internal_queue(max_size) { }
 
-    inline void push(Data const& data) {
+    inline void push(const Data & data) {
         boost::mutex::scoped_lock lock(m_mutex);
-        m_not_full.wait(lock, boost::bind(&ConcurrentQueue<Data>::is_not_full, this));
-        internal_queue.push_back(data);
+        m_not_full.wait(
+            lock,
+            boost::bind(&ConcurrentQueue<Data>::is_not_full, this)
+        );
+        m_internal_queue.push_back(data);
         lock.unlock();
         m_not_empty.notify_one();
     }
 
     inline bool empty() const {
-        return internal_queue.empty();
+        return m_internal_queue.empty();
     }
 
-    inline void wait_and_pop(Data& popped_value) {
+    inline void wait_and_pop(Data & popped_value) {
         boost::mutex::scoped_lock lock(m_mutex);
-        m_not_empty.wait(lock, boost::bind(&ConcurrentQueue<Data>::is_not_empty, this));
-        popped_value=internal_queue.front();
-        internal_queue.pop_front();
+        m_not_empty.wait(
+            lock,
+            boost::bind(&ConcurrentQueue<Data>::is_not_empty, this)
+        );
+        popped_value = m_internal_queue.front();
+        m_internal_queue.pop_front();
         lock.unlock();
         m_not_full.notify_one();
     }
 
     inline bool try_pop(Data& popped_value) {
         boost::mutex::scoped_lock lock(m_mutex);
-        if(internal_queue.empty()) {
+        if(m_internal_queue.empty()) {
             return false;
         }
-        popped_value=internal_queue.front();
-        internal_queue.pop_front();
+        popped_value=m_internal_queue.front();
+        m_internal_queue.pop_front();
         lock.unlock();
         m_not_full.notify_one();
         return true;
     }
 
 private:
-    boost::circular_buffer<Data> internal_queue;
-    boost::mutex m_mutex;
-    boost::condition m_not_empty;
-    boost::condition m_not_full;
+    inline bool is_not_empty() const {
+        return !m_internal_queue.empty();
+    }
 
-    inline bool is_not_empty() const { return internal_queue.size() > 0; }
-    inline bool is_not_full() const { return internal_queue.size() < internal_queue.capacity(); }
+    inline bool is_not_full() const {
+        return m_internal_queue.size() < m_internal_queue.capacity();
+    }
+
+    boost::circular_buffer<Data>    m_internal_queue;
+    boost::mutex                    m_mutex;
+    boost::condition                m_not_empty;
+    boost::condition                m_not_full;
 };
 
-#endif //#ifndef CONCURRENTQUEUE_H_INCLUDED
+#endif /* CONCURRENTQUEUE_H_ */

DataStructures/Coordinate.h

@@ -1,25 +1,35 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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.
 
-#ifndef COORDINATE_H_
-#define COORDINATE_H_
+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 FIXED_POINT_COORDINATE_H_
+#define FIXED_POINT_COORDINATE_H_
+
+#include "../DataStructures/MercatorUtil.h"
+#include "../Util/StringUtil.h"
 
 #include <cassert>
 #include <cmath>
@@ -27,11 +37,14 @@ or see http://www.gnu.org/licenses/agpl.txt.
 
 #include <iostream>
 
-struct _Coordinate {
+static const double COORDINATE_PRECISION = 1000000.;
+
+struct FixedPointCoordinate {
     int lat;
     int lon;
-    _Coordinate () : lat(INT_MIN), lon(INT_MIN) {}
-    _Coordinate (int t, int n) : lat(t) , lon(n) {}
+    FixedPointCoordinate () : lat(INT_MIN), lon(INT_MIN) {}
+    explicit FixedPointCoordinate (int lat, int lon) : lat(lat) , lon(lon) {}
+
     void Reset() {
         lat = INT_MIN;
         lon = INT_MIN;
@@ -40,17 +53,22 @@ struct _Coordinate {
         return (INT_MIN != lat) && (INT_MIN != lon);
     }
     inline bool isValid() const {
-        if(lat > 90*100000 || lat < -90*100000 || lon > 180*100000 || lon <-180*100000) {
+        if(
+            lat >   90*COORDINATE_PRECISION ||
+            lat <  -90*COORDINATE_PRECISION ||
+            lon >  180*COORDINATE_PRECISION ||
+            lon < -180*COORDINATE_PRECISION
+        ) {
             return false;
         }
         return true;
     }
-    bool operator==(const _Coordinate & other) const {
+    bool operator==(const FixedPointCoordinate & other) const {
         return lat == other.lat && lon == other.lon;
     }
 };
 
-inline std::ostream & operator<<(std::ostream & out, const _Coordinate & c){
+inline std::ostream & operator<<(std::ostream & out, const FixedPointCoordinate & c){
     out << "(" << c.lat << "," << c.lon << ")";
     return out;
 }
@@ -61,10 +79,10 @@ inline double ApproximateDistance( const int lat1, const int lon1, const int lat
     assert(lat2 != INT_MIN);
     assert(lon2 != INT_MIN);
     double RAD = 0.017453292519943295769236907684886;
-    double lt1 = lat1/100000.;
-    double ln1 = lon1/100000.;
-    double lt2 = lat2/100000.;
-    double ln2 = lon2/100000.;
+    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);
@@ -83,20 +101,20 @@ inline double ApproximateDistance( const int lat1, const int lon1, const int lat
     return distance;
 }
 
-inline double ApproximateDistance(const _Coordinate &c1, const _Coordinate &c2) {
+inline double ApproximateDistance(const FixedPointCoordinate &c1, const FixedPointCoordinate &c2) {
     return ApproximateDistance( c1.lat, c1.lon, c2.lat, c2.lon );
 }
 
-inline double ApproximateDistanceByEuclid(const _Coordinate &c1, const _Coordinate &c2) {
+inline double ApproximateEuclideanDistance(const FixedPointCoordinate &c1, const FixedPointCoordinate &c2) {
     assert(c1.lat != INT_MIN);
     assert(c1.lon != INT_MIN);
     assert(c2.lat != INT_MIN);
     assert(c2.lon != INT_MIN);
     const double RAD = 0.017453292519943295769236907684886;
-    const double lat1 = (c1.lat/100000.)*RAD;
-    const double lon1 = (c1.lon/100000.)*RAD;
-    const double lat2 = (c2.lat/100000.)*RAD;
-    const double lon2 = (c2.lon/100000.)*RAD;
+    const double lat1 = (c1.lat/COORDINATE_PRECISION)*RAD;
+    const double lon1 = (c1.lon/COORDINATE_PRECISION)*RAD;
+    const double lat2 = (c2.lat/COORDINATE_PRECISION)*RAD;
+    const double lon2 = (c2.lon/COORDINATE_PRECISION)*RAD;
 
     const double x = (lon2-lon1) * cos((lat1+lat2)/2.);
     const double y = (lat2-lat1);
@@ -105,4 +123,48 @@ inline double ApproximateDistanceByEuclid(const _Coordinate &c1, const _Coordina
     return d;
 }
 
-#endif /* COORDINATE_H_ */
+static inline void convertInternalLatLonToString(const int value, std::string & output) {
+    char buffer[100];
+    buffer[11] = 0; // zero termination
+    char* string = printInt< 11, 6 >( buffer, value );
+    output = string;
+}
+
+static inline void convertInternalCoordinateToString(const FixedPointCoordinate & coord, std::string & output) {
+    std::string tmp;
+    convertInternalLatLonToString(coord.lon, tmp);
+    output = tmp;
+    output += ",";
+    convertInternalLatLonToString(coord.lat, tmp);
+    output += tmp;
+    output += " ";
+}
+static inline void convertInternalReversedCoordinateToString(const FixedPointCoordinate & coord, std::string & output) {
+    std::string tmp;
+    convertInternalLatLonToString(coord.lat, tmp);
+    output = tmp;
+    output += ",";
+    convertInternalLatLonToString(coord.lon, tmp);
+    output += tmp;
+    output += " ";
+}
+
+
+/* Get angle of line segment (A,C)->(C,B), atan2 magic, formerly cosine theorem*/
+template<class CoordinateT>
+static inline double GetAngleBetweenThreeFixedPointCoordinates (
+    const CoordinateT & A,
+    const CoordinateT & C,
+    const CoordinateT & 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;
+    return angle;
+}
+#endif /* FIXED_POINT_COORDINATE_H_ */

DataStructures/DeallocatingVector.h

@@ -1,27 +1,35 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 <cassert>
+#include <cstring>
 #include <vector>
 
 #if __cplusplus > 199711L

DataStructures/DynamicGraph.h

@@ -1,22 +1,29 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 DYNAMICGRAPH_H_INCLUDED
 #define DYNAMICGRAPH_H_INCLUDED
@@ -194,7 +201,7 @@ class DynamicGraph {
         //searches for a specific edge
         EdgeIterator FindEdge( const NodeIterator from, const NodeIterator to ) const {
             for ( EdgeIterator i = BeginEdges( from ), iend = EndEdges( from ); i != iend; ++i ) {
-                if ( m_edges[i].target == to ) {
+                if ( to == m_edges[i].target ) {
                     return i;
                 }
             }

DataStructures/GridEdge.h

@@ -1,82 +0,0 @@
-/*
-    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 GRIDEDGE_H_
-#define GRIDEDGE_H_
-
-#include "Coordinate.h"
-
-struct _GridEdge {
-    _GridEdge(NodeID n, NodeID na, int w, _Coordinate sc, _Coordinate tc, bool bttc) : edgeBasedNode(n), nameID(na), weight(w), startCoord(sc), targetCoord(tc), belongsToTinyComponent(bttc) {}
-    _GridEdge() : edgeBasedNode(UINT_MAX), nameID(UINT_MAX), weight(INT_MAX), belongsToTinyComponent(false) {}
-    NodeID edgeBasedNode;
-    NodeID nameID;
-    int weight;
-    _Coordinate startCoord;
-    _Coordinate targetCoord;
-    bool belongsToTinyComponent;
-
-    bool operator< ( const _GridEdge& right) const {
-        return edgeBasedNode < right.edgeBasedNode;
-    }
-    bool operator== ( const _GridEdge& right) const {
-        return edgeBasedNode == right.edgeBasedNode;
-    }
-};
-
-struct GridEntry {
-    GridEntry() : fileIndex(UINT_MAX), ramIndex(UINT_MAX){}
-    GridEntry(_GridEdge e, unsigned f, unsigned r) : edge(e), fileIndex(f), ramIndex(r) {}
-    _GridEdge edge;
-    unsigned fileIndex;
-    unsigned ramIndex;
-    bool operator< ( const GridEntry& right ) const {
-        return (edge.edgeBasedNode < right.edge.edgeBasedNode);
-    }
-    bool operator==( const GridEntry& right ) const {
-        return right.edge.edgeBasedNode == edge.edgeBasedNode;
-    }
-};
-
-struct CompareGridEdgeDataByFileIndex {
-    bool operator ()  (const GridEntry & a, const GridEntry & b) const {
-        return a.fileIndex < b.fileIndex;
-    }
-};
-
-struct CompareGridEdgeDataByRamIndex {
-    typedef GridEntry value_type;
-
-    bool operator ()  (const GridEntry & a, const GridEntry & b) const {
-        return a.ramIndex < b.ramIndex;
-    }
-    value_type max_value() {
-        GridEntry e;
-        e.ramIndex = (1024*1024) - 1;
-        return e;
-    }
-    value_type min_value() {
-        GridEntry e;
-        e.ramIndex = 0;
-        return e;
-    }
-};
-
-#endif /* GRIDEDGE_H_ */

DataStructures/HashTable.h

@@ -1,79 +1,67 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
+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.
 
-  Created on: 18.11.2010
-  Author: dennis
- */
+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 HASHTABLE_H_
 #define HASHTABLE_H_
 
+#include <boost/ref.hpp>
 #include <boost/unordered_map.hpp>
 
 template<typename keyT, typename valueT>
-class HashTable {
-    typedef boost::unordered_map<keyT, valueT> MyHashTable;
+class HashTable : public boost::unordered_map<keyT, valueT> {
+private:
+    typedef boost::unordered_map<keyT, valueT> super;
 public:
-    typedef typename boost::unordered_map<keyT, valueT>::const_iterator MyIterator;
-    typedef MyIterator iterator;
-    HashTable() { }
-    HashTable(const unsigned size) {
-        table.resize(size);
+    HashTable() : super() { }
+
+    HashTable(const unsigned size) : super(size) { }
+
+    HashTable &operator=(const HashTable &other) {
+        super::operator = (other);
+        return *this;
     }
+
     inline void Add(const keyT& key, const valueT& value){
-        table[key] = value;
-    }
-    inline void Set(const keyT& key, const valueT& value){
-        table[key] = value;
+        super::insert(std::make_pair(key, value));
     }
+
     inline valueT Find(const keyT& key) const {
-        if(table.find(key) == table.end())
+        if(super::find(key) == super::end()) {
             return valueT();
-        return table.find(key)->second;
+        }
+        return boost::ref(super::find(key)->second);
     }
 
     inline bool Holds(const keyT& key) const {
-        if(table.find(key) == table.end())
+        if(super::find(key) == super::end()) {
             return false;
+        }
         return true;
     }
-    void EraseAll() {
-        if(table.size() > 0)
-            table.clear();
-    }
-
-    inline valueT operator[] (keyT key) const {
-    	if(table.find(key) == table.end())
-    		return valueT();
-    	return table.find(key)->second;
-    }
-    inline unsigned Size() const {
-        return table.size();
-    }
-    MyIterator begin() const {
-        return table.begin();
-    }
-    MyIterator end() const {
-        return table.end();
-    }
-private:
-    MyHashTable table;
 };
 
 #endif /* HASHTABLE_H_ */

DataStructures/HilbertValue.h

@@ -1,26 +1,35 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 HILBERTVALUE_H_
 #define HILBERTVALUE_H_
 
+#include "Coordinate.h"
+
 #include <boost/integer.hpp>
 #include <boost/noncopyable.hpp>
 
@@ -29,10 +38,11 @@ or see http://www.gnu.org/licenses/agpl.txt.
 class HilbertCode : boost::noncopyable {
 public:
 	static uint64_t GetHilbertNumberForCoordinate(
-			const _Coordinate & current_coordinate) {
+		const FixedPointCoordinate & current_coordinate
+	) {
 		unsigned location[2];
-		location[0] = current_coordinate.lat+( 90*100000);
-		location[1] = current_coordinate.lon+(180*100000);
+		location[0] = current_coordinate.lat+( 90*COORDINATE_PRECISION);
+		location[1] = current_coordinate.lon+(180*COORDINATE_PRECISION);
 
 		TransposeCoordinate(location);
 		const uint64_t result = BitInterleaving(location[0], location[1]);

DataStructures/ImportEdge.h

@@ -1,31 +1,41 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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.
 
-#ifndef EDGE_H
-#define EDGE_H
+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 <cassert>
+*/
+
+#ifndef IMPORT_EDGE_H
+#define IMPORT_EDGE_H
+
+#include "../Util/OSRMException.h"
+#include "../typedefs.h"
+
+#include <boost/assert.hpp>
 
 class NodeBasedEdge {
-public:
 
+public:
     bool operator< (const NodeBasedEdge& e) const {
         if (source() == e.source()) {
             if (target() == e.target()) {
@@ -40,45 +50,70 @@ public:
         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) :
-                                            _source(s), _target(t), _name(n), _weight(w), forward(f), backward(b), _type(ty), _roundabout(ra), _ignoreInGrid(ig), _accessRestricted(ar), _contraFlow(cf) { if(ty < 0) {ERR("Type: " << ty);}; }
+    explicit NodeBasedEdge(
+        NodeID s,
+        NodeID t,
+        NodeID n,
+        EdgeWeight w,
+        bool f,
+        bool b,
+        short ty,
+        bool ra,
+        bool ig,
+        bool ar,
+        bool cf
+    ) : _source(s),
+        _target(t),
+        _name(n),
+        _weight(w),
+        _type(ty),
+        forward(f),
+        backward(b),
+        _roundabout(ra),
+        _ignoreInGrid(ig),
+        _accessRestricted(ar),
+        _contraFlow(cf)
+    {
+        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; }
+    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; }
 
-    short type() const { assert(_type >= 0); 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; }
-
-    NodeID _source;
-    NodeID _target;
-    NodeID _name;
-    EdgeWeight _weight;
-    bool forward;
-    bool backward;
-    short _type;
-    bool _roundabout;
-    bool _ignoreInGrid;
-    bool _accessRestricted;
-    bool _contraFlow;
+    //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;
 
 private:
-    /** Default constructor. target and weight are set to 0.*/
-    NodeBasedEdge() :
-        _source(0), _target(0), _name(0), _weight(0), forward(0), backward(0), _type(0), _roundabout(false), _ignoreInGrid(false), _accessRestricted(false), _contraFlow(false) { assert(false); } //shall not be used.
-
+    NodeBasedEdge() { }
 };
 
 class EdgeBasedEdge {
-public:
 
+public:
     bool operator< (const EdgeBasedEdge& e) const {
         if (source() == e.source()) {
             if (target() == e.target()) {
@@ -113,7 +148,14 @@ public:
         m_backward(false)
     { }
 
-    explicit EdgeBasedEdge(const NodeID s, const NodeID t, const NodeID v, const EdgeWeight w, const bool f, const bool b) :
+    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),
@@ -122,21 +164,22 @@ public:
         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; }
+    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;
+    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 // EDGE_H
+#endif /* IMPORT_EDGE_H */

DataStructures/ImportNode.h

@@ -1,27 +1,34 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 IMPORTNODE_H_
 #define IMPORTNODE_H_
 
-#include "NodeCoords.h"
+#include "QueryNode.h"
 #include "../DataStructures/HashTable.h"
 
 
@@ -44,9 +51,9 @@ struct _Node : NodeInfo{
 
 struct ImportNode : public _Node {
     HashTable<std::string, std::string> keyVals;
-	
+
 	inline void Clear() {
-		keyVals.EraseAll();
+		keyVals.clear();
 		lat = 0; lon = 0; id = 0; bollard = false; trafficLight = false;
 	}
 };

DataStructures/InputReaderFactory.h

@@ -1,22 +1,30 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+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.
+
+*/
 
-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 INPUTREADERFACTORY_H
 #define INPUTREADERFACTORY_H

DataStructures/LRUCache.h

@@ -1,22 +1,29 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 LRUCACHE_H
 #define LRUCACHE_H

DataStructures/MercatorUtil.h

@@ -1,21 +1,28 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+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.
 
-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 MERCATORUTIL_H_

DataStructures/NNGrid.h

@@ -1,602 +0,0 @@
-/*
-    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 NNGRID_H_
-#define NNGRID_H_
-
-#include <cassert>
-#include <cfloat>
-#include <cmath>
-#include <cstring>
-
-#include <algorithm>
-#include <fstream>
-#include <limits>
-#include <vector>
-
-#ifndef ROUTED
-#include <stxxl.h>
-#endif
-
-#ifdef _WIN32
-#include <math.h>
-#endif
-
-#include <boost/thread.hpp>
-#include <boost/foreach.hpp>
-#include <boost/unordered_map.hpp>
-
-#include "DeallocatingVector.h"
-#include "GridEdge.h"
-#include "Percent.h"
-#include "PhantomNodes.h"
-#include "MercatorUtil.h"
-#include "StaticGraph.h"
-#include "TimingUtil.h"
-#include "../Algorithms/Bresenham.h"
-
-namespace NNGrid{
-
-static boost::thread_specific_ptr<std::ifstream> localStream;
-
-template<bool WriteAccess = false>
-class NNGrid {
-public:
-    NNGrid() /*: cellCache(500), fileCache(500)*/ {
-        ramIndexTable.resize((1024*1024), std::numeric_limits<uint64_t>::max());
-    }
-
-    NNGrid(const char* rif, const char* _i) {
-        if(WriteAccess) {
-            ERR("Not available in Write mode");
-        }
-        iif = std::string(_i);
-        ramIndexTable.resize((1024*1024), std::numeric_limits<uint64_t>::max());
-        ramInFile.open(rif, std::ios::in | std::ios::binary);
-        if(!ramInFile) { ERR(rif <<  " not found"); }
-
-    }
-
-    ~NNGrid() {
-        if(ramInFile.is_open()) ramInFile.close();
-
-#ifndef ROUTED
-        if (WriteAccess) {
-            entries.clear();
-        }
-#endif
-        if(localStream.get() && localStream->is_open()) {
-            localStream->close();
-        }
-    }
-
-    void OpenIndexFiles() {
-        assert(ramInFile.is_open());
-        ramInFile.read(static_cast<char*>(static_cast<void*>(&ramIndexTable[0]) ), sizeof(uint64_t)*1024*1024);
-        ramInFile.close();
-    }
-
-#ifndef ROUTED
-    template<typename EdgeT>
-    inline void ConstructGrid(DeallocatingVector<EdgeT> & edgeList, const char * ramIndexOut, const char * fileIndexOut) {
-    	//TODO: Implement this using STXXL-Streams
-        Percent p(edgeList.size());
-        BOOST_FOREACH(EdgeT & edge, edgeList) {
-            p.printIncrement();
-            if(edge.ignoreInGrid)
-                continue;
-            int slat = 100000*lat2y(edge.lat1/100000.);
-            int slon = edge.lon1;
-            int tlat = 100000*lat2y(edge.lat2/100000.);
-            int tlon = edge.lon2;
-            AddEdge( _GridEdge( edge.id, edge.nameID, edge.weight, _Coordinate(slat, slon), _Coordinate(tlat, tlon), edge.belongsToTinyComponent ) );
-        }
-        if( 0 == entries.size() ) {
-        	ERR("No viable edges for nearest neighbor index. Aborting");
-        }
-        double timestamp = get_timestamp();
-        //create index file on disk, old one is over written
-        indexOutFile.open(fileIndexOut, std::ios::out | std::ios::binary | std::ios::trunc);
-        //sort entries
-        stxxl::sort(entries.begin(), entries.end(), CompareGridEdgeDataByRamIndex(), 1024*1024*1024);
-        INFO("finished sorting after " << (get_timestamp() - timestamp) << "s");
-        std::vector<GridEntry> entriesInFileWithRAMSameIndex;
-        unsigned indexInRamTable = entries.begin()->ramIndex;
-        uint64_t lastPositionInIndexFile = 0;
-        std::cout << "writing data ..." << std::flush;
-        p.reinit(entries.size());
-        boost::unordered_map< unsigned, unsigned > cellMap(1024);
-        BOOST_FOREACH(GridEntry & gridEntry, entries) {
-            p.printIncrement();
-            if(gridEntry.ramIndex != indexInRamTable) {
-                cellMap.clear();
-                BuildCellIndexToFileIndexMap(indexInRamTable, cellMap);
-
-                unsigned numberOfBytesInCell = FillCell(entriesInFileWithRAMSameIndex, lastPositionInIndexFile, cellMap);
-                ramIndexTable[indexInRamTable] = lastPositionInIndexFile;
-                lastPositionInIndexFile += numberOfBytesInCell;
-                entriesInFileWithRAMSameIndex.clear();
-                indexInRamTable = gridEntry.ramIndex;
-            }
-            entriesInFileWithRAMSameIndex.push_back(gridEntry);
-        }
-        cellMap.clear();
-        BuildCellIndexToFileIndexMap(indexInRamTable, cellMap);
-        /*unsigned numberOfBytesInCell = */FillCell(entriesInFileWithRAMSameIndex, lastPositionInIndexFile, cellMap);
-        ramIndexTable[indexInRamTable] = lastPositionInIndexFile;
-        entriesInFileWithRAMSameIndex.clear();
-        std::vector<GridEntry>().swap(entriesInFileWithRAMSameIndex);
-        assert(entriesInFileWithRAMSameIndex.size() == 0);
-        //close index file
-        indexOutFile.close();
-
-        //Serialize RAM Index
-        std::ofstream ramFile(ramIndexOut, std::ios::out | std::ios::binary | std::ios::trunc);
-        //write 4 MB of index Table in RAM
-        ramFile.write((char *)&ramIndexTable[0], sizeof(uint64_t)*1024*1024 );
-        //close ram index file
-        ramFile.close();
-    }
-#endif
-    inline bool CoordinatesAreEquivalent(const _Coordinate & a, const _Coordinate & b, const _Coordinate & c, const _Coordinate & d) const {
-        return (a == b && c == d) || (a == c && b == d) || (a == d && b == c);
-    }
-
-    bool FindPhantomNodeForCoordinate( const _Coordinate & location, PhantomNode & resultNode, const unsigned zoomLevel) {
-        bool ignoreTinyComponents = (zoomLevel <= 14);
-//        INFO("Coordinate: " << location << ", zoomLevel: " << zoomLevel << ", ignoring tinyComponentents: " << (ignoreTinyComponents ? "yes" : "no"));
-//        double time1 = get_timestamp();
-        bool foundNode = false;
-        const _Coordinate startCoord(100000*(lat2y(static_cast<double>(location.lat)/100000.)), location.lon);
-        /** search for point on edge close to source */
-        const unsigned fileIndex = GetFileIndexForLatLon(startCoord.lat, startCoord.lon);
-        std::vector<_GridEdge> candidates;
-        const int lowerBoundForLoop = (fileIndex < 32768 ? 0 : -32768);
-        for(int j = lowerBoundForLoop; (j < (32768+1)) && (fileIndex != UINT_MAX); j+=32768) {
-            for(int i = -1; i < 2; ++i){
-//                unsigned oldSize = candidates.size();
-                GetContentsOfFileBucketEnumerated(fileIndex+i+j, candidates);
-//                INFO("Getting fileIndex=" << fileIndex+i+j << " with " << candidates.size() - oldSize << " candidates");
-            }
-        }
-//        INFO("looked up " << candidates.size());
-        _GridEdge smallestEdge;
-        _Coordinate tmp, edgeStartCoord, edgeEndCoord;
-        double dist = std::numeric_limits<double>::max();
-        double r, tmpDist;
-
-        BOOST_FOREACH(const _GridEdge & candidate, candidates) {
-            if(candidate.belongsToTinyComponent && ignoreTinyComponents)
-                continue;
-            r = 0.;
-            tmpDist = ComputeDistance(startCoord, candidate.startCoord, candidate.targetCoord, tmp, &r);
-//            INFO("dist " << startCoord << "->[" << candidate.startCoord << "-" << candidate.targetCoord << "]=" << tmpDist );
-//            INFO("Looking at edge " << candidate.edgeBasedNode << " at distance " << tmpDist);
-            if(tmpDist < dist && !DoubleEpsilonCompare(dist, tmpDist)) {
-//                INFO("a) " << candidate.edgeBasedNode << ", dist: " << tmpDist << ", tinyCC: " << (candidate.belongsToTinyComponent ? "yes" : "no"));
-                dist = tmpDist;
-                resultNode.edgeBasedNode = candidate.edgeBasedNode;
-                resultNode.nodeBasedEdgeNameID = candidate.nameID;
-                resultNode.weight1 = candidate.weight;
-                resultNode.weight2 = INT_MAX;
-                resultNode.location.lat = tmp.lat;
-                resultNode.location.lon = tmp.lon;
-                edgeStartCoord = candidate.startCoord;
-                edgeEndCoord = candidate.targetCoord;
-                foundNode = true;
-                smallestEdge = candidate;
-                //}  else if(tmpDist < dist) {
-                //INFO("a) ignored " << candidate.edgeBasedNode << " at distance " << std::fabs(dist - tmpDist));
-            } else if(DoubleEpsilonCompare(dist, tmpDist) && 1 == std::abs(static_cast<int>(candidate.edgeBasedNode)-static_cast<int>(resultNode.edgeBasedNode) )  && CoordinatesAreEquivalent(edgeStartCoord, candidate.startCoord, edgeEndCoord, candidate.targetCoord)) {
-                resultNode.edgeBasedNode = std::min(candidate.edgeBasedNode, resultNode.edgeBasedNode);
-                resultNode.weight2 = candidate.weight;
-                //INFO("b) " << candidate.edgeBasedNode << ", dist: " << tmpDist);
-            }
-        }
-
-        //        INFO("startcoord: " << smallestEdge.startCoord << ", tgtcoord" <<  smallestEdge.targetCoord << "result: " << newEndpoint);
-        //        INFO("length of old edge: " << ApproximateDistance(smallestEdge.startCoord, smallestEdge.targetCoord));
-        //        INFO("Length of new edge: " << ApproximateDistance(smallestEdge.startCoord, newEndpoint));
-        //        assert(!resultNode.isBidirected() || (resultNode.weight1 == resultNode.weight2));
-        //        if(resultNode.weight1 != resultNode.weight2) {
-        //            INFO("-> Weight1: " << resultNode.weight1 << ", weight2: " << resultNode.weight2);
-        //            INFO("-> node: " << resultNode.edgeBasedNode << ", bidir: " << (resultNode.isBidirected() ? "yes" : "no"));
-        //        }
-
-//        INFO("startCoord: " << smallestEdge.startCoord << "; targetCoord: " << smallestEdge.targetCoord << "; newEndpoint: " << resultNode.location);
-        const double ratio = (foundNode ? std::min(1., ApproximateDistance(smallestEdge.startCoord, resultNode.location)/ApproximateDistance(smallestEdge.startCoord, smallestEdge.targetCoord)) : 0);
-        resultNode.location.lat = round(100000.*(y2lat(static_cast<double>(resultNode.location.lat)/100000.)));
-//        INFO("Length of vector: " << ApproximateDistance(smallestEdge.startCoord, resultNode.location)/ApproximateDistance(smallestEdge.startCoord, smallestEdge.targetCoord));
-        //Hack to fix rounding errors and wandering via nodes.
-        if(std::abs(location.lon - resultNode.location.lon) == 1)
-            resultNode.location.lon = location.lon;
-        if(std::abs(location.lat - resultNode.location.lat) == 1)
-            resultNode.location.lat = location.lat;
-
-        resultNode.weight1 *= ratio;
-        if(INT_MAX != resultNode.weight2) {
-            resultNode.weight2 *= (1.-ratio);
-        }
-        resultNode.ratio = ratio;
-//        INFO("start: " << edgeStartCoord << ", end: " << edgeEndCoord);
-//        INFO("selected node: " << resultNode.edgeBasedNode << ", bidirected: " << (resultNode.isBidirected() ? "yes" : "no"));
-//        INFO("New weight1: " << resultNode.weight1 << ", new weight2: " << resultNode.weight2 << ", ratio: " << ratio);
- //       INFO("distance to input coordinate: " << ApproximateDistance(location, resultNode.location) <<  "\n--");
-//        double time2 = get_timestamp();
-//        INFO("NN-Lookup in " << 1000*(time2-time1) << "ms");
-        return foundNode;
-    }
-
-    bool FindRoutingStarts(const _Coordinate& start, const _Coordinate& target, PhantomNodes & routingStarts, unsigned zoomLevel) {
-        routingStarts.Reset();
-        return (FindPhantomNodeForCoordinate( start, routingStarts.startPhantom, zoomLevel) &&
-                FindPhantomNodeForCoordinate( target, routingStarts.targetPhantom, zoomLevel) );
-    }
-
-    bool FindNearestCoordinateOnEdgeInNodeBasedGraph(const _Coordinate& inputCoordinate, _Coordinate& outputCoordinate, unsigned zoomLevel = 18) {
-        PhantomNode resultNode;
-        bool foundNode = FindPhantomNodeForCoordinate(inputCoordinate, resultNode, zoomLevel);
-        outputCoordinate = resultNode.location;
-        return foundNode;
-    }
-
-    void FindNearestPointOnEdge(const _Coordinate& inputCoordinate, _Coordinate& outputCoordinate) {
-        _Coordinate startCoord(100000*(lat2y(static_cast<double>(inputCoordinate.lat)/100000.)), inputCoordinate.lon);
-        unsigned fileIndex = GetFileIndexForLatLon(startCoord.lat, startCoord.lon);
-
-        std::vector<_GridEdge> candidates;
-        boost::unordered_map< unsigned, unsigned > cellMap;
-        for(int j = -32768; j < (32768+1); j+=32768) {
-            for(int i = -1; i < 2; ++i) {
-                GetContentsOfFileBucket(fileIndex+i+j, candidates, cellMap);
-            }
-        }
-        _Coordinate tmp;
-        double dist = (std::numeric_limits<double>::max)();
-        BOOST_FOREACH(const _GridEdge & candidate, candidates) {
-            double r = 0.;
-            double tmpDist = ComputeDistance(startCoord, candidate.startCoord, candidate.targetCoord, tmp, &r);
-            if(tmpDist < dist) {
-                dist = tmpDist;
-                outputCoordinate.lat = round(100000*(y2lat(static_cast<double>(tmp.lat)/100000.)));
-                outputCoordinate.lon = tmp.lon;
-            }
-        }
-    }
-
-
-private:
-    inline unsigned GetCellIndexFromRAMAndFileIndex(const unsigned ramIndex, const unsigned fileIndex) const {
-        unsigned lineBase = ramIndex/1024;
-        lineBase = lineBase*32*32768;
-        unsigned columnBase = ramIndex%1024;
-        columnBase=columnBase*32;
-        for (int i = 0;i < 32;++i) {
-            for (int j = 0;j < 32;++j) {
-                const unsigned localFileIndex = lineBase + i * 32768 + columnBase + j;
-                if(localFileIndex == fileIndex) {
-                    unsigned cellIndex = i * 32 + j;
-                    return cellIndex;
-                }
-            }
-        }
-        return UINT_MAX;
-    }
-
-    inline void BuildCellIndexToFileIndexMap(const unsigned ramIndex, boost::unordered_map<unsigned, unsigned >& cellMap){
-        unsigned lineBase = ramIndex/1024;
-        lineBase = lineBase*32*32768;
-        unsigned columnBase = ramIndex%1024;
-        columnBase=columnBase*32;
-        std::vector<std::pair<unsigned, unsigned> >insertionVector(1024);
-        for (int i = 0;i < 32;++i) {
-            for (int j = 0;j < 32;++j) {
-                unsigned fileIndex = lineBase + i * 32768 + columnBase + j;
-                unsigned cellIndex = i * 32 + j;
-                insertionVector[i * 32 + j] = std::make_pair(fileIndex, cellIndex);
-            }
-        }
-        cellMap.insert(insertionVector.begin(), insertionVector.end());
-    }
-
-    inline bool DoubleEpsilonCompare(const double d1, const double d2) const {
-        return (std::fabs(d1 - d2) < FLT_EPSILON);
-    }
-
-#ifndef ROUTED
-    inline unsigned FillCell(std::vector<GridEntry>& entriesWithSameRAMIndex, const uint64_t fileOffset, boost::unordered_map< unsigned, unsigned > & cellMap ) {
-        std::vector<char> tmpBuffer(32*32*4096,0);
-        uint64_t indexIntoTmpBuffer = 0;
-        unsigned numberOfWrittenBytes = 0;
-        assert(indexOutFile.is_open());
-
-        std::vector<uint64_t> cellIndex(32*32,std::numeric_limits<uint64_t>::max());
-
-        for(unsigned i = 0; i < entriesWithSameRAMIndex.size() -1; ++i) {
-            assert(entriesWithSameRAMIndex[i].ramIndex== entriesWithSameRAMIndex[i+1].ramIndex);
-        }
-
-        //sort & unique
-        std::sort(entriesWithSameRAMIndex.begin(), entriesWithSameRAMIndex.end(), CompareGridEdgeDataByFileIndex());
-//        entriesWithSameRAMIndex.erase(std::unique(entriesWithSameRAMIndex.begin(), entriesWithSameRAMIndex.end()), entriesWithSameRAMIndex.end());
-
-        //traverse each file bucket and write its contents to disk
-        std::vector<GridEntry> entriesWithSameFileIndex;
-        unsigned fileIndex = entriesWithSameRAMIndex.begin()->fileIndex;
-
-        BOOST_FOREACH(GridEntry & gridEntry, entriesWithSameRAMIndex) {
-            assert(cellMap.find(gridEntry.fileIndex) != cellMap.end() ); //asserting that file index belongs to cell index
-            if(gridEntry.fileIndex != fileIndex) {
-                // start in cellIndex vermerken
-                int localFileIndex = entriesWithSameFileIndex.begin()->fileIndex;
-                int localCellIndex = cellMap.find(localFileIndex)->second;
-                assert(cellMap.find(entriesWithSameFileIndex.begin()->fileIndex) != cellMap.end());
-
-                cellIndex[localCellIndex] = indexIntoTmpBuffer + fileOffset;
-                indexIntoTmpBuffer += FlushEntriesWithSameFileIndexToBuffer(entriesWithSameFileIndex, tmpBuffer, indexIntoTmpBuffer);
-                fileIndex = gridEntry.fileIndex;
-            }
-            entriesWithSameFileIndex.push_back(gridEntry);
-        }
-        assert(cellMap.find(entriesWithSameFileIndex.begin()->fileIndex) != cellMap.end());
-        int localFileIndex = entriesWithSameFileIndex.begin()->fileIndex;
-        int localCellIndex = cellMap.find(localFileIndex)->second;
-
-        cellIndex[localCellIndex] = indexIntoTmpBuffer + fileOffset;
-        indexIntoTmpBuffer += FlushEntriesWithSameFileIndexToBuffer(entriesWithSameFileIndex, tmpBuffer, indexIntoTmpBuffer);
-
-        assert(entriesWithSameFileIndex.size() == 0);
-        indexOutFile.write(static_cast<char*>(static_cast<void*>(&cellIndex[0])),32*32*sizeof(uint64_t));
-        numberOfWrittenBytes += 32*32*sizeof(uint64_t);
-
-        //write contents of tmpbuffer to disk
-        indexOutFile.write(&tmpBuffer[0], indexIntoTmpBuffer*sizeof(char));
-        numberOfWrittenBytes += indexIntoTmpBuffer*sizeof(char);
-
-        return numberOfWrittenBytes;
-    }
-
-    inline unsigned FlushEntriesWithSameFileIndexToBuffer( std::vector<GridEntry> &vectorWithSameFileIndex, std::vector<char> & tmpBuffer, const uint64_t index) const {
-        sort( vectorWithSameFileIndex.begin(), vectorWithSameFileIndex.end() );
-        vectorWithSameFileIndex.erase(unique(vectorWithSameFileIndex.begin(), vectorWithSameFileIndex.end()), vectorWithSameFileIndex.end());
-        const unsigned lengthOfBucket = vectorWithSameFileIndex.size();
-        tmpBuffer.resize(tmpBuffer.size()+(sizeof(_GridEdge)*lengthOfBucket) + sizeof(unsigned) );
-        unsigned counter = 0;
-
-        for(unsigned i = 0; i < vectorWithSameFileIndex.size()-1; ++i) {
-            assert( vectorWithSameFileIndex[i].fileIndex == vectorWithSameFileIndex[i+1].fileIndex );
-            assert( vectorWithSameFileIndex[i].ramIndex == vectorWithSameFileIndex[i+1].ramIndex );
-        }
-
-        //write length of bucket
-        memcpy((char*)&(tmpBuffer[index+counter]), (char*)&lengthOfBucket, sizeof(lengthOfBucket));
-        counter += sizeof(lengthOfBucket);
-
-        BOOST_FOREACH(const GridEntry & entry, vectorWithSameFileIndex) {
-            char * data = (char*)&(entry.edge);
-            memcpy(static_cast<char*>(static_cast<void*>(&(tmpBuffer[index+counter]) )), data, sizeof(entry.edge));
-            counter += sizeof(entry.edge);
-        }
-        //Freeing data
-        vectorWithSameFileIndex.clear();
-        return counter;
-    }
-#endif
-
-    inline void GetContentsOfFileBucketEnumerated(const unsigned fileIndex, std::vector<_GridEdge>& result) const {
-        unsigned ramIndex = GetRAMIndexFromFileIndex(fileIndex);
-        uint64_t startIndexInFile = ramIndexTable[ramIndex];
-        if(startIndexInFile == std::numeric_limits<uint64_t>::max()) {
-            return;
-        }
-        unsigned enumeratedIndex = GetCellIndexFromRAMAndFileIndex(ramIndex, fileIndex);
-
-        if(!localStream.get() || !localStream->is_open()) {
-            localStream.reset(new std::ifstream(iif.c_str(), std::ios::in | std::ios::binary));
-        }
-        if(!localStream->good()) {
-            localStream->clear(std::ios::goodbit);
-            DEBUG("Resetting stale filestream");
-        }
-
-        //only read the single necessary cell index
-        localStream->seekg(startIndexInFile+(enumeratedIndex*sizeof(uint64_t)));
-        uint64_t fetchedIndex = 0;
-        localStream->read(static_cast<char*>( static_cast<void*>(&fetchedIndex)), sizeof(uint64_t));
-
-        if(fetchedIndex == std::numeric_limits<uint64_t>::max()) {
-            return;
-        }
-        const uint64_t position = fetchedIndex + 32*32*sizeof(uint64_t) ;
-
-        unsigned lengthOfBucket;
-        unsigned currentSizeOfResult = result.size();
-        localStream->seekg(position);
-        localStream->read(static_cast<char*>( static_cast<void*>(&(lengthOfBucket))), sizeof(unsigned));
-        result.resize(currentSizeOfResult+lengthOfBucket);
-        localStream->read(static_cast<char*>( static_cast<void*>(&result[currentSizeOfResult])), lengthOfBucket*sizeof(_GridEdge));
-    }
-
-    inline void GetContentsOfFileBucket(const unsigned fileIndex, std::vector<_GridEdge>& result, boost::unordered_map< unsigned, unsigned> & cellMap) {
-        unsigned ramIndex = GetRAMIndexFromFileIndex(fileIndex);
-        uint64_t startIndexInFile = ramIndexTable[ramIndex];
-        if(startIndexInFile == std::numeric_limits<uint64_t>::max()) {
-            return;
-        }
-
-        uint64_t cellIndex[32*32];
-
-        cellMap.clear();
-        BuildCellIndexToFileIndexMap(ramIndex,  cellMap);
-        if(!localStream.get() || !localStream->is_open()) {
-            localStream.reset(new std::ifstream(iif.c_str(), std::ios::in | std::ios::binary));
-        }
-        if(!localStream->good()) {
-            localStream->clear(std::ios::goodbit);
-            DEBUG("Resetting stale filestream");
-        }
-
-        localStream->seekg(startIndexInFile);
-        localStream->read(static_cast<char*>(static_cast<void*>( cellIndex)), 32*32*sizeof(uint64_t));
-        assert(cellMap.find(fileIndex) != cellMap.end());
-        if(cellIndex[cellMap[fileIndex]] == std::numeric_limits<uint64_t>::max()) {
-            return;
-        }
-        const uint64_t position = cellIndex[cellMap[fileIndex]] + 32*32*sizeof(uint64_t) ;
-
-        unsigned lengthOfBucket;
-        unsigned currentSizeOfResult = result.size();
-        localStream->seekg(position);
-        localStream->read(static_cast<char*>(static_cast<void*>(&(lengthOfBucket))), sizeof(unsigned));
-        result.resize(currentSizeOfResult+lengthOfBucket);
-        localStream->read(static_cast<char*>(static_cast<void*>(&result[currentSizeOfResult])), lengthOfBucket*sizeof(_GridEdge));
-    }
-
-#ifndef ROUTED
-    inline void AddEdge(const _GridEdge & edge) {
-        std::vector<BresenhamPixel> indexList;
-        GetListOfIndexesForEdgeAndGridSize(edge.startCoord, edge.targetCoord, indexList);
-        for(unsigned i = 0; i < indexList.size(); ++i) {
-            entries.push_back(GridEntry(edge, indexList[i].first, indexList[i].second));
-        }
-    }
-#endif
-
-    inline double ComputeDistance(const _Coordinate& inputPoint, const _Coordinate& source, const _Coordinate& target, _Coordinate& nearest, double *r) {
-//        INFO("comparing point " << inputPoint << " to edge [" << source << "-" << target << "]");
-        const double x = static_cast<double>(inputPoint.lat);
-        const double y = static_cast<double>(inputPoint.lon);
-        const double a = static_cast<double>(source.lat);
-        const double b = static_cast<double>(source.lon);
-        const double c = static_cast<double>(target.lat);
-        const double d = static_cast<double>(target.lon);
-        double p,q,mX,nY;
-//        INFO("x=" << x << ", y=" << y << ", a=" << a << ", b=" << b << ", c=" << c << ", d=" << d);
-        if(fabs(a-c) > FLT_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);
-        mX = (p - nY*a)/c;// These values are actually n/m+n and m/m+n , we neednot calculate the values of m an n as we are just interested in the ratio
-//        INFO("p=" << p << ", q=" << q << ", nY=" << nY << ", mX=" << mX);
-        if(std::isnan(mX)) {
-            *r = (target == inputPoint) ? 1. : 0.;
-        } else {
-            *r = mX;
-        }
-//        INFO("r=" << *r);
-        if(*r<=0.){
-            nearest.lat = source.lat;
-            nearest.lon = source.lon;
-//            INFO("a returning distance " << ((b - y)*(b - y) + (a - x)*(a - x)))
-            return ((b - y)*(b - y) + (a - x)*(a - x));
-        }
-        else if(*r >= 1.){
-            nearest.lat = target.lat;
-            nearest.lon = target.lon;
-//            INFO("b returning distance " << ((d - y)*(d - y) + (c - x)*(c - x)))
-
-            return ((d - y)*(d - y) + (c - x)*(c - x));
-        }
-        // point lies in between
-        nearest.lat = p;
-        nearest.lon = q;
-//        INFO("c returning distance " << (p-x)*(p-x) + (q-y)*(q-y))
-
-        return (p-x)*(p-x) + (q-y)*(q-y);
-    }
-
-    inline void GetListOfIndexesForEdgeAndGridSize(const _Coordinate& start, const _Coordinate& target, std::vector<BresenhamPixel> &indexList) const {
-        double lat1 = start.lat/100000.;
-        double lon1 = start.lon/100000.;
-
-        double x1 = ( lon1 + 180.0 ) / 360.0;
-        double y1 = ( lat1 + 180.0 ) / 360.0;
-
-        double lat2 = target.lat/100000.;
-        double lon2 = target.lon/100000.;
-
-        double x2 = ( lon2 + 180.0 ) / 360.0;
-        double y2 = ( lat2 + 180.0 ) / 360.0;
-
-        Bresenham(x1*32768, y1*32768, x2*32768, y2*32768, indexList);
-        BOOST_FOREACH(BresenhamPixel & pixel, indexList) {
-            int fileIndex = (pixel.second-1)*32768 + pixel.first;
-            int ramIndex = GetRAMIndexFromFileIndex(fileIndex);
-            pixel.first = fileIndex;
-            pixel.second = ramIndex;
-        }
-    }
-
-    inline unsigned GetFileIndexForLatLon(const int lt, const int ln) const {
-        double lat = lt/100000.;
-        double lon = ln/100000.;
-
-        double x = ( lon + 180.0 ) / 360.0;
-        double y = ( lat + 180.0 ) / 360.0;
-
-        if( x>1.0 || x < 0.)
-            return UINT_MAX;
-        if( y>1.0 || y < 0.)
-            return UINT_MAX;
-
-        unsigned line = (32768 * (32768-1))*y;
-        line = line - (line % 32768);
-        assert(line % 32768 == 0);
-        unsigned column = 32768.*x;
-        unsigned fileIndex = line+column;
-        return fileIndex;
-    }
-
-    inline unsigned GetRAMIndexFromFileIndex(const int fileIndex) const {
-        unsigned fileLine = fileIndex / 32768;
-        fileLine = fileLine / 32;
-        fileLine = fileLine * 1024;
-        unsigned fileColumn = (fileIndex % 32768);
-        fileColumn = fileColumn / 32;
-        unsigned ramIndex = fileLine + fileColumn;
-        assert(ramIndex < 1024*1024);
-        return ramIndex;
-    }
-
-    const static uint64_t END_OF_BUCKET_DELIMITER = boost::integer_traits<uint64_t>::const_max;
-
-    std::ifstream ramInFile;
-#ifndef ROUTED
-    std::ofstream indexOutFile;
-    stxxl::vector<GridEntry> entries;
-#endif
-    std::vector<uint64_t> ramIndexTable; //8 MB for first level index in RAM
-    std::string iif;
-    //    LRUCache<int,std::vector<unsigned> > cellCache;
-    //    LRUCache<int,std::vector<_Edge> > fileCache;
-};
-}
-
-typedef NNGrid::NNGrid<false> ReadOnlyGrid;
-typedef NNGrid::NNGrid<true > WritableGrid;
-
-#endif /* NNGRID_H_ */

DataStructures/NodeCoords.h

@@ -1,69 +0,0 @@
-/*
-    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 _NODE_COORDS_H
-#define _NODE_COORDS_H
-
-#include <cassert>
-#include <cstddef>
-#include <climits>
-#include <limits>
-
-#include "../typedefs.h"
-
-template<typename NodeT>
-struct NodeCoords {
-	typedef unsigned key_type; 	//type of NodeID
-	typedef int value_type;		//type of lat,lons
-
-	NodeCoords(int _lat, int _lon, NodeT _id) : lat(_lat), lon(_lon), id(_id) {}
-	NodeCoords() : lat(INT_MAX), lon(INT_MAX), id(UINT_MAX) {}
-	int lat;
-	int lon;
-	NodeT id;
-
-	static NodeCoords<NodeT> min_value() {
-		return NodeCoords<NodeT>(-90*100000,-180*100000,std::numeric_limits<NodeT>::min());
-	}
-	static NodeCoords<NodeT> max_value() {
-		return NodeCoords<NodeT>(90*100000, 180*100000, std::numeric_limits<NodeT>::max());
-	}
-
-	value_type operator[](std::size_t n) const {
-		switch(n) {
-		case 1:
-			return lat;
-			break;
-		case 0:
-			return lon;
-			break;
-		default:
-			assert(false);
-			return UINT_MAX;
-			break;
-		}
-		assert(false);
-		return UINT_MAX;
-	}
-};
-
-typedef NodeCoords<NodeID> NodeInfo;
-
-#endif //_NODE_COORDS_H

DataStructures/NodeInformationHelpDesk.h

@@ -1,140 +1,130 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+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.
+
+*/
 
-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 NODEINFORMATIONHELPDESK_H_
 #define NODEINFORMATIONHELPDESK_H_
 
-#include "NodeCoords.h"
+#include "QueryNode.h"
 #include "PhantomNodes.h"
-#include "QueryEdge.h"
 #include "StaticRTree.h"
 #include "../Contractor/EdgeBasedGraphFactory.h"
+#include "../Util/OSRMException.h"
 #include "../typedefs.h"
 
 #include <boost/assert.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 #include <boost/noncopyable.hpp>
 
-#include <fstream>
-
 #include <iostream>
+#include <string>
 #include <vector>
 
 typedef EdgeBasedGraphFactory::EdgeBasedNode RTreeLeaf;
 
-class NodeInformationHelpDesk : boost::noncopyable{
+class NodeInformationHelpDesk : boost::noncopyable {
+
 public:
     NodeInformationHelpDesk(
-        const char* ramIndexInput,
-        const char* fileIndexInput,
-        const unsigned number_of_nodes,
-        const unsigned crc) : number_of_nodes(number_of_nodes), checkSum(crc) {
-        read_only_rtree = new StaticRTree<RTreeLeaf>(
-            ramIndexInput,
-            fileIndexInput
+        const std::string & ram_index_filename,
+        const std::string & mem_index_filename,
+        const std::string & nodes_filename,
+        const std::string & edges_filename,
+        const unsigned m_number_of_nodes,
+        const unsigned m_check_sum
+    ) :
+        m_number_of_nodes(m_number_of_nodes),
+        m_check_sum(m_check_sum)
+    {
+        if ( ram_index_filename.empty() ) {
+            throw OSRMException("no ram index file name in server ini");
+        }
+        if ( mem_index_filename.empty() ) {
+            throw OSRMException("no mem index file name in server ini");
+        }
+        if ( nodes_filename.empty()     ) {
+            throw OSRMException("no nodes file name in server ini");
+        }
+        if ( edges_filename.empty()     ) {
+            throw OSRMException("no edges file name in server ini");
+        }
+
+        m_ro_rtree_ptr = new StaticRTree<RTreeLeaf>(
+            ram_index_filename,
+            mem_index_filename
         );
         BOOST_ASSERT_MSG(
-            0 == coordinateVector.size(),
+            0 == m_coordinate_list.size(),
             "Coordinate vector not empty"
         );
+
+        LoadNodesAndEdges(nodes_filename, edges_filename);
     }
 
-    //Todo: Shared memory mechanism
 	~NodeInformationHelpDesk() {
-		delete read_only_rtree;
+		delete m_ro_rtree_ptr;
 	}
 
-	void initNNGrid(
-        std::ifstream& nodesInstream,
-        std::ifstream& edgesInStream
-    ) {
-	    DEBUG("Loading node data");
-		NodeInfo b;
-	    while(!nodesInstream.eof()) {
-			nodesInstream.read((char *)&b, sizeof(NodeInfo));
-			coordinateVector.push_back(_Coordinate(b.lat, b.lon));
-		}
-	    std::vector<_Coordinate>(coordinateVector).swap(coordinateVector);
-	    nodesInstream.close();
-
-        DEBUG("Loading edge data");
-        unsigned numberOfOrigEdges(0);
-        edgesInStream.read((char*)&numberOfOrigEdges, sizeof(unsigned));
-        origEdgeData_viaNode.resize(numberOfOrigEdges);
-        origEdgeData_nameID.resize(numberOfOrigEdges);
-        origEdgeData_turnInstruction.resize(numberOfOrigEdges);
-
-        OriginalEdgeData deserialized_originalEdgeData;
-        for(unsigned i = 0; i < numberOfOrigEdges; ++i) {
-        	edgesInStream.read((char*)&(deserialized_originalEdgeData), sizeof(OriginalEdgeData));
-            origEdgeData_viaNode[i] = deserialized_originalEdgeData.viaNode;
-            origEdgeData_nameID[i] 	= deserialized_originalEdgeData.nameID;
-            origEdgeData_turnInstruction[i] = deserialized_originalEdgeData.turnInstruction;
-        }
-        edgesInStream.close();
-        DEBUG("Loaded " << numberOfOrigEdges << " orig edges");
-	    DEBUG("Opening NN indices");
-	}
-
-	inline int getLatitudeOfNode(const unsigned id) const {
-	    const NodeID node = origEdgeData_viaNode.at(id);
-	    return coordinateVector.at(node).lat;
-	}
-
-	inline int getLongitudeOfNode(const unsigned id) const {
-        const NodeID node = origEdgeData_viaNode.at(id);
-	    return coordinateVector.at(node).lon;
-	}
-
-	inline unsigned getNameIndexFromEdgeID(const unsigned id) const {
-	    return origEdgeData_nameID.at(id);
-	}
-
-    inline TurnInstruction getTurnInstructionFromEdgeID(const unsigned id) const {
-        return origEdgeData_turnInstruction.at(id);
+    inline FixedPointCoordinate GetCoordinateOfNode(const unsigned id) const {
+        const NodeID node = m_via_node_list.at(id);
+        return m_coordinate_list.at(node);
     }
 
-    inline NodeID getNumberOfNodes() const {
-        return number_of_nodes;
+	inline unsigned GetNameIndexFromEdgeID(const unsigned id) const {
+	    return m_name_ID_list.at(id);
+	}
+
+    inline TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const {
+        return m_turn_instruction_list.at(id);
     }
 
-	inline NodeID getNumberOfNodes2() const {
-        return coordinateVector.size();
+    inline NodeID GetNumberOfNodes() const {
+        return m_number_of_nodes;
     }
 
-    inline bool FindNearestNodeCoordForLatLon(
-            const _Coordinate& input_coordinate,
-            _Coordinate& result,
+    inline bool LocateClosestEndPointForCoordinate(
+            const FixedPointCoordinate& input_coordinate,
+            FixedPointCoordinate& result,
             const unsigned zoom_level = 18
     ) const {
-        PhantomNode resulting_phantom_node;
-        bool foundNode = FindPhantomNodeForCoordinate(input_coordinate, resulting_phantom_node, zoom_level);
-        result = resulting_phantom_node.location;
-        return foundNode;
+        bool found_node = m_ro_rtree_ptr->LocateClosestEndPointForCoordinate(
+                            input_coordinate,
+                            result, zoom_level
+                          );
+        return found_node;
     }
 
     inline bool FindPhantomNodeForCoordinate(
-            const _Coordinate & input_coordinate,
+            const FixedPointCoordinate & input_coordinate,
             PhantomNode & resulting_phantom_node,
             const unsigned zoom_level
     ) const {
-        return read_only_rtree->FindPhantomNodeForCoordinate(
+        return m_ro_rtree_ptr->FindPhantomNodeForCoordinate(
                 input_coordinate,
                 resulting_phantom_node,
                 zoom_level
@@ -142,18 +132,87 @@ public:
     }
 
 	inline unsigned GetCheckSum() const {
-	    return checkSum;
+	    return m_check_sum;
 	}
 
 private:
-	std::vector<_Coordinate> coordinateVector;
-	std::vector<NodeID> origEdgeData_viaNode;
-	std::vector<unsigned> origEdgeData_nameID;
-	std::vector<TurnInstruction> origEdgeData_turnInstruction;
+    void LoadNodesAndEdges(
+        const std::string & nodes_filename,
+        const std::string & edges_filename
+    ) {
+        boost::filesystem::path nodes_file(nodes_filename);
+        if ( !boost::filesystem::exists( nodes_file ) ) {
+            throw OSRMException("nodes file does not exist");
+        }
+        if ( 0 == boost::filesystem::file_size( nodes_file ) ) {
+            throw OSRMException("nodes file is empty");
+        }
 
-	StaticRTree<EdgeBasedGraphFactory::EdgeBasedNode> * read_only_rtree;
-	const unsigned number_of_nodes;
-	const unsigned checkSum;
+        boost::filesystem::path edges_file(edges_filename);
+        if ( !boost::filesystem::exists( edges_file ) ) {
+            throw OSRMException("edges file does not exist");
+        }
+        if ( 0 == boost::filesystem::file_size( edges_file ) ) {
+            throw OSRMException("edges file is empty");
+        }
+
+        boost::filesystem::ifstream nodes_input_stream(
+            nodes_file,
+            std::ios::binary
+        );
+
+        boost::filesystem::ifstream edges_input_stream(
+            edges_file, std::ios::binary
+        );
+
+        SimpleLogger().Write(logDEBUG)
+            << "Loading node data";
+        NodeInfo current_node;
+        while(!nodes_input_stream.eof()) {
+            nodes_input_stream.read((char *)&current_node, sizeof(NodeInfo));
+            m_coordinate_list.push_back(
+                FixedPointCoordinate(
+                    current_node.lat,
+                    current_node.lon
+                )
+            );
+        }
+        std::vector<FixedPointCoordinate>(m_coordinate_list).swap(m_coordinate_list);
+        nodes_input_stream.close();
+
+        SimpleLogger().Write(logDEBUG)
+            << "Loading edge data";
+        unsigned number_of_edges = 0;
+        edges_input_stream.read((char*)&number_of_edges, sizeof(unsigned));
+        m_via_node_list.resize(number_of_edges);
+        m_name_ID_list.resize(number_of_edges);
+        m_turn_instruction_list.resize(number_of_edges);
+
+        OriginalEdgeData current_edge_data;
+        for(unsigned i = 0; i < number_of_edges; ++i) {
+            edges_input_stream.read(
+                (char*)&(current_edge_data),
+                sizeof(OriginalEdgeData)
+            );
+            m_via_node_list[i] = current_edge_data.viaNode;
+            m_name_ID_list[i]  = current_edge_data.nameID;
+            m_turn_instruction_list[i] = current_edge_data.turnInstruction;
+        }
+        edges_input_stream.close();
+        SimpleLogger().Write(logDEBUG)
+            << "Loaded " << number_of_edges << " orig edges";
+        SimpleLogger().Write(logDEBUG)
+            << "Opening NN indices";
+    }
+
+	std::vector<FixedPointCoordinate>  m_coordinate_list;
+	std::vector<NodeID>                m_via_node_list;
+	std::vector<unsigned>              m_name_ID_list;
+	std::vector<TurnInstruction>       m_turn_instruction_list;
+
+	StaticRTree<EdgeBasedGraphFactory::EdgeBasedNode> * m_ro_rtree_ptr;
+	const unsigned m_number_of_nodes;
+	const unsigned m_check_sum;
 };
 
 #endif /*NODEINFORMATIONHELPDESK_H_*/

DataStructures/Percent.h

@@ -1,31 +1,37 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 PERCENT_H
 #define PERCENT_H
 
+#include "../Util/OpenMPWrapper.h"
 #include <iostream>
 
-
-class Percent
-{
+class Percent {
 public:
     /**
      * Constructor.
@@ -56,8 +62,7 @@ public:
             std::cout << " 100%" << std::endl;
     }
 
-    void printIncrement()
-    {
+    void printIncrement() {
 #pragma omp atomic
         ++_current_value;
         printStatus(_current_value);

DataStructures/PhantomNodes.h

@@ -1,22 +1,29 @@
 /*
-    open source routing machine
-    Copyright (C) Dennis Luxen, 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 PHANTOMNODES_H_
 #define PHANTOMNODES_H_
@@ -24,13 +31,20 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include "Coordinate.h"
 
 struct PhantomNode {
-    PhantomNode() : edgeBasedNode(UINT_MAX), nodeBasedEdgeNameID(UINT_MAX), weight1(INT_MAX), weight2(INT_MAX), ratio(0.) {}
+    PhantomNode() :
+        edgeBasedNode(UINT_MAX),
+        nodeBasedEdgeNameID(UINT_MAX),
+        weight1(INT_MAX),
+        weight2(INT_MAX),
+        ratio(0.)
+    { }
+
     NodeID edgeBasedNode;
     unsigned nodeBasedEdgeNameID;
     int weight1;
     int weight2;
     double ratio;
-    _Coordinate location;
+    FixedPointCoordinate location;
     void Reset() {
         edgeBasedNode = UINT_MAX;
         nodeBasedEdgeNameID = UINT_MAX;
@@ -88,7 +102,7 @@ inline std::ostream& operator<<(std::ostream &out, const PhantomNode & pn){
 struct NodesOfEdge {
     NodeID edgeBasedNode;
     double ratio;
-    _Coordinate projectedPoint;
+    FixedPointCoordinate projectedPoint;
 };
 
 #endif /* PHANTOMNODES_H_ */

DataStructures/QueryEdge.h

@@ -1,24 +1,29 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 QUERYEDGE_H_
 #define QUERYEDGE_H_
@@ -29,7 +34,11 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include <climits>
 
 struct OriginalEdgeData{
-    explicit OriginalEdgeData(NodeID v, unsigned n, TurnInstruction t) : viaNode(v), nameID(n), turnInstruction(t) {}
+    explicit OriginalEdgeData(
+        NodeID viaNode,
+        unsigned nameID,
+        TurnInstruction turnInstruction
+    ) : viaNode(viaNode), nameID(nameID), turnInstruction(turnInstruction) {}
     OriginalEdgeData() : viaNode(UINT_MAX), nameID(UINT_MAX), turnInstruction(UCHAR_MAX) {}
     NodeID viaNode;
     unsigned nameID;
@@ -46,23 +55,12 @@ struct QueryEdge {
         bool forward:1;
         bool backward:1;
     } data;
-    bool operator<( const QueryEdge& right ) const {
-        if ( source != right.source )
-            return source < right.source;
-        return target < right.target;
-    }
 
-    //sorts by source and other attributes
-    static bool CompareBySource( const QueryEdge& left, const QueryEdge& right ) {
-        if ( left.source != right.source )
-            return left.source < right.source;
-        int l = ( left.data.forward ? -1 : 0 ) + ( left.data.backward ? -1 : 0 );
-        int r = ( right.data.forward ? -1 : 0 ) + ( right.data.backward ? -1 : 0 );
-        if ( l != r )
-            return l < r;
-        if ( left.target != right.target )
-            return left.target < right.target;
-        return left.data.distance < right.data.distance;
+    bool operator<( const QueryEdge& right ) const {
+        if ( source != right.source ) {
+            return source < right.source;
+        }
+        return target < right.target;
     }
 
     bool operator== ( const QueryEdge& right ) const {

DataStructures/QueryNode.h

@@ -0,0 +1,85 @@
+/*
+
+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 _NODE_COORDS_H
+#define _NODE_COORDS_H
+
+#include "Coordinate.h"
+#include "../typedefs.h"
+
+#include <boost/assert.hpp>
+
+#include <cstddef>
+#include <climits>
+
+#include <limits>
+
+struct NodeInfo {
+	typedef NodeID key_type; 	//type of NodeID
+	typedef int value_type;		//type of lat,lons
+
+	NodeInfo(int _lat, int _lon, NodeID _id) : lat(_lat), lon(_lon), id(_id) {}
+	NodeInfo() : lat(INT_MAX), lon(INT_MAX), id(UINT_MAX) {}
+	int lat;
+	int lon;
+	NodeID id;
+
+	static NodeInfo min_value() {
+		return NodeInfo(
+			 -90*COORDINATE_PRECISION,
+			-180*COORDINATE_PRECISION,
+			std::numeric_limits<NodeID>::min()
+		);
+	}
+
+	static NodeInfo max_value() {
+		return NodeInfo(
+			 90*COORDINATE_PRECISION,
+			180*COORDINATE_PRECISION,
+			std::numeric_limits<NodeID>::max()
+			);
+	}
+
+	value_type operator[](const std::size_t n) const {
+		switch(n) {
+		case 1:
+			return lat;
+			break;
+		case 0:
+			return lon;
+			break;
+		default:
+			BOOST_ASSERT_MSG(false, "should not happen");
+			return UINT_MAX;
+			break;
+		}
+		BOOST_ASSERT_MSG(false, "should not happen");
+		return UINT_MAX;
+	}
+};
+
+#endif //_NODE_COORDS_H

DataStructures/RawRouteData.h

@@ -0,0 +1,56 @@
+/*
+
+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 RAWROUTEDATA_H_
+#define RAWROUTEDATA_H_
+
+#include "../DataStructures/Coordinate.h"
+#include "../DataStructures/PhantomNodes.h"
+#include "../typedefs.h"
+
+#include <vector>
+
+struct _PathData {
+    _PathData(NodeID no, unsigned na, unsigned tu, unsigned dur) : node(no), nameID(na), durationOfSegment(dur), turnInstruction(tu) { }
+    NodeID node;
+    unsigned nameID;
+    unsigned durationOfSegment;
+    short turnInstruction;
+};
+
+struct RawRouteData {
+    std::vector< _PathData > computedShortestPath;
+    std::vector< _PathData > computedAlternativePath;
+    std::vector< PhantomNodes > segmentEndCoordinates;
+    std::vector< FixedPointCoordinate > rawViaNodeCoordinates;
+    unsigned checkSum;
+    int lengthOfShortestPath;
+    int lengthOfAlternativePath;
+    RawRouteData() : checkSum(UINT_MAX), lengthOfShortestPath(INT_MAX), lengthOfAlternativePath(INT_MAX) {}
+};
+
+#endif /* RAWROUTEDATA_H_ */

DataStructures/Restriction.h

@@ -1,62 +1,105 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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_H_
 #define RESTRICTION_H_
 
+#include "../typedefs.h"
 #include <climits>
 
-struct _Restriction {
+struct TurnRestriction {
     NodeID viaNode;
     NodeID fromNode;
     NodeID toNode;
     struct Bits { //mostly unused
-        Bits() : isOnly(false), unused1(false), unused2(false), unused3(false), unused4(false), unused5(false), unused6(false), unused7(false) {}
-        char isOnly:1;
-        char unused1:1;
-        char unused2:1;
-        char unused3:1;
-        char unused4:1;
-        char unused5:1;
-        char unused6:1;
-        char unused7:1;
+        Bits()
+         :
+            isOnly(false),
+            unused1(false),
+            unused2(false),
+            unused3(false),
+            unused4(false),
+            unused5(false),
+            unused6(false),
+            unused7(false)
+        { }
+
+        bool isOnly:1;
+        bool unused1:1;
+        bool unused2:1;
+        bool unused3:1;
+        bool unused4:1;
+        bool unused5:1;
+        bool unused6:1;
+        bool unused7:1;
     } flags;
 
-    _Restriction(NodeID vn) : viaNode(vn), fromNode(UINT_MAX), toNode(UINT_MAX) { }
-    _Restriction(bool isOnly = false) : viaNode(UINT_MAX), fromNode(UINT_MAX), toNode(UINT_MAX) {
+    TurnRestriction(NodeID viaNode) :
+        viaNode(viaNode),
+        fromNode(UINT_MAX),
+        toNode(UINT_MAX) {
+
+    }
+
+    TurnRestriction(const bool isOnly = false) :
+        viaNode(UINT_MAX),
+        fromNode(UINT_MAX),
+        toNode(UINT_MAX) {
         flags.isOnly = isOnly;
     }
 };
 
-inline bool CmpRestrictionByFrom ( _Restriction a, _Restriction b) { return (a.fromNode < b.fromNode);  }
-
 struct _RawRestrictionContainer {
-    _Restriction restriction;
+    TurnRestriction restriction;
     EdgeID fromWay;
     EdgeID toWay;
     unsigned viaNode;
 
-    _RawRestrictionContainer(EdgeID f, EdgeID t, NodeID vn, unsigned vw) : fromWay(f), toWay(t), viaNode(vw) { restriction.viaNode = vn;}
-    _RawRestrictionContainer(bool isOnly = false) : fromWay(UINT_MAX), toWay(UINT_MAX), viaNode(UINT_MAX) { restriction.flags.isOnly = isOnly;}
+    _RawRestrictionContainer(
+        EdgeID fromWay,
+        EdgeID toWay,
+        NodeID vn,
+        unsigned vw
+    ) :
+        fromWay(fromWay),
+        toWay(toWay),
+        viaNode(vw)
+    {
+        restriction.viaNode = vn;
+    }
+    _RawRestrictionContainer(
+        bool isOnly = false
+    ) :
+        fromWay(UINT_MAX),
+        toWay(UINT_MAX),
+        viaNode(UINT_MAX)
+    {
+        restriction.flags.isOnly = isOnly;
+    }
 
     static _RawRestrictionContainer min_value() {
         return _RawRestrictionContainer(0, 0, 0, 0);
@@ -66,7 +109,7 @@ struct _RawRestrictionContainer {
     }
 };
 
-struct CmpRestrictionContainerByFrom: public std::binary_function<_RawRestrictionContainer, _RawRestrictionContainer, bool> {
+struct CmpRestrictionContainerByFrom : public std::binary_function<_RawRestrictionContainer, _RawRestrictionContainer, bool> {
     typedef _RawRestrictionContainer value_type;
     bool operator ()  (const _RawRestrictionContainer & a, const _RawRestrictionContainer & b) const {
         return a.fromWay < b.fromWay;
@@ -92,6 +135,4 @@ struct CmpRestrictionContainerByTo: public std::binary_function<_RawRestrictionC
     }
 };
 
-
-
 #endif /* RESTRICTION_H_ */

DataStructures/SearchEngine.cpp

@@ -1,49 +1,52 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 "SearchEngine.h"
 
-SearchEngine::SearchEngine(
-    QueryGraph * g,
-    NodeInformationHelpDesk * nh,
-    std::vector<std::string> & n
-    ) :
-        _queryData(g, nh, n),
-        shortestPath(_queryData),
-        alternativePaths(_queryData)
-    {}
-    SearchEngine::~SearchEngine() {}
+SearchEngine::SearchEngine( QueryObjectsStorage * query_objects ) :
+    _queryData(query_objects),
+    shortestPath(_queryData),
+    alternativePaths(_queryData)
+{}
+
+SearchEngine::~SearchEngine() {}
 
 void SearchEngine::GetCoordinatesForNodeID(
     NodeID id,
-    _Coordinate& result
-    ) const {
-    result.lat = _queryData.nodeHelpDesk->getLatitudeOfNode(id);
-    result.lon = _queryData.nodeHelpDesk->getLongitudeOfNode(id);
+    FixedPointCoordinate& result
+) const {
+        result = _queryData.nodeHelpDesk->GetCoordinateOfNode(id);
 }
 
 void SearchEngine::FindPhantomNodeForCoordinate(
-    const _Coordinate & location,
+    const FixedPointCoordinate & location,
     PhantomNode & result,
     const unsigned zoomLevel
-    ) const {
+) const {
     _queryData.nodeHelpDesk->FindPhantomNodeForCoordinate(
         location,
         result, zoomLevel
@@ -53,29 +56,29 @@ void SearchEngine::FindPhantomNodeForCoordinate(
 NodeID SearchEngine::GetNameIDForOriginDestinationNodeID(
     const NodeID s,
     const NodeID t
-    ) const {
-    if(s == t){
+) const {
+    if(s == t) {
         return 0;
     }
+
     EdgeID e = _queryData.graph->FindEdge(s, t);
     if(e == UINT_MAX) {
         e = _queryData.graph->FindEdge( t, s );
     }
+
     if(UINT_MAX == e) {
         return 0;
     }
+
     assert(e != UINT_MAX);
     const QueryEdge::EdgeData ed = _queryData.graph->GetEdgeData(e);
     return ed.id;
 }
 
 std::string SearchEngine::GetEscapedNameForNameID(const unsigned nameID) const {
-    bool is_name_invalid = (nameID >= _queryData.names.size() || nameID == 0);
-    if (is_name_invalid) {
-        return std::string("");
-    }
-
-    return HTMLEntitize(_queryData.names.at(nameID));
+    std::string result;
+    _queryData.query_objects->GetName(nameID, result);
+    return HTMLEntitize(result);
 }
 
 SearchEngineHeapPtr SearchEngineData::forwardHeap;
@@ -86,4 +89,3 @@ SearchEngineHeapPtr SearchEngineData::backwardHeap2;
 
 SearchEngineHeapPtr SearchEngineData::forwardHeap3;
 SearchEngineHeapPtr SearchEngineData::backwardHeap3;
-

DataStructures/SearchEngine.h

@@ -1,22 +1,29 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 SEARCHENGINE_H_
 #define SEARCHENGINE_H_
@@ -28,6 +35,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include "SearchEngineData.h"
 #include "../RoutingAlgorithms/AlternativePathRouting.h"
 #include "../RoutingAlgorithms/ShortestPathRouting.h"
+#include "../Server/DataStructures/QueryObjectsStorage.h"
 
 #include "../Util/StringUtil.h"
 #include "../typedefs.h"
@@ -44,18 +52,14 @@ public:
     ShortestPathRouting<SearchEngineData> shortestPath;
     AlternativeRouting<SearchEngineData> alternativePaths;
 
-    SearchEngine(
-        QueryGraph * g, 
-        NodeInformationHelpDesk * nh, 
-        std::vector<std::string> & n
-    );
+    SearchEngine( QueryObjectsStorage * query_objects );
 	~SearchEngine();
 
-	void GetCoordinatesForNodeID(NodeID id, _Coordinate& result) const;
+	void GetCoordinatesForNodeID(NodeID id, FixedPointCoordinate& result) const;
 
     void FindPhantomNodeForCoordinate(
-        const _Coordinate & location, 
-        PhantomNode & result, 
+        const FixedPointCoordinate & location,
+        PhantomNode & result,
         unsigned zoomLevel
     ) const;
 

DataStructures/SearchEngineData.cpp

@@ -1,33 +1,40 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 "SearchEngineData.h"
 
 void SearchEngineData::InitializeOrClearFirstThreadLocalStorage() {
     if(!forwardHeap.get()) {
-        forwardHeap.reset(new QueryHeap(nodeHelpDesk->getNumberOfNodes()));
+        forwardHeap.reset(new QueryHeap(nodeHelpDesk->GetNumberOfNodes()));
     } else {
         forwardHeap->Clear();
     }
     if(!backwardHeap.get()) {
-        backwardHeap.reset(new QueryHeap(nodeHelpDesk->getNumberOfNodes()));
+        backwardHeap.reset(new QueryHeap(nodeHelpDesk->GetNumberOfNodes()));
     } else {
         backwardHeap->Clear();
     }
@@ -35,12 +42,12 @@ void SearchEngineData::InitializeOrClearFirstThreadLocalStorage() {
 
 void SearchEngineData::InitializeOrClearSecondThreadLocalStorage() {
     if(!forwardHeap2.get()) {
-        forwardHeap2.reset(new QueryHeap(nodeHelpDesk->getNumberOfNodes()));
+        forwardHeap2.reset(new QueryHeap(nodeHelpDesk->GetNumberOfNodes()));
     } else {
         forwardHeap2->Clear();
     }
     if(!backwardHeap2.get()) {
-        backwardHeap2.reset(new QueryHeap(nodeHelpDesk->getNumberOfNodes()));
+        backwardHeap2.reset(new QueryHeap(nodeHelpDesk->GetNumberOfNodes()));
      } else {
         backwardHeap2->Clear();
     }
@@ -48,12 +55,12 @@ void SearchEngineData::InitializeOrClearSecondThreadLocalStorage() {
 
 void SearchEngineData::InitializeOrClearThirdThreadLocalStorage() {
     if(!forwardHeap3.get()) {
-        forwardHeap3.reset(new QueryHeap(nodeHelpDesk->getNumberOfNodes()));
+        forwardHeap3.reset(new QueryHeap(nodeHelpDesk->GetNumberOfNodes()));
     } else {
         forwardHeap3->Clear();
     }
     if(!backwardHeap3.get()) {
-        backwardHeap3.reset(new QueryHeap(nodeHelpDesk->getNumberOfNodes()));
+        backwardHeap3.reset(new QueryHeap(nodeHelpDesk->GetNumberOfNodes()));
     } else {
         backwardHeap3->Clear();
     }

DataStructures/SearchEngineData.h

@@ -1,27 +1,34 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 "BinaryHeap.h"
 #include "QueryEdge.h"
-#include "NodeInformationHelpDesk.h"
 #include "StaticGraph.h"
+#include "../Server/DataStructures/QueryObjectsStorage.h"
 
 #include "../typedefs.h"
 
@@ -41,10 +48,17 @@ typedef boost::thread_specific_ptr<QueryHeapType> SearchEngineHeapPtr;
 struct SearchEngineData {
     typedef QueryGraph Graph;
     typedef QueryHeapType QueryHeap;
-    SearchEngineData(QueryGraph * g, NodeInformationHelpDesk * nh, std::vector<std::string> & n) :graph(g), nodeHelpDesk(nh), names(n) {}
-    const QueryGraph * graph;
-    NodeInformationHelpDesk * nodeHelpDesk;
-    std::vector<std::string> & names;
+    SearchEngineData(QueryObjectsStorage * query_objects)
+     :
+        query_objects(query_objects),
+        graph(query_objects->graph),
+        nodeHelpDesk(query_objects->nodeHelpDesk)
+    {}
+
+    const QueryObjectsStorage       * query_objects;
+    const QueryGraph                * graph;
+    const NodeInformationHelpDesk   * nodeHelpDesk;
+
     static SearchEngineHeapPtr forwardHeap;
     static SearchEngineHeapPtr backwardHeap;
     static SearchEngineHeapPtr forwardHeap2;

DataStructures/SegmentInformation.h

@@ -1,41 +1,50 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 SEGMENTINFORMATION_H_
 #define SEGMENTINFORMATION_H_
 
+#include "Coordinate.h"
+#include "TurnInstructions.h"
+#include "../typedefs.h"
+
 #include <climits>
 
-#include "TurnInstructions.h"
-
 struct SegmentInformation {
-    _Coordinate location;
+    FixedPointCoordinate location;
     NodeID nameID;
     double length;
     unsigned duration;
     double bearing;
     TurnInstruction turnInstruction;
     bool necessary;
-    SegmentInformation(const _Coordinate & loc, const NodeID nam, const double len, const unsigned dur, const TurnInstruction tInstr, const bool nec) :
+    SegmentInformation(const FixedPointCoordinate & loc, const NodeID nam, const double len, const unsigned dur, const TurnInstruction tInstr, const bool nec) :
             location(loc), nameID(nam), length(len), duration(dur), bearing(0.), turnInstruction(tInstr), necessary(nec) {}
-    SegmentInformation(const _Coordinate & loc, const NodeID nam, const double len, const unsigned dur, const TurnInstruction tInstr) :
+    SegmentInformation(const FixedPointCoordinate & loc, const NodeID nam, const double len, const unsigned dur, const TurnInstruction tInstr) :
         location(loc), nameID(nam), length(len), duration(dur), bearing(0.), turnInstruction(tInstr), necessary(tInstr != 0) {}
 };
 

DataStructures/SimpleStack.h

@@ -1,22 +1,29 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 SIMPLESTACK_H_
 #define SIMPLESTACK_H_

DataStructures/StaticGraph.h

@@ -1,31 +1,39 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 STATICGRAPH_H_INCLUDED
 #define STATICGRAPH_H_INCLUDED
 
-#include <vector>
-#include <algorithm>
-
+#include "../DataStructures/Percent.h"
+#include "../Util/SimpleLogger.h"
 #include "../typedefs.h"
-#include "ImportEdge.h"
+
+#include <algorithm>
+#include <vector>
 
 template< typename EdgeDataT>
 class StaticGraph {
@@ -100,12 +108,17 @@ public:
                 if(data.shortcut) {
                     unsigned eid2 = FindEdgeInEitherDirection(u, data.id);
                     if(eid2 == UINT_MAX) {
-                        DEBUG("cannot find first segment of edge (" << u << "," << data.id << "," << v << ")");
+                        SimpleLogger().Write(logWARNING) <<
+                            "cannot find first segment of edge (" <<
+                                u << "," << data.id << "," << v << ")";
+
                         data.shortcut = false;
                     }
                     eid2 = FindEdgeInEitherDirection(data.id, v);
                     if(eid2 == UINT_MAX) {
-                        DEBUG("cannot find second segment of edge (" << u << "," << data.id << "," << v << ")");
+                        SimpleLogger().Write(logWARNING) <<
+                            "cannot find second segment of edge (" <<
+                                u << "," << data.id << "," << v << ")";
                         data.shortcut = false;
                     }
                 }

DataStructures/StaticKDTree.h

@@ -1,25 +1,32 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
+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.
 
-KD Tree coded by Christian Vetter, Monav Project
+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.
+
+*/
+
+// KD Tree coded by Christian Vetter, Monav Project
 
- */
 #ifndef STATICKDTREE_H_INCLUDED
 #define STATICKDTREE_H_INCLUDED
 

DataStructures/StaticRTree.h

@@ -1,50 +1,58 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 "MercatorUtil.h"
-#include "TimingUtil.h"
 #include "Coordinate.h"
 #include "PhantomNodes.h"
 #include "DeallocatingVector.h"
 #include "HilbertValue.h"
+#include "../Util/OSRMException.h"
+#include "../Util/SimpleLogger.h"
+#include "../Util/TimingUtil.h"
 #include "../typedefs.h"
 
 #include <boost/assert.hpp>
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 #include <boost/algorithm/minmax.hpp>
 #include <boost/algorithm/minmax_element.hpp>
 #include <boost/range/algorithm_ext/erase.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/thread.hpp>
 
-#include <cassert>
-#include <cfloat>
-#include <climits>
-
 #include <algorithm>
-#include <fstream>
+#include <limits>
 #include <queue>
+#include <string>
 #include <vector>
 
 //tuning parameters
@@ -53,7 +61,7 @@ const static uint32_t RTREE_LEAF_NODE_SIZE = 1170;
 
 // Implements a static, i.e. packed, R-tree
 
-static boost::thread_specific_ptr<std::ifstream> thread_local_rtree_stream;
+static boost::thread_specific_ptr<boost::filesystem::ifstream> thread_local_rtree_stream;
 
 template<class DataT>
 class StaticRTree : boost::noncopyable {
@@ -96,8 +104,8 @@ private:
             max_lat = std::max(max_lat, other.max_lat);
         }
 
-        inline _Coordinate Centroid() const {
-            _Coordinate centroid;
+        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;
@@ -106,10 +114,10 @@ private:
         }
 
         inline bool Intersects(const RectangleInt2D & other) const {
-            _Coordinate upper_left (other.max_lat, other.min_lon);
-            _Coordinate upper_right(other.max_lat, other.max_lon);
-            _Coordinate lower_right(other.min_lat, other.max_lon);
-            _Coordinate lower_left (other.min_lat, other.min_lon);
+            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)
@@ -119,13 +127,13 @@ private:
             );
         }
 
-        inline double GetMinDist(const _Coordinate & location) const {
+        inline double GetMinDist(const FixedPointCoordinate & location) const {
             bool is_contained = Contains(location);
             if (is_contained) {
                 return 0.0;
             }
 
-            double min_dist = DBL_MAX;
+            double min_dist = std::numeric_limits<double>::max();
             min_dist = std::min(
                     min_dist,
                     ApproximateDistance(
@@ -165,13 +173,13 @@ private:
             return min_dist;
         }
 
-        inline double GetMinMaxDist(const _Coordinate & location) const {
-            double min_max_dist = DBL_MAX;
+        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
-            _Coordinate upper_left (max_lat, min_lon);
-            _Coordinate upper_right(max_lat, max_lon);
-            _Coordinate lower_right(min_lat, max_lon);
-            _Coordinate lower_left (min_lat, min_lon);
+            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,
@@ -207,7 +215,7 @@ private:
             return min_max_dist;
         }
 
-        inline bool Contains(const _Coordinate & location) const {
+        inline bool Contains(const FixedPointCoordinate & location) const {
             bool lats_contained =
                     (location.lat > min_lat) && (location.lat < max_lat);
             bool lons_contained =
@@ -215,8 +223,14 @@ private:
             return lats_contained && lons_contained;
         }
 
-        inline friend std::ostream & operator<< ( std::ostream & out, const RectangleInt2D & rect ) {
-            out << rect.min_lat/100000. << "," << rect.min_lon/100000. << " " << rect.max_lat/100000. << "," << rect.max_lon/100000.;
+        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;
         }
     };
@@ -224,8 +238,11 @@ private:
     typedef RectangleInt2D RectangleT;
 
     struct WrappedInputElement {
-        explicit WrappedInputElement(const uint32_t _array_index, const uint64_t _hilbert_value) :
-			        m_array_index(_array_index), m_hilbert_value(_hilbert_value) {}
+        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;
@@ -251,11 +268,13 @@ private:
     };
 
     struct QueryCandidate {
-        explicit QueryCandidate(const uint32_t n_id, const double dist) : node_id(n_id), min_dist(dist)/*, minmax_dist(DBL_MAX)*/ {}
-        QueryCandidate() : node_id(UINT_MAX), min_dist(DBL_MAX)/*, minmax_dist(DBL_MAX)*/ {}
+        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;
-        //		double minmax_dist;
         inline bool operator<(const QueryCandidate & other) const {
             return min_dist < other.min_dist;
         }
@@ -264,45 +283,43 @@ private:
     std::vector<TreeNode> m_search_tree;
     uint64_t m_element_count;
 
-    std::string m_leaf_node_filename;
+    const std::string m_leaf_node_filename;
 public:
-    //Construct a pack R-Tree from the input-list with Kamel-Faloutsos algorithm [1]
-    explicit StaticRTree(std::vector<DataT> & input_data_vector, const char * tree_node_filename, const char * leaf_node_filename) :
-    m_leaf_node_filename(leaf_node_filename) {
-        m_element_count = input_data_vector.size();
-        //remove elements that are flagged to be ignored
-//        boost::remove_erase_if(input_data_vector, boost::bind(&DataT::isIgnored, _1 ));
+    //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
+    )
+     :  m_element_count(input_data_vector.size()),
+        m_leaf_node_filename(leaf_node_filename)
+    {
+        SimpleLogger().Write() <<
+            "constructing r-tree of " << m_element_count <<
+            " elements";
 
-        INFO("constructing r-tree of " << m_element_count << " elements");
-//        INFO("sizeof(LeafNode)=" << sizeof(LeafNode));
-//        INFO("sizeof(TreeNode)=" << sizeof(TreeNode));
-//        INFO("sizeof(WrappedInputElement)=" << sizeof(WrappedInputElement));
         double time1 = get_timestamp();
-        std::vector<WrappedInputElement> input_wrapper_vector(input_data_vector.size());
+        std::vector<WrappedInputElement> input_wrapper_vector(m_element_count);
 
         //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) {
-            //INFO("ID: " << input_data_vector[element_counter].id);
             input_wrapper_vector[element_counter].m_array_index = element_counter;
             //Get Hilbert-Value for centroid in mercartor projection
             DataT & current_element = input_data_vector[element_counter];
-            _Coordinate current_centroid = current_element.Centroid();
-            current_centroid.lat = 100000*lat2y(current_centroid.lat/100000.);
+            FixedPointCoordinate current_centroid = current_element.Centroid();
+            current_centroid.lat = COORDINATE_PRECISION*lat2y(current_centroid.lat/COORDINATE_PRECISION);
 
             uint64_t current_hilbert_value = HilbertCode::GetHilbertNumberForCoordinate(current_centroid);
             input_wrapper_vector[element_counter].m_hilbert_value = current_hilbert_value;
 
         }
-        //INFO("finished wrapper setup");
-
         //open leaf file
-        std::ofstream leaf_node_file(leaf_node_filename, std::ios::binary);
+        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());
-        //		INFO("finished sorting");
         std::vector<TreeNode> tree_nodes_in_level;
 
         //pack M elements into leaf node and write to leaf file
@@ -313,19 +330,12 @@ public:
             TreeNode current_node;
             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)) {
-                    //					INFO("Checking element " << (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;
                 }
             }
 
-            if(0 == processed_objects_count) {
-                for(uint32_t i = 0; i < current_leaf.object_count; ++i) {
-                    					//INFO("[" << i << "] id: " << current_leaf.objects[i].id << ", weight: " << current_leaf.objects[i].weight << ", " << current_leaf.objects[i].lat1/100000. << "," << current_leaf.objects[i].lon1/100000. << ";" << current_leaf.objects[i].lat2/100000. << "," << current_leaf.objects[i].lon2/100000.);
-                }
-            }
-
             //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);
             current_node.child_is_on_disk = true;
@@ -337,20 +347,21 @@ public:
             processed_objects_count += current_leaf.object_count;
         }
 
-        //		INFO("wrote " << processed_objects_count << " leaf objects");
-
         //close leaf file
         leaf_node_file.close();
 
         uint32_t processing_level = 0;
         while(1 < tree_nodes_in_level.size()) {
-            //			INFO("processing " << (uint32_t)tree_nodes_in_level.size() << " tree nodes in level " << processing_level);
             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) {
+                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
@@ -364,15 +375,12 @@ public:
                     }
                 }
                 tree_nodes_in_next_level.push_back(parent_node);
-                //				INFO("processed: " << processed_tree_nodes_in_level << ", generating " << (uint32_t)tree_nodes_in_next_level.size() << " parents");
             }
             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;
-        //		INFO("root node has " << (uint32_t)tree_nodes_in_level[0].child_count << " children");
-        //store root node
+        //last remaining entry is the root node, store it
         m_search_tree.push_back(tree_nodes_in_level[0]);
 
         //reverse and renumber tree to have root at index 0
@@ -388,7 +396,11 @@ public:
         }
 
         //open tree file
-        std::ofstream tree_node_file(tree_node_filename, std::ios::binary);
+        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));
@@ -396,56 +408,52 @@ public:
         //close tree node file.
         tree_node_file.close();
         double time2 = get_timestamp();
-//        INFO("written " << processed_objects_count << " leafs in " << sizeof(LeafNode)*(1+(unsigned)std::ceil(processed_objects_count/RTREE_LEAF_NODE_SIZE) )+sizeof(uint64_t) << " bytes");
-//        INFO("written search tree of " << size_of_tree << " tree nodes in " << sizeof(TreeNode)*size_of_tree+sizeof(uint32_t) << " bytes");
-        INFO("finished r-tree construction in " << (time2-time1) << " seconds");
-
-        //todo: test queries
-/*        INFO("first MBR:" << m_search_tree[0].minimum_bounding_rectangle);
-
-        DataT result;
-        time1 = get_timestamp();
-        bool found_nearest = NearestNeighbor(_Coordinate(50.191085,8.466479), result);
-        time2 = get_timestamp();
-        INFO("found nearest element to (50.191085,8.466479): " << (found_nearest ? "yes" : "no")  << " in " << (time2-time1) << "s at (" << result.lat1/100000. << "," << result.lon1/100000. << " " << result.lat2/100000. << "," << result.lon2/100000. << ")");
-        time1 = get_timestamp();
-        found_nearest = NearestNeighbor(_Coordinate(50.23979, 8.51882), result);
-        time2 = get_timestamp();
-        INFO("found nearest element to (50.23979, 8.51882): " << (found_nearest ? "yes" : "no")  << " in " << (time2-time1) << "s at (" << result.lat1/100000. << "," << result.lon1/100000. << " " << result.lat2/100000. << "," << result.lon2/100000. << ")");
-        time1 = get_timestamp();
-        found_nearest = NearestNeighbor(_Coordinate(49.0316,2.6937), result);
-        time2 = get_timestamp();
-        INFO("found nearest element to (49.0316,2.6937): " << (found_nearest ? "yes" : "no")  << " in " << (time2-time1) << "s at (" << result.lat1/100000. << "," << result.lon1/100000. << " " << result.lat2/100000. << "," << result.lon2/100000. << ")");
-*/
+        SimpleLogger().Write() <<
+            "finished r-tree construction in " << (time2-time1) << " seconds";
     }
 
     //Read-only operation for queries
     explicit StaticRTree(
-            const char * node_filename,
-            const char * leaf_filename
+            const std::string & node_filename,
+            const std::string & leaf_filename
     ) : m_leaf_node_filename(leaf_filename) {
-        //INFO("Loading nodes: " << node_filename);
-        //INFO("opening leafs: " << leaf_filename);
         //open tree node file and load into RAM.
-        std::ifstream tree_node_file(node_filename, std::ios::binary);
+        boost::filesystem::path node_file(node_filename);
+
+        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));
-        //INFO("reading " << tree_size << " tree nodes in " << (sizeof(TreeNode)*tree_size) << " bytes");
+        //SimpleLogger().Write() << "reading " << tree_size << " tree nodes in " << (sizeof(TreeNode)*tree_size) << " bytes";
         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
-        std::ifstream leaf_node_file(leaf_filename, std::ios::binary);
+        boost::filesystem::path leaf_file(leaf_filename);
+        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();
 
-        //INFO( tree_size << " nodes in search tree");
-        //INFO( m_element_count << " elements in leafs");
+        //SimpleLogger().Write() << tree_size << " nodes in search tree";
+        //SimpleLogger().Write() << m_element_count << " elements in leafs";
     }
 /*
     inline void FindKNearestPhantomNodesForCoordinate(
-        const _Coordinate & location,
+        const FixedPointCoordinate & location,
         const unsigned zoom_level,
         const unsigned candidate_count,
         std::vector<std::pair<PhantomNode, double> > & result_vector
@@ -456,17 +464,17 @@ public:
 
         uint32_t io_count = 0;
         uint32_t explored_tree_nodes_count = 0;
-        INFO("searching for coordinate " << input_coordinate);
-        double min_dist = DBL_MAX;
-        double min_max_dist = DBL_MAX;
+        SimpleLogger().Write() << "searching for coordinate " << input_coordinate;
+        double min_dist = std::numeric_limits<double>::max();
+        double min_max_dist = std::numeric_limits<double>::max();
         bool found_a_nearest_edge = false;
 
-        _Coordinate nearest, current_start_coordinate, current_end_coordinate;
+        FixedPointCoordinate nearest, current_start_coordinate, current_end_coordinate;
 
         //initialize queue with root element
         std::priority_queue<QueryCandidate> traversal_queue;
         traversal_queue.push(QueryCandidate(0, m_search_tree[0].minimum_bounding_rectangle.GetMinDist(input_coordinate)));
-        BOOST_ASSERT_MSG(FLT_EPSILON > (0. - traversal_queue.top().min_dist), "Root element in NN Search has min dist != 0.");
+        BOOST_ASSERT_MSG(std::numberic_limits<double>::epsilon() > (0. - traversal_queue.top().min_dist), "Root element in NN Search has min dist != 0.");
 
         while(!traversal_queue.empty()) {
             const QueryCandidate current_query_node = traversal_queue.top(); traversal_queue.pop();
@@ -489,8 +497,8 @@ public:
                         double current_ratio = 0.;
                         double current_perpendicular_distance = ComputePerpendicularDistance(
                                                                                              input_coordinate,
-                                                                                             _Coordinate(current_edge.lat1, current_edge.lon1),
-                                                                                             _Coordinate(current_edge.lat2, current_edge.lon2),
+                                                                                             FixedPointCoordinate(current_edge.lat1, current_edge.lon1),
+                                                                                             FixedPointCoordinate(current_edge.lat2, current_edge.lon2),
                                                                                              nearest,
                                                                                              &current_ratio
                                                                                              );
@@ -519,11 +527,11 @@ public:
                                   1 == abs(current_edge.id - result_phantom_node.edgeBasedNode )
                                   && CoordinatesAreEquivalent(
                                                               current_start_coordinate,
-                                                              _Coordinate(
+                                                              FixedPointCoordinate(
                                                                           current_edge.lat1,
                                                                           current_edge.lon1
                                                                           ),
-                                                              _Coordinate(
+                                                              FixedPointCoordinate(
                                                                           current_edge.lat2,
                                                                           current_edge.lon2
                                                                           ),
@@ -557,11 +565,20 @@ public:
             }
         }
 
+        const double distance_to_edge =
+        ApproximateDistance (
+            FixedPointCoordinate(nearest_edge.lat1, nearest_edge.lon1),
+            result_phantom_node.location
+        );
+
+        const double length_of_edge =
+        ApproximateDistance(
+            FixedPointCoordinate(nearest_edge.lat1, nearest_edge.lon1),
+            FixedPointCoordinate(nearest_edge.lat2, nearest_edge.lon2)
+        );
+
         const double ratio = (found_a_nearest_edge ?
-                              std::min(1., ApproximateDistance(_Coordinate(nearest_edge.lat1, nearest_edge.lon1),
-                                                               result_phantom_node.location)/ApproximateDistance(_Coordinate(nearest_edge.lat1, nearest_edge.lon1), _Coordinate(nearest_edge.lat2, nearest_edge.lon2))
-                                       ) : 0
-                              );
+          std::min(1., distance_to_edge/ length_of_edge ) : 0 );
         result_phantom_node.weight1 *= ratio;
         if(INT_MAX != result_phantom_node.weight2) {
             result_phantom_node.weight2 *= (1.-ratio);
@@ -576,15 +593,121 @@ public:
             result_phantom_node.location.lat = input_coordinate.lat;
         }
 
-        INFO("mindist: " << min_dist << ", io's: " << io_count << ", nodes: " << explored_tree_nodes_count << ", loc: " << result_phantom_node.location << ", ratio: " << ratio << ", id: " << result_phantom_node.edgeBasedNode);
-        INFO("bidirected: " << (result_phantom_node.isBidirected() ? "yes" : "no") );
+        SimpleLogger().Write() << "mindist: " << min_distphantom_node.isBidirected() ? "yes" : "no");
         return found_a_nearest_edge;
 
     }
 
   */
+    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.push(
+            QueryCandidate(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."
+        );
+
+        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) {
+                        const DataT & current_edge = current_leaf_node.objects[i];
+                        if(
+                            ignore_tiny_components &&
+                            current_edge.belongsToTinyComponent
+                        ) {
+                            continue;
+                        }
+                        if(current_edge.isIgnored()) {
+                            continue;
+                        }
+
+                        double current_minimum_distance = ApproximateDistance(
+                                input_coordinate.lat,
+                                input_coordinate.lon,
+                                current_edge.lat1,
+                                current_edge.lon1
+                            );
+                        if( current_minimum_distance < min_dist ) {
+                            //found a new minimum
+                            min_dist = current_minimum_distance;
+                            result_coordinate.lat = current_edge.lat1;
+                            result_coordinate.lon = current_edge.lon1;
+                            found_a_nearest_edge = true;
+                        }
+
+                        current_minimum_distance = ApproximateDistance(
+                                input_coordinate.lat,
+                                input_coordinate.lon,
+                                current_edge.lat2,
+                                current_edge.lon2
+                            );
+
+                        if( current_minimum_distance < min_dist ) {
+                            //found a new minimum
+                            min_dist = current_minimum_distance;
+                            result_coordinate.lat = current_edge.lat2;
+                            result_coordinate.lon = current_edge.lon2;
+                            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.push(
+                            QueryCandidate(child_id, current_min_dist)
+                        );
+                    }
+                }
+            }
+        }
+
+        return found_a_nearest_edge;
+    }
+
+
     bool FindPhantomNodeForCoordinate(
-            const _Coordinate & input_coordinate,
+            const FixedPointCoordinate & input_coordinate,
             PhantomNode & result_phantom_node,
             const unsigned zoom_level
     ) {
@@ -594,12 +717,12 @@ public:
 
         uint32_t io_count = 0;
         uint32_t explored_tree_nodes_count = 0;
-        //INFO("searching for coordinate " << input_coordinate);
-        double min_dist = DBL_MAX;
-        double min_max_dist = DBL_MAX;
+        //SimpleLogger().Write() << "searching for coordinate " << input_coordinate;
+        double min_dist = std::numeric_limits<double>::max();
+        double min_max_dist = std::numeric_limits<double>::max();
         bool found_a_nearest_edge = false;
 
-        _Coordinate nearest, current_start_coordinate, current_end_coordinate;
+        FixedPointCoordinate nearest, current_start_coordinate, current_end_coordinate;
 
         //initialize queue with root element
         std::priority_queue<QueryCandidate> traversal_queue;
@@ -609,8 +732,8 @@ public:
         );
 
         BOOST_ASSERT_MSG(
-                         FLT_EPSILON > (0. - traversal_queue.top().min_dist),
-                         "Root element in NN Search has min dist != 0."
+            std::numeric_limits<double>::epsilon() > (0. - traversal_queue.top().min_dist),
+            "Root element in NN Search has min dist != 0."
         );
 
         while(!traversal_queue.empty()) {
@@ -625,7 +748,6 @@ public:
                     LeafNode current_leaf_node;
                     LoadLeafFromDisk(current_tree_node.children[0], current_leaf_node);
                     ++io_count;
-                    //INFO("checking " << current_leaf_node.object_count << " elements");
                     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.belongsToTinyComponent) {
@@ -638,16 +760,12 @@ public:
                        double current_ratio = 0.;
                        double current_perpendicular_distance = ComputePerpendicularDistance(
                                 input_coordinate,
-                                _Coordinate(current_edge.lat1, current_edge.lon1),
-                                _Coordinate(current_edge.lat2, current_edge.lon2),
+                                FixedPointCoordinate(current_edge.lat1, current_edge.lon1),
+                                FixedPointCoordinate(current_edge.lat2, current_edge.lon2),
                                 nearest,
                                 &current_ratio
                         );
 
-                        //INFO("[" << current_edge.id << "] (" << current_edge.lat1/100000. << "," << current_edge.lon1/100000. << ")==(" << current_edge.lat2/100000. << "," << current_edge.lon2/100000. << ") at distance " << current_perpendicular_distance << " min dist: " << min_dist
-                        //     << ", ratio " << current_ratio
-                        //     );
-
                         if(
                                 current_perpendicular_distance < min_dist
                                 && !DoubleEpsilonCompare(
@@ -672,27 +790,25 @@ public:
                                 1 == abs(current_edge.id - result_phantom_node.edgeBasedNode )
                         && CoordinatesAreEquivalent(
                                 current_start_coordinate,
-                                _Coordinate(
+                                FixedPointCoordinate(
                                         current_edge.lat1,
                                         current_edge.lon1
                                 ),
-                                _Coordinate(
+                                FixedPointCoordinate(
                                         current_edge.lat2,
                                         current_edge.lon2
                                 ),
                                 current_end_coordinate
                             )
                         ) {
+
                             BOOST_ASSERT_MSG(current_edge.id != result_phantom_node.edgeBasedNode, "IDs not different");
-                            //INFO("found bidirected edge on nodes " << current_edge.id << " and " << result_phantom_node.edgeBasedNode);
                             result_phantom_node.weight2 = current_edge.weight;
                             if(current_edge.id < result_phantom_node.edgeBasedNode) {
                                 result_phantom_node.edgeBasedNode = current_edge.id;
                                 std::swap(result_phantom_node.weight1, result_phantom_node.weight2);
                                 std::swap(current_end_coordinate, current_start_coordinate);
-                            //    INFO("case 2");
                             }
-                            //INFO("w1: " << result_phantom_node.weight1 << ", w2: " << result_phantom_node.weight2);
                         }
                     }
                 } else {
@@ -737,107 +853,26 @@ public:
             result_phantom_node.location.lat = input_coordinate.lat;
         }
 
-//        INFO("start: (" << nearest_edge.lat1 << "," << nearest_edge.lon1 << "), end: (" << nearest_edge.lat2 << "," << nearest_edge.lon2 << ")" );
-//        INFO("mindist: " << min_dist << ", io's: " << io_count << ", nodes: " << explored_tree_nodes_count << ", loc: " << result_phantom_node.location << ", ratio: " << ratio << ", id: " << result_phantom_node.edgeBasedNode);
-//        INFO("weight1: " << result_phantom_node.weight1 << ", weight2: " << result_phantom_node.weight2);
-//        INFO("bidirected: " << (result_phantom_node.isBidirected() ? "yes" : "no") );
-//        INFO("NameID: " << result_phantom_node.nodeBasedEdgeNameID);
         return found_a_nearest_edge;
 
     }
-/*
-    //Nearest-Neighbor query with the Roussopoulos et al. algorithm [2]
-    inline bool NearestNeighbor(const _Coordinate & input_coordinate, DataT & result_element) {
-        uint32_t io_count = 0;
-        uint32_t explored_tree_nodes_count = 0;
-        INFO("searching for coordinate " << input_coordinate);
-        double min_dist = DBL_MAX;
-        double min_max_dist = DBL_MAX;
-        bool found_return_value = false;
 
-        //initialize queue with root element
-        std::priority_queue<QueryCandidate> traversal_queue;
-        traversal_queue.push(QueryCandidate(0, m_search_tree[0].minimum_bounding_rectangle.GetMinDist(input_coordinate)));
-        BOOST_ASSERT_MSG(FLT_EPSILON > (0. - traversal_queue.top().min_dist), "Root element in NN Search has min dist != 0.");
-
-        while(!traversal_queue.empty()) {
-            const QueryCandidate current_query_node = traversal_queue.top(); traversal_queue.pop();
-
-            ++explored_tree_nodes_count;
-
-            //			INFO("popped node " << current_query_node.node_id << " at distance " << current_query_node.min_dist);
-            bool prune_downward = (current_query_node.min_dist >= min_max_dist);
-            bool prune_upward    = (current_query_node.min_dist >= min_dist);
-            //			INFO(" up prune:   " << (prune_upward ? "y" : "n" ));
-            //			INFO(" down prune: " << (prune_downward ? "y" : "n" ));
-            if( prune_downward || prune_upward ) { //downward pruning
-                //				INFO("  pruned node " << current_query_node.node_id << " because " << current_query_node.min_dist << "<" << min_max_dist);
-            } else {
-                TreeNode & current_tree_node = m_search_tree[current_query_node.node_id];
-                if (current_tree_node.child_is_on_disk) {
-                    //					INFO("  Fetching child from disk for id: " << current_query_node.node_id);
-                    LeafNode current_leaf_node;
-                    LoadLeafFromDisk(current_tree_node.children[0], current_leaf_node);
-                    ++io_count;
-                    double ratio = 0.;
-                    _Coordinate nearest;
-                    for(uint32_t i = 0; i < current_leaf_node.object_count; ++i) {
-                        DataT & current_object = current_leaf_node.objects[i];
-                        double current_perpendicular_distance = ComputePerpendicularDistance(
-                                input_coordinate,
-                                _Coordinate(current_object.lat1, current_object.lon1),
-                                _Coordinate(current_object.lat2, current_object.lon2),
-                                nearest,
-                                &ratio
-                        );
-
-                        if(current_perpendicular_distance < min_dist && !DoubleEpsilonCompare(current_perpendicular_distance, min_dist)) { //found a new minimum
-                            min_dist = current_perpendicular_distance;
-                            result_element = current_object;
-                            found_return_value = true;
-                        }
-                    }
-                } else {
-                    //traverse children, prune if global mindist is smaller than local one
-                    //					INFO("  Checking " << current_tree_node.child_count << " children of node " << current_query_node.node_id);
-                    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;
-                        }
-                        //						INFO("   pushing node " << child_id << " at distance " << current_min_dist);
-                        traversal_queue.push(QueryCandidate(child_id, current_min_dist));
-                    }
-                }
-            }
-        }
-        INFO("mindist: " << min_dist << ", io's: " << io_count << ",  touched nodes: " << explored_tree_nodes_count);
-        return found_return_value;
-    }
- */
 private:
     inline void LoadLeafFromDisk(const uint32_t leaf_id, LeafNode& result_node) {
-        if(!thread_local_rtree_stream.get() || !thread_local_rtree_stream->is_open()) {
+        if(
+            !thread_local_rtree_stream.get() ||
+            !thread_local_rtree_stream->is_open()
+        ) {
             thread_local_rtree_stream.reset(
-                new std::ifstream(
-                        m_leaf_node_filename.c_str(),
+                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);
-            DEBUG("Resetting stale filestream");
+            SimpleLogger().Write(logDEBUG) << "Resetting stale filestream";
         }
         uint64_t seek_pos = sizeof(uint64_t) + leaf_id*sizeof(LeafNode);
         thread_local_rtree_stream->seekg(seek_pos);
@@ -845,18 +880,18 @@ private:
     }
 
     inline double ComputePerpendicularDistance(
-            const _Coordinate& inputPoint,
-            const _Coordinate& source,
-            const _Coordinate& target,
-            _Coordinate& nearest, double *r) const {
-        const double x = static_cast<double>(inputPoint.lat);
-        const double y = static_cast<double>(inputPoint.lon);
-        const double a = static_cast<double>(source.lat);
-        const double b = static_cast<double>(source.lon);
-        const double c = static_cast<double>(target.lat);
-        const double d = static_cast<double>(target.lon);
+            const FixedPointCoordinate& inputPoint,
+            const FixedPointCoordinate& source,
+            const FixedPointCoordinate& target,
+            FixedPointCoordinate& nearest, double *r) const {
+        const double x = inputPoint.lat/COORDINATE_PRECISION;
+        const double y = inputPoint.lon/COORDINATE_PRECISION;
+        const double a = source.lat/COORDINATE_PRECISION;
+        const double b = source.lon/COORDINATE_PRECISION;
+        const double c = target.lat/COORDINATE_PRECISION;
+        const double d = target.lon/COORDINATE_PRECISION;
         double p,q,mX,nY;
-        if(fabs(a-c) > FLT_EPSILON){
+        if(std::fabs(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);
@@ -886,18 +921,18 @@ private:
 //            return std::sqrt(((d - y)*(d - y) + (c - x)*(c - x)));
         }
         // point lies in between
-        nearest.lat = p;
-        nearest.lon = q;
+        nearest.lat = p*COORDINATE_PRECISION;
+        nearest.lon = q*COORDINATE_PRECISION;
 //        return std::sqrt((p-x)*(p-x) + (q-y)*(q-y));
         return (p-x)*(p-x) + (q-y)*(q-y);
     }
 
-    inline bool CoordinatesAreEquivalent(const _Coordinate & a, const _Coordinate & b, const _Coordinate & c, const _Coordinate & d) const {
+    inline bool CoordinatesAreEquivalent(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::fabs(d1 - d2) < FLT_EPSILON);
+        return (std::fabs(d1 - d2) < std::numeric_limits<double>::epsilon() );
     }
 
 };

DataStructures/TimingUtil.h

@@ -1,50 +0,0 @@
-/*
-    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 TIMINGUTIL_H_
-#define TIMINGUTIL_H_
-
-#include <climits>
-#include <cstdlib>
-
-
-#ifdef _WIN32
- #include <sys/timeb.h>
- #include <sys/types.h>
- #include <winsock.h>
- void gettimeofday(struct timeval* t,void* timezone)
- {       struct _timeb timebuffer;
-        _ftime( &timebuffer );
-        t->tv_sec=timebuffer.time;
-        t->tv_usec=1000*timebuffer.millitm;
- }
-#else
- #include <sys/time.h>
-#endif
-
-/** Returns a timestamp (now) in seconds (incl. a fractional part). */
-static inline double get_timestamp() {
-    struct timeval tp;
-    gettimeofday(&tp, NULL);
-    return double(tp.tv_sec) + tp.tv_usec / 1000000.;
-}
-
-
-#endif /* TIMINGUTIL_H_ */

DataStructures/TurnInstructions.h

@@ -1,22 +1,29 @@
 /*
- 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
- 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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
- 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.
- */
+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 TURNINSTRUCTIONS_H_
 #define TURNINSTRUCTIONS_H_

DataStructures/XORFastHash.h

@@ -1,22 +1,29 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 FASTXORHASH_H_
 #define FASTXORHASH_H_

DataStructures/XORFastHashStorage.h

@@ -1,32 +1,39 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 XORFASTHASHSTORAGE_H_
 #define XORFASTHASHSTORAGE_H_
 
+#include "XORFastHash.h"
+
 #include <climits>
 #include <vector>
 #include <bitset>
 
-#include "XORFastHash.h"
-
 template< typename NodeID, typename Key >
 class XORFastHashStorage {
 public:

Descriptors/BaseDescriptor.h

@@ -1,40 +1,48 @@
 /*
-    open source routing machine
-    Copyright (C) Dennis Luxen, 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 BASE_DESCRIPTOR_H_
 #define BASE_DESCRIPTOR_H_
 
+#include "../DataStructures/HashTable.h"
+#include "../DataStructures/PhantomNodes.h"
+#include "../DataStructures/RawRouteData.h"
+#include "../DataStructures/SearchEngine.h"
+#include "../Server/BasicDatastructures.h"
+#include "../Util/StringUtil.h"
+#include "../typedefs.h"
+
 #include <cassert>
 #include <cmath>
 #include <cstdio>
+
 #include <string>
 #include <vector>
 
-#include "../typedefs.h"
-#include "../DataStructures/HashTable.h"
-#include "../DataStructures/PhantomNodes.h"
-#include "../DataStructures/SearchEngine.h"
-#include "../Util/StringUtil.h"
-
-#include "../Plugins/RawRouteData.h"
-
 struct _DescriptorConfig {
     _DescriptorConfig() : instructions(true), geometry(true), encodeGeometry(true), z(18) {}
     bool instructions;

Descriptors/DescriptionFactory.cpp

@@ -1,22 +1,29 @@
 /*
- 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
- 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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
- 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.
- */
+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"
 
@@ -32,11 +39,14 @@ inline double DescriptionFactory::RadianToDegree(const double radian) const {
         return radian * (180/M_PI);
 }
 
-double DescriptionFactory::GetBearing(const _Coordinate& A, const _Coordinate& B) const {
-    double deltaLong = DegreeToRadian(B.lon/100000. - A.lon/100000.);
+double DescriptionFactory::GetBearing(
+    const FixedPointCoordinate & A,
+    const FixedPointCoordinate & B
+) const {
+    double deltaLong = DegreeToRadian(B.lon/COORDINATE_PRECISION - A.lon/COORDINATE_PRECISION);
 
-    double lat1 = DegreeToRadian(A.lat/100000.);
-    double lat2 = DegreeToRadian(B.lat/100000.);
+    double lat1 = DegreeToRadian(A.lat/COORDINATE_PRECISION);
+    double lat2 = DegreeToRadian(B.lat/COORDINATE_PRECISION);
 
     double y = sin(deltaLong) * cos(lat2);
     double x = cos(lat1) * sin(lat2) - sin(lat1) * cos(lat2) * cos(deltaLong);
@@ -59,7 +69,7 @@ void DescriptionFactory::SetEndSegment(const PhantomNode & _targetPhantom) {
     pathDescription.push_back(SegmentInformation(_targetPhantom.location, _targetPhantom.nodeBasedEdgeNameID, 0, _targetPhantom.weight1, 0, true) );
 }
 
-void DescriptionFactory::AppendSegment(const _Coordinate & coordinate, const _PathData & data ) {
+void DescriptionFactory::AppendSegment(const FixedPointCoordinate & coordinate, const _PathData & data ) {
     if(1 == pathDescription.size() && pathDescription.back().location == coordinate) {
         pathDescription.back().nameID = data.nameID;
     } else {
@@ -91,7 +101,7 @@ void DescriptionFactory::Run(const SearchEngine &sEngine, const unsigned zoomLev
     /** starts at index 1 */
     pathDescription[0].length = 0;
     for(unsigned i = 1; i < pathDescription.size(); ++i) {
-        pathDescription[i].length = ApproximateDistanceByEuclid(pathDescription[i-1].location, pathDescription[i].location);
+        pathDescription[i].length = ApproximateEuclideanDistance(pathDescription[i-1].location, pathDescription[i].location);
     }
 
     double lengthOfSegment = 0;
@@ -123,7 +133,7 @@ void DescriptionFactory::Run(const SearchEngine &sEngine, const unsigned zoomLev
 //            		|| std::string::npos != string0.find(string1+" ;")
 //                    || std::string::npos != string0.find("; "+string1)
 //                    ){
-//                INFO("->next correct: " << string0 << " contains " << string1);
+//                SimpleLogger().Write() << "->next correct: " << string0 << " contains " << string1;
 //                for(; lastTurn != i; ++lastTurn)
 //                    pathDescription[lastTurn].nameID = pathDescription[i].nameID;
 //                pathDescription[i].turnInstruction = TurnInstructionsClass::NoTurn;
@@ -132,7 +142,7 @@ void DescriptionFactory::Run(const SearchEngine &sEngine, const unsigned zoomLev
 //                    || std::string::npos != string1.find(string0+" ;")
 //                    || std::string::npos != string1.find("; "+string0)
 //                    ){
-//                INFO("->prev correct: " << string1 << " contains " << string0);
+//                SimpleLogger().Write() << "->prev correct: " << string1 << " contains " << string0;
 //                pathDescription[i].nameID = pathDescription[i-1].nameID;
 //                pathDescription[i].turnInstruction = TurnInstructionsClass::NoTurn;
 //            }
@@ -153,36 +163,36 @@ void DescriptionFactory::Run(const SearchEngine &sEngine, const unsigned zoomLev
 
 
         if(TurnInstructionsClass::NoTurn != pathDescription[i].turnInstruction) {
-            //INFO("Turn after " << lengthOfSegment << "m into way with name id " << segment.nameID);
+            //SimpleLogger().Write() << "Turn after " << lengthOfSegment << "m into way with name id " << segment.nameID;
             assert(pathDescription[i].necessary);
             lengthOfSegment = 0;
             durationOfSegment = 0;
             indexOfSegmentBegin = i;
         }
     }
-    //    INFO("#segs: " << pathDescription.size());
+    //    SimpleLogger().Write() << "#segs: " << pathDescription.size();
 
     //Post-processing to remove empty or nearly empty path segments
-    if(FLT_EPSILON > pathDescription.back().length) {
-        //        INFO("#segs: " << pathDescription.size() << ", last ratio: " << targetPhantom.ratio << ", length: " << pathDescription.back().length);
+    if(std::numeric_limits<double>::epsilon() > pathDescription.back().length) {
+        //        SimpleLogger().Write() << "#segs: " << pathDescription.size() << ", last ratio: " << targetPhantom.ratio << ", length: " << pathDescription.back().length;
         if(pathDescription.size() > 2){
             pathDescription.pop_back();
             pathDescription.back().necessary = true;
             pathDescription.back().turnInstruction = TurnInstructions.NoTurn;
             targetPhantom.nodeBasedEdgeNameID = (pathDescription.end()-2)->nameID;
-            //            INFO("Deleting last turn instruction");
+            //            SimpleLogger().Write() << "Deleting last turn instruction";
         }
     } else {
         pathDescription[indexOfSegmentBegin].duration *= (1.-targetPhantom.ratio);
     }
-    if(FLT_EPSILON > pathDescription[0].length) {
+    if(std::numeric_limits<double>::epsilon() > pathDescription[0].length) {
         //TODO: this is never called actually?
         if(pathDescription.size() > 2) {
             pathDescription.erase(pathDescription.begin());
             pathDescription[0].turnInstruction = TurnInstructions.HeadOn;
             pathDescription[0].necessary = true;
             startPhantom.nodeBasedEdgeNameID = pathDescription[0].nameID;
-            //            INFO("Deleting first turn instruction, ratio: " << startPhantom.ratio << ", length: " << pathDescription[0].length);
+            //            SimpleLogger().Write() << "Deleting first turn instruction, ratio: " << startPhantom.ratio << ", length: " << pathDescription[0].length;
         }
     } else {
         pathDescription[0].duration *= startPhantom.ratio;

Descriptors/DescriptionFactory.h

@@ -1,35 +1,44 @@
 /*
- 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
- 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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
- 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.
- */
+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 DESCRIPTIONFACTORY_H_
 #define DESCRIPTIONFACTORY_H_
 
-#include <vector>
-
-#include "../typedefs.h"
 #include "../Algorithms/DouglasPeucker.h"
 #include "../Algorithms/PolylineCompressor.h"
 #include "../DataStructures/Coordinate.h"
 #include "../DataStructures/SearchEngine.h"
 #include "../DataStructures/SegmentInformation.h"
 #include "../DataStructures/TurnInstructions.h"
+#include "../Util/SimpleLogger.h"
+#include "../typedefs.h"
+
+#include <limits>
+#include <vector>
 
 /* This class is fed with all way segments in consecutive order
  *  and produces the description plus the encoded polyline */
@@ -62,10 +71,10 @@ public:
     std::vector <SegmentInformation> pathDescription;
     DescriptionFactory();
     virtual ~DescriptionFactory();
-    double GetBearing(const _Coordinate& C, const _Coordinate& B) const;
+    double GetBearing(const FixedPointCoordinate& C, const FixedPointCoordinate& B) const;
     void AppendEncodedPolylineString(std::string &output);
     void AppendUnencodedPolylineString(std::string &output);
-    void AppendSegment(const _Coordinate & coordinate, const _PathData & data);
+    void AppendSegment(const FixedPointCoordinate & coordinate, const _PathData & data);
     void BuildRouteSummary(const double distance, const unsigned time);
     void SetStartSegment(const PhantomNode & startPhantom);
     void SetEndSegment(const PhantomNode & startPhantom);

Descriptors/GPXDescriptor.h

@@ -1,33 +1,41 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 <boost/foreach.hpp>
 #include "BaseDescriptor.h"
 
+#include <boost/foreach.hpp>
+
 class GPXDescriptor : public BaseDescriptor{
 private:
     _DescriptorConfig config;
-    _Coordinate current;
+    FixedPointCoordinate current;
 
     std::string tmp;
 public:

Descriptors/JSONDescriptor.h

@@ -1,31 +1,33 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 <algorithm>
-
-#include <boost/lambda/lambda.hpp>
-#include <boost/bind.hpp>
-
 #include "BaseDescriptor.h"
 #include "DescriptionFactory.h"
 #include "../Algorithms/ObjectToBase64.h"
@@ -34,14 +36,24 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include "../Util/Azimuth.h"
 #include "../Util/StringUtil.h"
 
+#include <boost/bind.hpp>
+#include <boost/lambda/lambda.hpp>
+
+#include <algorithm>
+
 class JSONDescriptor : public BaseDescriptor{
 private:
     _DescriptorConfig config;
     DescriptionFactory descriptionFactory;
     DescriptionFactory alternateDescriptionFactory;
-    _Coordinate current;
+    FixedPointCoordinate current;
     unsigned numberOfEnteredRestrictedAreas;
-    struct {
+    struct RoundAbout{
+        RoundAbout() :
+            startIndex(INT_MAX),
+            nameID(INT_MAX),
+            leaveAtExit(INT_MAX)
+        {}
         int startIndex;
         int nameID;
         int leaveAtExit;

Extractor/BaseParser.cpp

@@ -1,21 +1,28 @@
 /*
-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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+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.
 
-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.
 */
 
 #include "BaseParser.h"
@@ -29,38 +36,34 @@ extractor_callbacks(ec), scriptingEnvironment(se), luaState(NULL), use_turn_rest
 
 void BaseParser::ReadUseRestrictionsSetting() {
     if( 0 != luaL_dostring( luaState, "return use_turn_restrictions\n") ) {
-        ERR(lua_tostring( luaState,-1)<< " occured in scripting block");
+        throw OSRMException(
+            /*lua_tostring( luaState, -1 ) + */"ERROR occured in scripting block"
+        );
     }
     if( lua_isboolean( luaState, -1) ) {
         use_turn_restrictions = lua_toboolean(luaState, -1);
     }
     if( use_turn_restrictions ) {
-        INFO("Using turn restrictions" );
+        SimpleLogger().Write() << "Using turn restrictions";
     } else {
-        INFO("Ignoring turn restrictions" );
+        SimpleLogger().Write() << "Ignoring turn restrictions";
     }
 }
 
 void BaseParser::ReadRestrictionExceptions() {
     if(lua_function_exists(luaState, "get_exceptions" )) {
         //get list of turn restriction exceptions
-        try {
-            luabind::call_function<void>(
-                luaState,
-                "get_exceptions",
-                boost::ref(restriction_exceptions)
-                );
-            INFO("Found " << restriction_exceptions.size() << " exceptions to turn restriction");
-            BOOST_FOREACH(std::string & str, restriction_exceptions) {
-                INFO("   " << str);
-            }
-        } catch (const luabind::error &er) {
-            lua_State* Ler=er.state();
-            report_errors(Ler, -1);
-            ERR(er.what());
+        luabind::call_function<void>(
+            luaState,
+            "get_exceptions",
+            boost::ref(restriction_exceptions)
+        );
+        SimpleLogger().Write() << "Found " << restriction_exceptions.size() << " exceptions to turn restriction";
+        BOOST_FOREACH(const std::string & str, restriction_exceptions) {
+            SimpleLogger().Write() << "   " << str;
         }
     } else {
-        INFO("Found no exceptions to turn restrictions");
+        SimpleLogger().Write() << "Found no exceptions to turn restrictions";
     }
 }
 
@@ -72,37 +75,22 @@ void BaseParser::report_errors(lua_State *L, const int status) const {
 }
 
 void BaseParser::ParseNodeInLua(ImportNode& n, lua_State* localLuaState) {
-    try {
-        luabind::call_function<void>( localLuaState, "node_function", boost::ref(n) );
-    } catch (const luabind::error &er) {
-        lua_State* Ler=er.state();
-        report_errors(Ler, -1);
-        ERR(er.what());
-    }
+    luabind::call_function<void>( localLuaState, "node_function", boost::ref(n) );
 }
 
 void BaseParser::ParseWayInLua(ExtractionWay& w, lua_State* localLuaState) {
-    if(2 > w.path.size()) {
-        return;
-    }
-    try {
-        luabind::call_function<void>( localLuaState, "way_function", boost::ref(w) );
-    } catch (const luabind::error &er) {
-        lua_State* Ler=er.state();
-        report_errors(Ler, -1);
-        ERR(er.what());
-    }
+    luabind::call_function<void>( localLuaState, "way_function", boost::ref(w) );
 }
 
-bool BaseParser::ShouldIgnoreRestriction(const std::string& except_tag_string) const {
+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), ex: except=bus;bicycle
     //b) the lua profile defines a hierachy of modes, ex: [access, vehicle, bicycle]
-    
+
     if( "" == except_tag_string ) {
         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;

Extractor/BaseParser.h

@@ -1,37 +1,46 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 BASEPARSER_H_
 #define BASEPARSER_H_
 
+#include "ExtractorCallbacks.h"
+#include "ScriptingEnvironment.h"
+#include "../Util/OSRMException.h"
+#include "../Util/SimpleLogger.h"
+
 extern "C" {
-#include <lua.h>
-#include <lauxlib.h>
-#include <lualib.h>
+    #include <lua.h>
+    #include <lauxlib.h>
+    #include <lualib.h>
 }
 
 #include <boost/noncopyable.hpp>
 
-#include "ExtractorCallbacks.h"
-#include "ScriptingEnvironment.h"
-
 class BaseParser : boost::noncopyable {
 public:
     BaseParser(ExtractorCallbacks* ec, ScriptingEnvironment& se);
@@ -43,11 +52,11 @@ public:
     virtual void ParseWayInLua(ExtractionWay& n, lua_State* luaStateForThread);
     virtual void report_errors(lua_State *L, const int status) const;
 
-protected:   
+protected:
     virtual void ReadUseRestrictionsSetting();
     virtual void ReadRestrictionExceptions();
     virtual bool ShouldIgnoreRestriction(const std::string& except_tag_string) const;
-    
+
     ExtractorCallbacks* extractor_callbacks;
     ScriptingEnvironment& scriptingEnvironment;
     lua_State* luaState;

Extractor/ExtractionContainers.cpp

@@ -1,26 +1,33 @@
 /*
- 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
- 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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
- 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.
- */
+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 "ExtractionContainers.h"
 
-void ExtractionContainers::PrepareData(const std::string & outputFileName, const std::string restrictionsFileName, const unsigned amountOfRAM) {
+void ExtractionContainers::PrepareData(const std::string & output_file_name, const std::string restrictionsFileName, const unsigned amountOfRAM) {
     try {
         unsigned usedNodeCounter = 0;
         unsigned usedEdgeCounter = 0;
@@ -111,26 +118,38 @@ void ExtractionContainers::PrepareData(const std::string & outputFileName, const
                 restrictionsIT->restriction.toNode = wayStartAndEndEdgeIT->firstStart;
             }
 
-            if(UINT_MAX != restrictionsIT->restriction.fromNode && UINT_MAX != restrictionsIT->restriction.toNode) {
+            if(
+                UINT_MAX != restrictionsIT->restriction.fromNode &&
+                UINT_MAX != restrictionsIT->restriction.toNode
+            ) {
                 ++usableRestrictionsCounter;
             }
             ++restrictionsIT;
         }
         std::cout << "ok, after " << get_timestamp() - time << "s" << std::endl;
-        INFO("usable restrictions: " << usableRestrictionsCounter );
+        SimpleLogger().Write() << "usable restrictions: " << usableRestrictionsCounter;
         //serialize restrictions
         std::ofstream restrictionsOutstream;
         restrictionsOutstream.open(restrictionsFileName.c_str(), std::ios::binary);
+        restrictionsOutstream.write((char*)&uuid, sizeof(UUID));
         restrictionsOutstream.write((char*)&usableRestrictionsCounter, sizeof(unsigned));
-        for(restrictionsIT = restrictionsVector.begin(); restrictionsIT != restrictionsVector.end(); ++restrictionsIT) {
-            if(UINT_MAX != restrictionsIT->restriction.fromNode && UINT_MAX != restrictionsIT->restriction.toNode) {
-                restrictionsOutstream.write((char *)&(restrictionsIT->restriction), sizeof(_Restriction));
+        for(
+            restrictionsIT = restrictionsVector.begin();
+            restrictionsIT != restrictionsVector.end();
+            ++restrictionsIT
+        ) {
+            if(
+                UINT_MAX != restrictionsIT->restriction.fromNode &&
+                UINT_MAX != restrictionsIT->restriction.toNode
+            ) {
+                restrictionsOutstream.write((char *)&(restrictionsIT->restriction), sizeof(TurnRestriction));
             }
         }
         restrictionsOutstream.close();
 
         std::ofstream fout;
-        fout.open(outputFileName.c_str(), std::ios::binary);
+        fout.open(output_file_name.c_str(), std::ios::binary);
+        fout.write((char*)&uuid, sizeof(UUID));
         fout.write((char*)&usedNodeCounter, sizeof(unsigned));
         time = get_timestamp();
         std::cout << "[extractor] Confirming/Writing used nodes     ... " << std::flush;
@@ -158,7 +177,7 @@ void ExtractionContainers::PrepareData(const std::string & outputFileName, const
 
         std::cout << "[extractor] setting number of nodes   ... " << std::flush;
         std::ios::pos_type positionInFile = fout.tellp();
-        fout.seekp(std::ios::beg);
+        fout.seekp(std::ios::beg+sizeof(UUID));
         fout.write((char*)&usedNodeCounter, sizeof(unsigned));
         fout.seekp(positionInFile);
 
@@ -270,37 +289,43 @@ void ExtractionContainers::PrepareData(const std::string & outputFileName, const
         fout.close();
         std::cout << "ok" << std::endl;
         time = get_timestamp();
-        std::cout << "[extractor] writing street name index ... " << std::flush;
-        std::string nameOutFileName = (outputFileName + ".names");
-        std::ofstream nameOutFile(nameOutFileName.c_str(), std::ios::binary);
-        unsigned sizeOfNameIndex = nameVector.size();
-        nameOutFile.write((char *)&(sizeOfNameIndex), sizeof(unsigned));
 
-        BOOST_FOREACH(const std::string & str, nameVector) {
-            unsigned lengthOfRawString = strlen(str.c_str());
-            nameOutFile.write((char *)&(lengthOfRawString), sizeof(unsigned));
-            nameOutFile.write(str.c_str(), lengthOfRawString);
+        std::cout << "[extractor] writing street name index ... " << std::flush;
+        std::string name_file_streamName = (output_file_name + ".names");
+        boost::filesystem::ofstream name_file_stream(
+            name_file_streamName,
+            std::ios::binary
+        );
+
+        const unsigned number_of_ways = name_list.size()+1;
+        name_file_stream.write((char *)&(number_of_ways), sizeof(unsigned));
+        unsigned name_lengths_prefix_sum = 0;
+        BOOST_FOREACH(const std::string & str, name_list) {
+            name_file_stream.write(
+                (char *)&(name_lengths_prefix_sum),
+                sizeof(unsigned)
+            );
+            name_lengths_prefix_sum += strlen(str.c_str());
+        }
+        name_file_stream.write(
+            (char *)&(name_lengths_prefix_sum),
+            sizeof(unsigned)
+        );
+        //duplicate on purpose!
+        name_file_stream.write((char *)&(name_lengths_prefix_sum), sizeof(unsigned));
+        BOOST_FOREACH(const std::string & str, name_list) {
+            const unsigned lengthOfRawString = strlen(str.c_str());
+            name_file_stream.write(str.c_str(), lengthOfRawString);
         }
 
-        nameOutFile.close();
+        name_file_stream.close();
         std::cout << "ok, after " << get_timestamp() - time << "s" << std::endl;
-
-        //        time = get_timestamp();
-        //        cout << "[extractor] writing address list      ... " << flush;
-        //
-        //        adressFileName.append(".address");
-        //        ofstream addressOutFile(adressFileName.c_str());
-        //        for(STXXLAddressVector::iterator it = adressVector.begin(); it != adressVector.end(); it++) {
-        //            addressOutFile << it->node.id << "|" << it->node.lat << "|" << it->node.lon << "|" << it->city << "|" << it->street << "|" << it->housenumber << "|" << it->state << "|" << it->country << "\n";
-        //        }
-        //        addressOutFile.close();
-        //        cout << "ok, after " << get_timestamp() - time << "s" << endl;
-
-        INFO("Processed " << usedNodeCounter << " nodes and " << usedEdgeCounter << " edges");
+        SimpleLogger().Write() <<
+            "Processed " << usedNodeCounter << " nodes and " << usedEdgeCounter << " edges";
 
 
     } catch ( const std::exception& e ) {
-      std::cerr <<  "Caught Execption:" << e.what() << std::endl;
+        std::cerr <<  "Caught Execption:" << e.what() << std::endl;
     }
 }
 

Extractor/ExtractionContainers.h

@@ -1,69 +1,81 @@
 /*
- 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
- 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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
- 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.
- */
+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 EXTRACTIONCONTAINERS_H_
 #define EXTRACTIONCONTAINERS_H_
 
 #include "ExtractorStructs.h"
-#include "../DataStructures/TimingUtil.h"
+#include "../Util/SimpleLogger.h"
+#include "../Util/TimingUtil.h"
+#include "../Util/UUID.h"
 
 #include <boost/foreach.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 #include <stxxl.h>
 
 class ExtractionContainers {
 public:
-    typedef stxxl::vector<NodeID> STXXLNodeIDVector;
-    typedef stxxl::vector<_Node> STXXLNodeVector;
-    typedef stxxl::vector<InternalExtractorEdge> STXXLEdgeVector;
-    typedef stxxl::vector<std::string> STXXLStringVector;
+    typedef stxxl::vector<NodeID>                   STXXLNodeIDVector;
+    typedef stxxl::vector<_Node>                    STXXLNodeVector;
+    typedef stxxl::vector<InternalExtractorEdge>    STXXLEdgeVector;
+    typedef stxxl::vector<std::string>              STXXLStringVector;
     typedef stxxl::vector<_RawRestrictionContainer> STXXLRestrictionsVector;
-    typedef stxxl::vector<_WayIDStartAndEndEdge> STXXLWayIDStartEndVector;
+    typedef stxxl::vector<_WayIDStartAndEndEdge>    STXXLWayIDStartEndVector;
+
+
+    STXXLNodeIDVector                               usedNodeIDs;
+    STXXLNodeVector                                 allNodes;
+    STXXLEdgeVector                                 allEdges;
+    STXXLStringVector                               name_list;
+    STXXLRestrictionsVector                         restrictionsVector;
+    STXXLWayIDStartEndVector                        wayStartEndVector;
+    const UUID uuid;
 
     ExtractionContainers() {
         //Check if another instance of stxxl is already running or if there is a general problem
-        try {
-            stxxl::vector<unsigned> testForRunningInstance;
-        } catch(std::exception & e) {
-            ERR("Could not instantiate STXXL layer." << std::endl << e.what());
-        }
-
-        nameVector.push_back("");
+        stxxl::vector<unsigned> testForRunningInstance;
+        name_list.push_back("");
     }
+
     virtual ~ExtractionContainers() {
         usedNodeIDs.clear();
         allNodes.clear();
         allEdges.clear();
-        nameVector.clear();
+        name_list.clear();
         restrictionsVector.clear();
         wayStartEndVector.clear();
     }
 
-    void PrepareData( const std::string & outputFileName, const std::string restrictionsFileName, const unsigned amountOfRAM);
-
-    STXXLNodeIDVector           usedNodeIDs;
-    STXXLNodeVector             allNodes;
-    STXXLEdgeVector             allEdges;
-    STXXLStringVector           nameVector;
-    STXXLRestrictionsVector     restrictionsVector;
-    STXXLWayIDStartEndVector    wayStartEndVector;
-
+    void PrepareData(
+        const std::string & output_file_name,
+        const std::string restrictionsFileName,
+        const unsigned amountOfRAM
+    );
 };
 
 #endif /* EXTRACTIONCONTAINERS_H_ */

Extractor/ExtractionHelperFunctions.h

@@ -1,36 +1,40 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 EXTRACTIONHELPERFUNCTIONS_H_
 #define EXTRACTIONHELPERFUNCTIONS_H_
 
+#include "../Util/StringUtil.h"
+
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string_regex.hpp>
 #include <boost/regex.hpp>
 #include <climits>
 
-
-#include "../Util/StringUtil.h"
-
 namespace qi = boost::spirit::qi;
 
 //TODO: Move into LUA

Extractor/ExtractorCallbacks.cpp

@@ -1,46 +1,31 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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.
 
-/*
-    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.
- */
+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 "ExtractionHelperFunctions.h"
 
 ExtractorCallbacks::ExtractorCallbacks() {externalMemory = NULL; stringMap = NULL; }
 ExtractorCallbacks::ExtractorCallbacks(ExtractionContainers * ext, StringMap * strMap) {
@@ -52,7 +37,7 @@ ExtractorCallbacks::~ExtractorCallbacks() { }
 
 /** warning: caller needs to take care of synchronization! */
 void ExtractorCallbacks::nodeFunction(const _Node &n) {
-    if(n.lat <= 85*100000 && n.lat >= -85*100000) {
+    if(n.lat <= 85*COORDINATE_PRECISION && n.lat >= -85*COORDINATE_PRECISION) {
         externalMemory->allNodes.push_back(n);
     }
 }
@@ -66,7 +51,9 @@ bool ExtractorCallbacks::restrictionFunction(const _RawRestrictionContainer &r)
 void ExtractorCallbacks::wayFunction(ExtractionWay &parsed_way) {
     if((0 < parsed_way.speed) || (0 < parsed_way.duration)) { //Only true if the way is specified by the speed profile
         if(UINT_MAX == parsed_way.id){
-            DEBUG("found bogus way with id: " << parsed_way.id << " of size " << parsed_way.path.size());
+            SimpleLogger().Write(logDEBUG) <<
+                "found bogus way with id: " << parsed_way.id <<
+                " of size " << parsed_way.path.size();
             return;
         }
 
@@ -75,16 +62,17 @@ void ExtractorCallbacks::wayFunction(ExtractionWay &parsed_way) {
             parsed_way.speed = parsed_way.duration/(parsed_way.path.size()-1);
         }
 
-        if(FLT_EPSILON >= fabs(-1. - parsed_way.speed)){
-            DEBUG("found way with bogus speed, id: " << parsed_way.id);
+        if(std::numeric_limits<double>::epsilon() >= fabs(-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 StringMap::const_iterator string_map_iterator = stringMap->find(parsed_way.name);
         if(stringMap->end() == string_map_iterator) {
-            parsed_way.nameID = externalMemory->nameVector.size();
-            externalMemory->nameVector.push_back(parsed_way.name);
+            parsed_way.nameID = externalMemory->name_list.size();
+            externalMemory->name_list.push_back(parsed_way.name);
             stringMap->insert(std::make_pair(parsed_way.name, parsed_way.nameID));
         } else {
             parsed_way.nameID = string_map_iterator->second;

Extractor/ExtractorCallbacks.h

@@ -1,28 +1,38 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 EXTRACTORCALLBACKS_H_
 #define EXTRACTORCALLBACKS_H_
 
-#include <string>
-#include <vector>
+#include "ExtractionContainers.h"
+#include "ExtractionHelperFunctions.h"
+#include "ExtractorStructs.h"
+
+#include "../DataStructures/Coordinate.h"
 
 #include <cfloat>
 
@@ -30,8 +40,8 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include <boost/algorithm/string/regex.hpp>
 #include <boost/regex.hpp>
 
-#include "ExtractionContainers.h"
-#include "ExtractorStructs.h"
+#include <string>
+#include <vector>
 
 class ExtractorCallbacks{
 private:

Extractor/ExtractorStructs.h

@@ -1,41 +1,47 @@
 /*
-    open source routing machine
-    Copyright (C) Dennis Luxen, 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 <climits>
-#include <string>
+#include "../DataStructures/Coordinate.h"
+#include "../DataStructures/HashTable.h"
+#include "../DataStructures/ImportNode.h"
+#include "../DataStructures/QueryNode.h"
+#include "../DataStructures/Restriction.h"
+#include "../typedefs.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/regex.hpp>
 #include <boost/regex.hpp>
 #include <boost/unordered_map.hpp>
 
-#include "../DataStructures/Coordinate.h"
-#include "../DataStructures/HashTable.h"
-#include "../DataStructures/ImportNode.h"
-#include "../DataStructures/NodeCoords.h"
-#include "../DataStructures/Restriction.h"
-#include "../DataStructures/TimingUtil.h"
-#include "../typedefs.h"
+#include <climits>
+#include <string>
 
 typedef boost::unordered_map<std::string, NodeID > StringMap;
 typedef boost::unordered_map<std::string, std::pair<int, short> > StringToIntPairMap;
@@ -44,12 +50,12 @@ struct ExtractionWay {
     ExtractionWay() {
 		Clear();
     }
-	
+
 	inline void Clear(){
 		id = UINT_MAX;
 		nameID = UINT_MAX;
 		path.clear();
-		keyVals.EraseAll();
+		keyVals.clear();
         direction = ExtractionWay::notSure;
         speed = -1;
         backward_speed = -1;
@@ -110,8 +116,8 @@ struct InternalExtractorEdge {
     bool isAccessRestricted;
     bool isContraFlow;
 
-    _Coordinate startCoord;
-    _Coordinate targetCoord;
+    FixedPointCoordinate startCoord;
+    FixedPointCoordinate targetCoord;
 
     static InternalExtractorEdge min_value() {
         return InternalExtractorEdge(0,0);
@@ -155,7 +161,7 @@ struct CmpWayByID : public std::binary_function<_WayIDStartAndEndEdge, _WayIDSta
 
 struct Cmp : public std::binary_function<NodeID, NodeID, bool> {
     typedef NodeID value_type;
-    bool operator ()  (const NodeID & a, const NodeID & b) const {
+    bool operator ()  (const NodeID a, const NodeID b) const {
         return a < b;
     }
     value_type max_value() {

Extractor/PBFParser.cpp

@@ -1,22 +1,29 @@
 /*
- 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
- 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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
- 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.
- */
+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"
 
@@ -28,7 +35,7 @@ PBFParser::PBFParser(const char * fileName, ExtractorCallbacks* ec, ScriptingEnv
 	input.open(fileName, std::ios::in | std::ios::binary);
 
 	if (!input) {
-		std::cerr << fileName << ": File not found." << std::endl;
+		throw OSRMException("pbf file not found.");
 	}
 
 #ifndef NDEBUG
@@ -50,7 +57,10 @@ PBFParser::~PBFParser() {
 	google::protobuf::ShutdownProtobufLibrary();
 
 #ifndef NDEBUG
-	DEBUG("parsed " << blockCount << " blocks from pbf with " << groupCount << " groups");
+	SimpleLogger().Write(logDEBUG) <<
+		"parsed " << blockCount <<
+		" blocks from pbf with " << groupCount <<
+		" groups";
 #endif
 }
 
@@ -108,7 +118,7 @@ inline void PBFParser::ParseData() {
 		_ThreadData *threadData;
 		threadDataQueue->wait_and_pop(threadData);
 		if( NULL==threadData ) {
-			INFO("Parse Data Thread Finished");
+			SimpleLogger().Write() << "Parse Data Thread Finished";
 			threadDataQueue->push(NULL); // Signal end of data for other threads
 			break;
 		}
@@ -166,18 +176,18 @@ inline void PBFParser::parseDenseNode(_ThreadData * threadData) {
 		m_lastDenseLatitude += dense.lat( i );
 		m_lastDenseLongitude += dense.lon( i );
 		extracted_nodes_vector[i].id = m_lastDenseID;
-		extracted_nodes_vector[i].lat = 100000*( ( double ) m_lastDenseLatitude * threadData->PBFprimitiveBlock.granularity() + threadData->PBFprimitiveBlock.lat_offset() ) / NANO;
-		extracted_nodes_vector[i].lon = 100000*( ( double ) m_lastDenseLongitude * threadData->PBFprimitiveBlock.granularity() + threadData->PBFprimitiveBlock.lon_offset() ) / NANO;
+		extracted_nodes_vector[i].lat = COORDINATE_PRECISION*( ( double ) m_lastDenseLatitude * threadData->PBFprimitiveBlock.granularity() + threadData->PBFprimitiveBlock.lat_offset() ) / NANO;
+		extracted_nodes_vector[i].lon = COORDINATE_PRECISION*( ( double ) m_lastDenseLongitude * threadData->PBFprimitiveBlock.granularity() + threadData->PBFprimitiveBlock.lon_offset() ) / NANO;
 		while (denseTagIndex < dense.keys_vals_size()) {
 			const int tagValue = dense.keys_vals( denseTagIndex );
-			if( 0==tagValue ) {
+			if( 0 == tagValue ) {
 				++denseTagIndex;
 				break;
 			}
 			const int keyValue = dense.keys_vals ( denseTagIndex+1 );
-			const std::string & key = threadData->PBFprimitiveBlock.stringtable().s(tagValue).data();
-			const std::string & value = threadData->PBFprimitiveBlock.stringtable().s(keyValue).data();
-			extracted_nodes_vector[i].keyVals.Add(key, value);
+			const std::string & key = threadData->PBFprimitiveBlock.stringtable().s(tagValue);
+			const std::string & value = threadData->PBFprimitiveBlock.stringtable().s(keyValue);
+			extracted_nodes_vector[i].keyVals.emplace(key, value);
 			denseTagIndex += 2;
 		}
 	}
@@ -188,13 +198,15 @@ inline void PBFParser::parseDenseNode(_ThreadData * threadData) {
 	    ParseNodeInLua( n, scriptingEnvironment.getLuaStateForThreadID(omp_get_thread_num()) );
 	}
 
-	BOOST_FOREACH(ImportNode &n, extracted_nodes_vector) {
+	BOOST_FOREACH(const ImportNode &n, extracted_nodes_vector) {
 	    extractor_callbacks->nodeFunction(n);
 	}
 }
 
 inline void PBFParser::parseNode(_ThreadData * ) {
-	ERR("Parsing of simple nodes not supported. PBF should use dense nodes");
+	throw OSRMException(
+		"Parsing of simple nodes not supported. PBF should use dense nodes"
+	);
 }
 
 inline void PBFParser::parseRelation(_ThreadData * threadData) {
@@ -204,7 +216,8 @@ inline void PBFParser::parseRelation(_ThreadData * threadData) {
 		return;
 	}
 	const OSMPBF::PrimitiveGroup& group = threadData->PBFprimitiveBlock.primitivegroup( threadData->currentGroupID );
-	for(int i = 0; i < group.relations_size(); ++i ) {
+
+	for(int i = 0, relation_size = group.relations_size(); i < relation_size; ++i ) {
 		std::string except_tag_string;
 		const OSMPBF::Relation& inputRelation = threadData->PBFprimitiveBlock.primitivegroup( threadData->currentGroupID ).relations(i);
 		bool isRestriction = false;
@@ -236,8 +249,12 @@ inline void PBFParser::parseRelation(_ThreadData * threadData) {
 		if(isRestriction) {
 			int64_t lastRef = 0;
 			_RawRestrictionContainer currentRestrictionContainer(isOnlyRestriction);
-			for(int rolesIndex = 0; rolesIndex < inputRelation.roles_sid_size(); ++rolesIndex) {
-				std::string role(threadData->PBFprimitiveBlock.stringtable().s( inputRelation.roles_sid( rolesIndex ) ).data());
+			for(
+				int rolesIndex = 0, last_role =  inputRelation.roles_sid_size();
+				rolesIndex < last_role;
+				++rolesIndex
+			) {
+				const std::string & role = threadData->PBFprimitiveBlock.stringtable().s( inputRelation.roles_sid( rolesIndex ) );
 				lastRef += inputRelation.memids(rolesIndex);
 
 				if(!("from" == role || "to" == role || "via" == role)) {
@@ -275,7 +292,6 @@ inline void PBFParser::parseRelation(_ThreadData * threadData) {
 					break;
 
 				default: //should not happen
-					//cout << "unknown";
 					assert(false);
 					break;
 				}
@@ -304,17 +320,23 @@ inline void PBFParser::parseWay(_ThreadData * threadData) {
 		for(int j = 0; j < number_of_keys; ++j) {
 			const std::string & key = threadData->PBFprimitiveBlock.stringtable().s(inputWay.keys(j));
 			const std::string & val = threadData->PBFprimitiveBlock.stringtable().s(inputWay.vals(j));
-			parsed_way_vector[i].keyVals.Add(key, val);
+			parsed_way_vector[i].keyVals.emplace(key, val);
 		}
 	}
 
 #pragma omp parallel for schedule ( guided )
 	for(int i = 0; i < number_of_ways; ++i) {
 	    ExtractionWay & w = parsed_way_vector[i];
-	    ParseWayInLua( w, scriptingEnvironment.getLuaStateForThreadID(omp_get_thread_num()) );
+		if(2 > w.path.size()) {
+        	continue;
+    	}
+	    ParseWayInLua( w, scriptingEnvironment.getLuaStateForThreadID( omp_get_thread_num()) );
 	}
 
 	BOOST_FOREACH(ExtractionWay & w, parsed_way_vector) {
+		if(2 > w.path.size()) {
+        	continue;
+    	}
 	    extractor_callbacks->wayFunction(w);
 	}
 }
@@ -325,21 +347,21 @@ inline void PBFParser::loadGroup(_ThreadData * threadData) {
 #endif
 
 	const OSMPBF::PrimitiveGroup& group = threadData->PBFprimitiveBlock.primitivegroup( threadData->currentGroupID );
-	threadData->entityTypeIndicator = 0;
-	if ( group.nodes_size() != 0 ) {
+	threadData->entityTypeIndicator = TypeDummy;
+	if ( 0 != group.nodes_size() ) {
 		threadData->entityTypeIndicator = TypeNode;
 	}
-	if ( group.ways_size() != 0 ) {
+	if ( 0 != group.ways_size() ) {
 		threadData->entityTypeIndicator = TypeWay;
 	}
-	if ( group.relations_size() != 0 ) {
+	if ( 0 != group.relations_size() ) {
 		threadData->entityTypeIndicator = TypeRelation;
 	}
 	if ( group.has_dense() )  {
 		threadData->entityTypeIndicator = TypeDenseNode;
-		assert( group.dense().id_size() != 0 );
+		assert( 0 != group.dense().id_size() );
 	}
-	assert( threadData->entityTypeIndicator != 0 );
+	assert( threadData->entityTypeIndicator != TypeDummy );
 }
 
 inline void PBFParser::loadBlock(_ThreadData * threadData) {
@@ -475,7 +497,7 @@ bool PBFParser::readNextBlock(std::fstream& stream, _ThreadData * threadData) {
 	}
 
 	if ( !threadData->PBFprimitiveBlock.ParseFromArray( &(threadData->charBuffer[0]), threadData-> charBuffer.size() ) ) {
-		ERR("failed to parse PrimitiveBlock");
+		std::cerr << "failed to parse PrimitiveBlock" << std::endl;
 		return false;
 	}
 	return true;

Extractor/PBFParser.h

@@ -1,33 +1,44 @@
 /*
- 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
- 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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
- 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.
- */
+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/Coordinate.h"
 #include "../DataStructures/HashTable.h"
 #include "../DataStructures/ConcurrentQueue.h"
 #include "../Util/MachineInfo.h"
 #include "../Util/OpenMPWrapper.h"
+#include "../Util/OSRMException.h"
+#include "../Util/SimpleLogger.h"
 #include "../typedefs.h"
 
-#include "BaseParser.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/ref.hpp>
@@ -37,21 +48,20 @@
 
 #include <zlib.h>
 
-
-
 class PBFParser : public BaseParser {
 
     enum EntityType {
-        TypeNode = 1,
-        TypeWay = 2,
-        TypeRelation = 4,
+        TypeDummy     = 0,
+        TypeNode      = 1,
+        TypeWay       = 2,
+        TypeRelation  = 4,
         TypeDenseNode = 8
-    } ;
+    };
 
     struct _ThreadData {
         int currentGroupID;
         int currentEntityID;
-        short entityTypeIndicator;
+        EntityType entityTypeIndicator;
 
         OSMPBF::BlobHeader PBFBlobHeader;
         OSMPBF::Blob PBFBlob;
@@ -72,18 +82,18 @@ public:
 private:
     inline void ReadData();
     inline void ParseData();
-    inline void parseDenseNode(_ThreadData * threadData);
-    inline void parseNode(_ThreadData * );
-    inline void parseRelation(_ThreadData * threadData);
-    inline void parseWay(_ThreadData * threadData);
+    inline void parseDenseNode  (_ThreadData * threadData);
+    inline void parseNode       (_ThreadData * threadData);
+    inline void parseRelation   (_ThreadData * threadData);
+    inline void parseWay        (_ThreadData * threadData);
 
-    inline void loadGroup(_ThreadData * threadData);
-    inline void loadBlock(_ThreadData * threadData);
-    inline bool readPBFBlobHeader(std::fstream& stream, _ThreadData * threadData);
-    inline bool unpackZLIB(std::fstream &, _ThreadData * threadData);
-    inline bool unpackLZMA(std::fstream &, _ThreadData * );
-    inline bool readBlob(std::fstream& stream, _ThreadData * threadData) ;
-    inline bool readNextBlock(std::fstream& stream, _ThreadData * threadData);
+    inline void loadGroup       (_ThreadData * threadData);
+    inline void loadBlock       (_ThreadData * threadData);
+    inline bool readPBFBlobHeader(std::fstream & stream, _ThreadData * threadData);
+    inline bool unpackZLIB       (std::fstream & stream, _ThreadData * threadData);
+    inline bool unpackLZMA       (std::fstream & stream, _ThreadData * threadData);
+    inline bool readBlob         (std::fstream & stream, _ThreadData * threadData);
+    inline bool readNextBlock    (std::fstream & stream, _ThreadData * threadData);
 
     static const int NANO = 1000 * 1000 * 1000;
     static const int MAX_BLOB_HEADER_SIZE = 64 * 1024;

Extractor/ScriptingEnvironment.cpp

@@ -1,32 +1,40 @@
 /*
- 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
- 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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
- 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.
- */
+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"
 
 ScriptingEnvironment::ScriptingEnvironment() {}
 ScriptingEnvironment::ScriptingEnvironment(const char * fileName) {
-	INFO("Using script " << fileName);
+	SimpleLogger().Write() << "Using script " << fileName;
 
     // Create a new lua state
-    for(int i = 0; i < omp_get_max_threads(); ++i)
+    for(int i = 0; i < omp_get_max_threads(); ++i) {
         luaStateVector.push_back(luaL_newstate());
+    }
 
     // Connect LuaBind to this lua state for all threads
 #pragma omp parallel
@@ -40,59 +48,59 @@ ScriptingEnvironment::ScriptingEnvironment(const char * fileName) {
 
         // Add our function to the state's global scope
         luabind::module(myLuaState) [
-                                     luabind::def("print", LUA_print<std::string>),
-                                     luabind::def("parseMaxspeed", parseMaxspeed),
-                                     luabind::def("durationIsValid", durationIsValid),
-                                     luabind::def("parseDuration", parseDuration)
+            luabind::def("print", LUA_print<std::string>),
+            luabind::def("parseMaxspeed", parseMaxspeed),
+            luabind::def("durationIsValid", durationIsValid),
+            luabind::def("parseDuration", parseDuration)
         ];
 
         luabind::module(myLuaState) [
-                                     luabind::class_<HashTable<std::string, std::string> >("keyVals")
-                                     .def("Add", &HashTable<std::string, std::string>::Add)
-                                     .def("Find", &HashTable<std::string, std::string>::Find)
-                                     .def("Holds", &HashTable<std::string, std::string>::Holds)
-                                     ];
+            luabind::class_<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(myLuaState) [
-                                     luabind::class_<ImportNode>("Node")
-                                     .def(luabind::constructor<>())
-                                     .def_readwrite("lat", &ImportNode::lat)
-                                     .def_readwrite("lon", &ImportNode::lon)
-                                     .def_readwrite("id", &ImportNode::id)
-                                     .def_readwrite("bollard", &ImportNode::bollard)
-                                     .def_readwrite("traffic_light", &ImportNode::trafficLight)
-                                     .def_readwrite("tags", &ImportNode::keyVals)
-                                     ];
+            luabind::class_<ImportNode>("Node")
+            .def(luabind::constructor<>())
+            .def_readwrite("lat", &ImportNode::lat)
+            .def_readwrite("lon", &ImportNode::lon)
+            .def_readwrite("id", &ImportNode::id)
+            .def_readwrite("bollard", &ImportNode::bollard)
+            .def_readwrite("traffic_light", &ImportNode::trafficLight)
+            .def_readwrite("tags", &ImportNode::keyVals)
+        ];
 
         luabind::module(myLuaState) [
-                                     luabind::class_<ExtractionWay>("Way")
-                                     .def(luabind::constructor<>())
-                                     .def_readwrite("name", &ExtractionWay::name)
-                                     .def_readwrite("speed", &ExtractionWay::speed)
-                                     .def_readwrite("backward_speed", &ExtractionWay::backward_speed)
-                                     .def_readwrite("duration", &ExtractionWay::duration)
-                                     .def_readwrite("type", &ExtractionWay::type)
-                                     .def_readwrite("access", &ExtractionWay::access)
-                                     .def_readwrite("roundabout", &ExtractionWay::roundabout)
-                                     .def_readwrite("is_access_restricted", &ExtractionWay::isAccessRestricted)
-                                     .def_readwrite("ignore_in_grid", &ExtractionWay::ignoreInGrid)
-                                     .def_readwrite("tags", &ExtractionWay::keyVals)
-                                     .def_readwrite("direction", &ExtractionWay::direction)
-                                     .enum_("constants")
-										 [
-										  luabind::value("notSure", 0),
-										  luabind::value("oneway", 1),
-										  luabind::value("bidirectional", 2),
-										  luabind::value("opposite", 3)
-										 ]
-        							 ];
+            luabind::class_<ExtractionWay>("Way")
+            .def(luabind::constructor<>())
+            .def_readwrite("name", &ExtractionWay::name)
+            .def_readwrite("speed", &ExtractionWay::speed)
+            .def_readwrite("backward_speed", &ExtractionWay::backward_speed)
+            .def_readwrite("duration", &ExtractionWay::duration)
+            .def_readwrite("type", &ExtractionWay::type)
+            .def_readwrite("access", &ExtractionWay::access)
+            .def_readwrite("roundabout", &ExtractionWay::roundabout)
+            .def_readwrite("is_access_restricted", &ExtractionWay::isAccessRestricted)
+            .def_readwrite("ignore_in_grid", &ExtractionWay::ignoreInGrid)
+            .def_readwrite("tags", &ExtractionWay::keyVals)
+            .def_readwrite("direction", &ExtractionWay::direction)
+            .enum_("constants") [
+				  luabind::value("notSure", 0),
+				  luabind::value("oneway", 1),
+				  luabind::value("bidirectional", 2),
+				  luabind::value("opposite", 3)
+			]
+    	];
+
         luabind::module(myLuaState) [
-                                     luabind::class_<std::vector<std::string> >("vector")
-                                     .def("Add", &std::vector<std::string>::push_back)
-                                     ];
+            luabind::class_<std::vector<std::string> >("vector")
+            .def("Add", &std::vector<std::string>::push_back)
+        ];
 
         if(0 != luaL_dofile(myLuaState, fileName) ) {
-            ERR(lua_tostring(myLuaState,-1)<< " occured in scripting block");
+            throw OSRMException("ERROR occured in scripting block");
         }
     }
 }

Extractor/ScriptingEnvironment.h

@@ -1,40 +1,43 @@
 /*
- 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
- 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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
- 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.
- */
+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 SCRIPTINGENVIRONMENT_H_
 #define SCRIPTINGENVIRONMENT_H_
 
-extern "C" {
-#include <lua.h>
-#include <lauxlib.h>
-#include <lualib.h>
-}
-#include <luabind/luabind.hpp>
-
 #include "ExtractionHelperFunctions.h"
 #include "ExtractorStructs.h"
-
-#include "../typedefs.h"
 #include "../DataStructures/ImportNode.h"
 #include "../Util/LuaUtil.h"
 #include "../Util/OpenMPWrapper.h"
+#include "../Util/OSRMException.h"
+#include "../Util/SimpleLogger.h"
+#include "../typedefs.h"
+
+#include <vector>
 
 class ScriptingEnvironment {
 public:

Extractor/XMLParser.cpp

@@ -1,24 +1,29 @@
 /*
- 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
- 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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
- 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.
- */
+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.
 
-#include <boost/ref.hpp>
+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"
 
@@ -26,9 +31,12 @@
 #include "../DataStructures/HashTable.h"
 #include "../DataStructures/InputReaderFactory.h"
 
+#include <boost/ref.hpp>
 
 XMLParser::XMLParser(const char * filename, ExtractorCallbacks* ec, ScriptingEnvironment& se) : BaseParser(ec, se) {
-	WARN("Parsing plain .osm/.osm.bz2 is deprecated. Switch to .pbf");
+	SimpleLogger().Write(logWARNING) <<
+		"Parsing plain .osm/.osm.bz2 is deprecated. Switch to .pbf";
+
 	inputReader = inputReaderFactory(filename);
 }
 
@@ -43,12 +51,12 @@ bool XMLParser::Parse() {
 		if ( type != 1 ) {
 			continue;
 		}
-		
+
 		xmlChar* currentName = xmlTextReaderName( inputReader );
 		if ( currentName == NULL ) {
 			continue;
 		}
-		
+
 		if ( xmlStrEqual( currentName, ( const xmlChar* ) "node" ) == 1 ) {
 			ImportNode n = _ReadXMLNode();
 			ParseNodeInLua( n, luaState );
@@ -130,13 +138,13 @@ _RawRestrictionContainer XMLParser::_ReadXMLRestriction() {
 					xmlChar * type = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "type" );
 
 					if(xmlStrEqual(role, (const xmlChar *) "to") && xmlStrEqual(type, (const xmlChar *) "way")) {
-						restriction.toWay = atoi((const char*) ref);
+						restriction.toWay = stringToUint((const char*) ref);
 					}
 					if(xmlStrEqual(role, (const xmlChar *) "from") && xmlStrEqual(type, (const xmlChar *) "way")) {
-						restriction.fromWay = atoi((const char*) ref);
+						restriction.fromWay = stringToUint((const char*) ref);
 					}
 					if(xmlStrEqual(role, (const xmlChar *) "via") && xmlStrEqual(type, (const xmlChar *) "node")) {
-						restriction.restriction.viaNode = atoi((const char*) ref);
+						restriction.restriction.viaNode = stringToUint((const char*) ref);
 					}
 
 					if(NULL != type) {
@@ -177,7 +185,7 @@ ExtractionWay XMLParser::_ReadXMLWay() {
 
 			if ( depth == childDepth && childType == 15 && xmlStrEqual( childName, ( const xmlChar* ) "way" ) == 1 ) {
 				xmlChar* id = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "id" );
-				way.id = atoi((char*)id);
+				way.id = stringToUint((char*)id);
 				xmlFree(id);
 				xmlFree( childName );
 				break;
@@ -203,7 +211,7 @@ ExtractionWay XMLParser::_ReadXMLWay() {
 			} else if ( xmlStrEqual( childName, ( const xmlChar* ) "nd" ) == 1 ) {
 				xmlChar* ref = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "ref" );
 				if ( ref != NULL ) {
-					way.path.push_back( atoi(( const char* ) ref ) );
+					way.path.push_back( stringToUint(( const char* ) ref ) );
 					xmlFree( ref );
 				}
 			}
@@ -218,17 +226,17 @@ ImportNode XMLParser::_ReadXMLNode() {
 
 	xmlChar* attribute = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "lat" );
 	if ( attribute != NULL ) {
-		node.lat =  static_cast<NodeID>(100000.*atof(( const char* ) attribute ) );
+		node.lat =  static_cast<NodeID>(COORDINATE_PRECISION*atof(( const char* ) attribute ) );
 		xmlFree( attribute );
 	}
 	attribute = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "lon" );
 	if ( attribute != NULL ) {
-		node.lon =  static_cast<NodeID>(100000.*atof(( const char* ) attribute ));
+		node.lon =  static_cast<NodeID>(COORDINATE_PRECISION*atof(( const char* ) attribute ));
 		xmlFree( attribute );
 	}
 	attribute = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "id" );
 	if ( attribute != NULL ) {
-		node.id =  atoi(( const char* ) attribute );
+		node.id =  stringToUint(( const char* ) attribute );
 		xmlFree( attribute );
 	}
 

Extractor/XMLParser.h

@@ -1,37 +1,48 @@
 /*
- 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.
- */
+
+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 XMLPARSER_H_
 #define XMLPARSER_H_
 
+#include "BaseParser.h"
+#include "../DataStructures/Coordinate.h"
+#include "../Util/SimpleLogger.h"
+#include "../Util/StringUtil.h"
+#include "../typedefs.h"
+
 #include <libxml/xmlreader.h>
 
-#include "../typedefs.h"
-#include "BaseParser.h"
 
 class XMLParser : public BaseParser {
 public:
     XMLParser(const char* filename, ExtractorCallbacks* ec, ScriptingEnvironment& se);
     bool ReadHeader();
     bool Parse();
-    
+
 private:
     _RawRestrictionContainer _ReadXMLRestriction();
     ExtractionWay _ReadXMLWay();

Gemfile.lock

@@ -1,23 +1,23 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    builder (3.0.0)
-    cucumber (1.1.4)
+    builder (3.2.2)
+    cucumber (1.3.8)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.7.1)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    diff-lcs (1.1.3)
-    gherkin (2.7.6)
-      json (>= 1.4.6)
-    json (1.6.5)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12.1)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.0.2)
+    diff-lcs (1.2.4)
+    gherkin (2.12.1)
+      multi_json (~> 1.3)
+    multi_json (1.8.0)
+    multi_test (0.0.2)
     osmlib-base (0.1.4)
-    rake (0.9.2.2)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    sys-proctable (0.9.1)
-    term-ansicolor (1.0.7)
+    rake (10.1.0)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    sys-proctable (0.9.3)
 
 PLATFORMS
   ruby

LICENCE.TXT

@@ -1,661 +1,22 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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
-    (at your option) 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 Affero 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, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
+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.

Library/OSRM.cpp

@@ -0,0 +1,64 @@
+/*
+
+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.h"
+#include <boost/foreach.hpp>
+
+
+OSRM::OSRM(boost::unordered_map<const std::string,boost::filesystem::path>& paths) {
+    objects = new QueryObjectsStorage( paths );
+    RegisterPlugin(new HelloWorldPlugin());
+    RegisterPlugin(new LocatePlugin(objects));
+    RegisterPlugin(new NearestPlugin(objects));
+    RegisterPlugin(new TimestampPlugin(objects));
+    RegisterPlugin(new ViaRoutePlugin(objects));
+}
+
+OSRM::~OSRM() {
+    BOOST_FOREACH(PluginMap::value_type & plugin_pointer, pluginMap) {
+        delete plugin_pointer.second;
+    }
+    delete objects;
+}
+
+void OSRM::RegisterPlugin(BasePlugin * plugin) {
+    SimpleLogger().Write()  << "loaded plugin: " << plugin->GetDescriptor();
+    if( pluginMap.find(plugin->GetDescriptor()) != pluginMap.end() ) {
+        delete pluginMap.find(plugin->GetDescriptor())->second;
+    }
+    pluginMap.emplace(plugin->GetDescriptor(), plugin);
+}
+
+void OSRM::RunQuery(RouteParameters & route_parameters, http::Reply & reply) {
+    const PluginMap::const_iterator & iter = pluginMap.find(route_parameters.service);
+    if(pluginMap.end() != iter) {
+        reply.status = http::Reply::ok;
+        iter->second->HandleRequest(route_parameters, reply );
+    } else {
+        reply = http::Reply::stockReply(http::Reply::badRequest);
+    }
+}

Library/OSRM.h

@@ -0,0 +1,65 @@
+/*
+
+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 OSRM_H
+#define OSRM_H
+
+#include "OSRM.h"
+
+#include "../Plugins/BasePlugin.h"
+#include "../Plugins/HelloWorldPlugin.h"
+#include "../Plugins/LocatePlugin.h"
+#include "../Plugins/NearestPlugin.h"
+#include "../Plugins/TimestampPlugin.h"
+#include "../Plugins/ViaRoutePlugin.h"
+#include "../Server/DataStructures/RouteParameters.h"
+#include "../Util/InputFileUtil.h"
+#include "../Util/OSRMException.h"
+#include "../Util/ProgramOptions.h"
+#include "../Util/SimpleLogger.h"
+#include "../Server/BasicDatastructures.h"
+
+#include <boost/assert.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/noncopyable.hpp>
+#include <boost/thread.hpp>
+
+#include <vector>
+
+class OSRM : boost::noncopyable {
+    typedef boost::unordered_map<std::string, BasePlugin *> PluginMap;
+    QueryObjectsStorage * objects;
+public:
+    OSRM(boost::unordered_map<const std::string,boost::filesystem::path>& paths);
+    ~OSRM();
+    void RunQuery(RouteParameters & route_parameters, http::Reply & reply);
+private:
+    void RegisterPlugin(BasePlugin * plugin);
+    PluginMap pluginMap;
+};
+
+#endif //OSRM_H

Plugins/BasePlugin.h

@@ -1,41 +1,59 @@
 /*
-    open source routing machine
-    Copyright (C) Dennis Luxen, 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 BASEPLUGIN_H_
 #define BASEPLUGIN_H_
 
-#include <cassert>
+#include "../DataStructures/Coordinate.h"
+#include "../Server/BasicDatastructures.h"
+#include "../Server/DataStructures/RouteParameters.h"
+
 #include <string>
 #include <vector>
 
-#include "RouteParameters.h"
-#include "../Server/BasicDatastructures.h"
-
 class BasePlugin {
 public:
 	BasePlugin() { }
 	//Maybe someone can explain the pure virtual destructor thing to me (dennis)
 	virtual ~BasePlugin() { }
-	virtual std::string GetDescriptor() const = 0;
-	virtual std::string GetVersionString() const = 0 ;
+	virtual const std::string & GetDescriptor() const = 0;
 	virtual void HandleRequest(const RouteParameters & routeParameters, http::Reply& reply) = 0;
+
+	inline bool checkCoord(const FixedPointCoordinate & c) {
+        if(
+            c.lat >   90*COORDINATE_PRECISION ||
+            c.lat <  -90*COORDINATE_PRECISION ||
+            c.lon >  180*COORDINATE_PRECISION ||
+            c.lon < -180*COORDINATE_PRECISION
+        ) {
+            return false;
+        }
+        return true;
+    }
 };
 
 #endif /* BASEPLUGIN_H_ */

Plugins/HelloWorldPlugin.h

@@ -1,24 +1,42 @@
 /*
- * LocatePlugin.h
- *
- *  Created on: 01.01.2011
- *      Author: dennis
- */
+
+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 <sstream>
-
 #include "BasePlugin.h"
-#include "RouteParameters.h"
+
+#include <sstream>
 
 class HelloWorldPlugin : public BasePlugin {
 public:
-	HelloWorldPlugin() {}
-	virtual ~HelloWorldPlugin() { /*std::cout << GetDescriptor() << " destructor" << std::endl;*/ }
-	std::string GetDescriptor() const { return std::string("hello"); }
-	std::string GetVersionString() const { return std::string("0.1a"); }
+	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;
@@ -35,7 +53,7 @@ public:
         content << "language: " << routeParameters.language << "<br>";
         content << "Number of locations: " << routeParameters.coordinates.size() << "\n";
         for(unsigned i = 0; i < routeParameters.coordinates.size(); ++i) {
-            content << "  [" << i << "] " << routeParameters.coordinates[i].lat/100000. << "," << routeParameters.coordinates[i].lon/100000. << "\n";
+            content << "  [" << i << "] " << routeParameters.coordinates[i].lat/COORDINATE_PRECISION << "," << routeParameters.coordinates[i].lon/COORDINATE_PRECISION << "\n";
         }
         content << "Number of hints: " << routeParameters.hints.size() << "\n";
         for(unsigned i = 0; i < routeParameters.hints.size(); ++i) {
@@ -45,6 +63,8 @@ public:
 		reply.content.append(content.str());
 		reply.content.append("</body></html>");
 	}
+private:
+    std::string descriptor_string;
 };
 
 #endif /* HELLOWORLDPLUGIN_H_ */

Plugins/LocatePlugin.h

@@ -1,44 +1,47 @@
 /*
-    open source routing machine
-    Copyright (C) Dennis Luxen, 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 LOCATEPLUGIN_H_
 #define LOCATEPLUGIN_H_
 
 #include "BasePlugin.h"
-#include "RouteParameters.h"
 #include "../DataStructures/NodeInformationHelpDesk.h"
 #include "../Server/DataStructures/QueryObjectsStorage.h"
 #include "../Util/StringUtil.h"
 
-#include <fstream>
-
 /*
  * This Plugin locates the nearest node in the road network for a given coordinate.
  */
 class LocatePlugin : public BasePlugin {
 public:
-    LocatePlugin(QueryObjectsStorage * objects) {
+    LocatePlugin(QueryObjectsStorage * objects) : descriptor_string("locate") {
         nodeHelpDesk = objects->nodeHelpDesk;
     }
-    std::string GetDescriptor() const { return std::string("locate"); }
-    std::string GetVersionString() const { return std::string("0.3 (DL)"); }
+    const std::string & GetDescriptor() const { return descriptor_string; }
     void HandleRequest(const RouteParameters & routeParameters, http::Reply& reply) {
         //check number of parameters
         if(!routeParameters.coordinates.size()) {
@@ -51,7 +54,7 @@ public:
         }
 
         //query to helpdesk
-        _Coordinate result;
+        FixedPointCoordinate result;
         std::string tmp;
         //json
 
@@ -63,7 +66,7 @@ public:
         reply.status = http::Reply::ok;
         reply.content += ("{");
         reply.content += ("\"version\":0.3,");
-        if(!nodeHelpDesk->FindNearestNodeCoordForLatLon(routeParameters.coordinates[0], result)) {
+        if(!nodeHelpDesk->LocateClosestEndPointForCoordinate(routeParameters.coordinates[0], result)) {
             reply.content += ("\"status\":207,");
             reply.content += ("\"mapped_coordinate\":[]");
         } else {
@@ -99,15 +102,10 @@ public:
         reply.headers[0].value = tmp;
         return;
     }
-private:
-    inline bool checkCoord(const _Coordinate & c) {
-        if(c.lat > 90*100000 || c.lat < -90*100000 || c.lon > 180*100000 || c.lon <-180*100000) {
-            return false;
-        }
-        return true;
-    }
 
+private:
     NodeInformationHelpDesk * nodeHelpDesk;
+    std::string descriptor_string;
 };
 
 #endif /* LOCATEPLUGIN_H_ */

Plugins/NearestPlugin.h

@@ -1,34 +1,37 @@
 /*
-    open source routing machine
-    Copyright (C) Dennis Luxen, 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 NearestPlugin_H_
 #define NearestPlugin_H_
 
-#include <fstream>
-
 #include "BasePlugin.h"
-#include "RouteParameters.h"
-
-#include "../Server/DataStructures/QueryObjectsStorage.h"
 
 #include "../DataStructures/NodeInformationHelpDesk.h"
+#include "../Server/DataStructures/QueryObjectsStorage.h"
 #include "../Util/StringUtil.h"
 
 /*
@@ -36,14 +39,15 @@ or see http://www.gnu.org/licenses/agpl.txt.
  */
 class NearestPlugin : public BasePlugin {
 public:
-    NearestPlugin(QueryObjectsStorage * objects) : names(objects->names) {
-        nodeHelpDesk = objects->nodeHelpDesk;
-
-        descriptorTable.Set("", 0); //default descriptor
-        descriptorTable.Set("json", 1);
+    NearestPlugin(QueryObjectsStorage * objects )
+     :
+        m_query_objects(objects),
+        descriptor_string("nearest")
+    {
+        descriptorTable.insert(std::make_pair(""    , 0)); //default descriptor
+        descriptorTable.insert(std::make_pair("json", 1));
     }
-    std::string GetDescriptor() const { return std::string("nearest"); }
-    std::string GetVersionString() const { return std::string("0.3 (DL)"); }
+    const std::string & GetDescriptor() const { return descriptor_string; }
     void HandleRequest(const RouteParameters & routeParameters, http::Reply& reply) {
         //check number of parameters
         if(!routeParameters.coordinates.size()) {
@@ -54,12 +58,16 @@ public:
             reply = http::Reply::stockReply(http::Reply::badRequest);
             return;
         }
-
+        NodeInformationHelpDesk * nodeHelpDesk = m_query_objects->nodeHelpDesk;
         //query to helpdesk
         PhantomNode result;
-        nodeHelpDesk->FindPhantomNodeForCoordinate(routeParameters.coordinates[0], result, routeParameters.zoomLevel);
+        nodeHelpDesk->FindPhantomNodeForCoordinate(
+            routeParameters.coordinates[0],
+            result,
+            routeParameters.zoomLevel
+        );
 
-        std::string tmp;
+        std::string temp_string;
         //json
 
         if("" != routeParameters.jsonpParameter) {
@@ -71,23 +79,26 @@ public:
         reply.content += ("{");
         reply.content += ("\"version\":0.3,");
         reply.content += ("\"status\":");
-        if(UINT_MAX != result.edgeBasedNode)
+        if(UINT_MAX != result.edgeBasedNode) {
             reply.content += "0,";
-        else
+        } else {
             reply.content += "207,";
+        }
         reply.content += ("\"mapped_coordinate\":");
         reply.content += "[";
         if(UINT_MAX != result.edgeBasedNode) {
-            convertInternalLatLonToString(result.location.lat, tmp);
-            reply.content += tmp;
-            convertInternalLatLonToString(result.location.lon, tmp);
+            convertInternalLatLonToString(result.location.lat, temp_string);
+            reply.content += temp_string;
+            convertInternalLatLonToString(result.location.lon, temp_string);
             reply.content += ",";
-            reply.content += tmp;
+            reply.content += temp_string;
         }
         reply.content += "],";
         reply.content += "\"name\":\"";
-        if(UINT_MAX != result.edgeBasedNode)
-            reply.content += names[result.nodeBasedEdgeNameID];
+        if(UINT_MAX != result.edgeBasedNode) {
+            m_query_objects->GetName(result.nodeBasedEdgeNameID, temp_string);
+            reply.content += temp_string;
+        }
         reply.content += "\"";
         reply.content += ",\"transactionId\":\"OSRM Routing Engine JSON Nearest (v0.3)\"";
         reply.content += ("}");
@@ -105,20 +116,14 @@ public:
             reply.headers[2].value = "attachment; filename=\"location.json\"";
         }
         reply.headers[0].name = "Content-Length";
-        intToString(reply.content.size(), tmp);
-        reply.headers[0].value = tmp;
-    }
-private:
-    inline bool checkCoord(const _Coordinate & c) {
-        if(c.lat > 90*100000 || c.lat < -90*100000 || c.lon > 180*100000 || c.lon <-180*100000) {
-            return false;
-        }
-        return true;
+        intToString(reply.content.size(), temp_string);
+        reply.headers[0].value = temp_string;
     }
 
-    NodeInformationHelpDesk * nodeHelpDesk;
+private:
+    QueryObjectsStorage * m_query_objects;
     HashTable<std::string, unsigned> descriptorTable;
-    std::vector<std::string> & names;
+    std::string descriptor_string;
 };
 
 #endif /* NearestPlugin_H_ */

Plugins/PluginMapFactory.h

@@ -1,34 +0,0 @@
-/*
-    open source routing machine
-    Copyright (C) Dennis Luxen, 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 PLUGINMAPFACTORY_H_
-#define PLUGINMAPFACTORY_H_
-
-//#include "../DataStructures/HashTable.h"
-//#include "../Plugins/BasePlugin.h"
-//
-//struct PluginMapFactory {
-//	static HashTable<std::string, BasePlugin *> * CreatePluginMap() {
-//		HashTable<std::string, BasePlugin *> * map = new HashTable<std::string, BasePlugin *>();
-//
-//	}
-//};
-
-#endif	/* PLUGINMAPFACTORY_H_ */

Plugins/RawRouteData.h

@@ -1,45 +0,0 @@
-/*
-    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 RAWROUTEDATA_H_
-#define RAWROUTEDATA_H_
-
-#include "../typedefs.h"
-
-struct _PathData {
-    _PathData(NodeID no, unsigned na, unsigned tu, unsigned dur) : node(no), nameID(na), durationOfSegment(dur), turnInstruction(tu) { }
-    NodeID node;
-    unsigned nameID;
-    unsigned durationOfSegment;
-    short turnInstruction;
-};
-
-struct RawRouteData {
-    std::vector< _PathData > computedShortestPath;
-    std::vector< _PathData > computedAlternativePath;
-    std::vector< PhantomNodes > segmentEndCoordinates;
-    std::vector< _Coordinate > rawViaNodeCoordinates;
-    unsigned checkSum;
-    int lengthOfShortestPath;
-    int lengthOfAlternativePath;
-    RawRouteData() : checkSum(UINT_MAX), lengthOfShortestPath(INT_MAX), lengthOfAlternativePath(INT_MAX) {}
-};
-
-#endif /* RAWROUTEDATA_H_ */

Plugins/RouteParameters.h

@@ -1,107 +0,0 @@
-/*
-    open source routing machine
-    Copyright (C) Dennis Luxen, 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 ROUTE_PARAMETERS_H
-#define ROUTE_PARAMETERS_H
-
-#include <string>
-#include <vector>
-
-#include <boost/fusion/sequence/intrinsic.hpp>
-
-#include "../DataStructures/Coordinate.h"
-
-struct RouteParameters {
-    RouteParameters() : zoomLevel(18), printInstructions(false), alternateRoute(true), geometry(true), compression(true), deprecatedAPI(false), checkSum(-1) {}
-    short zoomLevel;
-    bool printInstructions;
-    bool alternateRoute;
-    bool geometry;
-    bool compression;
-    bool deprecatedAPI;
-    unsigned checkSum;
-    std::string service;
-    std::string outputFormat;
-    std::string jsonpParameter;
-    std::string language;
-    std::vector<std::string> hints;
-    std::vector<_Coordinate> coordinates;
-    typedef HashTable<std::string, std::string>::MyIterator OptionsIterator;
-
-    void setZoomLevel(const short i) {
-        if (18 > i && 0 < i)
-            zoomLevel = i;
-    }
-
-    void setAlternateRouteFlag(const bool b) {
-        alternateRoute = b;
-    }
-
-    void setDeprecatedAPIFlag(const std::string &) {
-        deprecatedAPI = true;
-    }
-
-    void setChecksum(const unsigned c) {
-        checkSum = c;
-    }
-
-    void setInstructionFlag(const bool b) {
-        printInstructions = b;
-    }
-
-    void setService( const std::string & s) {
-        service = s;
-    }
-
-    void setOutputFormat(const std::string & s) {
-        outputFormat = s;
-    }
-
-    void setJSONpParameter(const std::string & s) {
-        jsonpParameter = s;
-    }
-
-    void addHint(const std::string & s) {
-        hints.resize(coordinates.size());
-        hints.back() = s;
-    }
-
-    void setLanguage(const std::string & s) {
-        language = s;
-    }
-
-    void setGeometryFlag(const bool b) {
-        geometry = b;
-    }
-
-    void setCompressionFlag(const bool b) {
-        compression = b;
-    }
-
-    void addCoordinate(boost::fusion::vector < double, double > arg_) {
-        int lat = 100000.*boost::fusion::at_c < 0 > (arg_);
-        int lon = 100000.*boost::fusion::at_c < 1 > (arg_);
-        _Coordinate myCoordinate(lat, lon);
-        coordinates.push_back(_Coordinate(lat, lon));
-    }
-};
-
-
-#endif /*ROUTE_PARAMETERS_H*/

Plugins/TimestampPlugin.h

@@ -1,37 +1,41 @@
 /*
-    open source routing machine
-    Copyright (C) Dennis Luxen, 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 TIMESTAMPPLUGIN_H_
 #define TIMESTAMPPLUGIN_H_
 
-#include <cassert>
-
 #include "BasePlugin.h"
-#include "RouteParameters.h"
 
 class TimestampPlugin : public BasePlugin {
 public:
-    TimestampPlugin(QueryObjectsStorage * o) : objects(o) {
-    }
-    std::string GetDescriptor() const { return std::string("timestamp"); }
-    std::string GetVersionString() const { return std::string("0.3 (DL)"); }
+    TimestampPlugin(QueryObjectsStorage * o)
+     : objects(o), descriptor_string("timestamp")
+    { }
+    const std::string & GetDescriptor() const { return descriptor_string; }
     void HandleRequest(const RouteParameters & routeParameters, http::Reply& reply) {
         std::string tmp;
 
@@ -70,6 +74,7 @@ public:
     }
 private:
     QueryObjectsStorage * objects;
+    std::string descriptor_string;
 };
 
 #endif /* TIMESTAMPPLUGIN_H_ */

Plugins/ViaRoutePlugin.h

@@ -1,77 +1,82 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 <cstdlib>
-#include <fstream>
-#include <sstream>
-#include <string>
-#include <vector>
-
 #include "BasePlugin.h"
-#include "RouteParameters.h"
 
 #include "../Algorithms/ObjectToBase64.h"
-
-#include "../Descriptors/BaseDescriptor.h"
-#include "../Descriptors/GPXDescriptor.h"
-#include "../Descriptors/JSONDescriptor.h"
-
-#include "../DataStructures/HashTable.h"
 #include "../DataStructures/QueryEdge.h"
 #include "../DataStructures/StaticGraph.h"
 #include "../DataStructures/SearchEngine.h"
-
+#include "../Descriptors/BaseDescriptor.h"
+#include "../Descriptors/GPXDescriptor.h"
+#include "../Descriptors/JSONDescriptor.h"
+#include "../Server/DataStructures/QueryObjectsStorage.h"
+#include "../Util/SimpleLogger.h"
 #include "../Util/StringUtil.h"
 
-#include "../Server/DataStructures/QueryObjectsStorage.h"
+#include <boost/unordered_map.hpp>
+
+#include <cstdlib>
+
+#include <string>
+#include <vector>
 
 class ViaRoutePlugin : public BasePlugin {
 private:
     NodeInformationHelpDesk * nodeHelpDesk;
-    std::vector<std::string> & names;
     StaticGraph<QueryEdge::EdgeData> * graph;
     HashTable<std::string, unsigned> descriptorTable;
-    std::string pluginDescriptorString;
     SearchEngine * searchEnginePtr;
 public:
 
-    ViaRoutePlugin(QueryObjectsStorage * objects, std::string psd = "viaroute") : names(objects->names), pluginDescriptorString(psd) {
+    ViaRoutePlugin(QueryObjectsStorage * objects)
+     :
+        // objects(objects),
+        descriptor_string("viaroute")
+    {
         nodeHelpDesk = objects->nodeHelpDesk;
         graph = objects->graph;
 
-        searchEnginePtr = new SearchEngine(graph, nodeHelpDesk, names);
+        searchEnginePtr = new SearchEngine(objects);
 
-        descriptorTable.Set("", 0); //default descriptor
-        descriptorTable.Set("json", 0);
-        descriptorTable.Set("gpx", 1);
+        // descriptorTable.emplace(""    , 0);
+        descriptorTable.emplace("json", 0);
+        descriptorTable.emplace("gpx" , 1);
     }
 
     virtual ~ViaRoutePlugin() {
         delete searchEnginePtr;
     }
 
-    std::string GetDescriptor() const { return pluginDescriptorString; }
-    std::string GetVersionString() const { return std::string("0.3 (DL)"); }
+    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() ) {
@@ -93,14 +98,14 @@ public:
         std::vector<PhantomNode> phantomNodeVector(rawRoute.rawViaNodeCoordinates.size());
         for(unsigned i = 0; i < rawRoute.rawViaNodeCoordinates.size(); ++i) {
             if(checksumOK && i < routeParameters.hints.size() && "" != routeParameters.hints[i]) {
-//                INFO("Decoding hint: " << routeParameters.hints[i] << " for location index " << i);
-                DecodeObjectFromBase64(phantomNodeVector[i], routeParameters.hints[i]);
-                if(phantomNodeVector[i].isValid(nodeHelpDesk->getNumberOfNodes())) {
-//                    INFO("Decoded hint " << i << " successfully");
+//                SimpleLogger().Write() <<"Decoding hint: " << routeParameters.hints[i] << " for location index " << i;
+                DecodeObjectFromBase64(routeParameters.hints[i], phantomNodeVector[i]);
+                if(phantomNodeVector[i].isValid(nodeHelpDesk->GetNumberOfNodes())) {
+//                    SimpleLogger().Write() << "Decoded hint " << i << " successfully";
                     continue;
                 }
             }
-//            INFO("Brute force lookup of coordinate " << i);
+//            SimpleLogger().Write() << "Brute force lookup of coordinate " << i;
             searchEnginePtr->FindPhantomNodeForCoordinate( rawRoute.rawViaNodeCoordinates[i], phantomNodeVector[i], routeParameters.zoomLevel);
         }
 
@@ -111,7 +116,7 @@ public:
             rawRoute.segmentEndCoordinates.push_back(segmentPhantomNodes);
         }
         if( ( routeParameters.alternateRoute ) && (1 == rawRoute.segmentEndCoordinates.size()) ) {
-//            INFO("Checking for alternative paths");
+//            SimpleLogger().Write() << "Checking for alternative paths";
             searchEnginePtr->alternativePaths(rawRoute.segmentEndCoordinates[0],  rawRoute);
 
         } else {
@@ -120,7 +125,7 @@ public:
 
 
         if(INT_MAX == rawRoute.lengthOfShortestPath ) {
-            DEBUG( "Error occurred, single path not found" );
+            SimpleLogger().Write(logDEBUG) << "Error occurred, single path not found";
         }
         reply.status = http::Reply::ok;
 
@@ -132,7 +137,11 @@ public:
         }
 
         _DescriptorConfig descriptorConfig;
-        unsigned descriptorType = descriptorTable[routeParameters.outputFormat];
+
+        unsigned descriptorType = 0;
+        if(descriptorTable.find(routeParameters.outputFormat) != descriptorTable.end() ) {
+            descriptorType = descriptorTable.find(routeParameters.outputFormat)->second;
+        }
         descriptorConfig.z = routeParameters.zoomLevel;
         descriptorConfig.instructions = routeParameters.printInstructions;
         descriptorConfig.geometry = routeParameters.geometry;
@@ -155,10 +164,10 @@ public:
 
         PhantomNodes phantomNodes;
         phantomNodes.startPhantom = rawRoute.segmentEndCoordinates[0].startPhantom;
-//        INFO("Start location: " << phantomNodes.startPhantom.location)
+//        SimpleLogger().Write() << "Start location: " << phantomNodes.startPhantom.location;
         phantomNodes.targetPhantom = rawRoute.segmentEndCoordinates[rawRoute.segmentEndCoordinates.size()-1].targetPhantom;
-//        INFO("TargetLocation: " << phantomNodes.targetPhantom.location);
-//        INFO("Number of segments: " << rawRoute.segmentEndCoordinates.size());
+//        SimpleLogger().Write() << "TargetLocation: " << phantomNodes.targetPhantom.location;
+//        SimpleLogger().Write() << "Number of segments: " << rawRoute.segmentEndCoordinates.size();
         desc->SetConfig(descriptorConfig);
 
         desc->Run(reply, rawRoute, phantomNodes, *searchEnginePtr);
@@ -204,7 +213,6 @@ public:
                 reply.headers[2].name = "Content-Disposition";
                 reply.headers[2].value = "attachment; filename=\"route.json\"";
             }
-
             break;
         }
 
@@ -212,12 +220,7 @@ public:
         return;
     }
 private:
-    inline bool checkCoord(const _Coordinate & c) {
-        if(c.lat > 90*100000 || c.lat < -90*100000 || c.lon > 180*100000 || c.lon <-180*100000) {
-            return false;
-        }
-        return true;
-    }
+    std::string descriptor_string;
 };
 
 

README.md

@@ -1,3 +1,5 @@
+# Readme
+
 For instructions on how to compile and run OSRM, please consult the Wiki at
 
 https://github.com/DennisOSRM/Project-OSRM/wiki
@@ -6,8 +8,11 @@ or use our free and daily updated online service at
 
 http://map.project-osrm.org
 
-When using the code in a scientific publication, please cite
+## References in publications
 
+When using the code in a (scientific) publication, please cite
+
+```
 @inproceedings{luxen-vetter-2011,
  author = {Luxen, Dennis and Vetter, Christian},
  title = {Real-time routing with OpenStreetMap data},
@@ -23,5 +28,13 @@ When using the code in a scientific publication, please cite
  acmid = {2094062},
  publisher = {ACM},
  address = {New York, NY, USA},
-} 
+}
+```
 
+## Current build status
+
+| 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) |
+| LUAbind fork | master  | [![Build Status](https://travis-ci.org/DennisOSRM/luabind.png?branch=master)](https://travis-ci.org/DennisOSRM/luabind) |

Rakefile

@@ -59,47 +59,27 @@ def wait_for_shutdown name
   raise "*** Could not terminate #{name}."
 end
 
-def write_server_ini osm_file
-  s=<<-EOF
-  Threads = 1
-  IP = 0.0.0.0
-  Port = #{OSRM_PORT}
-
-  hsgrData=#{osm_file}.osrm.hsgr
-  nodesData=#{osm_file}.osrm.nodes
-  edgesData=#{osm_file}.osrm.edges
-  ramIndex=#{osm_file}.osrm.ramIndex
-  fileIndex=#{osm_file}.osrm.fileIndex
-  namesData=#{osm_file}.osrm.names
-  timestamp=#{osm_file}.osrm.timestamp
-  EOF
-  File.open( 'server.ini', 'w') {|f| f.write( s ) }
-end
-
 
 desc "Rebuild and run tests."
 task :default => [:build]
 
 desc "Build using CMake."
 task :build do
-  Dir.chdir BUILD_FOLDER do
-    system "make"
+  if Dir.exists? BUILD_FOLDER
+    Dir.chdir BUILD_FOLDER do
+      system "make"
+    end
+  else
+    system "mkdir build; cd build; cmake ..; make"
   end
 end
 
 desc "Setup config files."
 task :setup do
-  Dir.mkdir "#{DATA_FOLDER}" unless File.exist? "#{DATA_FOLDER}"
-  ['server.ini','extractor.ini','contractor.ini'].each do |file|
-    unless File.exist? "#{DATA_FOLDER}/#{file}"
-      puts "Copying #{file} template to #{DATA_FOLDER}/#{file}" 
-      FileUtils.cp file, "#{DATA_FOLDER}/#{file}"
-    end
-  end
 end
 
 desc "Download OSM data."
-task :download => :setup do
+task :download do
   Dir.mkdir "#{DATA_FOLDER}" unless File.exist? "#{DATA_FOLDER}"
   puts "Downloading..."
   puts "curl http://download.geofabrik.de/europe/#{osm_data_country}-latest.osm.pbf -o #{DATA_FOLDER}/#{osm_data_country}.osm.pbf"
@@ -118,26 +98,20 @@ task :crop do
 end
 
 desc "Reprocess OSM data."
-task :process => :setup do
-  Dir.chdir DATA_FOLDER do
-    raise "Error while extracting data." unless system "../#{BUILD_FOLDER}/osrm-extract #{osm_data_area_name}.osm.pbf #{PROFILES_FOLDER}/#{PROFILE}.lua"
-    puts
-    raise "Error while preparing data." unless system "../#{BUILD_FOLDER}/osrm-prepare #{osm_data_area_name}.osrm #{osm_data_area_name}.osrm.restrictions #{PROFILES_FOLDER}/#{PROFILE}.lua"
-    puts
-  end
+task :process => [:extract,:prepare] do
 end
 
 desc "Extract OSM data."
-task :extract => :setup do
+task :extract do
   Dir.chdir DATA_FOLDER do
-    raise "Error while extracting data." unless system "../#{BUILD_FOLDER}/osrm-extract #{osm_data_area_name}.osm.pbf ../profiles/#{PROFILE}.lua"
+    raise "Error while extracting data." unless system "../#{BUILD_FOLDER}/osrm-extract #{osm_data_area_name}.osm.pbf --profile ../profiles/#{PROFILE}.lua"
   end
 end
 
 desc "Prepare OSM data."
-task :prepare => :setup do
+task :prepare do
   Dir.chdir DATA_FOLDER do
-    raise "Error while preparing data." unless system "../#{BUILD_FOLDER}/osrm-prepare #{osm_data_area_name}.osrm #{osm_data_area_name}.osrm.restrictions ../profiles/#{PROFILE}.lua"
+    raise "Error while preparing data." unless system "../#{BUILD_FOLDER}/osrm-prepare #{osm_data_area_name}.osrm --profile ../profiles/#{PROFILE}.lua"
   end
 end
 
@@ -154,19 +128,17 @@ task :test do
 end
 
 desc "Run the routing server in the terminal. Press Ctrl-C to stop."
-task :run => :setup do
+task :run do
   Dir.chdir DATA_FOLDER do
-    write_server_ini osm_data_area_name
-    system "../#{BUILD_FOLDER}/osrm-routed"
+    system "../#{BUILD_FOLDER}/osrm-routed #{osm_data_area_name}.osrm --port #{OSRM_PORT}"
   end
 end
 
 desc "Launch the routing server in the background. Use rake:down to stop it."
-task :up => :setup do
+task :up do
   Dir.chdir DATA_FOLDER do
     abort("Already up.") if up?
-    write_server_ini osm_data_area_name
-    pipe = IO.popen("../#{BUILD_FOLDER}/osrm-routed 1>>osrm-routed.log 2>>osrm-routed.log")
+    pipe = IO.popen("../#{BUILD_FOLDER}/osrm-routed #{osm_data_area_name}.osrm --port #{OSRM_PORT} 1>>osrm-routed.log 2>>osrm-routed.log")
     timeout = 5
     (timeout*10).times do
       begin

RoutingAlgorithms/AlternativePathRouting.h

@@ -1,31 +1,37 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 ALTERNATIVEROUTES_H_
 #define ALTERNATIVEROUTES_H_
 
-#include <boost/unordered_map.hpp>
-#include <vector>
-#include <cmath>
-
 #include "BasicRoutingInterface.h"
+#include <boost/unordered_map.hpp>
+#include <cmath>
+#include <vector>
 
 const double VIAPATH_ALPHA   = 0.15;
 const double VIAPATH_EPSILON = 0.10; //alternative at most 15% longer
@@ -308,7 +314,7 @@ private:
         int aindex = 0;
         //compute forward sharing
         while( (packedAlternativePath[aindex] == packedShortestPath[aindex]) && (packedAlternativePath[aindex+1] == packedShortestPath[aindex+1]) ) {
-            //            INFO("retrieving edge (" << packedAlternativePath[aindex] << "," << packedAlternativePath[aindex+1] << ")");
+            //            SimpleLogger().Write() << "retrieving edge (" << packedAlternativePath[aindex] << "," << packedAlternativePath[aindex+1] << ")";
             typename SearchGraph::EdgeIterator edgeID = search_graph->FindEdgeInEitherDirection(packedAlternativePath[aindex], packedAlternativePath[aindex+1]);
             sharing += search_graph->GetEdgeData(edgeID).distance;
             ++aindex;

RoutingAlgorithms/BasicRoutingInterface.h

@@ -1,30 +1,36 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 BASICROUTINGINTERFACE_H_
 #define BASICROUTINGINTERFACE_H_
 
-#include "../Plugins/RawRouteData.h"
+#include "../DataStructures/RawRouteData.h"
 #include "../Util/ContainerUtils.h"
+#include "../Util/SimpleLogger.h"
 
 #include <boost/noncopyable.hpp>
 
@@ -44,7 +50,7 @@ public:
     inline void RoutingStep(typename QueryDataT::QueryHeap & _forwardHeap, typename QueryDataT::QueryHeap & _backwardHeap, NodeID *middle, int *_upperbound, const int edgeBasedOffset, const bool forwardDirection) const {
         const NodeID node = _forwardHeap.DeleteMin();
         const int distance = _forwardHeap.GetKey(node);
-        //INFO("Settled (" << _forwardHeap.GetData( node ).parent << "," << node << ")=" << distance);
+        //SimpleLogger().Write() << "Settled (" << _forwardHeap.GetData( node ).parent << "," << node << ")=" << distance;
         if(_backwardHeap.WasInserted(node) ){
             const int newDistance = _backwardHeap.GetKey(node) + distance;
             if(newDistance < *_upperbound ){
@@ -147,7 +153,14 @@ public:
                 recursionStack.push(std::make_pair(edge.first, middle));
             } else {
                 assert(!ed.shortcut);
-                unpackedPath.push_back(_PathData(ed.id, _queryData.nodeHelpDesk->getNameIndexFromEdgeID(ed.id), _queryData.nodeHelpDesk->getTurnInstructionFromEdgeID(ed.id), ed.distance) );
+                unpackedPath.push_back(
+                    _PathData(
+                        ed.id,
+                        _queryData.nodeHelpDesk->GetNameIndexFromEdgeID(ed.id),
+                        _queryData.nodeHelpDesk->GetTurnInstructionForEdgeID(ed.id),
+                        ed.distance
+                    )
+                );
             }
         }
     }

RoutingAlgorithms/ShortestPathRouting.h

@@ -1,24 +1,29 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 SHORTESTPATHROUTING_H_
 #define SHORTESTPATHROUTING_H_
@@ -72,24 +77,24 @@ public:
 
             //insert new starting nodes into forward heap, adjusted by previous distances.
             if(searchFrom1stStartNode) {
-                forward_heap1.Insert(phantomNodePair.startPhantom.edgeBasedNode, -phantomNodePair.startPhantom.weight1, phantomNodePair.startPhantom.edgeBasedNode);
-                INFO("fw1: " << phantomNodePair.startPhantom.edgeBasedNode << "´, w: " << -phantomNodePair.startPhantom.weight1);
-                forward_heap2.Insert(phantomNodePair.startPhantom.edgeBasedNode, -phantomNodePair.startPhantom.weight1, phantomNodePair.startPhantom.edgeBasedNode);
-                INFO("fw2: " << phantomNodePair.startPhantom.edgeBasedNode << "´, w: " << -phantomNodePair.startPhantom.weight1);
+                forward_heap1.Insert(phantomNodePair.startPhantom.edgeBasedNode, distance1-phantomNodePair.startPhantom.weight1, phantomNodePair.startPhantom.edgeBasedNode);
+                // INFO("fw1: " << phantomNodePair.startPhantom.edgeBasedNode << "´, w: " << -phantomNodePair.startPhantom.weight1);
+                forward_heap2.Insert(phantomNodePair.startPhantom.edgeBasedNode, distance1-phantomNodePair.startPhantom.weight1, phantomNodePair.startPhantom.edgeBasedNode);
+                // INFO("fw2: " << phantomNodePair.startPhantom.edgeBasedNode << "´, w: " << -phantomNodePair.startPhantom.weight1);
            }
             if(phantomNodePair.startPhantom.isBidirected() && searchFrom2ndStartNode) {
-                forward_heap1.Insert(phantomNodePair.startPhantom.edgeBasedNode+1, -phantomNodePair.startPhantom.weight2, phantomNodePair.startPhantom.edgeBasedNode+1);
-                INFO("fw1: " << phantomNodePair.startPhantom.edgeBasedNode+1 << "´, w: " << -phantomNodePair.startPhantom.weight2);
-                forward_heap2.Insert(phantomNodePair.startPhantom.edgeBasedNode+1, -phantomNodePair.startPhantom.weight2, phantomNodePair.startPhantom.edgeBasedNode+1);
-                INFO("fw2: " << phantomNodePair.startPhantom.edgeBasedNode+1 << "´, w: " << -phantomNodePair.startPhantom.weight2);
+                forward_heap1.Insert(phantomNodePair.startPhantom.edgeBasedNode+1, distance2-phantomNodePair.startPhantom.weight2, phantomNodePair.startPhantom.edgeBasedNode+1);
+                // INFO("fw1: " << phantomNodePair.startPhantom.edgeBasedNode+1 << "´, w: " << -phantomNodePair.startPhantom.weight2);
+                forward_heap2.Insert(phantomNodePair.startPhantom.edgeBasedNode+1, distance2-phantomNodePair.startPhantom.weight2, phantomNodePair.startPhantom.edgeBasedNode+1);
+                // INFO("fw2: " << phantomNodePair.startPhantom.edgeBasedNode+1 << "´, w: " << -phantomNodePair.startPhantom.weight2);
             }
 
             //insert new backward nodes into backward heap, unadjusted.
             reverse_heap1.Insert(phantomNodePair.targetPhantom.edgeBasedNode, phantomNodePair.targetPhantom.weight1, phantomNodePair.targetPhantom.edgeBasedNode);
-            INFO("rv1: " << phantomNodePair.targetPhantom.edgeBasedNode << ", w;" << phantomNodePair.targetPhantom.weight1 );
+            // INFO("rv1: " << phantomNodePair.targetPhantom.edgeBasedNode << ", w;" << phantomNodePair.targetPhantom.weight1 );
             if(phantomNodePair.targetPhantom.isBidirected() ) {
                 reverse_heap2.Insert(phantomNodePair.targetPhantom.edgeBasedNode+1, phantomNodePair.targetPhantom.weight2, phantomNodePair.targetPhantom.edgeBasedNode+1);
-                INFO("rv2: " << phantomNodePair.targetPhantom.edgeBasedNode+1 << ", w;" << phantomNodePair.targetPhantom.weight2 );
+                // INFO("rv2: " << phantomNodePair.targetPhantom.edgeBasedNode+1 << ", w;" << phantomNodePair.targetPhantom.weight2 );
            }
             const int forward_offset = phantomNodePair.startPhantom.weight1 + (phantomNodePair.startPhantom.isBidirected() ? phantomNodePair.startPhantom.weight2 : 0);
             const int reverse_offset = phantomNodePair.targetPhantom.weight1 + (phantomNodePair.targetPhantom.isBidirected() ? phantomNodePair.targetPhantom.weight2 : 0);
@@ -160,11 +165,9 @@ public:
                     if( *(packedPath1.end()-1) == *(temporaryPackedPath1.begin())) {
                         packedPath2.clear();
                         packedPath2.insert(packedPath2.end(), packedPath1.begin(), packedPath1.end());
-                        distance2 = distance1;
                     } else {
                         packedPath1.clear();
                         packedPath1.insert(packedPath1.end(), packedPath2.begin(), packedPath2.end());
-                        distance1 = distance2;
                     }
                 } else  {
                     //packed paths 1 and 2 may need to switch.
@@ -184,8 +187,8 @@ public:
                 searchFrom2ndStartNode &= !(lastNodeID == phantomNodePair.targetPhantom.edgeBasedNode);
             }
 
-            distance1 += _localUpperbound1;
-            distance2 += _localUpperbound2;
+            distance1 = _localUpperbound1;
+            distance2 = _localUpperbound2;
         }
 
         if(distance1 > distance2){

Server/APIGrammar.h

@@ -1,24 +1,29 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 APIGRAMMAR_H_
 #define APIGRAMMAR_H_

Server/BasicDatastructures.h

@@ -1,31 +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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+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.
 
-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 BASIC_DATASTRUCTURES_H
 #define BASIC_DATASTRUCTURES_H
-#include <string>
-#include <sstream>
-#include <boost/foreach.hpp>
 
 #include "../Util/StringUtil.h"
 
+#include <boost/asio.hpp>
+#include <boost/foreach.hpp>
+
+#include <string>
+#include <sstream>
+#include <vector>
+
 namespace http {
 
 const std::string okString 					= "HTTP/1.0 200 OK\r\n";
@@ -77,7 +88,7 @@ struct Reply {
 		BOOST_FOREACH ( Header& h,  headers) {
 			if("Content-Length" == h.name) {
 				std::string sizeString;
-				intToString(size,h.value );
+				intToString(size,h.value);
 			}
 		}
 	}
@@ -125,7 +136,6 @@ std::vector<boost::asio::const_buffer> Reply::HeaderstoBuffers(){
     buffers.push_back(ToBuffer(status));
     for (std::size_t i = 0; i < headers.size(); ++i) {
         Header& h = headers[i];
-//        std::cout << h.name << ": " << h.value << std::endl;
         buffers.push_back(boost::asio::buffer(h.name));
         buffers.push_back(boost::asio::buffer(seperators));
         buffers.push_back(boost::asio::buffer(h.value));
@@ -139,7 +149,7 @@ Reply Reply::stockReply(Reply::status_type status) {
 	Reply rep;
 	rep.status = status;
 	rep.content = ToString(status);
-	rep.headers.resize(3);	
+	rep.headers.resize(3);
 	rep.headers[0].name = "Access-Control-Allow-Origin";
 	rep.headers[0].value = "*";
 	rep.headers[1].name = "Content-Length";

Server/Connection.h

@@ -1,126 +1,224 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 CONNECTION_H
 #define CONNECTION_H
 
-#include <vector>
-
-#include <boost/asio.hpp>
-#include <boost/array.hpp>
-#include <boost/bind.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
-
 #include "BasicDatastructures.h"
 #include "RequestHandler.h"
 #include "RequestParser.h"
 
-#include "zlib.h"
+#include <boost/array.hpp>
+#include <boost/asio.hpp>
+#include <boost/assert.hpp>
+#include <boost/bind.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/noncopyable.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <zlib.h>
+
+#include <vector>
 
 namespace http {
 
 /// Represents a single connection from a client.
-class Connection : public boost::enable_shared_from_this<Connection>, private boost::noncopyable {
+class Connection : 	public boost::enable_shared_from_this<Connection>,
+					private boost::noncopyable {
 public:
-	explicit Connection(boost::asio::io_service& io_service, RequestHandler& handler) : strand(io_service), TCPsocket(io_service), requestHandler(handler) {}
+	explicit Connection(
+		boost::asio::io_service& io_service,
+		RequestHandler& handler
+	) : strand(io_service), TCP_socket(io_service), request_handler(handler) { }
 
 	boost::asio::ip::tcp::socket& socket() {
-		return TCPsocket;
+		return TCP_socket;
 	}
 
 	/// Start the first asynchronous operation for the connection.
 	void start() {
-	    TCPsocket.async_read_some(boost::asio::buffer(incomingDataBuffer), strand.wrap( boost::bind(&Connection::handleRead, this->shared_from_this(), boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred)));
+	    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)
+	    	)
+	    );
 	}
 
 private:
-	void handleRead(const boost::system::error_code& e, std::size_t bytes_transferred) {
-		if (!e) {
-			CompressionType compressionType(noCompression);
+	void handle_read(
+		const boost::system::error_code& e,
+		std::size_t bytes_transferred
+	) {
+		if( !e ) {
+			CompressionType compression_type(noCompression);
 			boost::tribool result;
-			boost::tie(result, boost::tuples::ignore) = requestParser.Parse( request, incomingDataBuffer.data(), incomingDataBuffer.data() + bytes_transferred, &compressionType);
+			boost::tie(result, boost::tuples::ignore) = request_parser.Parse(
+				request,
+				incoming_data_buffer.data(),
+				incoming_data_buffer.data() + bytes_transferred,
+				&compression_type
+			);
 
-			if (result) {
-				//                std::cout << "----" << std::endl;
-				//				if(compressionType == gzipRFC1952)
-				//					std::cout << "[debug] using gzip" << std::endl;
-				//				if(compressionType == deflateRFC1951)
-				//					std::cout << "[debug] using deflate" << std::endl;
-				//				if(compressionType == noCompression)
-				//					std::cout << "[debug] no compression" << std::endl;
-			    request.endpoint = TCPsocket.remote_endpoint().address();
-				requestHandler.handle_request(request, reply);
+			if( result ) {
+				request.endpoint = TCP_socket.remote_endpoint().address();
+				request_handler.handle_request(request, reply);
 
-				Header compressionHeader;
-				std::vector<unsigned char> compressed;
-				std::vector<boost::asio::const_buffer> outputBuffer;
-				switch(compressionType) {
+				Header compression_header;
+				std::vector<unsigned char> compressed_output;
+				std::vector<boost::asio::const_buffer> output_buffer;
+				switch(compression_type) {
 				case deflateRFC1951:
-					compressionHeader.name = "Content-Encoding";
-					compressionHeader.value = "deflate";
-					reply.headers.insert(reply.headers.begin(), compressionHeader);   //push_back(compressionHeader);
-					compressCharArray(reply.content.c_str(), reply.content.length(), compressed, compressionType);
-					reply.setSize(compressed.size());
-					outputBuffer = reply.HeaderstoBuffers();
-					outputBuffer.push_back(boost::asio::buffer(compressed));
-					boost::asio::async_write(TCPsocket, outputBuffer, strand.wrap( boost::bind(&Connection::handleWrite, this->shared_from_this(), boost::asio::placeholders::error)));
+					compression_header.name = "Content-Encoding";
+					compression_header.value = "deflate";
+					reply.headers.insert(
+						reply.headers.begin(),
+						compression_header
+					);
+					compressCharArray(
+						reply.content.c_str(),
+						reply.content.length(),
+						compressed_output,
+						compression_type
+					);
+					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:
-					compressionHeader.name = "Content-Encoding";
-					compressionHeader.value = "gzip";
-					reply.headers.insert(reply.headers.begin(), compressionHeader);
-					compressCharArray(reply.content.c_str(), reply.content.length(), compressed, compressionType);
-					reply.setSize(compressed.size());
-					outputBuffer = reply.HeaderstoBuffers();
-					outputBuffer.push_back(boost::asio::buffer(compressed));
-					boost::asio::async_write(TCPsocket, outputBuffer, strand.wrap( boost::bind(&Connection::handleWrite, this->shared_from_this(), boost::asio::placeholders::error)));break;
+					compression_header.name = "Content-Encoding";
+					compression_header.value = "gzip";
+					reply.headers.insert(
+						reply.headers.begin(),
+						compression_header
+					);
+					compressCharArray(
+						reply.content.c_str(),
+						reply.content.length(),
+						compressed_output,
+						compression_type
+					);
+					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:
-					boost::asio::async_write(TCPsocket, reply.toBuffers(), strand.wrap( boost::bind(&Connection::handleWrite, this->shared_from_this(), boost::asio::placeholders::error)));
+					boost::asio::async_write(
+						TCP_socket,
+						reply.toBuffers(),
+						strand.wrap(
+							boost::bind(
+								&Connection::handle_write,
+								this->shared_from_this(),
+								boost::asio::placeholders::error
+								)
+							)
+						);
 					break;
 				}
-
 			} else if (!result) {
 				reply = Reply::stockReply(Reply::badRequest);
-				boost::asio::async_write(TCPsocket, reply.toBuffers(), strand.wrap( boost::bind(&Connection::handleWrite, this->shared_from_this(), boost::asio::placeholders::error)));
+				boost::asio::async_write(
+					TCP_socket,
+					reply.toBuffers(),
+					strand.wrap(
+						boost::bind(
+							&Connection::handle_write,
+							this->shared_from_this(),
+							boost::asio::placeholders::error
+						)
+					)
+				);
 			} else {
-				TCPsocket.async_read_some(boost::asio::buffer(incomingDataBuffer), strand.wrap( boost::bind(&Connection::handleRead, this->shared_from_this(), boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred)));
+				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 handleWrite(const boost::system::error_code& e) {
+	void handle_write(const boost::system::error_code& e) {
 		if (!e) {
 			// Initiate graceful connection closure.
 			boost::system::error_code ignoredEC;
-			TCPsocket.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignoredEC);
+			TCP_socket.shutdown(
+				boost::asio::ip::tcp::socket::shutdown_both,
+				ignoredEC
+			);
 		}
-		// No new asynchronous operations are started. This means that all shared_ptr
-		// references to the connection object will disappear and the object will be
-		// destroyed automatically after this handler returns. The connection class's
-		// destructor closes the socket.
 	}
 
-	void compressCharArray(const void *in_data, size_t in_data_size, std::vector<unsigned char> &buffer, CompressionType type) {
+	// Big thanks to deusty who explains how to use gzip compression by
+	// the right call to deflateInit2():
+	// http://deusty.blogspot.com/2007/07/gzip-compressiondecompression.html
+	void compressCharArray(
+		const char * in_data,
+		size_t in_data_size,
+		std::vector<unsigned char> & buffer,
+		CompressionType type
+	) {
 		const size_t BUFSIZE = 128 * 1024;
 		unsigned char temp_buffer[BUFSIZE];
 
@@ -140,20 +238,23 @@ private:
 			deflateInit(&strm, Z_BEST_SPEED);
 			break;
 		case gzipRFC1952:
-			/*
-			 * Big thanks to deusty who explains how to have gzip compression turned on by the right call to deflateInit2():
-			 * http://deusty.blogspot.com/2007/07/gzip-compressiondecompression.html
-			 */
-			deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, (15+16), 9, Z_DEFAULT_STRATEGY);
+			deflateInit2(
+				&strm,
+				Z_DEFAULT_COMPRESSION,
+				Z_DEFLATED,
+				(15+16),
+				9,
+				Z_DEFAULT_STRATEGY
+			);
 			break;
 		default:
-			assert(false);
+			BOOST_ASSERT_MSG(false, "should not happen");
 			break;
 		}
 
 		int deflate_res = Z_OK;
 		do {
-			if (strm.avail_out == 0) {
+			if ( 0 == strm.avail_out ) {
 				buffer.insert(buffer.end(), temp_buffer, temp_buffer + BUFSIZE);
 				strm.next_out = temp_buffer;
 				strm.avail_out = BUFSIZE;
@@ -162,17 +263,25 @@ private:
 
 		} while (deflate_res == Z_OK);
 
-		assert(deflate_res == Z_STREAM_END);
-		buffer.insert(buffer.end(), temp_buffer, temp_buffer + BUFSIZE - strm.avail_out);
+		BOOST_ASSERT_MSG(
+			deflate_res == Z_STREAM_END,
+			"compression not properly finished"
+		);
+
+		buffer.insert(
+			buffer.end(),
+			temp_buffer,
+			temp_buffer + BUFSIZE - strm.avail_out
+		);
 		deflateEnd(&strm);
 	}
 
 	boost::asio::io_service::strand strand;
-	boost::asio::ip::tcp::socket TCPsocket;
-	RequestHandler& requestHandler;
-	boost::array<char, 8192> incomingDataBuffer;
+	boost::asio::ip::tcp::socket TCP_socket;
+	RequestHandler& request_handler;
+	boost::array<char, 8192> incoming_data_buffer;
 	Request request;
-	RequestParser requestParser;
+	RequestParser request_parser;
 	Reply reply;
 };
 

Server/DataStructures/QueryObjectsStorage.cpp

@@ -1,100 +1,183 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 "QueryObjectsStorage.h"
-#include "../../Util/GraphLoader.h"
 
-QueryObjectsStorage::QueryObjectsStorage(
-	std::string hsgrPath,
-	std::string ramIndexPath,
-	std::string fileIndexPath,
-	std::string nodesPath,
-	std::string edgesPath,
-	std::string namesPath,
-	std::string timestampPath
-) {
-	INFO("loading graph data");
-	std::ifstream hsgrInStream(hsgrPath.c_str(), std::ios::binary);
-    if(!hsgrInStream) { ERR(hsgrPath <<  " not found"); }
+QueryObjectsStorage::QueryObjectsStorage( const ServerPaths & paths ) {
+	if( paths.find("hsgrdata") == paths.end() ) {
+		throw OSRMException("no hsgr file given in ini file");
+	}
+	if( paths.find("ramindex") == paths.end() ) {
+		throw OSRMException("no ram index file given in ini file");
+	}
+	if( paths.find("fileindex") == paths.end() ) {
+		throw OSRMException("no mem index file given in ini file");
+	}
+	if( paths.find("nodesdata") == paths.end() ) {
+		throw OSRMException("no nodes file given in ini file");
+	}
+	if( paths.find("edgesdata") == paths.end() ) {
+		throw OSRMException("no edges file given in ini file");
+	}
+	if( paths.find("namesdata") == paths.end() ) {
+		throw OSRMException("no names file given in ini file");
+	}
+
+	SimpleLogger().Write() << "loading graph data";
 	//Deserialize road network graph
-	std::vector< QueryGraph::_StrNode> nodeList;
-	std::vector< QueryGraph::_StrEdge> edgeList;
-	const int n = readHSGRFromStream(
-		hsgrInStream,
-		nodeList,
-		edgeList,
-		&checkSum
+
+	ServerPaths::const_iterator paths_iterator = paths.find("hsgrdata");
+	BOOST_ASSERT(paths.end() != paths_iterator);
+	const std::string & hsgr_data_string = paths_iterator->second.string();
+
+	std::vector< QueryGraph::_StrNode> node_list;
+	std::vector< QueryGraph::_StrEdge> edge_list;
+	const int number_of_nodes = readHSGRFromStream(
+		hsgr_data_string,
+		node_list,
+		edge_list,
+		&check_sum
 	);
 
-	INFO("Data checksum is " << checkSum);
-	graph = new QueryGraph(nodeList, edgeList);
-	assert(0 == nodeList.size());
-	assert(0 == edgeList.size());
+	SimpleLogger().Write() << "Data checksum is " << check_sum;
+	graph = new QueryGraph(node_list, edge_list);
+	BOOST_ASSERT(0 == node_list.size());
+	BOOST_ASSERT(0 == edge_list.size());
 
-	if(timestampPath.length()) {
-	    INFO("Loading Timestamp");
-	    std::ifstream timestampInStream(timestampPath.c_str());
-	    if(!timestampInStream) { WARN(timestampPath <<  " not found"); }
+	paths_iterator = paths.find("timestamp");
 
-	    getline(timestampInStream, timestamp);
-	    timestampInStream.close();
+	if(paths.end() != paths_iterator) {
+	    SimpleLogger().Write() << "Loading Timestamp";
+    	const std::string & timestamp_string = paths_iterator->second.string();
+
+	    boost::filesystem::ifstream time_stamp_instream(timestamp_string);
+	    if( !time_stamp_instream.good() ) {
+	        SimpleLogger().Write(logWARNING) << timestamp_string << " not found";
+	    }
+
+	    getline(time_stamp_instream, timestamp);
+	    time_stamp_instream.close();
 	}
-	if(!timestamp.length())
+	if(!timestamp.length()) {
 	    timestamp = "n/a";
-	if(25 < timestamp.length())
+	}
+	if(25 < timestamp.length()) {
 	    timestamp.resize(25);
+	}
+    SimpleLogger().Write() << "Loading auxiliary information";
+
+    paths_iterator = paths.find("ramindex");
+    BOOST_ASSERT(paths.end() != paths_iterator);
+    const std::string & ram_index_string = paths_iterator->second.string();
+	paths_iterator = paths.find("fileindex");
+    BOOST_ASSERT(paths.end() != paths_iterator);
+	const std::string & file_index_string = paths_iterator->second.string();
+	paths_iterator = paths.find("nodesdata");
+    BOOST_ASSERT(paths.end() != paths_iterator);
+	const std::string & nodes_data_string = paths_iterator->second.string();
+	paths_iterator = paths.find("edgesdata");
+    BOOST_ASSERT(paths.end() != paths_iterator);
+	const std::string & edges_data_string = paths_iterator->second.string();
 
-    INFO("Loading auxiliary information");
     //Init nearest neighbor data structure
-	std::ifstream nodesInStream(nodesPath.c_str(), std::ios::binary);
-	if(!nodesInStream) { ERR(nodesPath <<  " not found"); }
-    std::ifstream edgesInStream(edgesPath.c_str(), std::ios::binary);
-    if(!edgesInStream) { ERR(edgesPath <<  " not found"); }
-	nodeHelpDesk = new NodeInformationHelpDesk(ramIndexPath.c_str(), fileIndexPath.c_str(), n, checkSum);
-	nodeHelpDesk->initNNGrid(nodesInStream, edgesInStream);
+	nodeHelpDesk = new NodeInformationHelpDesk(
+		ram_index_string,
+		file_index_string,
+		nodes_data_string,
+		edges_data_string,
+		number_of_nodes,
+		check_sum
+	);
 
 	//deserialize street name list
-	INFO("Loading names index");
-	std::ifstream namesInStream(namesPath.c_str(), std::ios::binary);
-    if(!namesInStream) { ERR(namesPath <<  " not found"); }
-	unsigned size(0);
-	namesInStream.read((char *)&size, sizeof(unsigned));
-	//        names = new std::vector<std::string>();
+	SimpleLogger().Write() << "Loading names index";
 
-	char buf[1024];
-	for(unsigned i = 0; i < size; ++i) {
-		unsigned sizeOfString = 0;
-		namesInStream.read((char *)&sizeOfString, sizeof(unsigned));
-		buf[sizeOfString] = '\0'; // instead of memset
-		namesInStream.read(buf, sizeOfString);
-		names.push_back(buf);
+	paths_iterator = paths.find("namesdata");
+    BOOST_ASSERT(paths.end() != paths_iterator);
+	const std::string & names_data_string = paths_iterator->second.string();
+    if ( !boost::filesystem::exists( paths_iterator->second ) ) {
+        throw OSRMException("names file does not exist");
+    }
+    if ( 0 == boost::filesystem::file_size( paths_iterator->second ) ) {
+        throw OSRMException("names file is empty");
+    }
+
+	boost::filesystem::ifstream name_stream(names_data_string, std::ios::binary);
+	unsigned size = 0;
+	name_stream.read((char *)&size, sizeof(unsigned));
+	BOOST_ASSERT_MSG(0 != size, "name file broken");
+
+	m_name_begin_indices.resize(size);
+	name_stream.read((char*)&m_name_begin_indices[0], size*sizeof(unsigned));
+	name_stream.read((char *)&size, sizeof(unsigned));
+	BOOST_ASSERT_MSG(0 != size, "name file broken");
+
+	m_names_char_list.resize(size+1); //+1 is sentinel/dummy element
+	name_stream.read((char *)&m_names_char_list[0], size*sizeof(char));
+	BOOST_ASSERT_MSG(0 != m_names_char_list.size(), "could not load any names");
+
+	name_stream.close();
+	SimpleLogger().Write() << "All query data structures loaded";
+}
+
+void QueryObjectsStorage::GetName(
+	const unsigned name_id,
+	std::string & result
+) const {
+	if(UINT_MAX == name_id) {
+		result = "";
+		return;
 	}
-	std::vector<std::string>(names).swap(names);
-	hsgrInStream.close();
-	namesInStream.close();
-	INFO("All query data structures loaded");
+	BOOST_ASSERT_MSG(
+		name_id < m_name_begin_indices.size(),
+		"name id too high"
+	);
+	unsigned begin_index = m_name_begin_indices[name_id];
+	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"
+	);
+
+	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()
+	);
 }
 
 QueryObjectsStorage::~QueryObjectsStorage() {
-	//        delete names;
 	delete graph;
 	delete nodeHelpDesk;
 }

Server/DataStructures/QueryObjectsStorage.h

@@ -1,46 +1,63 @@
 /*
-    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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 QUERYOBJECTSSTORAGE_H_
 #define QUERYOBJECTSSTORAGE_H_
 
-#include<vector>
-#include<string>
-
+#include "../../Util/GraphLoader.h"
+#include "../../Util/OSRMException.h"
+#include "../../Util/ProgramOptions.h"
+#include "../../Util/SimpleLogger.h"
 #include "../../DataStructures/NodeInformationHelpDesk.h"
 #include "../../DataStructures/QueryEdge.h"
 #include "../../DataStructures/StaticGraph.h"
 
+#include <boost/assert.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
+
+#include <vector>
+#include <string>
+
+
 struct QueryObjectsStorage {
-    typedef StaticGraph<QueryEdge::EdgeData> QueryGraph;
-    typedef QueryGraph::InputEdge InputEdge;
+    typedef StaticGraph<QueryEdge::EdgeData>    QueryGraph;
+    typedef QueryGraph::InputEdge               InputEdge;
 
-    NodeInformationHelpDesk * nodeHelpDesk;
-    std::vector<std::string> names;
-    QueryGraph * graph;
-    std::string timestamp;
-    unsigned checkSum;
+    NodeInformationHelpDesk                   * nodeHelpDesk;
+    std::vector<char>                           m_names_char_list;
+    std::vector<unsigned>                       m_name_begin_indices;
+    QueryGraph                                * graph;
+    std::string                                 timestamp;
+    unsigned                                    check_sum;
 
-    QueryObjectsStorage(std::string hsgrPath, std::string ramIndexPath, std::string fileIndexPath, std::string nodesPath, std::string edgesPath, std::string namesPath, std::string timestampPath);
+    void GetName( const unsigned name_id, std::string & result ) const;
 
+    QueryObjectsStorage( const ServerPaths & paths );
     ~QueryObjectsStorage();
 };
 

Server/DataStructures/RouteParameters.h

@@ -0,0 +1,123 @@
+/*
+
+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 ROUTE_PARAMETERS_H
+#define ROUTE_PARAMETERS_H
+
+#include "../../DataStructures/Coordinate.h"
+#include "../../DataStructures/HashTable.h"
+
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/sequence/intrinsic.hpp>
+#include <boost/fusion/include/at_c.hpp>
+
+#include <string>
+#include <vector>
+
+struct RouteParameters {
+    RouteParameters() :
+        zoomLevel(18),
+        printInstructions(false),
+        alternateRoute(true),
+        geometry(true),
+        compression(true),
+        deprecatedAPI(false),
+        checkSum(-1) {}
+    short zoomLevel;
+    bool printInstructions;
+    bool alternateRoute;
+    bool geometry;
+    bool compression;
+    bool deprecatedAPI;
+    unsigned checkSum;
+    std::string service;
+    std::string outputFormat;
+    std::string jsonpParameter;
+    std::string language;
+    std::vector<std::string> hints;
+    std::vector<FixedPointCoordinate> coordinates;
+    typedef HashTable<std::string, std::string>::const_iterator OptionsIterator;
+
+    void setZoomLevel(const short i) {
+        if (18 > i && 0 < i) {
+            zoomLevel = i;
+        }
+    }
+
+    void setAlternateRouteFlag(const bool b) {
+        alternateRoute = b;
+    }
+
+    void setDeprecatedAPIFlag(const std::string &) {
+        deprecatedAPI = true;
+    }
+
+    void setChecksum(const unsigned c) {
+        checkSum = c;
+    }
+
+    void setInstructionFlag(const bool b) {
+        printInstructions = b;
+    }
+
+    void setService( const std::string & s) {
+        service = s;
+    }
+
+    void setOutputFormat(const std::string & s) {
+        outputFormat = s;
+    }
+
+    void setJSONpParameter(const std::string & s) {
+        jsonpParameter = s;
+    }
+
+    void addHint(const std::string & s) {
+        hints.resize(coordinates.size());
+        hints.back() = s;
+    }
+
+    void setLanguage(const std::string & s) {
+        language = s;
+    }
+
+    void setGeometryFlag(const bool b) {
+        geometry = b;
+    }
+
+    void setCompressionFlag(const bool b) {
+        compression = b;
+    }
+
+    void addCoordinate(const boost::fusion::vector < double, double > & arg_) {
+        int lat = COORDINATE_PRECISION*boost::fusion::at_c < 0 > (arg_);
+        int lon = COORDINATE_PRECISION*boost::fusion::at_c < 1 > (arg_);
+        coordinates.push_back(FixedPointCoordinate(lat, lon));
+    }
+};
+
+#endif /*ROUTE_PARAMETERS_H*/

Server/RequestHandler.h

@@ -1,78 +1,88 @@
 /*
-    open source routing machine
-    Copyright (C) Dennis Luxen, 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 REQUEST_HANDLER_H
 #define REQUEST_HANDLER_H
 
-#include <algorithm>
-#include <cctype> // std::tolower
-#include <string>
-#include <iostream>
-#include <boost/noncopyable.hpp>
-
 #include "APIGrammar.h"
 #include "BasicDatastructures.h"
-#include "../DataStructures/HashTable.h"
-#include "../Plugins/BasePlugin.h"
-#include "../Plugins/RouteParameters.h"
+#include "DataStructures/RouteParameters.h"
+#include "../Library/OSRM.h"
+#include "../Util/SimpleLogger.h"
 #include "../Util/StringUtil.h"
 #include "../typedefs.h"
 
-namespace http {
+#include <boost/foreach.hpp>
+#include <boost/noncopyable.hpp>
+
+#include <algorithm>
+#include <iostream>
+#include <iterator>
+#include <string>
 
 class RequestHandler : private boost::noncopyable {
 public:
-    explicit RequestHandler() : _pluginCount(0) { }
+    typedef APIGrammar<std::string::iterator, RouteParameters> APIGrammarParser;
+    explicit RequestHandler() : routing_machine(NULL) { }
 
-    ~RequestHandler() {
-
-        for(unsigned i = 0; i < _pluginVector.size(); i++) {
-            BasePlugin * tempPointer = _pluginVector[i];
-            delete tempPointer;
-        }
-    }
-
-    void handle_request(const Request& req, Reply& rep){
+    void handle_request(const http::Request& req, http::Reply& rep){
         //parse command
         try {
             std::string request(req.uri);
 
-            { //This block logs the current request to std out. should be moved to a logging component
-                time_t ltime;
-                struct tm *Tm;
+            time_t ltime;
+            struct tm *Tm;
 
-                ltime=time(NULL);
-                Tm=localtime(&ltime);
+            ltime=time(NULL);
+            Tm=localtime(&ltime);
 
-                INFO((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 << " " <<
-                        req.endpoint.to_string() << " " << req.referrer << ( 0 == req.referrer.length() ? "- " :" ") << req.agent << ( 0 == req.agent.length() ? "- " :" ") << req.uri );
-            }
+            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 << " " << req.endpoint.to_string() << " " <<
+                req.referrer << ( 0 == req.referrer.length() ? "- " :" ") <<
+                req.agent << ( 0 == req.agent.length() ? "- " :" ") << req.uri;
 
             RouteParameters routeParameters;
-            APIGrammar<std::string::iterator, RouteParameters> apiParser(&routeParameters);
+            APIGrammarParser apiParser(&routeParameters);
 
             std::string::iterator it = request.begin();
-            bool result = boost::spirit::qi::parse(it, request.end(), apiParser);    // returns true if successful
-            if (!result || (it != request.end()) ) {
+            const bool result = boost::spirit::qi::parse(
+                it,
+                request.end(),
+                apiParser
+            );
+
+            if ( !result || (it != request.end()) ) {
                 rep = http::Reply::stockReply(http::Reply::badRequest);
-                int position = std::distance(request.begin(), it);
+                const int position = std::distance(request.begin(), it);
                 std::string tmp_position_string;
                 intToString(position, tmp_position_string);
                 rep.content += "Input seems to be malformed close to position ";
@@ -80,38 +90,34 @@ public:
                 rep.content += request;
                 rep.content += tmp_position_string;
                 rep.content += "<br>";
-                for(unsigned i = 0, end = std::distance(request.begin(), it); i < end; ++i)
+                const unsigned end = std::distance(request.begin(), it);
+                for(unsigned i = 0; i < end; ++i) {
                     rep.content += "&nbsp;";
+                }
                 rep.content += "^<br></pre>";
             } else {
-                //Finished parsing, lets call the right plugin to handle the request
-                if(pluginMap.Holds(routeParameters.service)) {
-                    rep.status = Reply::ok;
-                    _pluginVector[pluginMap.Find(routeParameters.service)]->HandleRequest(routeParameters, rep );
-                } else {
-                    rep = Reply::stockReply(Reply::badRequest);
-                }
+                //parsing done, lets call the right plugin to handle the request
+                BOOST_ASSERT_MSG(
+                    routing_machine != NULL,
+                    "pointer not init'ed"
+                );
+                routing_machine->RunQuery(routeParameters, rep);
                 return;
             }
         } catch(std::exception& e) {
-            rep = Reply::stockReply(Reply::internalServerError);
-            std::cerr << "[server error] code: " << e.what() << ", uri: " << req.uri << std::endl;
+            rep = http::Reply::stockReply(http::Reply::internalServerError);
+            SimpleLogger().Write(logWARNING) <<
+                "[server error] code: " << e.what() << ", uri: " << req.uri;
             return;
         }
     };
 
-    void RegisterPlugin(BasePlugin * plugin) {
-        std::cout << "[handler] registering plugin " << plugin->GetDescriptor() << std::endl;
-        pluginMap.Add(plugin->GetDescriptor(), _pluginCount);
-        _pluginVector.push_back(plugin);
-        ++_pluginCount;
+    void RegisterRoutingMachine(OSRM * osrm) {
+        routing_machine = osrm;
     }
 
 private:
-    HashTable<std::string, unsigned> pluginMap;
-    std::vector<BasePlugin *> _pluginVector;
-    unsigned _pluginCount;
+    OSRM * routing_machine;
 };
-} // namespace http
 
 #endif // REQUEST_HANDLER_H

Server/RequestParser.h

@@ -1,29 +1,37 @@
 /*
-    open source routing machine
-    Copyright (C) Dennis Luxen, 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 REQUEST_PARSER_H
 #define REQUEST_PARSER_H
 
+#include "BasicDatastructures.h"
+
 #include <boost/logic/tribool.hpp>
 #include <boost/tuple/tuple.hpp>
-#include "BasicDatastructures.h"
 
 namespace http {
 

Server/Server.h

@@ -1,41 +1,56 @@
 /*
-    open source routing machine
-    Copyright (C) Dennis Luxen, 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.
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
 
-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.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-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.
- */
+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 SERVER_H
 #define SERVER_H
 
-#include <vector>
+#include "Connection.h"
+#include "RequestHandler.h"
+
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
-#include "Connection.h"
-#include "RequestHandler.h"
-
-namespace http {
+#include <vector>
 
 class Server: private boost::noncopyable {
 public:
-	explicit Server(const std::string& address, const std::string& port, unsigned thread_pool_size) : threadPoolSize(thread_pool_size), acceptor(ioService), newConnection(new Connection(ioService, requestHandler)), requestHandler(){
+	explicit Server(
+		const std::string& address,
+		const std::string& port,
+		unsigned thread_pool_size
+	) :
+		threadPoolSize(thread_pool_size),
+		acceptor(ioService),
+		newConnection(new http::Connection(ioService, requestHandler)),
+		requestHandler()
+	{
 		boost::asio::ip::tcp::resolver resolver(ioService);
 		boost::asio::ip::tcp::resolver::query query(address, port);
 		boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
@@ -44,7 +59,14 @@ public:
 		acceptor.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
 		acceptor.bind(endpoint);
 		acceptor.listen();
-		acceptor.async_accept(newConnection->socket(), boost::bind(&Server::handleAccept, this, boost::asio::placeholders::error));
+		acceptor.async_accept(
+			newConnection->socket(),
+			boost::bind(
+				&Server::handleAccept,
+				this,
+				boost::asio::placeholders::error
+			)
+		);
 	}
 
 	void Run() {
@@ -66,23 +88,28 @@ public:
 	}
 
 private:
-	typedef boost::shared_ptr<Connection > ConnectionPtr;
-
 	void handleAccept(const boost::system::error_code& e) {
 		if (!e) {
 			newConnection->start();
-			newConnection.reset(new Connection(ioService, requestHandler));
-			acceptor.async_accept(newConnection->socket(), boost::bind(&Server::handleAccept, this, boost::asio::placeholders::error));
+			newConnection.reset(
+				new http::Connection(ioService, requestHandler)
+			);
+			acceptor.async_accept(
+				newConnection->socket(),
+				boost::bind(
+					&Server::handleAccept,
+					this,
+					boost::asio::placeholders::error
+				)
+			);
 		}
 	}
 
 	unsigned threadPoolSize;
 	boost::asio::io_service ioService;
 	boost::asio::ip::tcp::acceptor acceptor;
-	ConnectionPtr newConnection;
+	boost::shared_ptr<http::Connection> newConnection;
 	RequestHandler requestHandler;
 };
 
-}   // namespace http
-
 #endif // SERVER_H

Server/ServerConfiguration.h

@@ -1,28 +0,0 @@
-/*
-    open source routing machine
-    Copyright (C) Dennis Luxen, 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 SERVERCONFIGURATION_H_
-#define SERVERCONFIGURATION_H_
-
-#include "../Util/BaseConfiguration.h"
-
-typedef BaseConfiguration ServerConfiguration;
-
-#endif /* SERVERCONFIGURATION_H_ */