AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

In the case when a transit edge is inside a transfer node don't generate polyline for this edge.

Browse source
This commit is contained in:
Daria Volvenkova 2018-03-19 19:05:08 +03:00 • committed by Roman Kuznetsov
parent 3267623af5
commit d3de8ba897
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
map/transit/transit_display.cpp
View file

@ -285,9 +285,12 @@ void TransitRouteDisplay::ProcessSubroute(vector<RouteSegment> const & segments,
auto const id1 = isTransfer1 ? stop1.GetTransferId() : stop1.GetId();
auto const id2 = isTransfer2 ? stop2.GetTransferId() : stop2.GetId();
bool const isInverted = id1 > id2;
AddTransitShapes(edge.m_shapeIds, displayInfo.m_shapes, currentColor, isInverted, subroute);
if (id1 != id2)
{
bool const isInverted = id1 > id2;
AddTransitShapes(edge.m_shapeIds, displayInfo.m_shapes, currentColor, isInverted, subroute);
}
ASSERT_GREATER(subroute.m_polyline.GetSize(), 1, ());
auto const & p1 = *(subroute.m_polyline.End() - 2);

2
tools/python/transit/transit_graph_generator.py
View file

@ -261,6 +261,8 @@ class TransitGraphBuilder:
node2 = self.stops[line['stop_ids'][i + 1]]
id1 = node1.get('transfer_id', node1['id'])
id2 = node2.get('transfer_id', node2['id'])
if id1 == id2:
continue
seg = tuple(sorted([id1, id2]))
if seg not in self.segments:
self.segments[seg] = {'guide_points': {id1: set(), id2: set()}}