From 94ae86d690b4e0dd5f9999f0a3f3ce72797521cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Mon, 20 Nov 2017 02:38:35 +0100
Subject: [PATCH] =?UTF-8?q?refactor=20even=20more=20data=E2=86=92geometry?=
 =?UTF-8?q?=20and=20levelrender?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/c3nav/mapdata/models/update.py                          | 2 +-
 src/c3nav/mapdata/render/__init__.py                        | 1 +
 src/c3nav/mapdata/render/data/__init__.py                   | 2 --
 src/c3nav/mapdata/render/engines/base3d.py                  | 2 +-
 src/c3nav/mapdata/render/engines/opengl.py                  | 2 +-
 src/c3nav/mapdata/render/geometry/__init__.py               | 3 +++
 src/c3nav/mapdata/render/{data => geometry}/altitudearea.py | 2 +-
 .../render/{data/hybridgeom.py => geometry/hybrid.py}       | 0
 .../mapdata/render/{data/levelgeom.py => geometry/level.py} | 6 +++---
 src/c3nav/mapdata/render/{data => geometry}/mesh.py         | 0
 .../mapdata/render/{data/levelrender.py => renderdata.py}   | 3 +--
 src/c3nav/mapdata/render/renderer.py                        | 3 ++-
 12 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100644 src/c3nav/mapdata/render/data/__init__.py
 create mode 100644 src/c3nav/mapdata/render/geometry/__init__.py
 rename src/c3nav/mapdata/render/{data => geometry}/altitudearea.py (98%)
 rename src/c3nav/mapdata/render/{data/hybridgeom.py => geometry/hybrid.py} (100%)
 rename src/c3nav/mapdata/render/{data/levelgeom.py => geometry/level.py} (99%)
 rename src/c3nav/mapdata/render/{data => geometry}/mesh.py (100%)
 rename src/c3nav/mapdata/render/{data/levelrender.py => renderdata.py} (98%)

diff --git a/src/c3nav/mapdata/models/update.py b/src/c3nav/mapdata/models/update.py
index 61221493..90e5ce3a 100644
--- a/src/c3nav/mapdata/models/update.py
+++ b/src/c3nav/mapdata/models/update.py
@@ -123,7 +123,7 @@ class MapUpdate(models.Model):
 
             logger.info('Rebuilding level render data...')
 
