Port isc file

src/extractor/edge_based_graph_factory.cpp

@@ -348,10 +348,8 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedEdges(
                                          profile_properties);
 
     util::guidance::LaneDataIdMap lane_data_map;
-    guidance::lanes::TurnLaneHandler turn_lane_handler(*m_node_based_graph,
-                                                       lane_description_map,
-                                                       turn_analysis,
-                                                       lane_data_map);
+    guidance::lanes::TurnLaneHandler turn_lane_handler(
+        *m_node_based_graph, lane_description_map, turn_analysis, lane_data_map);
 
     bearing_class_by_node_based_node.resize(m_node_based_graph->GetNumberOfNodes(),
                                             std::numeric_limits<std::uint32_t>::max());

src/extractor/extractor.cpp

@@ -518,10 +518,15 @@ Extractor::BuildEdgeExpandedGraph(ScriptingEnvironment &scripting_environment,
 
     const std::size_t number_of_node_based_nodes = node_based_graph->GetNumberOfNodes();
 
-    WriteIntersectionClassificationData(intersection_class_output_file,
-                                        edge_based_graph_factory.GetBearingClassIds(),
-                                        edge_based_graph_factory.GetBearingClasses(),
-                                        edge_based_graph_factory.GetEntryClasses());
+    util::Log() << "Writing Intersection Classification Data";
+    TIMER_START(write_intersections);
+    files::writeIntersections(
+        intersection_class_output_file,
+        IntersectionBearingsContainer{edge_based_graph_factory.GetBearingClassIds(),
+                                      edge_based_graph_factory.GetBearingClasses()},
+        edge_based_graph_factory.GetEntryClasses());
+    TIMER_STOP(write_intersections);
+    util::Log() << "ok, after " << TIMER_SEC(write_intersections) << "s";
 
     return std::make_pair(number_of_node_based_nodes, max_edge_id);
 }
@@ -572,49 +577,6 @@ void Extractor::BuildRTree(std::vector<EdgeBasedNodeSegment> edge_based_node_seg
     util::Log() << "finished r-tree construction in " << TIMER_SEC(construction) << " seconds";
 }
 
-void Extractor::WriteIntersectionClassificationData(
-    const std::string &output_file_name,
-    const std::vector<BearingClassID> &node_based_intersection_classes,
-    const std::vector<util::guidance::BearingClass> &bearing_classes,
-    const std::vector<util::guidance::EntryClass> &entry_classes) const
-{
-    storage::io::FileWriter writer(output_file_name, storage::io::FileWriter::GenerateFingerprint);
-
-    util::Log() << "Writing Intersection Classification Data";
-    TIMER_START(write_edges);
-    storage::serialization::write(writer, node_based_intersection_classes);
-
-    // create range table for vectors:
-    std::vector<unsigned> bearing_counts;
-    bearing_counts.reserve(bearing_classes.size());
-    std::uint64_t total_bearings = 0;
-    for (const auto &bearing_class : bearing_classes)
-    {
-        bearing_counts.push_back(
-            static_cast<unsigned>(bearing_class.getAvailableBearings().size()));
-        total_bearings += bearing_class.getAvailableBearings().size();
-    }
-
-    util::RangeTable<> bearing_class_range_table(bearing_counts);
-    bearing_class_range_table.Write(writer);
-
-    writer.WriteOne(total_bearings);
-
-    for (const auto &bearing_class : bearing_classes)
-    {
-        const auto &bearings = bearing_class.getAvailableBearings();
-        writer.WriteFrom(bearings.data(), bearings.size());
-    }
-
-    storage::serialization::write(writer, entry_classes);
-
-    TIMER_STOP(write_edges);
-    util::Log() << "ok, after " << TIMER_SEC(write_edges) << "s for "
-                << node_based_intersection_classes.size() << " Indices into "
-                << bearing_classes.size() << " bearing classes and " << entry_classes.size()
-                << " entry classes and " << total_bearings << " bearing values.";
-}
-
 void Extractor::WriteCompressedNodeBasedGraph(const std::string &path,
                                               const util::NodeBasedDynamicGraph &graph,
                                               const std::vector<util::Coordinate> &coordinates)

src/extractor/guidance/turn_lane_handler.cpp

@@ -37,10 +37,11 @@ TurnLaneHandler::TurnLaneHandler(const util::NodeBasedDynamicGraph &node_based_g
                                  LaneDescriptionMap &lane_description_map,
                                  const TurnAnalysis &turn_analysis,
                                  util::guidance::LaneDataIdMap &id_map)
-    : node_based_graph(node_based_graph),  lane_description_map(lane_description_map),
+    : node_based_graph(node_based_graph), lane_description_map(lane_description_map),
       turn_analysis(turn_analysis), id_map(id_map)
 {
-    std::tie(turn_lane_offsets, turn_lane_masks) = transformTurnLaneMapIntoArrays(lane_description_map);
+    std::tie(turn_lane_offsets, turn_lane_masks) =
+        transformTurnLaneMapIntoArrays(lane_description_map);
     count_handled = count_called = 0;
 }