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

typedef instead of enum for TravelMode to avoid gcc warnings

Browse Source
This commit is contained in:
Emil Tin 2014-08-18 15:11:24 +02:00
parent eb122a2b8c
commit 6cdc590db5
9 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DataStructures/EdgeBasedNode.h
View File

@ -27,8 +27,8 @@ struct EdgeBasedNode
packed_geometry_id(SPECIAL_EDGEID), packed_geometry_id(SPECIAL_EDGEID),
fwd_segment_position( std::numeric_limits<unsigned short>::max() ), fwd_segment_position( std::numeric_limits<unsigned short>::max() ),
is_in_tiny_cc(false), is_in_tiny_cc(false),
travel_mode(TravelMode::Inaccessible), travel_mode(TRAVEL_MODE_INACCESSIBLE),
backward_travel_mode(TravelMode::Inaccessible) backward_travel_mode(TRAVEL_MODE_INACCESSIBLE)
{ } { }
explicit EdgeBasedNode( explicit EdgeBasedNode(

2
DataStructures/NodeBasedGraph.h
View File

@ -15,7 +15,7 @@ struct NodeBasedEdgeData
: distance(INVALID_EDGE_WEIGHT), edgeBasedNodeID(SPECIAL_NODEID), : distance(INVALID_EDGE_WEIGHT), edgeBasedNodeID(SPECIAL_NODEID),
nameID(std::numeric_limits<unsigned>::max()), type(std::numeric_limits<short>::max()), nameID(std::numeric_limits<unsigned>::max()), type(std::numeric_limits<short>::max()),
isAccessRestricted(false), shortcut(false), forward(false), backward(false), isAccessRestricted(false), shortcut(false), forward(false), backward(false),
roundabout(false), ignore_in_grid(false), travel_mode(TravelMode::Inaccessible) roundabout(false), ignore_in_grid(false), travel_mode(TRAVEL_MODE_INACCESSIBLE)
{ {
} }

2
DataStructures/OriginalEdgeData.h
View File

@ -50,7 +50,7 @@ struct OriginalEdgeData
: via_node(std::numeric_limits<unsigned>::max()), : via_node(std::numeric_limits<unsigned>::max()),
name_id(std::numeric_limits<unsigned>::max()), name_id(std::numeric_limits<unsigned>::max()),
turn_instruction(TurnInstruction::NoTurn), compressed_geometry(false), turn_instruction(TurnInstruction::NoTurn), compressed_geometry(false),
travel_mode(TravelMode::Inaccessible) travel_mode(TRAVEL_MODE_INACCESSIBLE)
{ {
} }

4
DataStructures/PhantomNodes.h
View File

@ -66,8 +66,8 @@ struct PhantomNode
reverse_offset(0), reverse_offset(0),
packed_geometry_id(SPECIAL_EDGEID), packed_geometry_id(SPECIAL_EDGEID),
fwd_segment_position(0), fwd_segment_position(0),
travel_mode(TravelMode::Inaccessible), travel_mode(TRAVEL_MODE_INACCESSIBLE),
backward_travel_mode(TravelMode::Inaccessible) backward_travel_mode(TRAVEL_MODE_INACCESSIBLE)
{ } { }
NodeID forward_node_id; NodeID forward_node_id;

2
DataStructures/RawRouteData.h
View File

@ -43,7 +43,7 @@ struct PathData
: node(SPECIAL_NODEID), name_id(INVALID_EDGE_WEIGHT), : node(SPECIAL_NODEID), name_id(INVALID_EDGE_WEIGHT),
segment_duration(INVALID_EDGE_WEIGHT), segment_duration(INVALID_EDGE_WEIGHT),
turn_instruction(TurnInstruction::NoTurn), turn_instruction(TurnInstruction::NoTurn),
travel_mode(TravelMode::Inaccessible) travel_mode(TRAVEL_MODE_INACCESSIBLE)
{ {
} }

6
DataStructures/TravelMode.h
View File

@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef TRAVEL_MODE_H #ifndef TRAVEL_MODE_H
#define TRAVEL_MODE_H #define TRAVEL_MODE_H
enum TravelMode : unsigned char { typedef unsigned char TravelMode;
Inaccessible=0, Default=1 static const TravelMode TRAVEL_MODE_INACCESSIBLE = 0;
}; static const TravelMode TRAVEL_MODE_DEFAULT = 1;
#endif /* TRAVEL_MODE_H */ #endif /* TRAVEL_MODE_H */

22
Extractor/ExtractionWay.h
View File

@ -53,8 +53,8 @@ struct ExtractionWay
roundabout = false; roundabout = false;
isAccessRestricted = false; isAccessRestricted = false;
ignoreInGrid = false; ignoreInGrid = false;
travel_mode = TravelMode::Default; travel_mode = TRAVEL_MODE_DEFAULT;
backward_travel_mode = TravelMode::Default; backward_travel_mode = TRAVEL_MODE_DEFAULT;
} }
enum Directions enum Directions
@ -67,32 +67,32 @@ struct ExtractionWay
{ {
if (Directions::oneway == m ) if (Directions::oneway == m )
{ {
travel_mode = TravelMode::Default; travel_mode = TRAVEL_MODE_DEFAULT;
backward_travel_mode = TravelMode::Inaccessible; backward_travel_mode = TRAVEL_MODE_INACCESSIBLE;
} }
else if (Directions::opposite == m ) else if (Directions::opposite == m )
{ {
travel_mode = TravelMode::Inaccessible; travel_mode = TRAVEL_MODE_INACCESSIBLE;
backward_travel_mode = TravelMode::Default; backward_travel_mode = TRAVEL_MODE_DEFAULT;
} }
else if (Directions::bidirectional == m ) else if (Directions::bidirectional == m )
{ {
travel_mode = TravelMode::Default; travel_mode = TRAVEL_MODE_DEFAULT;
backward_travel_mode = TravelMode::Default; backward_travel_mode = TRAVEL_MODE_DEFAULT;
} }
} }
inline const Directions get_direction() inline const Directions get_direction()
{ {
if (TravelMode::Inaccessible != travel_mode && TravelMode::Inaccessible != backward_travel_mode ) if (TRAVEL_MODE_INACCESSIBLE != travel_mode && TRAVEL_MODE_INACCESSIBLE != backward_travel_mode )
{ {
return Directions::bidirectional; return Directions::bidirectional;
} }
else if (TravelMode::Inaccessible != travel_mode ) else if (TRAVEL_MODE_INACCESSIBLE != travel_mode )
{ {
return Directions::oneway; return Directions::oneway;
} }
else if (TravelMode::Inaccessible != backward_travel_mode ) else if (TRAVEL_MODE_INACCESSIBLE != backward_travel_mode )
{ {
return Directions::opposite; return Directions::opposite;
} }

10
Extractor/ExtractorCallbacks.cpp
View File

@ -106,16 +106,16 @@ void ExtractorCallbacks::ProcessWay(ExtractionWay &parsed_way)
parsed_way.nameID = string_map_iterator->second; parsed_way.nameID = string_map_iterator->second;
} }
if (TravelMode::Inaccessible == parsed_way.travel_mode) if (TRAVEL_MODE_INACCESSIBLE == parsed_way.travel_mode)
{ {
std::reverse(parsed_way.path.begin(), parsed_way.path.end()); std::reverse(parsed_way.path.begin(), parsed_way.path.end());
parsed_way.travel_mode = parsed_way.backward_travel_mode; parsed_way.travel_mode = parsed_way.backward_travel_mode;
parsed_way.backward_travel_mode = TravelMode::Inaccessible; parsed_way.backward_travel_mode = TRAVEL_MODE_INACCESSIBLE;
} }
const bool split_edge = const bool split_edge =
(parsed_way.speed>0) && (TravelMode::Inaccessible != parsed_way.travel_mode) && (parsed_way.speed>0) && (TRAVEL_MODE_INACCESSIBLE != parsed_way.travel_mode) &&
(parsed_way.backward_speed>0) && (TravelMode::Inaccessible != parsed_way.backward_travel_mode) && (parsed_way.backward_speed>0) && (TRAVEL_MODE_INACCESSIBLE != parsed_way.backward_travel_mode) &&
((parsed_way.speed != parsed_way.backward_speed) || ((parsed_way.speed != parsed_way.backward_speed) ||
(parsed_way.travel_mode != parsed_way.backward_travel_mode)); (parsed_way.travel_mode != parsed_way.backward_travel_mode));
@ -126,7 +126,7 @@ void ExtractorCallbacks::ProcessWay(ExtractionWay &parsed_way)
parsed_way.path[n], parsed_way.path[n],
parsed_way.path[n + 1], parsed_way.path[n + 1],
parsed_way.type, parsed_way.type,
((split_edge || TravelMode::Inaccessible == parsed_way.backward_travel_mode) ? ExtractionWay::oneway ((split_edge || TRAVEL_MODE_INACCESSIBLE == parsed_way.backward_travel_mode) ? ExtractionWay::oneway
: ExtractionWay::bidirectional), : ExtractionWay::bidirectional),
parsed_way.speed, parsed_way.speed,
parsed_way.nameID, parsed_way.nameID,

