[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Maposmatic-dev] [PATCH] render daemon: do not render in unsupported for
From: |
Thomas Petazzoni |
Subject: |
[Maposmatic-dev] [PATCH] render daemon: do not render in unsupported formats |
Date: |
Sat, 31 Mar 2012 19:34:12 +0200 |
The settings_local.py file defines the RENDERING_RESULT_FORMATS which
contains the formats (PNG, SVGZ, PDF, CSV) in which the maps should be
rendered. However, depending on the selected rendering layout, some
formats may not be supported: typically, PNG and SVGZ are not
supported by the multi-page rendering layout.
Therefore, the daemon automatically renders the map only in the
formats that are the intersection of the formats choosen in
RENDERING_RESULT_FORMATS and the formats compatible with the rendering
layout.
Signed-off-by: Thomas Petazzoni <address@hidden>
---
scripts/render.py | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/scripts/render.py b/scripts/render.py
index 4a975fc..00c96cd 100755
--- a/scripts/render.py
+++ b/scripts/render.py
@@ -32,6 +32,7 @@ import subprocess
import ocitysmap2
import ocitysmap2.coords
+from ocitysmap2 import renderers
from www.maposmatic.models import MapRenderingJob
from www.settings import OCITYSMAP_CFG_PATH
from www.settings import RENDERING_RESULT_PATH, RENDERING_RESULT_FORMATS
@@ -217,8 +218,18 @@ class JobRenderer(threading.Thread):
prefix = os.path.join(RENDERING_RESULT_PATH, self.job.files_prefix())
try:
+ # Get the list of output formats (PNG, PDF, SVGZ, CSV)
+ # that the renderer accepts.
+ renderer_cls =
renderers.get_renderer_class_by_name(self.job.layout)
+ compatible_output_formats =
renderer_cls.get_compatible_output_formats()
+
+ # Compute the intersection of the accepted output formats
+ # with the desired output formats.
+ output_formats = \
+ list(set(compatible_output_formats) &
set(RENDERING_RESULT_FORMATS))
+
renderer.render(config, self.job.layout,
- RENDERING_RESULT_FORMATS, prefix)
+ output_formats, prefix)
# Create thumbnail
self._gen_thumbnail(prefix, config.paper_width_mm,
--
1.7.4.1
- [Maposmatic-dev] [PATCH] render daemon: do not render in unsupported formats,
Thomas Petazzoni <=