add commandline args to parse multiple tiles

Author: Yatekii

Cargo.lock

@@ -25,6 +25,7 @@ name = "sailor"
 path = "src/bin/main.rs"
 
 [dependencies]
+clap = { version = "4", features = ["derive"] }
 config = "0.14"
 crossbeam-channel = "0.5"
 log = { version = "0.4", features = ["serde"] }

Cargo.toml

@@ -16,4 +16,12 @@ cargo build --verbose --bin sailor
 
 ```
 cargo build --verbose --bin sailor --no-default-features --features metal
-```
+```
+
+### Debug the Zurich Landesmuseeum tile
+
+```
+cargo run --release -- -t 14/8580/5737
+```
+
+Use any number of `-t` args to load multiple tiles. If no args are passed, load a full map.

README.md

@@ -65,10 +65,6 @@ impl AppState {
         self.feature_collection.clone()
     }
 
-    pub fn css_cache_mut(&mut self) -> &mut RulesCache {
-        &mut self.css_cache
-    }
-
     pub fn load_tile(&mut self, tile_id: TileId) {
         self.tile_cache.finalize_loaded_tiles();
         if !self.visible_tiles.contains(&tile_id) {

src/bin/app_state.rs

@@ -6,6 +6,7 @@ mod stats;
 use std::sync::Arc;
 
 use crate::config::CONFIG;
+use clap::Parser;
 use lyon::math::vector;
 use osm::math::{deg2num, tile_to_world_space, TileId};
 use winit::{
@@ -21,6 +22,8 @@ fn main() {
     log::set_max_level(CONFIG.general.log.level.to_level_filter());
     pretty_env_logger::init();
 
+    let args = Args::parse();
+
     let tile_coordinate = deg2num(
         CONFIG.map.initial.center.latitude,
         CONFIG.map.initial.center.longitude,
@@ -72,6 +75,7 @@ fn main() {
         modifiers_state,
         mouse_down,
         last_pos,
+        args,
     };
 
     // Hack to make the UI scale correctly.
@@ -93,6 +97,7 @@ pub struct Application {
     modifiers_state: ModifiersState,
     mouse_down: bool,
     last_pos: LogicalPosition<f64>,
+    args: Args,
 }
 
 impl ApplicationHandler for Application {
@@ -211,9 +216,22 @@ impl ApplicationHandler for Application {
                 if !event_loop.exiting() {
                     self.painter.update_shader();
                     // self.app_state.load_tile(TileId::new(13, 4290, 2868));
-                    self.app_state.load_tile(TileId::new(14, 8580, 5737));
-                    // self.app_state.load_tile(TileId::new(17, 137290, 91796));
-                    // self.app_state.load_tiles();
+
+                    if self.args.tile.is_empty() {
+                        self.app_state.load_tiles();
+                    } else {
+                        for tile in &self.args.tile {
+                            let coords: Vec<u32> =
+                                tile.split("/").filter_map(|v| v.parse().ok()).collect();
+                            if coords.len() != 3 {
+                                continue;
+                            }
+
+                            self.app_state
+                                .load_tile(TileId::new(coords[0], coords[1], coords[2]));
+                        }
+                    }
+
                     self.painter.paint(&mut self.hud, &mut self.app_state);
 
                     self.app_state.stats.capture_frame();
@@ -231,3 +249,14 @@ impl ApplicationHandler for Application {
         self.painter.window.request_redraw();
     }
 }
+
+/// Render a map beautifully and ultra fast with CSS styling
+#[derive(Parser, Debug)]
+#[command(version, about, long_about = None)]
+struct Args {
+    /// Tile to load (this argument can be given multiple times to load multiple tiles)
+    ///
+    /// If no tiles were given the full map is loaded.
+    #[arg(short, long)]
+    tile: Vec<String>,
+}