restructured to only return valid turns to the outside + cleanup

src/extractor/edge_based_graph_factory.cpp

@@ -318,15 +318,12 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedEdges(
             }
 
             ++node_based_edge_counter;
-            auto turn_candidates = turn_analysis.getTurns(node_u, edge_from_u);
+            auto possible_turns = turn_analysis.getTurns(node_u, edge_from_u);
 
             const NodeID node_v = m_node_based_graph->GetTarget(edge_from_u);
 
-            for (const auto turn : turn_candidates)
+            for (const auto turn : possible_turns)
             {
-                if (!turn.valid)
-                    continue;
-
                 const double turn_angle = turn.angle;
 
                 // only add an edge if turn is not prohibited

src/util/name_table.cpp

@@ -1,5 +1,6 @@
 #include "util/name_table.hpp"
 #include "util/simple_logger.hpp"
+#include "util/exception.hpp"
 
 #include <algorithm>
 #include <limits>
@@ -16,14 +17,23 @@ NameTable::NameTable(const std::string &filename)
 {
     boost::filesystem::ifstream name_stream(filename, std::ios::binary);
 
+    if( !name_stream )
+        throw exception("Failed to open " + filename + " for reading.");
+
     name_stream >> m_name_table;
 
     unsigned number_of_chars = 0;
     name_stream.read(reinterpret_cast<char *>(&number_of_chars), sizeof(number_of_chars));
+    if( !name_stream )
+        throw exception("Encountered invalid file, failed to read number of contained chars");
+
     BOOST_ASSERT_MSG(0 != number_of_chars, "name file broken");
     m_names_char_list.resize(number_of_chars + 1); //+1 gives sentinel element
     name_stream.read(reinterpret_cast<char *>(&m_names_char_list[0]),
                      number_of_chars * sizeof(m_names_char_list[0]));
+    if( !name_stream )
+        throw exception("Failed to read " + std::to_string(number_of_chars) + " characters from file.");
+
     if (0 == m_names_char_list.size())
     {
         util::SimpleLogger().Write(logWARNING) << "list of street names is empty";