[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Maposmatic-dev] [PATCH 4/5] multi-page: some clean-up
From: |
Étienne Loks |
Subject: |
[Maposmatic-dev] [PATCH 4/5] multi-page: some clean-up |
Date: |
Fri, 30 Mar 2012 18:51:20 +0200 |
---
ocitysmap2/layoutlib/multi_page_renderer.py | 13 +++++---
ocitysmap2/maplib/overview_grid.py | 45 ---------------------------
2 files changed, 8 insertions(+), 50 deletions(-)
diff --git a/ocitysmap2/layoutlib/multi_page_renderer.py
b/ocitysmap2/layoutlib/multi_page_renderer.py
index 36fa24c..b69fd3a 100644
--- a/ocitysmap2/layoutlib/multi_page_renderer.py
+++ b/ocitysmap2/layoutlib/multi_page_renderer.py
@@ -222,7 +222,7 @@ class MultiPageRenderer(Renderer):
self.rc.stylesheet.grid_line_width)
map_canvas.render()
- self.pages.append((map_canvas, map_grid))
+ self.pages.append((map_canvas, None))
# Create the map canvas for each page
indexes = []
@@ -374,10 +374,13 @@ class MultiPageRenderer(Renderer):
commons.convert_pt_to_dots(self.grayed_margin_pt))
# Place the vertical and horizontal square labels
- self._draw_labels(ctx, grid,
-
commons.convert_pt_to_dots(self._usable_area_width_pt) - 2 *
commons.convert_pt_to_dots(self.grayed_margin_pt),
-
commons.convert_pt_to_dots(self._usable_area_height_pt) - 2 *
commons.convert_pt_to_dots(self.grayed_margin_pt),
-
commons.convert_pt_to_dots(self._grid_legend_margin_pt))
+ if grid:
+ self._draw_labels(ctx, grid,
+ commons.convert_pt_to_dots(self._usable_area_width_pt) \
+ - 2 *
commons.convert_pt_to_dots(self.grayed_margin_pt),
+ commons.convert_pt_to_dots(self._usable_area_height_pt) \
+ - 2 *
commons.convert_pt_to_dots(self.grayed_margin_pt),
+ commons.convert_pt_to_dots(self._grid_legend_margin_pt))
ctx.restore()
diff --git a/ocitysmap2/maplib/overview_grid.py
b/ocitysmap2/maplib/overview_grid.py
index d196036..fdde50a 100644
--- a/ocitysmap2/maplib/overview_grid.py
+++ b/ocitysmap2/maplib/overview_grid.py
@@ -36,11 +36,6 @@ class OverviewGrid:
self._pages_wkt = [bb.as_wkt() for bb in self._pages_bbox]
- self.horiz_count = 1
- self.vert_count = 1
- self.horizontal_labels = ['plouf']
- self.vertical_labels = ['plouf']
-
def generate_shape_file(self, filename):
"""Generates the grid shapefile with all the horizontal and
vertical lines added.
@@ -58,46 +53,6 @@ class OverviewGrid:
map(g.add_box, self._pages_bbox)
return g
- def _gen_horizontal_square_label(self, x):
- """Generates a human-readable label for the given horizontal square
- number. For example:
- 1 -> A
- 2 -> B
- 26 -> Z
- 27 -> AA
- 28 -> AB
- ...
- """
- if self.rtl:
- x = len(self._vertical_lines) - x
-
- label = ''
- while x != -1:
- label = chr(ord('A') + x % 26) + label
- x = x/26 - 1
- return label
-
- def _gen_vertical_square_label(self, x):
- """Generate a human-readable label for the given vertical square
- number. Since we put numbers verticaly, this is simply x+1."""
- return str(x + 1)
-
- def get_location_str(self, lattitude, longitude):
- """
- Translate the given lattitude/longitude (EPSG:4326) into a
- string of the form "CA42"
- """
- hdelta = min(abs(longitude - self._bbox.get_top_left()[1]),
- self._horiz_angle_span)
- hlabel = self.horizontal_labels[int(hdelta / self._horiz_unit_angle)]
-
- vdelta = min(abs(lattitude - self._bbox.get_top_left()[0]),
- self._vert_angle_span)
- vlabel = self.vertical_labels[int(vdelta / self._vert_unit_angle)]
-
- return "%s%s" % (hlabel, vlabel)
-
-
if __name__ == "__main__":
logging.basicConfig(level=logging.DEBUG)
pass
--
1.7.9.1