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

update lua interface to speed and mode

Browse Source
This commit is contained in:
Emil Tin
2014-08-18 15:38:07 +02:00
parent 6cdc590db5
commit 30362cfc0c
14 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataStructures/EdgeBasedNode.h
+4 -4
View File
@@ -27,7 +27,7 @@ struct EdgeBasedNode
packed_geometry_id(SPECIAL_EDGEID),
fwd_segment_position( std::numeric_limits<unsigned short>::max() ),
is_in_tiny_cc(false),
travel_mode(TRAVEL_MODE_INACCESSIBLE),
forward_travel_mode(TRAVEL_MODE_INACCESSIBLE),
backward_travel_mode(TRAVEL_MODE_INACCESSIBLE)
{ }
@@ -44,7 +44,7 @@ struct EdgeBasedNode
unsigned packed_geometry_id,
unsigned short fwd_segment_position,
bool belongs_to_tiny_component,
TravelMode travel_mode ,
TravelMode forward_travel_mode,
TravelMode backward_travel_mode
) :
forward_edge_based_node_id(forward_edge_based_node_id),
@@ -59,7 +59,7 @@ struct EdgeBasedNode
packed_geometry_id(packed_geometry_id),
fwd_segment_position(fwd_segment_position),
is_in_tiny_cc(belongs_to_tiny_component),
travel_mode(travel_mode),
forward_travel_mode(forward_travel_mode),
backward_travel_mode(backward_travel_mode)
{
BOOST_ASSERT((forward_edge_based_node_id != SPECIAL_NODEID) ||
@@ -92,7 +92,7 @@ struct EdgeBasedNode
unsigned packed_geometry_id; // if set, then the edge represents a packed geometry
unsigned short fwd_segment_position; // segment id in a compressed geometry
bool is_in_tiny_cc;
TravelMode travel_mode : 4;
TravelMode forward_travel_mode : 4;
TravelMode backward_travel_mode : 4;
};
DataStructures/PhantomNodes.h
+4 -4
View File
@@ -41,7 +41,7 @@ struct PhantomNode
int forward_weight, int reverse_weight, int forward_offset, int reverse_offset,
unsigned packed_geometry_id, FixedPointCoordinate &location,
unsigned short fwd_segment_position,
TravelMode travel_mode, TravelMode backward_travel_mode) :
TravelMode forward_travel_mode, TravelMode backward_travel_mode) :
forward_node_id(forward_node_id),
reverse_node_id(reverse_node_id),
name_id(name_id),
@@ -52,7 +52,7 @@ struct PhantomNode
packed_geometry_id(packed_geometry_id),
location(location),
fwd_segment_position(fwd_segment_position),
travel_mode(travel_mode),
forward_travel_mode(forward_travel_mode),
backward_travel_mode(backward_travel_mode)
{ }
@@ -66,7 +66,7 @@ struct PhantomNode
reverse_offset(0),
packed_geometry_id(SPECIAL_EDGEID),
fwd_segment_position(0),
travel_mode(TRAVEL_MODE_INACCESSIBLE),
forward_travel_mode(TRAVEL_MODE_INACCESSIBLE),
backward_travel_mode(TRAVEL_MODE_INACCESSIBLE)
{ }
@@ -80,7 +80,7 @@ struct PhantomNode
unsigned packed_geometry_id;
FixedPointCoordinate location;
unsigned short fwd_segment_position;
TravelMode travel_mode : 4;
TravelMode forward_travel_mode : 4;
TravelMode backward_travel_mode : 4;
int GetForwardWeightPlusOffset() const
DataStructures/StaticRTree.h
+2 -2
View File
@@ -802,7 +802,7 @@ class StaticRTree
current_segment.packed_geometry_id,
foot_point_coordinate_on_segment,
current_segment.fwd_segment_position,
current_segment.travel_mode,
current_segment.forward_travel_mode,
current_segment.backward_travel_mode);
// Hack to fix rounding errors and wandering via nodes.
@@ -1080,7 +1080,7 @@ class StaticRTree
current_edge.packed_geometry_id,
nearest,
current_edge.fwd_segment_position,
current_edge.travel_mode,
current_edge.forward_travel_mode,
current_edge.backward_travel_mode};
nearest_edge = current_edge;
}