move everything from c3nav.routing.graph to c3nav.routing

src/c3nav/routing/graph.py

@@ -6,11 +6,11 @@ from itertools import permutations
 from django.conf import settings
 
 from c3nav.mapdata.models import Level
-from c3nav.routing.graph.connection import GraphConnection
-from c3nav.routing.graph.level import GraphLevel
-from c3nav.routing.graph.point import GraphPoint
-from c3nav.routing.graph.room import GraphRoom
-from c3nav.routing.graph.router import Router
+from c3nav.routing.connection import GraphConnection
+from c3nav.routing.level import GraphLevel
+from c3nav.routing.point import GraphPoint
+from c3nav.routing.room import GraphRoom
+from c3nav.routing.router import Router
 
 
 class Graph():

src/c3nav/routing/graph/__init__.py

@@ -1 +0,0 @@
-from c3nav.routing.graph.graph import Graph  # noqa

src/c3nav/routing/level.py

@@ -6,8 +6,8 @@ from PIL import Image, ImageDraw
 from shapely.geometry import JOIN_STYLE
 
 from c3nav.mapdata.utils import assert_multipolygon
-from c3nav.routing.graph.point import GraphPoint
-from c3nav.routing.graph.room import GraphRoom
+from c3nav.routing.point import GraphPoint
+from c3nav.routing.room import GraphRoom
 from c3nav.routing.utils.base import get_nearest_point
 from c3nav.routing.utils.draw import _ellipse_bbox, _line_coords
 

src/c3nav/routing/room.py

@@ -5,8 +5,8 @@ from matplotlib.path import Path
 from shapely.geometry import JOIN_STYLE, LineString
 
 from c3nav.mapdata.utils import assert_multipolygon
-from c3nav.routing.graph.point import GraphPoint
-from c3nav.routing.graph.router import Router
+from c3nav.routing.point import GraphPoint
+from c3nav.routing.router import Router
 from c3nav.routing.utils.coords import get_coords_angles
 from c3nav.routing.utils.mpl import polygon_to_mpl_paths