From 7aa17e3de378a6e631dc2232126b8382239d0835 Mon Sep 17 00:00:00 2001 From: tuxmain Date: Mon, 21 Feb 2022 18:00:48 +0100 Subject: [PATCH] mapserver: fix generation & allow .png url --- mapserver/src/main.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mapserver/src/main.rs b/mapserver/src/main.rs index 0b7f8c7..193be2a 100644 --- a/mapserver/src/main.rs +++ b/mapserver/src/main.rs @@ -67,7 +67,7 @@ fn run_minetestmapper( &format!( "{}:{}+{}+{}", x * config.tile_size as i32, - -1 - z * config.tile_size as i32, + -1 - y * config.tile_size as i32, config.tile_size, config.tile_size ), @@ -85,7 +85,7 @@ fn read_tile_file(tile_path: &str) -> Result, Error> { let mut tile_content = Vec::new(); std::fs::File::open(&tile_path) .map_err(Error::Io)? - .read(&mut tile_content) + .read_to_end(&mut tile_content) .map_err(Error::Io)?; // TODO resp_tile if error Ok(tile_content) } @@ -152,7 +152,8 @@ async fn req_tile( ) -> tide::Result { let z: i32 = req.param("z")?.parse()?; let x: i32 = req.param("x")?.parse()?; - let y: i32 = req.param("y")?.parse()?; + let y = req.param("y")?; + let y = y.strip_suffix(".png").unwrap_or(y).parse()?; let tile_dir = format!("{}{}/{}", config.output_path, z, x); let tile_path = format!("{}/{}.png", tile_dir, y);