diff --git a/crates/maps/src/error.rs b/crates/maps/src/error.rs index 2e1c8e3..6659de6 100644 --- a/crates/maps/src/error.rs +++ b/crates/maps/src/error.rs @@ -1,6 +1,5 @@ //! Error handling for the `maps` crate. -use log::error; use thiserror::Error; use maps_io_ros::impl_error_constructors; diff --git a/crates/maps/src/grid_options.rs b/crates/maps/src/grid_options.rs index 7021f01..a8ab25f 100644 --- a/crates/maps/src/grid_options.rs +++ b/crates/maps/src/grid_options.rs @@ -128,7 +128,10 @@ impl default::Default for GridOptions { line_spacing_points: 200., min_line_spacing_points: 1., max_line_spacing_points: 1000., - line_stroke: egui::Stroke::new(1., egui::Color32::LIGHT_BLUE), + line_stroke: egui::Stroke::new( + 1., + egui::Color32::from_rgba_unmultiplied(173, 216, 230, 90), + ), sub_lines_visible: SubLineVisibility::default(), sub_lines_factor: 10, sub_lines_stroke: egui::Stroke::new( diff --git a/crates/maps/src/wasm/async_map_io.rs b/crates/maps/src/wasm/async_map_io.rs index 23f72d8..90f4cc2 100644 --- a/crates/maps/src/wasm/async_map_io.rs +++ b/crates/maps/src/wasm/async_map_io.rs @@ -1,4 +1,4 @@ -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::sync::{Arc, Mutex}; use eframe::egui; @@ -95,7 +95,7 @@ fn pick_map_files(data: Arc>) { let expected_image = &meta.image_path; match image_handles .iter() - .find(|image_handle| PathBuf::from(image_handle.file_name()) == *expected_image) + .find(|image_handle| Path::new(&image_handle.file_name()) == *expected_image) { Some(image_file) => match load_image(image_file).await { Ok(image) => { diff --git a/crates/maps/tests/snapshots/aligned_view.png b/crates/maps/tests/snapshots/aligned_view.png index bf5f1c3..7bb6190 100644 --- a/crates/maps/tests/snapshots/aligned_view.png +++ b/crates/maps/tests/snapshots/aligned_view.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e21d7a73debe8d8e0aac5601bbe2bf1189f0220959b76245671804d911e82eb -size 72981 +oid sha256:fdf8174a3ce3ca0c7bd365d3df7f74199e390507d57bc5693d86d6bf92ebe1d8 +size 73643 diff --git a/crates/maps/tests/snapshots/dense_grid_precision.png b/crates/maps/tests/snapshots/dense_grid_precision.png index dc3e20a..cf1b7a7 100644 --- a/crates/maps/tests/snapshots/dense_grid_precision.png +++ b/crates/maps/tests/snapshots/dense_grid_precision.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8ebbcf9470075e53795060e6d81830a2ff475f26fc2d5121d2c7fb0aa96da5b -size 69852 +oid sha256:b1792140b61e14d143336de1eca29036ab3e5c3502ca85efb39cacf60ca862ed +size 68824 diff --git a/crates/maps/tests/snapshots/fixed_lens.png b/crates/maps/tests/snapshots/fixed_lens.png index a8c6eef..5cd10dc 100644 --- a/crates/maps/tests/snapshots/fixed_lens.png +++ b/crates/maps/tests/snapshots/fixed_lens.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec319ceea65e14b02a0059c821b20f1c5d574894a0b6497d98b429a1c4ea0468 -size 121131 +oid sha256:3c968879c2ae21f02995089872bd7ee4e40fb2a2dfa04193c34bbbbbc2b056b1 +size 123216 diff --git a/crates/maps/tests/snapshots/fixed_lens_background.png b/crates/maps/tests/snapshots/fixed_lens_background.png index b569132..1198d17 100644 --- a/crates/maps/tests/snapshots/fixed_lens_background.png +++ b/crates/maps/tests/snapshots/fixed_lens_background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40032e69c401f2b0b0f33879de1143aa0abec46d680ef5d8448aa0bd4d5ee2f7 -size 84878 +oid sha256:54dc7da482a205cd87943d75b996f6d45ec926bca6516700a57a87c832b67dc3 +size 84992 diff --git a/crates/maps/tests/snapshots/google_cartographer_example.png b/crates/maps/tests/snapshots/google_cartographer_example.png index 7ad45d0..b8c3619 100644 --- a/crates/maps/tests/snapshots/google_cartographer_example.png +++ b/crates/maps/tests/snapshots/google_cartographer_example.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fd0a5aedde493db275d220b87bd98d79c3dec41968f6197731f27ad827cf124 -size 272412 +oid sha256:1426f090e13c5ae41577995ea69b38b241151d8cbc3938f0c942067943d0df8b +size 276473 diff --git a/crates/maps/tests/snapshots/measurement.png b/crates/maps/tests/snapshots/measurement.png index 24c6385..55a8483 100644 --- a/crates/maps/tests/snapshots/measurement.png +++ b/crates/maps/tests/snapshots/measurement.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba6e221497338db2705fe9ed0433de28cec1276be1cc1bb2f7bf7751213807b0 -size 87664 +oid sha256:38fdefc4b0efb3726612c4ded2ac8e15afbe2d9e781bf627eb7aa568b675f912 +size 88323 diff --git a/crates/maps/tests/snapshots/nav2_example.png b/crates/maps/tests/snapshots/nav2_example.png index 5fc6508..13052dc 100644 --- a/crates/maps/tests/snapshots/nav2_example.png +++ b/crates/maps/tests/snapshots/nav2_example.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1ff338c37c43428d5ff8d196d02d8a7fa7d85d6054266ed7f96dd121b6ca995 -size 83755 +oid sha256:3027729ec54d8c35e1bce428707aff1164a4cd19218aaced4eddc06c611efebe +size 84730 diff --git a/crates/maps/tests/snapshots/pixel_test.png b/crates/maps/tests/snapshots/pixel_test.png index 6a99366..f3956e0 100644 --- a/crates/maps/tests/snapshots/pixel_test.png +++ b/crates/maps/tests/snapshots/pixel_test.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b849064831816fbdd0e9cef5852c2db94667a04e1dbd155889a4ddc7d5b3c75 -size 36435 +oid sha256:4ec4cc1a0e029e51da14a48d6f6d744f189ce66479f855bff7d05a5ccb7ec650 +size 36775