bugfix - build shape with un-cut roundabout

Fix grote#161

Author: nlehuby

osm2gtfs/core/osm_connector.py

@@ -635,6 +635,7 @@ def _generate_shape(self, route_variant, query_result_set):
         shape_sorter = []
         node_geography = {}
 
+        last_roundabout_nodes = []
         for way in ways:
             # Obtain geography (nodes) from original query result set
             nodes = query_result_set.get_ways(way).pop().get_nodes()
@@ -662,6 +663,21 @@ def _generate_shape(self, route_variant, query_result_set):
                 del shape_sorter[0]
                 shape_sorter.reverse()
                 shape_sorter.extend(reversed(way_nodes))
+            elif way_nodes[0] == way_nodes[-1]:
+                # this is a roundabout
+                last_roundabout_nodes = way_nodes
+            elif last_roundabout_nodes:
+                if way_nodes[0] in last_roundabout_nodes:
+                    shape_sorter.extend(way_nodes)
+                elif way_nodes[-1] in last_roundabout_nodes:
+                    shape_sorter.extend(reversed(way_nodes))
+                else:
+                    logging.warning("Route has non-matching ways: https://osm.org/relation/%s",
+                                    route_variant.id)
+                    logging.warning(
+                        "  Problem at: https://osm.org/way/%s", way)
+                    break
+                last_roundabout_nodes = []
             else:
                 logging.warning("Route has non-matching ways: https://osm.org/relation/%s",
                                 route_variant.id)