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

code style fixes

Browse Source
This commit is contained in:
Emil Tin 2014-08-19 16:38:53 +02:00
parent 9c23fd4a31
commit 60d80cf261
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Extractor/ExtractionWay.h
View File

@ -64,17 +64,17 @@ struct ExtractionWay
inline void set_direction(const Directions m) inline void set_direction(const Directions m)
{ {
if (Directions::oneway == m ) if (Directions::oneway == m)
{ {
forward_travel_mode = TRAVEL_MODE_DEFAULT; forward_travel_mode = TRAVEL_MODE_DEFAULT;
backward_travel_mode = TRAVEL_MODE_INACCESSIBLE; backward_travel_mode = TRAVEL_MODE_INACCESSIBLE;
} }
else if (Directions::opposite == m ) else if (Directions::opposite == m)
{ {
forward_travel_mode = TRAVEL_MODE_INACCESSIBLE; forward_travel_mode = TRAVEL_MODE_INACCESSIBLE;
backward_travel_mode = TRAVEL_MODE_DEFAULT; backward_travel_mode = TRAVEL_MODE_DEFAULT;
} }
else if (Directions::bidirectional == m ) else if (Directions::bidirectional == m)
{ {
forward_travel_mode = TRAVEL_MODE_DEFAULT; forward_travel_mode = TRAVEL_MODE_DEFAULT;
backward_travel_mode = TRAVEL_MODE_DEFAULT; backward_travel_mode = TRAVEL_MODE_DEFAULT;
@ -83,15 +83,15 @@ struct ExtractionWay
inline const Directions get_direction() inline const Directions get_direction()
{ {
if (TRAVEL_MODE_INACCESSIBLE != forward_travel_mode && TRAVEL_MODE_INACCESSIBLE != backward_travel_mode ) if (TRAVEL_MODE_INACCESSIBLE != forward_travel_mode && TRAVEL_MODE_INACCESSIBLE != backward_travel_mode)
{ {
return Directions::bidirectional; return Directions::bidirectional;
} }
else if (TRAVEL_MODE_INACCESSIBLE != forward_travel_mode ) else if (TRAVEL_MODE_INACCESSIBLE != forward_travel_mode)
{ {
return Directions::oneway; return Directions::oneway;
} }
else if (TRAVEL_MODE_INACCESSIBLE != backward_travel_mode ) else if (TRAVEL_MODE_INACCESSIBLE != backward_travel_mode)
{ {
return Directions::opposite; return Directions::opposite;
} }

2
Server/DataStructures/SharedDataFacade.h
View File

@ -151,7 +151,7 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
turn_instruction_list_ptr, turn_instruction_list_ptr,
data_layout->num_entries[SharedDataLayout::TURN_INSTRUCTION]); data_layout->num_entries[SharedDataLayout::TURN_INSTRUCTION]);
m_turn_instruction_list.swap(turn_instruction_list); m_turn_instruction_list.swap(turn_instruction_list);
unsigned *name_id_list_ptr = unsigned *name_id_list_ptr =
data_layout->GetBlockPtr<unsigned>(shared_memory, SharedDataLayout::NAME_ID_LIST); data_layout->GetBlockPtr<unsigned>(shared_memory, SharedDataLayout::NAME_ID_LIST);
typename ShM<unsigned, true>::vector name_id_list( typename ShM<unsigned, true>::vector name_id_list(

2
profiles/bicycle.lua
View File

@ -200,7 +200,7 @@ function way_function (way)
local area = way.tags:Find("area") local area = way.tags:Find("area")
local foot = way.tags:Find("foot") local foot = way.tags:Find("foot")
local surface = way.tags:Find("surface") local surface = way.tags:Find("surface")
local bicycle = way.tags:Find("bicycle") local bicycle = way.tags:Find("bicycle")
-- name -- name
if "" ~= ref and "" ~= name then if "" ~= ref and "" ~= name then