diff --git a/src/c3nav/mapdata/render/engines/svg.py b/src/c3nav/mapdata/render/engines/svg.py index 88acbe4f..560977cd 100644 --- a/src/c3nav/mapdata/render/engines/svg.py +++ b/src/c3nav/mapdata/render/engines/svg.py @@ -14,7 +14,7 @@ from shapely.geometry import LineString, Polygon from shapely.ops import unary_union # import gobject-inspect, cairo and rsvg if the native rsvg SVG_RENDERER should be used -from c3nav.mapdata.render.image.engines.base import FillAttribs, RenderEngine, StrokeAttribs +from c3nav.mapdata.render.engines.base import FillAttribs, RenderEngine, StrokeAttribs if settings.SVG_RENDERER == 'rsvg': import pgi diff --git a/src/c3nav/mapdata/render/renderer.py b/src/c3nav/mapdata/render/renderer.py index 0771c2fb..daf3b466 100644 --- a/src/c3nav/mapdata/render/renderer.py +++ b/src/c3nav/mapdata/render/renderer.py @@ -6,9 +6,9 @@ from shapely.ops import unary_union from c3nav.mapdata.cache import MapHistory from c3nav.mapdata.models import MapUpdate -from c3nav.mapdata.render.image.data import get_level_render_data -from c3nav.mapdata.render.image.engines.base import FillAttribs, StrokeAttribs -from c3nav.mapdata.render.image.engines.svg import SVGEngine +from c3nav.mapdata.render.data import get_level_render_data +from c3nav.mapdata.render.engines.base import FillAttribs, StrokeAttribs +from c3nav.mapdata.render.engines.svg import SVGEngine class ImageRenderer: diff --git a/src/c3nav/mapdata/views.py b/src/c3nav/mapdata/views.py index 1491b54b..0d02f419 100644 --- a/src/c3nav/mapdata/views.py +++ b/src/c3nav/mapdata/views.py @@ -14,8 +14,7 @@ from shapely.geometry import box from c3nav.mapdata.cache import MapHistory from c3nav.mapdata.middleware import no_language from c3nav.mapdata.models import Level, MapUpdate, Source -from c3nav.mapdata.render.image import (ImageRenderer, get_render_level_ids, get_tile_access_cookie, - set_tile_access_cookie) +from c3nav.mapdata.render import ImageRenderer, get_render_level_ids, get_tile_access_cookie, set_tile_access_cookie @no_language() diff --git a/src/c3nav/site/views.py b/src/c3nav/site/views.py index 08bca09c..7a9fa37e 100644 --- a/src/c3nav/site/views.py +++ b/src/c3nav/site/views.py @@ -15,7 +15,7 @@ from c3nav.mapdata.models import Location, Source from c3nav.mapdata.models.access import AccessPermission from c3nav.mapdata.models.level import Level from c3nav.mapdata.models.locations import LocationRedirect, SpecificLocation -from c3nav.mapdata.render.image.utils import set_tile_access_cookie +from c3nav.mapdata.render.utils import set_tile_access_cookie from c3nav.mapdata.utils.locations import get_location_by_slug_for_request ctype_mapping = {