refactor even more data→geometry and levelrender

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(

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

src/c3nav/mapdata/render/data/__init__.py

@@ -1,2 +0,0 @@
-from c3nav.mapdata.render.data.hybridgeom import hybrid_union, HybridGeometry  # noqa
-from c3nav.mapdata.render.data.levelrender import LevelRenderData  # noqa

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

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
 
 

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

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:

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.geometry.altitudearea import AltitudeAreaGeometries
-from c3nav.mapdata.render.data.hybridgeom import HybridGeometry
+from c3nav.mapdata.render.geometry.hybrid import HybridGeometry
-from c3nav.mapdata.render.data.mesh import Mesh
+from c3nav.mapdata.render.geometry.mesh import Mesh
 from c3nav.mapdata.utils.geometry import get_rings
 from c3nav.mapdata.utils.mesh import triangulate_rings
 

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.geometry import AltitudeAreaGeometries, LevelGeometries
-from c3nav.mapdata.render.data.levelgeom import LevelGeometries
 from c3nav.mapdata.utils.cache import MapHistory
 from c3nav.mapdata.utils.geometry import get_rings
 

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