6
Extractor/InternalExtractorEdge.h
View File

@ -39,7 +39,7 @@ struct InternalExtractorEdge
InternalExtractorEdge() InternalExtractorEdge()
: start(0), target(0), type(0), direction(0), speed(0), name_id(0), is_roundabout(false), : start(0), target(0), type(0), direction(0), speed(0), name_id(0), is_roundabout(false),
is_in_tiny_cc(false), is_duration_set(false), is_access_restricted(false), is_in_tiny_cc(false), is_duration_set(false), is_access_restricted(false),
travel_mode(TravelMode::Inaccessible), is_split(false) travel_mode(TRAVEL_MODE_INACCESSIBLE), is_split(false)
{ {
} }
@ -66,12 +66,12 @@ struct InternalExtractorEdge
// necessary static util functions for stxxl's sorting // necessary static util functions for stxxl's sorting
static InternalExtractorEdge min_value() static InternalExtractorEdge min_value()
{ {
return InternalExtractorEdge(0, 0, 0, 0, 0, 0, false, false, false, false, TravelMode::Inaccessible, false); return InternalExtractorEdge(0, 0, 0, 0, 0, 0, false, false, false, false, TRAVEL_MODE_INACCESSIBLE, false);
} }
static InternalExtractorEdge max_value() static InternalExtractorEdge max_value()
{ {
return InternalExtractorEdge( return InternalExtractorEdge(
SPECIAL_NODEID, SPECIAL_NODEID, 0, 0, 0, 0, false, false, false, false, TravelMode::Inaccessible, false); SPECIAL_NODEID, SPECIAL_NODEID, 0, 0, 0, 0, false, false, false, false, TRAVEL_MODE_INACCESSIBLE, false);
} }
NodeID start; NodeID start;