Fractional zoomlevels (0.5 step for now)

src/kothic.py

@@ -65,7 +65,7 @@ class Navigator:
     self.comm = comm
     self.center_coord = (27.6749791, 53.8621394)
     self.width, self.height = 800, 480
-    self.zoomlevel = 15
+    self.zoomlevel = 15.
     self.data_projection = "EPSG:4326"
     self.zoom = self.width/0.02;
     self.request_d = (0,0)
@@ -140,13 +140,13 @@ class Navigator:
   def scroll_ev(self, widget, event):
     # Zoom test :3
     if event.direction == gtk.gdk.SCROLL_UP:
-      self.zoom *= 2
-      self.zoomlevel += 1
+      self.zoom *= 2.**0.5
+      self.zoomlevel += 0.5
       debug("Zoom in")
     elif event.direction == gtk.gdk.SCROLL_DOWN:
       if self.zoomlevel >= 0: ## negative zooms are nonsense
-        self.zoom /= 2
-        self.zoomlevel -= 1
+        self.zoom /= 2.**0.5
+        self.zoomlevel -= 0.5
         debug("Zoom out")
     self.redraw()
    # widget.queue_draw()

src/vtiles_backend.py

@@ -73,6 +73,7 @@ class QuadTileBackend:
           debug ("tile killed not by us: %s" % (tile,))
 
   def get_vectors (self, bbox, zoom):
+    zoom = int(zoom)
     zoom = min(zoom, self.max_zoom)     ## If requested zoom is better than the best, take the best
     zoom = max(zoom, 0)                 ## Negative zooms are nonsense
     a,d,c,b = [int(x) for x in projections.tile_by_bbox(bbox,zoom, self.data_projection)]