Merge remote-tracking branch 'origin/master' into nested_namespace

src/nodejs/CMakeLists.txt

@@ -1,6 +1,4 @@
-# node-cmake requires CMake 3.1 features; for the osrm project we only
-# require CMake 2.8.11 so that we can build e.g. on Trusty by default.
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.18)
 
 message(STATUS "Building node_osrm")
 

src/util/coordinate_calculation.cpp

@@ -1,12 +1,11 @@
 #include "util/coordinate_calculation.hpp"
+#include "util/cheap_ruler.hpp"
 #include "util/coordinate.hpp"
 #include "util/trigonometry_table.hpp"
 #include "util/web_mercator.hpp"
 
 #include <boost/assert.hpp>
 
-#include <mapbox/cheap_ruler.hpp>
-
 #include <algorithm>
 #include <iterator>
 #include <limits>
@@ -26,8 +25,8 @@ class CheapRulerContainer
     {
         for (int n = 0; n < number_of_rulers; n++)
         {
-            cheap_ruler_cache[n] = mapbox::cheap_ruler::CheapRuler(
-                step * (n + 0.5) / COORDINATE_PRECISION, mapbox::cheap_ruler::CheapRuler::Meters);
+            cheap_ruler_cache[n] =
+                mapbox::cheap_ruler::CheapRuler(step * (n + 0.5) / COORDINATE_PRECISION);
         }
     };