Renamed EdgeBasedNode to EdgeBasedNodeSegment

include/contractor/contractor.hpp

@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "contractor/contractor_config.hpp"
 #include "contractor/query_edge.hpp"
 #include "extractor/edge_based_edge.hpp"
-#include "extractor/edge_based_node.hpp"
+#include "extractor/edge_based_node_segment.hpp"
 #include "util/deallocating_vector.hpp"
 #include "util/typedefs.hpp"
 

include/engine/datafacade/datafacade_base.hpp

@@ -4,7 +4,7 @@
 // Exposes all data access interfaces to the algorithms via base class ptr
 
 #include "contractor/query_edge.hpp"
-#include "extractor/edge_based_node.hpp"
+#include "extractor/edge_based_node_segment.hpp"
 #include "extractor/external_memory_node.hpp"
 #include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/guidance/turn_lane_types.hpp"
@@ -40,7 +40,7 @@ using StringView = util::StringView;
 class BaseDataFacade
 {
   public:
-    using RTreeLeaf = extractor::EdgeBasedNode;
+    using RTreeLeaf = extractor::EdgeBasedNodeSegment;
     BaseDataFacade() {}
     virtual ~BaseDataFacade() {}
 

include/extractor/edge_based_graph_factory.hpp

@@ -5,7 +5,7 @@
 
 #include "extractor/compressed_edge_container.hpp"
 #include "extractor/edge_based_edge.hpp"
-#include "extractor/edge_based_node.hpp"
+#include "extractor/edge_based_node_segment.hpp"
 #include "extractor/extraction_turn.hpp"
 #include "extractor/guidance/turn_analysis.hpp"
 #include "extractor/guidance/turn_instruction.hpp"
@@ -93,8 +93,8 @@ class EdgeBasedGraphFactory
 
     // The following get access functions destroy the content in the factory
     void GetEdgeBasedEdges(util::DeallocatingVector<EdgeBasedEdge> &edges);
-    void GetEdgeBasedNodes(EdgeBasedNodeDataContainer &ebg_node_data_container);
-    void GetNodeBasedEdges(std::vector<EdgeBasedNode> &nodes);
+    void GetEdgeBasedNodes(EdgeBasedNodeDataContainer &data_container);
+    void GetEdgeBasedNodeSegments(std::vector<EdgeBasedNodeSegment> &nodes);
     void GetStartPointMarkers(std::vector<bool> &node_is_startpoint);
     void GetEdgeBasedNodeWeights(std::vector<EdgeWeight> &output_node_weights);
 
@@ -129,8 +129,8 @@ class EdgeBasedGraphFactory
     std::vector<EdgeWeight> m_edge_based_node_weights;
 
     //! list of edge based nodes (compressed segments)
-    std::vector<EdgeBasedNode> m_edge_based_node_list;
-    EdgeBasedNodeDataContainer m_ebg_node_data_container;
+    std::vector<EdgeBasedNodeSegment> m_edge_based_node_segments;
+    EdgeBasedNodeDataContainer m_edge_based_node_container;
     util::DeallocatingVector<EdgeBasedEdge> m_edge_based_edge_list;
     EdgeID m_max_edge_id;
 

include/extractor/edge_based_node_segment.hpp

@@ -1,5 +1,5 @@
-#ifndef EDGE_BASED_NODE_HPP
-#define EDGE_BASED_NODE_HPP
+#ifndef OSRM_EXTRACT_EDGE_BASED_NODE_SEGMENT_HPP
+#define OSRM_EXTRACT_EDGE_BASED_NODE_SEGMENT_HPP
 
 #include "extractor/travel_mode.hpp"
 #include "util/typedefs.hpp"
@@ -17,20 +17,20 @@ namespace extractor
 
 /// This is what util::StaticRTree serialized and stores on disk
 /// It is generated in EdgeBasedGraphFactory.
-struct EdgeBasedNode
+struct EdgeBasedNodeSegment
 {
-    EdgeBasedNode()
+    EdgeBasedNodeSegment()
         : forward_segment_id{SPECIAL_SEGMENTID, false},
           reverse_segment_id{SPECIAL_SEGMENTID, false}, u(SPECIAL_NODEID), v(SPECIAL_NODEID),
           fwd_segment_position(std::numeric_limits<unsigned short>::max())
     {
     }
 
-    explicit EdgeBasedNode(const SegmentID forward_segment_id_,
-                           const SegmentID reverse_segment_id_,
-                           NodeID u,
-                           NodeID v,
-                           unsigned short fwd_segment_position)
+    explicit EdgeBasedNodeSegment(const SegmentID forward_segment_id_,
+                                  const SegmentID reverse_segment_id_,
+                                  NodeID u,
+                                  NodeID v,
+                                  unsigned short fwd_segment_position)
         : forward_segment_id(forward_segment_id_), reverse_segment_id(reverse_segment_id_), u(u),
           v(v), fwd_segment_position(fwd_segment_position)
     {
@@ -46,4 +46,4 @@ struct EdgeBasedNode
 }
 }
 
-#endif // EDGE_BASED_NODE_HPP
+#endif // OSRM_EXTRACT_EDGE_BASED_NODE_SEGMENT_HPP

include/extractor/extractor.hpp

@@ -63,8 +63,8 @@ class Extractor
     BuildEdgeExpandedGraph(ScriptingEnvironment &scripting_environment,
                            std::vector<util::Coordinate> &coordinates,
                            extractor::PackedOSMIDs &osm_node_ids,
-                           EdgeBasedNodeDataContainer &ebg_node_data_container,
-                           std::vector<EdgeBasedNode> &node_based_edge_list,
+                           EdgeBasedNodeDataContainer &edge_based_nodes_container,
+                           std::vector<EdgeBasedNodeSegment> &edge_based_node_segments,
                            std::vector<bool> &node_is_startpoint,
                            std::vector<EdgeWeight> &edge_based_node_weights,
                            util::DeallocatingVector<EdgeBasedEdge> &edge_based_edge_list,
@@ -75,7 +75,7 @@ class Extractor
     void FindComponents(unsigned max_edge_id,
                         const util::DeallocatingVector<EdgeBasedEdge> &edges,
                         EdgeBasedNodeDataContainer &nodes) const;
-    void BuildRTree(std::vector<EdgeBasedNode> node_based_edge_list,
+    void BuildRTree(std::vector<EdgeBasedNodeSegment> edge_based_node_segments,
                     std::vector<bool> node_is_startpoint,
                     const std::vector<util::Coordinate> &coordinates);
     std::shared_ptr<RestrictionMap> LoadRestrictionMap();

include/extractor/node_data_container.hpp

@@ -70,7 +70,7 @@ template <storage::Ownership Ownership> class EdgeBasedNodeDataContainerImpl
 
     // Used by EdgeBasedGraphFactory to fill data structure
     template <typename = std::enable_if<Ownership == storage::Ownership::Container>>
-    void SetData(NodeID node_id, ComponentID component_id)
+    void SetComponentID(NodeID node_id, ComponentID component_id)
     {
         component_ids[node_id] = component_id;
     }