Make PackedVector generic

src/extractor/edge_based_graph_factory.cpp

@@ -42,7 +42,7 @@ EdgeBasedGraphFactory::EdgeBasedGraphFactory(
     const std::unordered_set<NodeID> &traffic_lights,
     std::shared_ptr<const RestrictionMap> restriction_map,
     const std::vector<util::Coordinate> &coordinates,
-    const util::PackedVector<OSMNodeID> &osm_node_ids,
+    const extractor::PackedOSMIDs &osm_node_ids,
     ProfileProperties profile_properties,
     const util::NameTable &name_table,
     std::vector<std::uint32_t> &turn_lane_offsets,

src/extractor/extractor.cpp

@@ -263,7 +263,7 @@ int Extractor::run(ScriptingEnvironment &scripting_environment)
         std::vector<bool> node_is_startpoint;
         std::vector<EdgeWeight> edge_based_node_weights;
         std::vector<util::Coordinate> coordinates;
-        util::PackedVector<OSMNodeID> osm_node_ids;
+        extractor::PackedOSMIDs osm_node_ids;
 
         auto graph_size = BuildEdgeExpandedGraph(scripting_environment,
                                                  coordinates,
@@ -407,7 +407,7 @@ std::shared_ptr<util::NodeBasedDynamicGraph>
 Extractor::LoadNodeBasedGraph(std::unordered_set<NodeID> &barriers,
                               std::unordered_set<NodeID> &traffic_signals,
                               std::vector<util::Coordinate> &coordiantes,
-                              util::PackedVector<OSMNodeID> &osm_node_ids)
+                              extractor::PackedOSMIDs &osm_node_ids)
 {
     storage::io::FileReader file_reader(config.output_file_name,
                                         storage::io::FileReader::VerifyFingerprint);
@@ -439,7 +439,7 @@ Extractor::LoadNodeBasedGraph(std::unordered_set<NodeID> &barriers,
 std::pair<std::size_t, EdgeID>
 Extractor::BuildEdgeExpandedGraph(ScriptingEnvironment &scripting_environment,
                                   std::vector<util::Coordinate> &coordinates,
-                                  util::PackedVector<OSMNodeID> &osm_node_ids,
+                                  extractor::PackedOSMIDs &osm_node_ids,
                                   std::vector<EdgeBasedNode> &node_based_edge_list,
                                   std::vector<bool> &node_is_startpoint,
                                   std::vector<EdgeWeight> &edge_based_node_weights,

src/storage/storage.cpp

@@ -19,6 +19,7 @@
 #include "extractor/profile_properties.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/travel_mode.hpp"
+#include "extractor/packed_osm_ids.hpp"
 
 #include "partition/cell_storage.hpp"
 #include "partition/edge_based_graph_reader.hpp"
@@ -326,7 +327,7 @@ void Storage::PopulateLayout(DataLayout &layout)
         // number of items:
         layout.SetBlockSize<std::uint64_t>(
             DataLayout::OSM_NODE_ID_LIST,
-            util::PackedVectorView<OSMNodeID>::elements_to_blocks(coordinate_list_size));
+            extractor::PackedOSMIDsView::elements_to_blocks(coordinate_list_size));
     }
 
     // load geometries sizes
@@ -694,7 +695,7 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr)
             layout.GetBlockPtr<std::uint64_t, true>(memory_ptr, DataLayout::OSM_NODE_ID_LIST);
         util::vector_view<util::Coordinate> coordinates(
             coordinates_ptr, layout.num_entries[DataLayout::COORDINATE_LIST]);
-        util::PackedVectorView<OSMNodeID> osm_node_ids;
+        extractor::PackedOSMIDsView osm_node_ids;
         osm_node_ids.reset(osmnodeid_ptr, layout.num_entries[DataLayout::OSM_NODE_ID_LIST]);
 
         extractor::files::readNodes(config.nodes_data_path, coordinates, osm_node_ids);

src/tools/components.cpp

@@ -33,7 +33,7 @@ using TarjanEdge = util::static_graph_details::SortableEdgeWithData<void>;
 
 std::size_t loadGraph(const std::string &path,
                       std::vector<util::Coordinate> &coordinate_list,
-                      util::PackedVector<OSMNodeID> &osm_node_ids,
+                      extractor::PackedOSMIDs &osm_node_ids,
                       std::vector<TarjanEdge> &graph_edge_list)
 {
     storage::io::FileReader file_reader(path, storage::io::FileReader::VerifyFingerprint);
@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
 
     std::vector<tools::TarjanEdge> graph_edge_list;
     std::vector<util::Coordinate> coordinate_list;
-    util::PackedVector<OSMNodeID> osm_node_ids;
+    extractor::PackedOSMIDs osm_node_ids;
     auto number_of_nodes = tools::loadGraph(inpath, coordinate_list, osm_node_ids, graph_edge_list);
 
     tbb::parallel_sort(graph_edge_list.begin(), graph_edge_list.end());

src/updater/updater.cpp

@@ -134,7 +134,7 @@ updateSegmentData(const UpdaterConfig &config,
                   extractor::SegmentDataContainer &segment_data)
 {
     std::vector<util::Coordinate> coordinates;
-    util::PackedVector<OSMNodeID> osm_node_ids;
+    extractor::PackedOSMIDs osm_node_ids;
     extractor::files::readNodes(config.node_based_graph_path, coordinates, osm_node_ids);
 
     // vector to count used speeds for logging