diff --git a/Cargo.lock b/Cargo.lock index b276fe3..b1b8128 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -424,8 +424,9 @@ dependencies = [ [[package]] name = "srtm_reader" -version = "0.4.0" -source = "git+https://github.com/jeromeschmied/srtm_reader#84b357165a524a3a180ce90e96152ed38180c13c" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a2b003f10dd9f28e302de4fe93def3f46098d966156cac55ce424e72d947dd9" dependencies = [ "byteorder", ] diff --git a/Cargo.toml b/Cargo.toml index 71fe8f9..1fb361c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,12 +20,9 @@ geo-types = "0.7.15" gpx = "0.10.0" log = "0.4.25" rayon = "1.10.0" -srtm_reader = { version = "0.4.0", optional = true } +srtm_reader = { version = "0.4.1", optional = true } time = { version = "0.3.37", default-features = false } -[patch.crates-io] -srtm_reader = { git = "https://github.com/jeromeschmied/srtm_reader" } - [features] default = ["elevation"] elevation = ["dep:srtm_reader"] diff --git a/src/elevation.rs b/src/elevation.rs index 46cc56c..e9d1a64 100644 --- a/src/elevation.rs +++ b/src/elevation.rs @@ -41,7 +41,7 @@ pub fn read_needed_tiles( } // TODO: docs /// index the tiles with their coordinates -pub fn index_tiles(tiles: Vec) -> HashMap<(i32, i32), srtm_reader::Tile> { +pub fn index_tiles(tiles: Vec) -> HashMap<(i8, i16), srtm_reader::Tile> { log::info!("indexing all dem tiles"); log::trace!("tiles: {tiles:?}"); tiles @@ -74,7 +74,7 @@ pub fn index_tiles(tiles: Vec) -> HashMap<(i32, i32), srtm_re /// ``` pub fn add_elev_unchecked( wps: &mut [Waypoint], - elev_data: &HashMap<(i32, i32), srtm_reader::Tile>, + elev_data: &HashMap<(i8, i16), srtm_reader::Tile>, overwrite: bool, ) { // coord is (x;y) but we need (y;x) diff --git a/src/main.rs b/src/main.rs index b579fa0..c82ea2e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -67,7 +67,7 @@ fn main() -> Res<()> { } #[cfg(feature = "elevation")] -fn read_elev_data(conf: &args::Cli, all_fit: &Vec) -> HashMap<(i32, i32), srtm_reader::Tile> { +fn read_elev_data(conf: &args::Cli, all_fit: &Vec) -> HashMap<(i8, i16), srtm_reader::Tile> { log::info!("should add elevation: {:?}", conf.add_elevation); if !conf.add_elevation { return HashMap::new();