Browse Source

map_view: Rename zoom_level -> render_zoom_level

Johannes Hofmann 8 years ago
parent
commit
2b1fb5a60c
2 changed files with 3 additions and 3 deletions
  1. 2
    2
      src/map_view.rs
  2. 1
    1
      src/map_view_gl.rs

+ 2
- 2
src/map_view.rs View File

53
     }
53
     }
54
 
54
 
55
     pub fn visible_tiles(&self, snap_to_pixel: bool) -> Vec<VisibleTile> {
55
     pub fn visible_tiles(&self, snap_to_pixel: bool) -> Vec<VisibleTile> {
56
-        let uzoom = self.zoom_level();
56
+        let uzoom = self.render_zoom_level();
57
         let top_left_tile = self.top_left_coord().on_tile_at_zoom(uzoom);
57
         let top_left_tile = self.top_left_coord().on_tile_at_zoom(uzoom);
58
         let mut top_left_tile_screen_coord = self.tile_screen_position(&top_left_tile);
58
         let mut top_left_tile_screen_coord = self.tile_screen_position(&top_left_tile);
59
         let tile_screen_size = f64::powf(2.0, self.zoom2 - f64::from(uzoom)) * f64::from(self.tile_size);
59
         let tile_screen_size = f64::powf(2.0, self.zoom2 - f64::from(uzoom)) * f64::from(self.tile_size);
92
     }
92
     }
93
 
93
 
94
     //TODO make zoom level configurable
94
     //TODO make zoom level configurable
95
-    pub fn zoom_level(&self) -> u32 {
95
+    pub fn render_zoom_level(&self) -> u32 {
96
         self.zoom2.floor().max(0.0) as u32
96
         self.zoom2.floor().max(0.0) as u32
97
     }
97
     }
98
 
98
 

+ 1
- 1
src/map_view_gl.rs View File

92
     pub fn draw(&mut self, source: &TileSource) {
92
     pub fn draw(&mut self, source: &TileSource) {
93
         self.tile_cache.set_view_location(View {
93
         self.tile_cache.set_view_location(View {
94
             source_id: source.id(),
94
             source_id: source.id(),
95
-            zoom: self.map_view.zoom_level(),
95
+            zoom: self.map_view.render_zoom_level(),
96
             center: self.map_view.center,
96
             center: self.map_view.center,
97
         });
97
         });
98
 
98