From 9835a782aec5892b7b21b13a70a17788e56936c2 Mon Sep 17 00:00:00 2001
From: Hartmut Holzgraefe <hartmut@php.net>
Date: Thu, 5 Dec 2019 00:19:59 +0100
Subject: [PATCH] paper size handling fixes

---
 ocitysmap.conf.dist                        | 15 +++++++++++++++
 ocitysmap/layoutlib/multi_page_renderer.py |  1 -
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ocitysmap.conf.dist b/ocitysmap.conf.dist
index a0eacd8..b1713a7 100644
--- a/ocitysmap.conf.dist
+++ b/ocitysmap.conf.dist
@@ -6,6 +6,21 @@ dbname=maposmatic
 # Optional database port, defaults to 5432
 # port=5432
 
+[paper_sizes]
+Din A4: 210x297
+Din A3: 297x420
+Din A2: 420x594
+Din A1: 594x841
+Din A0: 841x1189
+2x A0: 1189x1682
+US letter: 216x279
+
+# multi page paper sizes need to be a subset of
+# the single page paper formats for now
+[multipage_paper_sizes]
+Din A4: 210x297
+US letter: 216x279
+
 [rendering]
 # List of available stylesheets, each needs to be described by an eponymous
 # configuration section in this file.
diff --git a/ocitysmap/layoutlib/multi_page_renderer.py b/ocitysmap/layoutlib/multi_page_renderer.py
index 081d494..1bc75fb 100644
--- a/ocitysmap/layoutlib/multi_page_renderer.py
+++ b/ocitysmap/layoutlib/multi_page_renderer.py
@@ -1007,7 +1007,6 @@ class MultiPageRenderer(Renderer):
                 })
             is_default = False
 
-            valid_sizes.append((sz[0], sz[1], sz[2], True, True, sz[0] == 'Din A4'))
         return valid_sizes
 
     def _draw_overview_labels(self, ctx, map_canvas, overview_grid,