From 6e364ff0badbdf0a12016a4b0091a1265a9d5ebf Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Sat, 16 Aug 2014 11:40:40 +0200 Subject: [PATCH] rename travel mode None to Inaccessible --- DataStructures/EdgeBasedNode.h | 4 ++-- DataStructures/NodeBasedGraph.h | 2 +- DataStructures/OriginalEdgeData.h | 2 +- DataStructures/PhantomNodes.h | 4 ++-- DataStructures/RawRouteData.h | 2 +- DataStructures/TravelMode.h | 2 +- Extractor/ExtractionWay.h | 10 +++++----- Extractor/ExtractorCallbacks.cpp | 10 +++++----- Extractor/InternalExtractorEdge.h | 6 +++--- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/DataStructures/EdgeBasedNode.h b/DataStructures/EdgeBasedNode.h index 49a9a81b6..c0ff1e66e 100644 --- a/DataStructures/EdgeBasedNode.h +++ b/DataStructures/EdgeBasedNode.h @@ -27,8 +27,8 @@ struct EdgeBasedNode packed_geometry_id(SPECIAL_EDGEID), fwd_segment_position( std::numeric_limits::max() ), is_in_tiny_cc(false), - travel_mode(TravelMode::None), - backward_travel_mode(TravelMode::None) + travel_mode(TravelMode::Inaccessible), + backward_travel_mode(TravelMode::Inaccessible) { } explicit EdgeBasedNode( diff --git a/DataStructures/NodeBasedGraph.h b/DataStructures/NodeBasedGraph.h index 4a0c1c8ff..6dff3eaf8 100644 --- a/DataStructures/NodeBasedGraph.h +++ b/DataStructures/NodeBasedGraph.h @@ -15,7 +15,7 @@ struct NodeBasedEdgeData : distance(INVALID_EDGE_WEIGHT), edgeBasedNodeID(SPECIAL_NODEID), nameID(std::numeric_limits::max()), type(std::numeric_limits::max()), isAccessRestricted(false), shortcut(false), forward(false), backward(false), - roundabout(false), ignore_in_grid(false), travel_mode(TravelMode::None) + roundabout(false), ignore_in_grid(false), travel_mode(TravelMode::Inaccessible) { } diff --git a/DataStructures/OriginalEdgeData.h b/DataStructures/OriginalEdgeData.h index 5ca1f255d..b7e90cd97 100644 --- a/DataStructures/OriginalEdgeData.h +++ b/DataStructures/OriginalEdgeData.h @@ -50,7 +50,7 @@ struct OriginalEdgeData : via_node(std::numeric_limits::max()), name_id(std::numeric_limits::max()), turn_instruction(TurnInstruction::NoTurn), compressed_geometry(false), - travel_mode(TravelMode::None) + travel_mode(TravelMode::Inaccessible) { } diff --git a/DataStructures/PhantomNodes.h b/DataStructures/PhantomNodes.h index 3654d7911..ebdfa94bf 100644 --- a/DataStructures/PhantomNodes.h +++ b/DataStructures/PhantomNodes.h @@ -66,8 +66,8 @@ struct PhantomNode reverse_offset(0), packed_geometry_id(SPECIAL_EDGEID), fwd_segment_position(0), - travel_mode(TravelMode::None), - backward_travel_mode(TravelMode::None) + travel_mode(TravelMode::Inaccessible), + backward_travel_mode(TravelMode::Inaccessible) { } NodeID forward_node_id; diff --git a/DataStructures/RawRouteData.h b/DataStructures/RawRouteData.h index fc3d227d4..aa841c0f9 100644 --- a/DataStructures/RawRouteData.h +++ b/DataStructures/RawRouteData.h @@ -43,7 +43,7 @@ struct PathData : node(SPECIAL_NODEID), name_id(INVALID_EDGE_WEIGHT), segment_duration(INVALID_EDGE_WEIGHT), turn_instruction(TurnInstruction::NoTurn), - travel_mode(TravelMode::None) + travel_mode(TravelMode::Inaccessible) { } diff --git a/DataStructures/TravelMode.h b/DataStructures/TravelMode.h index 86760708a..a2b2faabc 100644 --- a/DataStructures/TravelMode.h +++ b/DataStructures/TravelMode.h @@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define TRAVEL_MODE_H enum TravelMode : unsigned char { - None=0, Default=1 + Inaccessible=0, Default=1 }; #endif /* TRAVEL_MODE_H */ diff --git a/Extractor/ExtractionWay.h b/Extractor/ExtractionWay.h index f8c01fe00..4679df6b5 100644 --- a/Extractor/ExtractionWay.h +++ b/Extractor/ExtractionWay.h @@ -68,11 +68,11 @@ struct ExtractionWay if (Directions::oneway == m ) { travel_mode = TravelMode::Default; - backward_travel_mode = TravelMode::None; + backward_travel_mode = TravelMode::Inaccessible; } else if (Directions::opposite == m ) { - travel_mode = TravelMode::None; + travel_mode = TravelMode::Inaccessible; backward_travel_mode = TravelMode::Default; } else if (Directions::bidirectional == m ) @@ -84,15 +84,15 @@ struct ExtractionWay inline const Directions get_direction() { - if (TravelMode::None != travel_mode && TravelMode::None != backward_travel_mode ) + if (TravelMode::Inaccessible != travel_mode && TravelMode::Inaccessible != backward_travel_mode ) { return Directions::bidirectional; } - else if (TravelMode::None != travel_mode ) + else if (TravelMode::Inaccessible != travel_mode ) { return Directions::oneway; } - else if (TravelMode::None != backward_travel_mode ) + else if (TravelMode::Inaccessible != backward_travel_mode ) { return Directions::opposite; } diff --git a/Extractor/ExtractorCallbacks.cpp b/Extractor/ExtractorCallbacks.cpp index 210360fb1..ffe46ee0a 100644 --- a/Extractor/ExtractorCallbacks.cpp +++ b/Extractor/ExtractorCallbacks.cpp @@ -106,16 +106,16 @@ void ExtractorCallbacks::ProcessWay(ExtractionWay &parsed_way) parsed_way.nameID = string_map_iterator->second; } - if (TravelMode::None == parsed_way.travel_mode) + if (TravelMode::Inaccessible == parsed_way.travel_mode) { std::reverse(parsed_way.path.begin(), parsed_way.path.end()); parsed_way.travel_mode = parsed_way.backward_travel_mode; - parsed_way.backward_travel_mode = TravelMode::None; + parsed_way.backward_travel_mode = TravelMode::Inaccessible; } const bool split_edge = - (parsed_way.speed>0) && (TravelMode::None != parsed_way.travel_mode) && - (parsed_way.backward_speed>0) && (TravelMode::None != parsed_way.backward_travel_mode) && + (parsed_way.speed>0) && (TravelMode::Inaccessible != parsed_way.travel_mode) && + (parsed_way.backward_speed>0) && (TravelMode::Inaccessible != parsed_way.backward_travel_mode) && ((parsed_way.speed != parsed_way.backward_speed) || (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 + 1], parsed_way.type, - ((split_edge || TravelMode::None == parsed_way.backward_travel_mode) ? ExtractionWay::oneway + ((split_edge || TravelMode::Inaccessible == parsed_way.backward_travel_mode) ? ExtractionWay::oneway : ExtractionWay::bidirectional), parsed_way.speed, parsed_way.nameID, diff --git a/Extractor/InternalExtractorEdge.h b/Extractor/InternalExtractorEdge.h index dea0ec3c2..d05862ce7 100644 --- a/Extractor/InternalExtractorEdge.h +++ b/Extractor/InternalExtractorEdge.h @@ -39,7 +39,7 @@ struct InternalExtractorEdge InternalExtractorEdge() : 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), - travel_mode(TravelMode::None), is_split(false) + travel_mode(TravelMode::Inaccessible), is_split(false) { } @@ -66,12 +66,12 @@ struct InternalExtractorEdge // necessary static util functions for stxxl's sorting static InternalExtractorEdge min_value() { - return InternalExtractorEdge(0, 0, 0, 0, 0, 0, false, false, false, false, TravelMode::None, false); + return InternalExtractorEdge(0, 0, 0, 0, 0, 0, false, false, false, false, TravelMode::Inaccessible, false); } static InternalExtractorEdge max_value() { return InternalExtractorEdge( - SPECIAL_NODEID, SPECIAL_NODEID, 0, 0, 0, 0, false, false, false, false, TravelMode::None, false); + SPECIAL_NODEID, SPECIAL_NODEID, 0, 0, 0, 0, false, false, false, false, TravelMode::Inaccessible, false); } NodeID start;