Fix generation of csv file for "no index" layout

Signed-off-by: Gael UTARD <gael.utard@kisis.fr>
stable
Gael UTARD 2012-04-01 00:52:20 +02:00 zatwierdzone przez Thomas Petazzoni
rodzic c4cf3307b8
commit 56a1a63872
1 zmienionych plików z 5 dodań i 9 usunięć

Wyświetl plik

@ -66,7 +66,6 @@ class SinglePageRenderer(Renderer):
Args:
rc (RenderingConfiguration): rendering parameters.
tmpdir (os.path): Path to a temp dir that can hold temp files.
street_index (StreetIndex): None or the street index object.
index_position (str): None or 'side' (index on side),
'bottom' (index at bottom).
"""
@ -521,16 +520,15 @@ class SinglePageRendererNoIndex(SinglePageRenderer):
name = 'plain'
description = 'Full-page layout without index.'
def __init__(self, db, rc, tmpdir, dpi, street_index):
def __init__(self, db, rc, tmpdir, dpi, file_prefix):
"""
Create the renderer.
Args:
rc (RenderingConfiguration): rendering parameters.
tmpdir (os.path): Path to a temp dir that can hold temp files.
street_index (StreetIndex): None or the street index object.
"""
SinglePageRenderer.__init__(self, db, rc, tmpdir, dpi, None, None)
SinglePageRenderer.__init__(self, db, rc, tmpdir, dpi, file_prefix, None)
@staticmethod
@ -559,14 +557,13 @@ class SinglePageRendererIndexOnSide(SinglePageRenderer):
name = 'single_page_index_side'
description = 'Full-page layout with the index on the side.'
def __init__(self, db, rc, tmpdir, dpi, street_index):
def __init__(self, db, rc, tmpdir, dpi, file_prefix):
"""
Create the renderer.
Args:
rc (RenderingConfiguration): rendering parameters.
tmpdir (os.path): Path to a temp dir that can hold temp files.
street_index (StreetIndex): None or the street index object.
"""
SinglePageRenderer.__init__(self, db, rc, tmpdir, dpi, street_index, 'side')
@ -596,16 +593,15 @@ class SinglePageRendererIndexBottom(SinglePageRenderer):
name = 'single_page_index_bottom'
description = 'Full-page layout with the index at the bottom.'
def __init__(self, db, rc, tmpdir, dpi, street_index):
def __init__(self, db, rc, tmpdir, dpi, file_prefix):
"""
Create the renderer.
Args:
rc (RenderingConfiguration): rendering parameters.
tmpdir (os.path): Path to a temp dir that can hold temp files.
street_index (StreetIndex): None or the street index object.
"""
SinglePageRenderer.__init__(self, db, rc, tmpdir, dpi, street_index, 'bottom')
SinglePageRenderer.__init__(self, db, rc, tmpdir, dpi, file_prefix, 'bottom')
@staticmethod
def get_compatible_paper_sizes(bounding_box, zoom_level,