From 5fab7ba94dec1d53b37d88e410a97641e2780248 Mon Sep 17 00:00:00 2001
From: Siarhei Fedartsou <siarhei.fedartsou@gmail.com>
Date: Wed, 31 Aug 2022 22:54:02 +0200
Subject: [PATCH] Deprecate .osrm file

---
 include/extractor/extraction_containers.hpp |  1 -
 include/extractor/files.hpp                 |  9 ++-------
 src/extractor/extraction_containers.cpp     | 17 -----------------
 src/tools/components.cpp                    |  6 +-----
 4 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/include/extractor/extraction_containers.hpp b/include/extractor/extraction_containers.hpp
index cc3667813..0813b29b1 100644
--- a/include/extractor/extraction_containers.hpp
+++ b/include/extractor/extraction_containers.hpp
@@ -45,7 +45,6 @@ class ExtractionContainers
 
     void WriteNodes(storage::tar::FileWriter &file_out);
     void WriteEdges(storage::tar::FileWriter &file_out);
-    void WriteMetadata(storage::tar::FileWriter &file_out) const;
     void WriteCharData(const std::string &file_name);
 
   public:
diff --git a/include/extractor/files.hpp b/include/extractor/files.hpp
index 5c71e9de9..8cd4f1e95 100644
--- a/include/extractor/files.hpp
+++ b/include/extractor/files.hpp
@@ -444,13 +444,11 @@ inline void readConditionalRestrictions(const boost::filesystem::path &path,
 }
 
 // reads .osrm file which is a temporary file of osrm-extract
-template <typename BarrierOutIter, typename PackedOSMIDsT>
+template <typename PackedOSMIDsT>
 void readRawNBGraph(const boost::filesystem::path &path,
-                    BarrierOutIter barriers,
                     std::vector<util::Coordinate> &coordinates,
                     PackedOSMIDsT &osm_node_ids,
-                    std::vector<extractor::NodeBasedEdge> &edge_list,
-                    std::vector<extractor::NodeBasedEdgeAnnotation> &annotations)
+                    std::vector<extractor::NodeBasedEdge> &edge_list)
 {
     const auto fingerprint = storage::tar::FileReader::VerifyFingerprint;
     storage::tar::FileReader reader{path, fingerprint};
@@ -468,10 +466,7 @@ void readRawNBGraph(const boost::filesystem::path &path,
     reader.ReadStreaming<extractor::QueryNode>("/extractor/nodes",
                                                boost::make_function_output_iterator(decode));
 
-    reader.ReadStreaming<NodeID>("/extractor/barriers", barriers);
-
     storage::serialization::read(reader, "/extractor/edges", edge_list);
-    storage::serialization::read(reader, "/extractor/annotations", annotations);
 }
 
 template <typename NameTableT>
diff --git a/src/extractor/extraction_containers.cpp b/src/extractor/extraction_containers.cpp
index 2cb0a06c3..89dc202bc 100644
--- a/src/extractor/extraction_containers.cpp
+++ b/src/extractor/extraction_containers.cpp
@@ -422,7 +422,6 @@ void ExtractionContainers::PrepareData(ScriptingEnvironment &scripting_environme
     all_nodes_list.clear(); // free all_nodes_list before allocation of normal_edges
     all_nodes_list.shrink_to_fit();
     WriteEdges(writer);
-    WriteMetadata(writer);
 
     PrepareTrafficSignals(traffic_signals);
     PrepareManeuverOverrides(maneuver_override_ways);
@@ -841,19 +840,6 @@ void ExtractionContainers::WriteEdges(storage::tar::FileWriter &writer)
     }
 }
 
-void ExtractionContainers::WriteMetadata(storage::tar::FileWriter &writer) const
-{
-    util::UnbufferedLog log;
-    log << "Writing way meta-data     ... " << std::flush;
-    TIMER_START(write_meta_data);
-
-    storage::serialization::write(writer, "/extractor/annotations", all_edges_annotation_data_list);
-
-    TIMER_STOP(write_meta_data);
-    log << "ok, after " << TIMER_SEC(write_meta_data) << "s";
-    log << " -- Metadata contains << " << all_edges_annotation_data_list.size() << " entries.";
-}
-
 void ExtractionContainers::WriteNodes(storage::tar::FileWriter &writer)
 {
     {
@@ -912,9 +898,6 @@ void ExtractionContainers::WriteNodes(storage::tar::FileWriter &writer)
                 internal_barrier_nodes.emplace(node_id);
             }
         }
-        std::vector<NodeID> barrier_nodes_vector(internal_barrier_nodes.begin(),
-                                                 internal_barrier_nodes.end());
-        storage::serialization::write(writer, "/extractor/barriers", barrier_nodes_vector);
         log << "ok, after " << TIMER_SEC(write_nodes) << "s";
     }
 
diff --git a/src/tools/components.cpp b/src/tools/components.cpp
index 1b43cc215..ea4f21dbf 100644
--- a/src/tools/components.cpp
+++ b/src/tools/components.cpp
@@ -39,12 +39,8 @@ std::size_t loadGraph(const std::string &path,
                       std::vector<TarjanEdge> &graph_edge_list)
 {
     std::vector<extractor::NodeBasedEdge> edge_list;
-    std::vector<extractor::NodeBasedEdgeAnnotation> annotation_data;
 
-    auto nop = boost::make_function_output_iterator([](auto) {});
-
-    extractor::files::readRawNBGraph(
-        path, nop, coordinate_list, osm_node_ids, edge_list, annotation_data);
+    extractor::files::readRawNBGraph(path, coordinate_list, osm_node_ids, edge_list);
 
     // Building a node-based graph
     for (const auto &input_edge : edge_list)