Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge pull request #1157 from Project-OSRM/fix/spelling_of_edge

Browse Source 
fix spelling of 'edge'
This commit is contained in:
Dennis Luxen 2014-08-31 11:25:56 +02:00
commit e57d9f2e2e
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Contractor/EdgeBasedGraphFactory.cpp
View File

@ -438,7 +438,7 @@ void EdgeBasedGraphFactory::CompressGeometry()
} }
/** /**
* Writes the id of the edge in the edge expanded graph (into the egde in the node based graph) * Writes the id of the edge in the edge expanded graph (into the edge in the node based graph)
*/ */
void EdgeBasedGraphFactory::RenumberEdges() void EdgeBasedGraphFactory::RenumberEdges()
{ {

12
Server/DataStructures/InternalDataFacade.h
View File

@ -68,7 +68,7 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
ShM<TurnInstruction, false>::vector m_turn_instruction_list; ShM<TurnInstruction, false>::vector m_turn_instruction_list;
ShM<TravelMode, false>::vector m_travel_mode_list; ShM<TravelMode, false>::vector m_travel_mode_list;
ShM<char, false>::vector m_names_char_list; ShM<char, false>::vector m_names_char_list;
ShM<bool, false>::vector m_egde_is_compressed; ShM<bool, false>::vector m_edge_is_compressed;
ShM<unsigned, false>::vector m_geometry_indices; ShM<unsigned, false>::vector m_geometry_indices;
ShM<unsigned, false>::vector m_geometry_list; ShM<unsigned, false>::vector m_geometry_list;
@ -147,7 +147,7 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
m_name_ID_list.resize(number_of_edges); m_name_ID_list.resize(number_of_edges);
m_turn_instruction_list.resize(number_of_edges); m_turn_instruction_list.resize(number_of_edges);
m_travel_mode_list.resize(number_of_edges); m_travel_mode_list.resize(number_of_edges);
m_egde_is_compressed.resize(number_of_edges); m_edge_is_compressed.resize(number_of_edges);
unsigned compressed = 0; unsigned compressed = 0;
@ -159,8 +159,8 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
m_name_ID_list[i] = current_edge_data.name_id; m_name_ID_list[i] = current_edge_data.name_id;
m_turn_instruction_list[i] = current_edge_data.turn_instruction; m_turn_instruction_list[i] = current_edge_data.turn_instruction;
m_travel_mode_list[i] = current_edge_data.travel_mode; m_travel_mode_list[i] = current_edge_data.travel_mode;
m_egde_is_compressed[i] = current_edge_data.compressed_geometry; m_edge_is_compressed[i] = current_edge_data.compressed_geometry;
if (m_egde_is_compressed[i]) if (m_edge_is_compressed[i])
{ {
++compressed; ++compressed;
} }
@ -291,7 +291,7 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
SimpleLogger().Write() << "loading graph data"; SimpleLogger().Write() << "loading graph data";
AssertPathExists(hsgr_path); AssertPathExists(hsgr_path);
LoadGraph(hsgr_path); LoadGraph(hsgr_path);
SimpleLogger().Write() << "loading egde information"; SimpleLogger().Write() << "loading edge information";
AssertPathExists(nodes_data_path); AssertPathExists(nodes_data_path);
AssertPathExists(edges_data_path); AssertPathExists(edges_data_path);
LoadNodeAndEdgeInformation(nodes_data_path, edges_data_path); LoadNodeAndEdgeInformation(nodes_data_path, edges_data_path);
@ -352,7 +352,7 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
return m_coordinate_list->at(id); return m_coordinate_list->at(id);
}; };
bool EdgeIsCompressed(const unsigned id) const { return m_egde_is_compressed.at(id); } bool EdgeIsCompressed(const unsigned id) const { return m_edge_is_compressed.at(id); }
TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const final TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const final
{ {

8
Server/DataStructures/SharedDataFacade.h
View File

@ -80,7 +80,7 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
ShM<TravelMode, true>::vector m_travel_mode_list; ShM<TravelMode, true>::vector m_travel_mode_list;
ShM<char, true>::vector m_names_char_list; ShM<char, true>::vector m_names_char_list;
ShM<unsigned, true>::vector m_name_begin_indices; ShM<unsigned, true>::vector m_name_begin_indices;
ShM<bool, true>::vector m_egde_is_compressed; ShM<bool, true>::vector m_edge_is_compressed;
ShM<unsigned, true>::vector m_geometry_indices; ShM<unsigned, true>::vector m_geometry_indices;
ShM<unsigned, true>::vector m_geometry_list; ShM<unsigned, true>::vector m_geometry_list;
@ -200,10 +200,10 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
{ {
unsigned *geometries_compressed_ptr = data_layout->GetBlockPtr<unsigned>( unsigned *geometries_compressed_ptr = data_layout->GetBlockPtr<unsigned>(
shared_memory, SharedDataLayout::GEOMETRIES_INDICATORS); shared_memory, SharedDataLayout::GEOMETRIES_INDICATORS);
typename ShM<bool, true>::vector egde_is_compressed( typename ShM<bool, true>::vector edge_is_compressed(
geometries_compressed_ptr, geometries_compressed_ptr,
data_layout->num_entries[SharedDataLayout::GEOMETRIES_INDICATORS]); data_layout->num_entries[SharedDataLayout::GEOMETRIES_INDICATORS]);
m_egde_is_compressed.swap(egde_is_compressed); m_edge_is_compressed.swap(edge_is_compressed);
unsigned *geometries_index_ptr = unsigned *geometries_index_ptr =
data_layout->GetBlockPtr<unsigned>(shared_memory, SharedDataLayout::GEOMETRIES_INDEX); data_layout->GetBlockPtr<unsigned>(shared_memory, SharedDataLayout::GEOMETRIES_INDEX);
@ -330,7 +330,7 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
virtual bool EdgeIsCompressed(const unsigned id) const final virtual bool EdgeIsCompressed(const unsigned id) const final
{ {
return m_egde_is_compressed.at(id); return m_edge_is_compressed.at(id);
} }
virtual void GetUncompressedGeometry(const unsigned id, virtual void GetUncompressedGeometry(const unsigned id,