Cleanup

Project-OSRM · Nov 27, 2017 · 3f65550 · 3f65550
1 parent 936d2f3
commit 3f65550
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 1,012 deletions.
diff --git a/include/contractor/contracted_edge_container.hpp b/include/contractor/contracted_edge_container.hpp
@@ -108,7 +108,7 @@ struct ContractedEdgeContainer
         edges.insert(edges.end(), new_edges.begin(), new_end);
         auto edges_size = edges.size();
         auto new_edges_size = std::distance(new_edges.begin(), new_end);
-        BOOST_ASSERT(edges_size >= new_edges_size);
+        BOOST_ASSERT(edges_size >= static_cast<std::size_t>(new_edges_size));
         flags.resize(edges_size);
         std::fill(flags.begin() + edges_size - new_edges_size, flags.end(), flag);
 

diff --git a/include/extractor/guidance/intersection_normalizer.hpp b/include/extractor/guidance/intersection_normalizer.hpp
diff --git a/include/extractor/guidance/roundabout_handler.hpp b/include/extractor/guidance/roundabout_handler.hpp
@@ -64,10 +64,6 @@ class RoundaboutHandler : public IntersectionHandler
                                                const EdgeID via_eid,
                                                const Intersection &intersection) const;
 
-    void invalidateExitAgainstDirection(const NodeID from_nid,
-                                        const EdgeID via_eid,
-                                        Intersection &intersection) const;
-
     // decide whether we lookk at a roundabout or a rotary
     RoundaboutType getRoundaboutType(const NodeID nid) const;
 

diff --git a/include/extractor/guidance/turn_analysis.hpp b/include/extractor/guidance/turn_analysis.hpp
@@ -6,7 +6,6 @@
 #include "extractor/guidance/intersection.hpp"
 #include "extractor/guidance/intersection_generator.hpp"
 #include "extractor/guidance/intersection_normalization_operation.hpp"
-#include "extractor/guidance/intersection_normalizer.hpp"
 #include "extractor/guidance/motorway_handler.hpp"
 #include "extractor/guidance/roundabout_handler.hpp"
 #include "extractor/guidance/sliproad_handler.hpp"
@@ -56,22 +55,6 @@ class TurnAnalysis
     Intersection operator()(const NodeID node_prior_to_intersection,
                             const EdgeID entering_via_edge) const;
 
-    /*
-     * Returns a normalized intersection without any assigned turn types.
-     * This intersection can be used as input for intersection classification, turn lane assignment
-     * and similar.
-     */
-    struct ShapeResult
-    {
-        // the basic shape, containing all turns
-        IntersectionShape intersection_shape;
-        // normalized shape, merged some roads into others, adjusted bearings
-        // see intersection_normalizer for further explanations
-        IntersectionNormalizer::NormalizationResult annotated_normalized_shape;
-    };
-    OSRM_ATTR_WARN_UNUSED
-    ShapeResult ComputeIntersectionShapes(const NodeID node_at_center_of_intersection) const;
-
     // Select turn types based on the intersection shape
     OSRM_ATTR_WARN_UNUSED
     Intersection AssignTurnTypes(const NodeID from_node,
@@ -83,7 +66,6 @@ class TurnAnalysis
   private:
     const util::NodeBasedDynamicGraph &node_based_graph;
     const IntersectionGenerator intersection_generator;
-    const IntersectionNormalizer intersection_normalizer;
     const RoundaboutHandler roundabout_handler;
     const MotorwayHandler motorway_handler;
     const TurnHandler turn_handler;