Merge pull request #40 from dispiste/zoomMetadata

Correctly generate metadata for zoom levels

landez/tests.py

@@ -183,6 +183,17 @@ def test_grid_content(self):
         os.remove('foo.mbtiles')
         self.assertEqual(produced_data, expected_data)
 
+    def test_zoomlevels(self):
+        mb = MBTilesBuilder()
+        mb.add_coverage(bbox=(-180.0, -90.0, 180.0, 90.0), zoomlevels=[0, 1])
+        mb.add_coverage(bbox=(-180.0, -90.0, 180.0, 90.0), zoomlevels=[11, 12])
+        mb.add_coverage(bbox=(-180.0, -90.0, 180.0, 90.0), zoomlevels=[5])
+        self.assertEqual(mb.zoomlevels[0], 0)
+        self.assertEqual(mb.zoomlevels[1], 1)
+        self.assertEqual(mb.zoomlevels[2], 5)
+        self.assertEqual(mb.zoomlevels[3], 11)
+        self.assertEqual(mb.zoomlevels[4], 12)
+
 
 class TestImageExporter(unittest.TestCase):
     def test_gridtiles(self):

landez/tiles.py

@@ -259,9 +259,13 @@ def add_coverage(self, bbox, zoomlevels):
     @property
     def zoomlevels(self):
         """
-        Return the list of covered zoom levels
+        Return the list of covered zoom levels, in ascending order
         """
-        return self._bboxes[0][1]  #TODO: merge all coverages
+        zooms = set()
+        for coverage in self._bboxes:
+            for zoom in coverage[1]:
+                zooms.add(zoom)
+        return sorted(zooms)
 
     @property
     def bounds(self):