Handle different image file formats

deltamap.toml

@@ -3,3 +3,4 @@ tile_cache_dir = "/tmp"
 [sources.OSM]
 max_zoom = 19
 url_template = "http://a.tile.openstreetmap.org/{z}/{x}/{y}.png"
+extension = "png"

src/config.rs

@@ -16,6 +16,7 @@ pub struct Config {
 struct Source {
     max_zoom: u32,
     url_template: String,
+    extension: String,
 }
 
 impl Config {
@@ -47,6 +48,7 @@ impl Config {
                     id as u32,
                     source.url_template.clone(),
                     path,
+                    source.extension.clone(),
                     source.max_zoom,
                 ),
             ));

src/main.rs

@@ -170,7 +170,7 @@ fn main() {
     let mut sources = TileSources::new(config.tile_sources()).unwrap();
 
     let mut window = glutin::WindowBuilder::new().build().unwrap();
-    window.set_title("DeltaMap");
+    window.set_title(&("DeltaMap - ".to_string() + sources.current_name()));
     window.set_window_resize_callback(Some(resize_callback as fn(u32, u32)));
     let _ = unsafe { window.make_current() };
 
@@ -194,6 +194,7 @@ fn main() {
 
     'outer: for event in window.wait_events() {
         let mut start_loop = Instant::now();
+        let start_source_id = sources.current().id();
 
         let mut redraw = false;
 
@@ -247,6 +248,11 @@ fn main() {
             let diff = start_loop.elapsed();
             println!("EVENT LOOP SECS {}", diff.as_secs() as f64 + f64::from(diff.subsec_nanos()) * 1e-9);
         }
+
+        // set window title
+        if sources.current().id() != start_source_id {
+            window.set_title(&("DeltaMap - ".to_string() + sources.current_name()));
+        }
     }
 }
 
@@ -271,6 +277,10 @@ impl TileSources {
         &self.sources[self.current_index].1
     }
 
+    pub fn current_name(&self) -> &str {
+        &self.sources[self.current_index].0
+    }
+
     pub fn switch_to_next(&mut self) {
         self.current_index = (self.current_index + 1) % self.sources.len();
     }

src/tile_loader.rs

@@ -48,7 +48,7 @@ impl TileLoader {
     {
         let mut client_opt = None;
         while let Ok((tile, url, path, write_to_file)) = request_rx.recv() {
-            println!("work {:?}", tile);
+            println!("work {:?} {:?}", tile, path);
             match image::open(&path) {
                 Ok(img) => {
                     result_tx.send((tile, Some(img))).unwrap();

src/tile_source.rs

@@ -7,6 +7,7 @@ pub struct TileSource {
     id: u32,
     url_template: String,
     directory: PathBuf,
+    extension: String,
     max_zoom: u32,
 }
 
@@ -20,12 +21,14 @@ impl TileSource {
         id: u32,
         url_template: S,
         directory: P,
+        extension: String,
         max_zoom: u32,
     ) -> Self {
         TileSource {
             id: id,
             url_template: url_template.into(),
             directory: directory.into(),
+            extension: extension,
             max_zoom: max_zoom,
         }
     }
@@ -40,7 +43,7 @@ impl TileSource {
         let mut path = PathBuf::from(&self.directory);
         path.push(tile_coord.zoom.to_string());
         path.push(tile_coord.x.to_string());
-        path.push(tile_coord.y.to_string() + ".png");
+        path.push(tile_coord.y.to_string() + "." + &self.extension);
 
         path
     }