-            from c3nav.mapdata.render.data import LevelRenderData
+            from c3nav.mapdata.render import LevelRenderData
             LevelRenderData.rebuild()
 
             transaction.on_commit(
diff --git a/src/c3nav/mapdata/render/__init__.py b/src/c3nav/mapdata/render/__init__.py
index f6aa05f0..48425d3e 100644
--- a/src/c3nav/mapdata/render/__init__.py
+++ b/src/c3nav/mapdata/render/__init__.py
@@ -1,2 +1,3 @@
 from c3nav.mapdata.render.renderer import MapRenderer  # noqa
+from c3nav.mapdata.render.renderdata import LevelRenderData  # noqa
 from c3nav.mapdata.render.utils import get_render_level_ids, set_tile_access_cookie, get_tile_access_cookie  # noqa
diff --git a/src/c3nav/mapdata/render/data/__init__.py b/src/c3nav/mapdata/render/data/__init__.py
deleted file mode 100644
index 4a9b93fc..00000000
--- a/src/c3nav/mapdata/render/data/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from c3nav.mapdata.render.data.hybridgeom import hybrid_union, HybridGeometry  # noqa
-from c3nav.mapdata.render.data.levelrender import LevelRenderData  # noqa
diff --git a/src/c3nav/mapdata/render/engines/base3d.py b/src/c3nav/mapdata/render/engines/base3d.py
index 209d949f..23a39481 100644
--- a/src/c3nav/mapdata/render/engines/base3d.py
+++ b/src/c3nav/mapdata/render/engines/base3d.py
@@ -4,8 +4,8 @@ from typing import Optional
 
 import numpy as np
 
-from c3nav.mapdata.render.data import HybridGeometry
 from c3nav.mapdata.render.engines.base import FillAttribs, RenderEngine, StrokeAttribs
+from c3nav.mapdata.render.geometry import HybridGeometry
 
 
 # noinspection PyAbstractClass
diff --git a/src/c3nav/mapdata/render/engines/opengl.py b/src/c3nav/mapdata/render/engines/opengl.py
index ad033651..9f4940c5 100644
--- a/src/c3nav/mapdata/render/engines/opengl.py
+++ b/src/c3nav/mapdata/render/engines/opengl.py
@@ -11,9 +11,9 @@ from PIL import Image
 from shapely.geometry import CAP_STYLE, JOIN_STYLE, Polygon
 from shapely.ops import unary_union
 
-from c3nav.mapdata.render.data import HybridGeometry
 from c3nav.mapdata.render.engines.base import FillAttribs, StrokeAttribs
 from c3nav.mapdata.render.engines.base3d import Base3DEngine
+from c3nav.mapdata.render.geometry import HybridGeometry
 from c3nav.mapdata.utils.mesh import triangulate_polygon
 
 
diff --git a/src/c3nav/mapdata/render/geometry/__init__.py b/src/c3nav/mapdata/render/geometry/__init__.py
new file mode 100644
index 00000000..6bc17b9e
--- /dev/null
+++ b/src/c3nav/mapdata/render/geometry/__init__.py
@@ -0,0 +1,3 @@
+from c3nav.mapdata.render.geometry.hybrid import hybrid_union, HybridGeometry  # noqa
+from c3nav.mapdata.render.geometry.level import LevelGeometries  # noqa
+from c3nav.mapdata.render.geometry.altitudearea import AltitudeAreaGeometries  # noqa
diff --git a/src/c3nav/mapdata/render/data/altitudearea.py b/src/c3nav/mapdata/render/geometry/altitudearea.py
similarity index 98%
rename from src/c3nav/mapdata/render/data/altitudearea.py
rename to src/c3nav/mapdata/render/geometry/altitudearea.py
index be62d9c2..f4b98b2c 100644
--- a/src/c3nav/mapdata/render/data/altitudearea.py
+++ b/src/c3nav/mapdata/render/geometry/altitudearea.py
@@ -4,7 +4,7 @@ from itertools import chain
 import numpy as np
 
 from c3nav.mapdata.models import AltitudeArea
-from c3nav.mapdata.render.data.hybridgeom import HybridGeometry
+from c3nav.mapdata.render.geometry.hybrid import HybridGeometry
 
 
 class AltitudeAreaGeometries:
diff --git a/src/c3nav/mapdata/render/data/hybridgeom.py b/src/c3nav/mapdata/render/geometry/hybrid.py
similarity index 100%
rename from src/c3nav/mapdata/render/data/hybridgeom.py
rename to src/c3nav/mapdata/render/geometry/hybrid.py
diff --git a/src/c3nav/mapdata/render/data/levelgeom.py b/src/c3nav/mapdata/render/geometry/level.py
similarity index 99%
rename from src/c3nav/mapdata/render/data/levelgeom.py
rename to src/c3nav/mapdata/render/geometry/level.py
index a6a0905a..6ba99f13 100644
--- a/src/c3nav/mapdata/render/data/levelgeom.py
+++ b/src/c3nav/mapdata/render/geometry/level.py
@@ -9,9 +9,9 @@ from shapely import prepared
 from shapely.geometry import GeometryCollection
 from shapely.ops import unary_union
 
-from c3nav.mapdata.render.data.altitudearea import AltitudeAreaGeometries
-from c3nav.mapdata.render.data.hybridgeom import HybridGeometry
-from c3nav.mapdata.render.data.mesh import Mesh
+from c3nav.mapdata.render.geometry.altitudearea import AltitudeAreaGeometries
+from c3nav.mapdata.render.geometry.hybrid import HybridGeometry
+from c3nav.mapdata.render.geometry.mesh import Mesh
 from c3nav.mapdata.utils.geometry import get_rings
 from c3nav.mapdata.utils.mesh import triangulate_rings
 
diff --git a/src/c3nav/mapdata/render/data/mesh.py b/src/c3nav/mapdata/render/geometry/mesh.py
similarity index 100%
rename from src/c3nav/mapdata/render/data/mesh.py
rename to src/c3nav/mapdata/render/geometry/mesh.py
diff --git a/src/c3nav/mapdata/render/data/levelrender.py b/src/c3nav/mapdata/render/renderdata.py
similarity index 98%
rename from src/c3nav/mapdata/render/data/levelrender.py
rename to src/c3nav/mapdata/render/renderdata.py
index 0d39e0d7..c868ec1e 100644
--- a/src/c3nav/mapdata/render/data/levelrender.py
+++ b/src/c3nav/mapdata/render/renderdata.py
@@ -12,8 +12,7 @@ from shapely.geometry import GeometryCollection
 from shapely.ops import unary_union
 
 from c3nav.mapdata.models import Level, MapUpdate
-from c3nav.mapdata.render.data.altitudearea import AltitudeAreaGeometries
-from c3nav.mapdata.render.data.levelgeom import LevelGeometries
+from c3nav.mapdata.render.geometry import AltitudeAreaGeometries, LevelGeometries
 from c3nav.mapdata.utils.cache import MapHistory
 from c3nav.mapdata.utils.geometry import get_rings
 
diff --git a/src/c3nav/mapdata/render/renderer.py b/src/c3nav/mapdata/render/renderer.py
index 53923ed8..2556453e 100644
--- a/src/c3nav/mapdata/render/renderer.py
+++ b/src/c3nav/mapdata/render/renderer.py
@@ -6,8 +6,9 @@ from shapely import prepared
 from shapely.geometry import box
 
 from c3nav.mapdata.models import Level, MapUpdate
-from c3nav.mapdata.render.data import LevelRenderData, hybrid_union
 from c3nav.mapdata.render.engines.base import FillAttribs, StrokeAttribs
+from c3nav.mapdata.render.geometry import hybrid_union
+from c3nav.mapdata.render.renderdata import LevelRenderData
 from c3nav.mapdata.utils.cache import MapHistory