[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Maposmatic-dev] [PATCH 14/22] multi-page: remove multiple debugging out
From: |
Thomas Petazzoni |
Subject: |
[Maposmatic-dev] [PATCH 14/22] multi-page: remove multiple debugging outputs |
Date: |
Fri, 30 Mar 2012 13:00:31 +0200 |
Signed-off-by: Thomas Petazzoni <address@hidden>
---
ocitysmap2/indexlib/multi_page_renderer.py | 2 -
ocitysmap2/layoutlib/multi_page_renderer.py | 28 ++++++++++----------------
2 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/ocitysmap2/indexlib/multi_page_renderer.py
b/ocitysmap2/indexlib/multi_page_renderer.py
index c48f972..b942d29 100644
--- a/ocitysmap2/indexlib/multi_page_renderer.py
+++ b/ocitysmap2/indexlib/multi_page_renderer.py
@@ -54,7 +54,6 @@ class MultiPageStreetIndexRenderer:
return layout, fascent, fheight, em
def render(self, dpi = UTILS.PT_PER_INCH):
- print self.index_categories
self.ctx.save()
# Draw a filled rectangle as the background (to be removed,
@@ -149,7 +148,6 @@ class MultiPageStreetIndexRenderer:
delta_x = orig_delta_x
self.surface.show_page()
- print street.label
street.draw(self._i18n.isrtl(), self.ctx, pc, label_layout,
UTILS.convert_pt_to_dots(label_fascent, dpi),
UTILS.convert_pt_to_dots(label_fheight, dpi),
diff --git a/ocitysmap2/layoutlib/multi_page_renderer.py
b/ocitysmap2/layoutlib/multi_page_renderer.py
index 7a046e3..73d520c 100644
--- a/ocitysmap2/layoutlib/multi_page_renderer.py
+++ b/ocitysmap2/layoutlib/multi_page_renderer.py
@@ -68,9 +68,6 @@ class MultiPageRenderer(Renderer):
def __init__(self, *args, **kwargs):
Renderer.__init__(self, *args, **kwargs)
- print "One page width (in mm) : %f" % self.rc.paper_width_mm
- print "One page height (in mm) : %f" % self.rc.paper_height_mm
-
self._grid_legend_margin_pt = \
min(Renderer.GRID_LEGEND_MARGIN_RATIO * self.paper_width_pt,
Renderer.GRID_LEGEND_MARGIN_RATIO * self.paper_height_pt)
@@ -85,7 +82,8 @@ class MultiPageRenderer(Renderer):
GRAYED_MARGIN_MM = 10
OVERLAP_MARGIN_MM = 20
- print self.rc.bounding_box.as_javascript("original", "#00ff00")
+ # Debug: show original bounding box as JS code
+ # print self.rc.bounding_box.as_javascript("original", "#00ff00")
# Convert the original Bounding box into Mercator meters
self._proj = mapnik.Projection(_MAPNIK_PROJECTION)
@@ -151,7 +149,8 @@ class MultiPageRenderer(Renderer):
envelope = mapnik.Box2d(off_x, off_y, off_x + width, off_y + height)
self._geo_bbox = self._inverse_envelope(envelope)
- print self._geo_bbox.as_javascript("extended", "#0f0f0f")
+ # Debug: show transformed bounding box as JS code
+ # print self._geo_bbox.as_javascript("extended", "#0f0f0f")
# Convert the usable area on each sheet of paper into the
# amount of Mercator meters we can render in this area.
@@ -180,19 +179,17 @@ class MultiPageRenderer(Renderer):
bboxes.append((self._inverse_envelope(envelope),
self._inverse_envelope(envelope_inner)))
- for i, (bb, bb_inner) in enumerate(bboxes):
- print bb.as_javascript(name="p%d" % i)
+ # Debug: show per-page bounding boxes as JS code
+ # for i, (bb, bb_inner) in enumerate(bboxes):
+ # print bb.as_javascript(name="p%d" % i)
# Create the map canvas for each page
self.pages = []
indexes = []
- print "List of all bboxes"
for i, (bb, bb_inner) in enumerate(bboxes):
# Create the gray shape around the map
exterior = shapely.wkt.loads(bb.as_wkt())
- print bb.as_javascript("before-%d" % i, "#ff0000")
- print bb_inner.as_javascript("after-%d" % i, "#00ff00")
interior = shapely.wkt.loads(bb_inner.as_wkt())
shade_wkt = exterior.difference(interior).wkt
shade = maplib.shapes.PolyShapeFile(
@@ -205,7 +202,7 @@ class MultiPageRenderer(Renderer):
grid_shape = map_grid.generate_shape_file(
os.path.join(self.tmpdir, 'grid%d.shp' % i))
- # Create one canvas for each page
+ # Create one canvas for the current page
map_canvas = MapCanvas(self.rc.stylesheet,
bb, graphical_ratio=None)
@@ -216,18 +213,17 @@ class MultiPageRenderer(Renderer):
self.rc.stylesheet.grid_line_width)
map_canvas.render()
+ self.pages.append((map_canvas, map_grid))
+ # Create the index for the current page
index = StreetIndex(self.db,
bb_inner.as_wkt(),
self.rc.i18n)
index.apply_grid(map_grid)
-
- print index
-
indexes.append(index)
- self.pages.append((map_canvas, map_grid))
+ # Merge all indexes
self.index_categories = self._merge_page_indexes(indexes)
def _merge_page_indexes(self, indexes):
@@ -367,8 +363,6 @@ class MultiPageRenderer(Renderer):
mpsir.render()
cairo_surface.flush()
- print "I'm rendering"
- pass
# Convert a length in geometric meters (in the real life) into a
# length in paper millimiters (as drawn on the map).
--
1.7.4.1
- [Maposmatic-dev] [PATCH 04/22] multi-page: show page number at the bottom of each page, (continued)
- [Maposmatic-dev] [PATCH 04/22] multi-page: show page number at the bottom of each page, Thomas Petazzoni, 2012/03/30
- [Maposmatic-dev] [PATCH 07/22] indexlib: add page_number to IndexItem, Thomas Petazzoni, 2012/03/30
- [Maposmatic-dev] [PATCH 02/22] coords: add BoundingBox::as_javascript() method, Thomas Petazzoni, 2012/03/30
- [Maposmatic-dev] [PATCH 08/22] indexlib: do not raise exception when index is empty, Thomas Petazzoni, 2012/03/30
- [Maposmatic-dev] [PATCH 09/22] indexlib: villages section is not of street type, Thomas Petazzoni, 2012/03/30
- [Maposmatic-dev] [PATCH 10/22] renderers: pass the db connection to the Renderer class constructor, Thomas Petazzoni, 2012/03/30
- [Maposmatic-dev] [PATCH 12/22] indexlib: render page number as part of the street/amenity location, Thomas Petazzoni, 2012/03/30
- [Maposmatic-dev] [PATCH 15/22] indexlib: properly differentiate the page_number=None and page_number=0 cases, Thomas Petazzoni, 2012/03/30
- [Maposmatic-dev] [PATCH 13/22] multi-page: add in dex rendering with a new MultiPageStreetIndexRenderer cl ass, Thomas Petazzoni, 2012/03/30
- [Maposmatic-dev] [PATCH 11/22] multi-page: prepare data for index generation, Thomas Petazzoni, 2012/03/30
- [Maposmatic-dev] [PATCH 14/22] multi-page: remove multiple debugging outputs,
Thomas Petazzoni <=
- [Maposmatic-dev] [PATCH 18/22] indexlib: add min_drawing_width() method, Thomas Petazzoni, 2012/03/30
- [Maposmatic-dev] [PATCH 19/22] MultiPageStreetIndexRenderer: remove debugging background rectangle, Thomas Petazzoni, 2012/03/30
- [Maposmatic-dev] [PATCH 16/22] multi-page: in the street index, start page numbering at 1, Thomas Petazzoni, 2012/03/30
- [Maposmatic-dev] [PATCH 21/22] MultiPageStreetIndexRenderer: automatically compute the number of columns, Thomas Petazzoni, 2012/03/30
- [Maposmatic-dev] [PATCH 20/22] MultiPageStreetIndexRenderer: reduce size of default font, Thomas Petazzoni, 2012/03/30
- [Maposmatic-dev] [PATCH 22/22] multi-page: minor fixups for compatibility with Gaƫl's work to remo ve the scaling, Thomas Petazzoni, 2012/03/30
- [Maposmatic-dev] [PATCH 17/22] index for multi-page: improve page_number handling, Thomas Petazzoni, 2012/03/30
- Re: [Maposmatic-dev] Implementation of a multi-page renderer, Jeroen van Rijn, 2012/03/30