Add attribution - review-resolved fmt fix

Maximkaaa · Feb 23, 2025 · b296db1 · b296db1
1 parent 2e02b36
commit b296db1
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 32 deletions.
diff --git a/galileo-egui/src/egui_map.rs b/galileo-egui/src/egui_map.rs
@@ -5,12 +5,12 @@ use egui::load::SizedTexture;
 use egui::{Event, Image, ImageSource, Sense, TextureId, Ui, Vec2};
 use egui_wgpu::wgpu::{FilterMode, TextureView};
 use egui_wgpu::RenderState;
-use galileo::layer::attribution::Attribution;
 use galileo::control::{
     EventProcessor, MapController, MouseButton, RawUserEvent, UserEventHandler,
 };
 use galileo::galileo_types::cartesian::{Point2d, Size};
 use galileo::galileo_types::geo::impls::GeoPoint2d;
+use galileo::layer::attribution::Attribution;
 use galileo::render::WgpuRenderer;
 use galileo::{Map, Messenger};
 
@@ -144,17 +144,15 @@ impl EguiMapState {
         let attributions = self.collect_attributions();
         if attributions.is_some() {
             egui::Window::new("Attributions")
-            .collapsible(false)
-            .resizable(false)
-            .title_bar(false)
-            .anchor(egui::Align2::RIGHT_BOTTOM, [-10., -10.]) // Position bottom-right
-            .fixed_size([350., 150.])
-            .show(ui.ctx(), |ui| {
-                self.show_attributions(ui); // Render the attributions inside this window
-            });
+                .collapsible(false)
+                .resizable(false)
+                .title_bar(false)
+                .anchor(egui::Align2::RIGHT_BOTTOM, [-10., -10.]) // Position bottom-right
+                .fixed_size([350., 150.])
+                .show(ui.ctx(), |ui| {
+                    self.show_attributions(ui); // Render the attributions inside this window
+                });
         }
-
-
 
         if self.event_processor.is_dragging() || response.contains_pointer() {
             let events = ui.input(|input_state| input_state.events.clone());
@@ -193,22 +191,25 @@ impl EguiMapState {
     }
     fn add_attribution_entry(&mut self, ui: &mut egui::Ui, attribution: &Attribution) {
         if let Some(url) = attribution.get_url() {
-          ui.hyperlink_to(attribution.get_text(), url);
+            ui.hyperlink_to(attribution.get_text(), url);
         } else {
-          ui.label(attribution.get_text());
+            ui.label(attribution.get_text());
         }
     }
 
     pub fn show_attributions(&mut self, ui: &mut egui::Ui) {
-        let attributions = self.collect_attributions().expect("Failed to collect attributions");
+        let attributions = self
+            .collect_attributions()
+            .expect("Failed to collect attributions");
 
         let mut is_first = true;
         for attribution in &attributions {
-            self.add_attribution_entry(ui,attribution);
-            if !is_first { ui.label(" | "); }
+            self.add_attribution_entry(ui, attribution);
+            if !is_first {
+                ui.label(" | ");
+            }
             is_first = false;
         }
-
     }
 
     fn resize_map(&mut self, size: Vec2) {

diff --git a/galileo/examples/egui_app.rs b/galileo/examples/egui_app.rs
@@ -38,7 +38,7 @@ impl eframe::App for EguiMapApp {
                 .with_position(&mut self.position)
                 .with_resolution(&mut self.resolution)
                 .show_ui(ui);
-            
+
             egui::Window::new("Galileo map").show(ctx, |ui| {
                 ui.label("Map center position:");
                 ui.label(format!(

diff --git a/galileo/examples/vector_tiles.rs b/galileo/examples/vector_tiles.rs
@@ -89,7 +89,10 @@ pub(crate) fn run() {
     .with_style(style)
     .with_tile_schema(tile_schema())
     .with_file_cache_checked(".tile_cache")
-    .with_attribution("© MapTiler© OpenStreetMap contributors".to_string(),"https://www.maptiler.com/copyright/".to_string())
+    .with_attribution(
+        "© MapTiler© OpenStreetMap contributors".to_string(),
+        "https://www.maptiler.com/copyright/".to_string(),
+    )
     .build()
     .expect("failed to create layer");
 

diff --git a/galileo/src/layer/feature_layer/mod.rs b/galileo/src/layer/feature_layer/mod.rs
@@ -16,11 +16,11 @@ use maybe_sync::{MaybeSend, MaybeSync};
 use num_traits::AsPrimitive;
 use parking_lot::{Mutex, RwLock};
 
+use crate::layer::attribution::Attribution;
 use crate::layer::Layer;
 use crate::messenger::Messenger;
 use crate::render::{Canvas, RenderOptions};
 use crate::view::MapView;
-use crate::layer::attribution::Attribution;
 
 mod feature;
 mod feature_store;
@@ -391,7 +391,6 @@ where
     fn attribution(&self) -> Option<Attribution> {
         None
     }
-
 }
 
 impl<P, F, S> FeatureLayer<P, F, S, CartesianSpace2d>

diff --git a/galileo/src/layer/mod.rs b/galileo/src/layer/mod.rs
@@ -6,17 +6,17 @@ use std::sync::Arc;
 use maybe_sync::{MaybeSend, MaybeSync};
 use parking_lot::RwLock;
 
+use crate::layer::attribution::Attribution;
+use crate::messenger::Messenger;
 use crate::render::Canvas;
 use crate::view::MapView;
 use crate::TileSchema;
-use crate::messenger::Messenger;
-use crate::layer::attribution::Attribution;
 
+pub mod attribution;
 pub mod data_provider;
 pub mod feature_layer;
 pub mod raster_tile_layer;
 pub mod vector_tile_layer;
-pub mod attribution;
 
 pub use feature_layer::{FeatureId, FeatureLayer};
 pub use raster_tile_layer::RasterTileLayer;
@@ -47,7 +47,7 @@ pub trait Layer: MaybeSend + MaybeSync {
         None
     }
     /// Returns the attribution of the layer, if available.
-    fn attribution(&self) -> Option<Attribution> ;
+    fn attribution(&self) -> Option<Attribution>;
 }
 
 impl<T: Layer + 'static> Layer for Arc<RwLock<T>> {

diff --git a/galileo/src/layer/raster_tile_layer/builder.rs b/galileo/src/layer/raster_tile_layer/builder.rs
@@ -95,7 +95,10 @@ impl RasterTileLayerBuilder {
             messenger: None,
             cache: CacheType::None,
             offline_mode: false,
-            attribution: Some(Attribution::new("© OpenStreetMap contributors".to_string(),Some("https://www.openstreetmap.org/copyright".to_string())) ),
+            attribution: Some(Attribution::new(
+                "© OpenStreetMap contributors".to_string(),
+                Some("https://www.openstreetmap.org/copyright".to_string()),
+            )),
         }
     }
 
@@ -319,7 +322,7 @@ impl RasterTileLayerBuilder {
             messenger,
             cache,
             offline_mode,
-            attribution
+            attribution,
         } = self;
 
         let tile_schema = tile_schema.unwrap_or_else(|| TileSchema::web(18));
@@ -354,7 +357,12 @@ impl RasterTileLayerBuilder {
             }
         };
 
-        Ok(RasterTileLayer::new_raw(provider, tile_schema, messenger, attribution))
+        Ok(RasterTileLayer::new_raw(
+            provider,
+            tile_schema,
+            messenger,
+            attribution,
+        ))
     }
 }
 

diff --git a/galileo/src/layer/raster_tile_layer/mod.rs b/galileo/src/layer/raster_tile_layer/mod.rs
@@ -11,11 +11,11 @@ use web_time::{Duration, SystemTime};
 
 use super::Layer;
 use crate::decoded_image::DecodedImage;
+use crate::layer::attribution::Attribution;
 use crate::messenger::Messenger;
 use crate::render::{Canvas, ImagePaint, PackedBundle, RenderOptions};
 use crate::tile_schema::{TileIndex, TileSchema};
 use crate::view::MapView;
-use crate::layer::attribution::Attribution;
 
 mod provider;
 pub use provider::{RasterTileProvider, RestTileProvider};

diff --git a/galileo/src/layer/vector_tile_layer/builder.rs b/galileo/src/layer/vector_tile_layer/builder.rs
@@ -49,7 +49,7 @@ pub struct VectorTileLayerBuilder {
     messenger: Option<Box<dyn Messenger>>,
     cache: CacheType,
     offline_mode: bool,
-    attribution:Option<Attribution>
+    attribution: Option<Attribution>,
 }
 
 enum ProviderType {
@@ -114,7 +114,7 @@ impl VectorTileLayerBuilder {
             messenger: None,
             cache: CacheType::None,
             offline_mode: false,
-            attribution:None
+            attribution: None,
         }
     }
 
@@ -174,7 +174,7 @@ impl VectorTileLayerBuilder {
     /// * `text` - A `String` containing the text of the attribution.
     /// * `url` - A `String` containing the URL associated with the attribution.
     ///
-    pub fn with_attribution(mut self, text:String, url:String) -> Self {
+    pub fn with_attribution(mut self, text: String, url: String) -> Self {
         self.attribution = Some(Attribution::new(text, Some(url)));
         self
     }