Add CCH routing

.gitignore

@@ -4,4 +4,9 @@
 /.pkg.mutex
 /.clang-tidy
 /.vs
-/out
+/out
+*.pbf
+test/monaco
+test/hamburg
+test/switzerland
+test/germany

.pkg

@@ -66,3 +66,7 @@
   url=git@github.com:motis-project/net.git
   branch=master
   commit=c2599102dcffa4babfdcf5320a6bd6f5c6e9b731
+[inertialflowcutter]
+  url=git@github.com:motis-project/InertialFlowCutter.git
+  branch=master
+  commit=04bc916d16df4dca862f92a1e441252e5775b3e4

.pkg.lock

@@ -1,5 +1,7 @@
-11881102796209809478
+12201350688430969258
 cista 02fc087619fc913aca2c3fd3e07ec12279b8d6c6
+oneTBB cda5d37ce8303c58ac506259387e75de4ffcf26b
+InertialFlowCutter 04bc916d16df4dca862f92a1e441252e5775b3e4
 zlib-ng d68e1d908e789c31c1f2fafe4bd8e09cb91e21c5
 boost 77467bf580d98ea06716e2931cbe3b1f28e0cd37
 conf f9bf4bd83bf55a2170725707e526cbacc45dcc66
@@ -25,7 +27,6 @@ clipper 2abf72015b85f1cfd38706b21d4f28b8c359c7d5
 concurrentqueue ab6b0b5334a005ef6ff1365ba5af87404de39d29
 lmdb 39d8127e5697b1323a67e61c3ad8f087384c7429
 miniz e857234a23de8e5a2d05d266e518220a495db0ce
-oneTBB cda5d37ce8303c58ac506259387e75de4ffcf26b
 pbf-sdf-fonts 66f0c760272c7bdd0efeaac5aab5520b9194225e
 sol2 40c7cbc7c5cfed1e8c7f1bbe6fcbe23d7a67fc75
 variant 5aa73631dc969087c77433a5cdef246303051f69

CMakeLists.txt

@@ -1,6 +1,10 @@
 cmake_minimum_required(VERSION 3.10)
 project(osr LANGUAGES C CXX ASM)
 
+set(BUILD_SHARED_LIBS OFF)
+option(TBB_BUILD_SHARED          "Build TBB shared library" OFF)
+option(TBB_BUILD_STATIC          "Build TBB static library" ON)
+
 cmake_policy(SET CMP0079 NEW)
 
 if (MSVC)
@@ -126,6 +130,7 @@ target_link_libraries(osr
         unordered_dense
         boost-thread
         boost-iostreams
+        inertialflowcutter
 )
 
 # --- MAIN ---

include/osr/geojson.h

@@ -200,6 +200,7 @@ struct geojson_writer {
           {"car", p.is_car_accessible()},
           {"bike", p.is_bike_accessible()},
           {"foot", p.is_walk_accessible()},
+          {"importance", w_.r_->node_importance_[n]},
           {"bus", p.is_bus_accessible()},
           {"bus_with_penalty", p.is_bus_accessible_with_penalty()},
           {"is_restricted", w_.r_->node_is_restricted_[n]},

include/osr/routing/algorithms.h

@@ -5,7 +5,7 @@
 
 namespace osr {
 
-enum class routing_algorithm : std::uint8_t { kDijkstra, kAStarBi };
+enum class routing_algorithm : std::uint8_t { kDijkstra, kAStarBi, kCCH };
 
 routing_algorithm to_algorithm(std::string_view);