Add --preferred-encoding (gzip|brotli) to use when tile is not pre-encoded by source

martin/src/args/srv.rs

@@ -1,4 +1,6 @@
 use crate::srv::{SrvConfig, KEEP_ALIVE_DEFAULT, LISTEN_ADDRESSES_DEFAULT};
+use martin_tile_utils::Encoding;
+use TileEncoding::{Brotli, Gzip};
 
 #[derive(clap::Args, Debug, PartialEq, Default)]
 #[command(about, version)]
@@ -10,6 +12,8 @@ pub struct SrvArgs {
     /// Number of web server workers
     #[arg(short = 'W', long)]
     pub workers: Option<usize>,
+    #[arg(help = "to do", short, long)]
+    pub preferred_encoding: Option<String>,
 }
 
 impl SrvArgs {
@@ -24,5 +28,15 @@ impl SrvArgs {
         if self.workers.is_some() {
             srv_config.worker_processes = self.workers;
         }
+        if let Some(encoding_str) = self.preferred_encoding {
+            match encoding_str.as_str() {
+                "gzip" => srv_config.preferred_encoding = Option::from(Encoding::Gzip),
+                "brotli" => srv_config.preferred_encoding = Option::from(Encoding::Brotli),
+                "br" => srv_config.preferred_encoding = Option::from(Encoding::Brotli),
+                _ => panic!("Invalid encoding: {}", encoding_str),
+            }
+        } else {
+            srv_config.preferred_encoding = Option::from(Encoding::Brotli);
+        }
     }
 }

martin/src/config.rs

@@ -10,6 +10,7 @@ use futures::future::try_join_all;
 use log::info;
 use serde::{Deserialize, Serialize};
 use subst::VariableMap;
+use martin_tile_utils::Encoding;
 
 #[cfg(any(feature = "mbtiles", feature = "pmtiles", feature = "sprites"))]
 use crate::file_config::FileConfigEnum;
@@ -32,6 +33,7 @@ pub struct ServerState {
     pub sprites: SpriteSources,
     #[cfg(feature = "fonts")]
     pub fonts: FontSources,
+    pub preferred_encoding: Encoding,
 }
 
 #[serde_with::skip_serializing_none]
@@ -143,6 +145,7 @@ impl Config {
             #[cfg(feature = "fonts")]
             fonts: FontSources::resolve(&mut self.fonts)?,
             cache,
+            preferred_encoding: self.srv.preferred_encoding.unwrap_or(Encoding::Brotli),
         })
     }
 

martin/src/srv/config.rs

@@ -1,3 +1,4 @@
+use martin_tile_utils::Encoding;
 use serde::{Deserialize, Serialize};
 
 pub const KEEP_ALIVE_DEFAULT: u64 = 75;
@@ -9,6 +10,7 @@ pub struct SrvConfig {
     pub keep_alive: Option<u64>,
     pub listen_addresses: Option<String>,
     pub worker_processes: Option<usize>,
+    pub preferred_encoding: Option<Encoding>,
 }
 
 #[cfg(test)]
@@ -31,6 +33,7 @@ mod tests {
                 keep_alive: Some(75),
                 listen_addresses: some("0.0.0.0:3000"),
                 worker_processes: Some(8),
+                preferred_encoding: None,
             }
         );
     }

martin/src/srv/server.rs

@@ -115,7 +115,8 @@ pub fn new_server(config: SrvConfig, state: ServerState) -> MartinResult<(Server
 
         let app = App::new()
             .app_data(Data::new(state.tiles.clone()))
-            .app_data(Data::new(state.cache.clone()));
+            .app_data(Data::new(state.cache.clone()))
+            .app_data(Data::new(state.preferred_encoding));
 
         #[cfg(feature = "sprites")]
         let app = app.app_data(Data::new(state.sprites.clone()));