Apply clang-tidy

src/extractor/extraction_containers.cpp

@@ -14,8 +14,8 @@
 #include <boost/assert.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
-#include <boost/ref.hpp>
 #include <boost/numeric/conversion/cast.hpp>
+#include <boost/ref.hpp>
 
 #include <luabind/luabind.hpp>
 

src/extractor/extractor.cpp

@@ -18,8 +18,8 @@
 
 #include "util/static_graph.hpp"
 #include "util/static_rtree.hpp"
-#include "extractor/restriction_map.hpp"
 #include "extractor/compressed_edge_container.hpp"
+#include "extractor/restriction_map.hpp"
 
 #include "extractor/tarjan_scc.hpp"
 #include "contractor/crc32_processor.hpp"
@@ -573,7 +573,7 @@ void extractor::BuildRTree(std::vector<EdgeBasedNode> node_based_edge_list,
     node_based_edge_list.resize(new_size);
 
     TIMER_START(construction);
-    StaticRTree<EdgeBasedNode>(node_based_edge_list, config.rtree_nodes_output_path,
+    StaticRTree<EdgeBasedNode> rtree(node_based_edge_list, config.rtree_nodes_output_path,
                                config.rtree_leafs_output_path, internal_to_external_node_map);
 
     TIMER_STOP(construction);

src/extractor/extractor_options.cpp

@@ -1,7 +1,7 @@
 #include "extractor/extractor_options.hpp"
 
-#include "util/version.hpp"
 #include "util/ini_file.hpp"
+#include "util/version.hpp"
 #include "util/simple_logger.hpp"
 
 #include <boost/filesystem.hpp>

src/extractor/graph_compressor.cpp

@@ -1,9 +1,9 @@
 #include "extractor/graph_compressor.hpp"
 
 #include "extractor/compressed_edge_container.hpp"
+#include "extractor/restriction_map.hpp"
 #include "util/dynamic_graph.hpp"
 #include "util/node_based_graph.hpp"
-#include "extractor/restriction_map.hpp"
 #include "util/percent.hpp"
 
 #include "util/simple_logger.hpp"

src/extractor/restriction_map.cpp

@@ -149,9 +149,5 @@ bool RestrictionMap::CheckIfTurnIsRestricted(const NodeID node_u,
 // check of node is the start of any restriction
 bool RestrictionMap::IsSourceNode(const NodeID node) const
 {
-    if (m_restriction_start_nodes.find(node) == m_restriction_start_nodes.end())
-    {
-        return false;
-    }
-    return true;
+    return m_restriction_start_nodes.find(node) != m_restriction_start_nodes.end();
 }

src/extractor/restriction_parser.cpp

@@ -9,9 +9,9 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/regex.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/optional/optional.hpp>
 #include <boost/ref.hpp>
 #include <boost/regex.hpp>
-#include <boost/optional/optional.hpp>
 
 #include <osmium/osm.hpp>
 #include <osmium/tags/regex_filter.hpp>
@@ -218,12 +218,8 @@ bool RestrictionParser::ShouldIgnoreRestriction(const std::string &except_tag_st
     return std::any_of(std::begin(exceptions), std::end(exceptions),
                        [&](const std::string &current_string)
                        {
-                           if (std::end(restriction_exceptions) !=
+                           return std::end(restriction_exceptions) !=
                                std::find(std::begin(restriction_exceptions),
-                                         std::end(restriction_exceptions), current_string))
-                           {
-                               return true;
-                           }
-                           return false;
+                                         std::end(restriction_exceptions), current_string);
                        });
 }