maposmatic-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Maposmatic-dev] [PATCH] Fix name grouping in the index


From: Étienne Loks
Subject: [Maposmatic-dev] [PATCH] Fix name grouping in the index
Date: Sat, 31 Mar 2012 01:02:00 +0200

---
 ocitysmap2/__init__.py          |    2 --
 ocitysmap2/indexlib/__init__.py |    2 --
 ocitysmap2/indexlib/indexer.py  |    1 +
 3 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/ocitysmap2/__init__.py b/ocitysmap2/__init__.py
index eccf448..048c03f 100644
--- a/ocitysmap2/__init__.py
+++ b/ocitysmap2/__init__.py
@@ -521,11 +521,9 @@ SELECT ST_AsText(ST_LongestLine(
                 'Unsupported output format: %s!' % output_format.upper()
 
         renderer = renderer_cls(self._db, config, tmpdir, dpi, street_index)
-
         # Update the street_index to reflect the grid's actual position
         if renderer.grid and street_index:
             street_index.apply_grid(renderer.grid)
-            street_index.group_identical_grid_locations()
 
         surface = factory(renderer.paper_width_pt, renderer.paper_height_pt)
 
diff --git a/ocitysmap2/indexlib/__init__.py b/ocitysmap2/indexlib/__init__.py
index e0ca557..23a8bc6 100644
--- a/ocitysmap2/indexlib/__init__.py
+++ b/ocitysmap2/indexlib/__init__.py
@@ -76,7 +76,6 @@ if __name__ == '__main__':
     # Map index to grid
     grid = Grid(bbox, rtl = False)
     street_index.apply_grid(grid)
-    street_index.group_identical_grid_locations()
 
     index = StreetIndexRenderer(i18nMock(False), street_index.categories)
 
@@ -122,7 +121,6 @@ if __name__ == '__main__':
     # Map index to grid
     grid = Grid(bbox, rtl = True)
     street_index.apply_grid(grid)
-    street_index.group_identical_grid_locations()
 
     index = StreetIndexRenderer(i18nMock(True), street_index.categories)
     _render('height', 'top')
diff --git a/ocitysmap2/indexlib/indexer.py b/ocitysmap2/indexlib/indexer.py
index f890103..edd0d73 100644
--- a/ocitysmap2/indexlib/indexer.py
+++ b/ocitysmap2/indexlib/indexer.py
@@ -85,6 +85,7 @@ class StreetIndex:
         for category in self._categories:
             for item in category.items:
                 item.update_location_str(grid)
+        self.group_identical_grid_locations()
 
     def group_identical_grid_locations(self):
         """
-- 
1.7.9.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]