Update to work with latest Valhalla (tile hierarchy changes)

Author: dnesbitt61

include/osmlr/util/tile_writer.hpp

@@ -27,7 +27,6 @@ struct tile_writer {
 
   const std::string m_base_dir, m_suffix;
   const size_t m_max_fds;
-  const valhalla::baldr::TileHierarchy m_tile_hierarchy;
 
   struct lru_fd {
     // the file descriptor itself

src/osmlr.cpp

@@ -1,5 +1,6 @@
 #include <valhalla/midgard/logging.h>
 #include <valhalla/baldr/graphreader.h>
+#include <valhalla/baldr/tilehierarchy.h>
 #include <valhalla/baldr/merge.h>
 
 #include <boost/program_options.hpp>
@@ -42,7 +43,7 @@ bool allow_edge_pred(const vb::DirectedEdge *edge) {
 }
 
 struct tiles_max_level {
-  typedef std::vector<vb::TileHierarchy::TileLevel> levels_t;
+  typedef std::vector<vb::TileLevel> levels_t;
   levels_t m_levels;
 
   struct const_iterator {
@@ -100,8 +101,8 @@ struct tiles_max_level {
     }
   };
 
-  tiles_max_level(vb::GraphReader &reader, unsigned int max_level) {
-    for (auto level : reader.GetTileHierarchy().levels() | bra::map_values) {
+  tiles_max_level(unsigned int max_level) {
+    for (auto level : vb::TileHierarchy::levels() | bra::map_values) {
       if (level.level <= max_level) {
         m_levels.push_back(level);
       }
@@ -279,7 +280,7 @@ int main(int argc, char** argv) {
   assert(max_level <= std::numeric_limits<uint8_t>::max());
 
   auto filtered_tiles = tile_exists_filter<tiles_max_level>(
-    tiles_max_level(reader, max_level), reader);
+    tiles_max_level(max_level), reader);
 
   vb::merge::merge(
     filtered_tiles, reader, allow_merge_pred, allow_edge_pred,

src/util/tile_writer.cpp

@@ -14,8 +14,7 @@ namespace util {
 tile_writer::tile_writer(std::string base_dir, std::string suffix, size_t max_fds)
   : m_base_dir(base_dir)
   , m_suffix(suffix)
-  , m_max_fds(max_fds)
-  , m_tile_hierarchy(m_base_dir) {
+  , m_max_fds(max_fds) {
   if (bfs::exists(base_dir) && !bfs::is_empty(base_dir)) {
     LOG_WARN("Non-empty " + base_dir + " will be purged of data.");
     bfs::remove_all(base_dir);
@@ -55,7 +54,7 @@ void tile_writer::close_all() {
 }
 
 std::string tile_writer::get_name_for_tile(vb::GraphId tile_id) {
-  auto suffix = vb::GraphTile::FileSuffix(tile_id, m_tile_hierarchy);
+  auto suffix = vb::GraphTile::FileSuffix(tile_id);
   auto path = bfs::path(m_base_dir) / suffix;
   return path.replace_extension(m_suffix).string();
 }