unified the types to be based on TileInfoSource (#1611)

This PR pulls the changes to `Box<dyn Source>` vs `TileInfoSource` from
- #1585

martin/src/file_config.rs

@@ -12,7 +12,7 @@ use crate::config::{copy_unrecognized_config, UnrecognizedValues};
 use crate::file_config::FileError::{
     InvalidFilePath, InvalidSourceFilePath, InvalidSourceUrl, IoError,
 };
-use crate::source::{Source, TileInfoSources};
+use crate::source::{TileInfoSource, TileInfoSources};
 use crate::utils::{IdResolver, OptMainCache, OptOneMany};
 use crate::MartinResult;
 use crate::OptOneMany::{Many, One};
@@ -70,13 +70,13 @@ pub trait SourceConfigExtras: ConfigExtras {
         &self,
         id: String,
         path: PathBuf,
-    ) -> impl std::future::Future<Output = FileResult<Box<dyn Source>>> + Send;
+    ) -> impl std::future::Future<Output = FileResult<TileInfoSource>> + Send;
 
     fn new_sources_url(
         &self,
         id: String,
         url: Url,
-    ) -> impl std::future::Future<Output = FileResult<Box<dyn Source>>> + Send;
+    ) -> impl std::future::Future<Output = FileResult<TileInfoSource>> + Send;
 }
 
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]

martin/src/mbtiles/mod.rs

@@ -14,7 +14,7 @@ use url::Url;
 use crate::config::UnrecognizedValues;
 use crate::file_config::FileError::{AcquireConnError, InvalidMetadata, IoError};
 use crate::file_config::{ConfigExtras, FileResult, SourceConfigExtras};
-use crate::source::{TileData, UrlQuery};
+use crate::source::{TileData, TileInfoSource, UrlQuery};
 use crate::{MartinResult, Source};
 
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
@@ -30,14 +30,14 @@ impl ConfigExtras for MbtConfig {
 }
 
 impl SourceConfigExtras for MbtConfig {
-    async fn new_sources(&self, id: String, path: PathBuf) -> FileResult<Box<dyn Source>> {
+    async fn new_sources(&self, id: String, path: PathBuf) -> FileResult<TileInfoSource> {
         Ok(Box::new(MbtSource::new(id, path).await?))
     }
 
     // TODO: Remove #[allow] after switching to Rust/Clippy v1.78+ in CI
     //       See https://github.com/rust-lang/rust-clippy/pull/12323
     #[allow(clippy::no_effect_underscore_binding)]
-    async fn new_sources_url(&self, _id: String, _url: Url) -> FileResult<Box<dyn Source>> {
+    async fn new_sources_url(&self, _id: String, _url: Url) -> FileResult<TileInfoSource> {
         unreachable!()
     }
 }
@@ -96,7 +96,7 @@ impl Source for MbtSource {
         self.tile_info
     }
 
-    fn clone_source(&self) -> Box<dyn Source> {
+    fn clone_source(&self) -> TileInfoSource {
         Box::new(self.clone())
     }
 

martin/src/pg/pg_source.rs

@@ -9,7 +9,7 @@ use tilejson::TileJSON;
 use crate::pg::pool::PgPool;
 use crate::pg::utils::query_to_json;
 use crate::pg::PgError::{GetTileError, GetTileWithQueryError, PrepareQueryError};
-use crate::source::{Source, TileData, UrlQuery};
+use crate::source::{Source, TileData, TileInfoSource, UrlQuery};
 use crate::MartinResult;
 
 #[derive(Clone, Debug)]
@@ -46,7 +46,7 @@ impl Source for PgSource {
         TileInfo::new(Mvt, Uncompressed)
     }
 
-    fn clone_source(&self) -> Box<dyn Source> {
+    fn clone_source(&self) -> TileInfoSource {
         Box::new(self.clone())
     }
 

martin/src/pmtiles/mod.rs

@@ -20,7 +20,7 @@ use url::Url;
 use crate::config::UnrecognizedValues;
 use crate::file_config::FileError::{InvalidMetadata, InvalidUrlMetadata, IoError};
 use crate::file_config::{ConfigExtras, FileError, FileResult, SourceConfigExtras};
-use crate::source::UrlQuery;
+use crate::source::{TileInfoSource, UrlQuery};
 use crate::utils::cache::get_cached_value;
 use crate::utils::{CacheKey, CacheValue, OptMainCache};
 use crate::{MartinResult, Source, TileData};
@@ -134,13 +134,13 @@ impl SourceConfigExtras for PmtConfig {
         true
     }
 
-    async fn new_sources(&self, id: String, path: PathBuf) -> FileResult<Box<dyn Source>> {
+    async fn new_sources(&self, id: String, path: PathBuf) -> FileResult<TileInfoSource> {
         Ok(Box::new(
             PmtFileSource::new(self.new_cached_source(), id, path).await?,
         ))
     }
 
-    async fn new_sources_url(&self, id: String, url: Url) -> FileResult<Box<dyn Source>> {
+    async fn new_sources_url(&self, id: String, url: Url) -> FileResult<TileInfoSource> {
         Ok(Box::new(
             PmtHttpSource::new(
                 self.client.clone().unwrap(),
@@ -250,7 +250,7 @@ macro_rules! impl_pmtiles_source {
                 self.tile_info
             }
 
-            fn clone_source(&self) -> Box<dyn Source> {
+            fn clone_source(&self) -> TileInfoSource {
                 Box::new(self.clone())
             }
 

martin/src/source.rs

@@ -18,7 +18,7 @@ pub type TileInfoSource = Box<dyn Source>;
 pub type TileInfoSources = Vec<TileInfoSource>;
 
 #[derive(Default, Clone)]
-pub struct TileSources(HashMap<String, Box<dyn Source>>);
+pub struct TileSources(HashMap<String, TileInfoSource>);
 pub type TileCatalog = BTreeMap<String, CatalogSourceEntry>;
 
 impl TileSources {
@@ -107,7 +107,7 @@ pub trait Source: Send + Debug {
 
     fn get_tile_info(&self) -> TileInfo;
 
-    fn clone_source(&self) -> Box<dyn Source>;
+    fn clone_source(&self) -> TileInfoSource;
 
     fn support_url_query(&self) -> bool {
         false
@@ -139,7 +139,7 @@ pub trait Source: Send + Debug {
     }
 }
 
-impl Clone for Box<dyn Source> {
+impl Clone for TileInfoSource {
     fn clone(&self) -> Self {
         self.clone_source()
     }

martin/src/srv/server.rs

@@ -201,7 +201,7 @@ pub mod tests {
     use tilejson::TileJSON;
 
     use super::*;
-    use crate::source::{Source, TileData};
+    use crate::source::{Source, TileData, TileInfoSource};
     use crate::UrlQuery;
 
     #[derive(Debug, Clone)]
@@ -225,7 +225,7 @@ pub mod tests {
             TileInfo::new(Format::Mvt, Encoding::Uncompressed)
         }
 
-        fn clone_source(&self) -> Box<dyn Source> {
+        fn clone_source(&self) -> TileInfoSource {
             unimplemented!()
         }