From 2826e76a0fa534e07f13f5b86d8daa597306f40b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Mon, 5 Dec 2016 13:56:54 +0100
Subject: [PATCH] move everything from c3nav.routing.graph to c3nav.routing

---
 src/c3nav/routing/{graph => }/connection.py |  0
 src/c3nav/routing/{graph => }/graph.py      | 10 +++++-----
 src/c3nav/routing/graph/__init__.py         |  1 -
 src/c3nav/routing/{graph => }/level.py      |  4 ++--
 src/c3nav/routing/{graph => }/point.py      |  0
 src/c3nav/routing/{graph => }/room.py       |  4 ++--
 src/c3nav/routing/{graph => }/router.py     |  0
 7 files changed, 9 insertions(+), 10 deletions(-)
 rename src/c3nav/routing/{graph => }/connection.py (100%)
 rename src/c3nav/routing/{graph => }/graph.py (93%)
 delete mode 100644 src/c3nav/routing/graph/__init__.py
 rename src/c3nav/routing/{graph => }/level.py (97%)
 rename src/c3nav/routing/{graph => }/point.py (100%)
 rename src/c3nav/routing/{graph => }/room.py (97%)
 rename src/c3nav/routing/{graph => }/router.py (100%)

diff --git a/src/c3nav/routing/graph/connection.py b/src/c3nav/routing/connection.py
similarity index 100%
rename from src/c3nav/routing/graph/connection.py
rename to src/c3nav/routing/connection.py
diff --git a/src/c3nav/routing/graph/graph.py b/src/c3nav/routing/graph.py
similarity index 93%
rename from src/c3nav/routing/graph/graph.py
rename to src/c3nav/routing/graph.py
index 48999ef3..91b36cc5 100644
--- a/src/c3nav/routing/graph/graph.py
+++ b/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():
diff --git a/src/c3nav/routing/graph/__init__.py b/src/c3nav/routing/graph/__init__.py
deleted file mode 100644
index 899cef4c..00000000
--- a/src/c3nav/routing/graph/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from c3nav.routing.graph.graph import Graph  # noqa
diff --git a/src/c3nav/routing/graph/level.py b/src/c3nav/routing/level.py
similarity index 97%
rename from src/c3nav/routing/graph/level.py
rename to src/c3nav/routing/level.py
index 18e85576..932bd46a 100644
--- a/src/c3nav/routing/graph/level.py
+++ b/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
 
diff --git a/src/c3nav/routing/graph/point.py b/src/c3nav/routing/point.py
similarity index 100%
rename from src/c3nav/routing/graph/point.py
rename to src/c3nav/routing/point.py
diff --git a/src/c3nav/routing/graph/room.py b/src/c3nav/routing/room.py
similarity index 97%
rename from src/c3nav/routing/graph/room.py
rename to src/c3nav/routing/room.py
index a519f34b..6c508798 100644
--- a/src/c3nav/routing/graph/room.py
+++ b/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
 
diff --git a/src/c3nav/routing/graph/router.py b/src/c3nav/routing/router.py
similarity index 100%
rename from src/c3nav/routing/graph/router.py
rename to src/c3nav/routing/router.py