* feat(cache): add default remove_parameters_modifier function

Author: sectore

galileo/examples/raster_tiles_switch.rs

@@ -1,5 +1,6 @@
 //! This example shows how to switch tile layers at runtime.
 
+use galileo::layer::data_provider::remove_parameters_modifier;
 use galileo::layer::raster_tile_layer::RasterTileLayerBuilder;
 use galileo::layer::RasterTileLayer;
 use galileo::tile_schema::TileIndex;
@@ -85,11 +86,7 @@ fn build_layer(tile_id: &str, messenger: Option<impl Messenger + 'static>) -> Ra
             y = index.y
         )
     })
-    .with_file_cache_modifier_checked(
-        ".tile_cache",
-        // Remove query parameters from path if they exist
-        Box::new(|path| path.split('?').next().unwrap_or(path).to_string()),
-    );
+    .with_file_cache_modifier_checked(".tile_cache", Box::new(remove_parameters_modifier));
 
     if let Some(messenger) = messenger {
         builder = builder.with_messenger(messenger);

galileo/examples/vector_tiles.rs

@@ -4,6 +4,7 @@ use std::sync::Arc;
 
 use egui::FontDefinitions;
 use galileo::control::{EventPropagation, MouseButton, UserEvent, UserEventHandler};
+use galileo::layer::data_provider::remove_parameters_modifier;
 use galileo::layer::vector_tile_layer::style::VectorTileStyle;
 use galileo::layer::vector_tile_layer::VectorTileLayerBuilder;
 use galileo::layer::VectorTileLayer;
@@ -88,11 +89,7 @@ pub(crate) fn run() {
     })
     .with_style(style)
     .with_tile_schema(tile_schema())
-    .with_file_cache_modifier_checked(
-        ".tile_cache",
-        // Remove query parameters from path if they exist
-        Box::new(|path| path.split('?').next().unwrap_or(path).to_string()),
-    )
+    .with_file_cache_modifier_checked(".tile_cache", Box::new(remove_parameters_modifier))
     .with_attribution(
         "© MapTiler© OpenStreetMap contributors".to_string(),
         "https://www.maptiler.com/copyright/".to_string(),

galileo/examples/vector_tiles_labels.rs

@@ -1,5 +1,6 @@
 //! This examples shows how to render labels for vector tile points.
 
+use galileo::layer::data_provider::remove_parameters_modifier;
 use galileo::layer::vector_tile_layer::style::{
     StyleRule, VectorTileLabelSymbol, VectorTileStyle, VectorTileSymbol,
 };
@@ -31,11 +32,7 @@ pub(crate) fn run() {
             y = index.y
         )
     })
-    .with_file_cache_modifier_checked(
-        ".tile_cache",
-        // Remove query parameters from path if they exist
-        Box::new(|path| path.split('?').next().unwrap_or(path).to_string()),
-    )
+    .with_file_cache_modifier_checked(".tile_cache", Box::new(remove_parameters_modifier))
     .with_style(default_style())
     .with_tile_schema(tile_schema())
     .with_attribution(

galileo/src/layer/data_provider/file_cache.rs

@@ -9,6 +9,12 @@ use crate::layer::data_provider::PersistentCacheController;
 /// Function to modify the default file path of the cache
 pub type FileCachePathModifier = dyn Fn(&str) -> String + Send + Sync;
 
+/// Modifier to remove parameters from file path.
+/// Can be used as a [`FileCachePathModifier`].
+pub fn remove_parameters_modifier(path: &str) -> String {
+    path.split('?').next().unwrap_or(path).to_owned()
+}
+
 /// Stores the cached data as a set of files in the specified folder. It generates file names from the given urls.
 ///
 /// Currently, there is no eviction mechanism.

galileo/src/layer/data_provider/mod.rs

@@ -1,7 +1,7 @@
 //! Data sources for layers.
 
 mod file_cache;
-pub use file_cache::{FileCacheController, FileCachePathModifier};
+pub use file_cache::{remove_parameters_modifier, FileCacheController, FileCachePathModifier};
 use maybe_sync::{MaybeSend, MaybeSync};
 
 use crate::error::GalileoError;