Cleanup and format

maplibre · Feb 27, 2024 · e9e36fc · e9e36fc
1 parent a24285a
commit e9e36fc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 82 deletions.
diff --git a/martin/src/srv/tiles_info.rs b/martin/src/srv/tiles_info.rs
@@ -32,7 +32,15 @@ async fn get_source_info(
 ) -> ActixResult<HttpResponse> {
     let sources = sources.get_sources(&path.source_ids, None)?.0;
 
-    let tiles_path = generate_tiles_base(&srv_config, &req, &path);
+    let tiles_path = if let Some(path_from_config) = &srv_config.base_path {
+        format!("{path_from_config}/{0}", &path.source_ids)
+    } else {
+        req.headers()
+            .get("x-rewrite-url")
+            .and_then(|url| url.to_str().ok())
+            .and_then(|v| parse_base_path(v).ok())
+            .unwrap_or_else(|| req.path().to_owned())
+    };
 
     let query_string = req.query_string();
     let path_and_query = if query_string.is_empty() {
@@ -54,27 +62,6 @@ async fn get_source_info(
     Ok(HttpResponse::Ok().json(merge_tilejson(&sources, tiles_url)))
 }
 
-fn generate_tiles_base(
-    srv_config: &SrvConfig,
-    req: &HttpRequest,
-    path: &Path<SourceIDsRequest>,
-) -> String {
-    let result = if let Some(path_from_config) = &srv_config.base_path {
-        let base = format!("{path_from_config}/{0}", &path.source_ids);
-        parse_base_path(&base).ok()
-    } else if let Some(rewrite_url) = req
-        .headers()
-        .get("x-rewrite-url")
-        .and_then(|url| url.to_str().ok())
-    {
-        parse_base_path(&rewrite_url.to_string()).ok()
-    } else {
-        None
-    };
-
-    result.map_or(req.path().to_owned(), |v| v)
-}
-
 #[must_use]
 pub fn merge_tilejson(sources: &[&dyn Source], tiles_url: String) -> TileJSON {
     if sources.len() == 1 {
@@ -172,66 +159,11 @@ pub fn merge_tilejson(sources: &[&dyn Source], tiles_url: String) -> TileJSON {
 pub mod tests {
     use std::collections::BTreeMap;
 
-    use actix_web::test::TestRequest;
     use tilejson::{Bounds, VectorLayer};
 
     use super::*;
     use crate::srv::server::tests::TestSource;
 
-    #[actix_web::test]
-    #[test]
-    async fn test_generate_tiles_base_path() {
-        // With config but rewrite url
-        let srv_config1 = SrvConfig {
-            base_path: Some("/tiles".to_string()),
-            ..Default::default()
-        };
-        let req1 = TestRequest::default().uri("/MixedPoints").to_http_request();
-        let path1 = Path::from(SourceIDsRequest {
-            source_ids: "MixedPoints".to_string(),
-        });
-
-        let base1 = generate_tiles_base(&srv_config1, &req1, &path1);
-        assert_eq!(base1, "/tiles/MixedPoints");
-
-        // With rewrite url but config
-        let srv_config2 = SrvConfig::default();
-        let req2 = TestRequest::default()
-            .insert_header(("x-rewrite-url", "/tiles/MixedPoints"))
-            .to_http_request();
-        let path2 = Path::from(SourceIDsRequest {
-            source_ids: "MixedPoints".to_string(),
-        });
-
-        let base2 = generate_tiles_base(&srv_config2, &req2, &path2);
-        assert_eq!(base2, "/tiles/MixedPoints");
-
-        // no config, no rewrite url
-        let srv_config3 = SrvConfig::default();
-        let req3 = TestRequest::default().uri("/MixedPoints").to_http_request();
-        let path3 = Path::from(SourceIDsRequest {
-            source_ids: "MixedPoints".to_string(),
-        });
-
-        let base3 = generate_tiles_base(&srv_config3, &req3, &path3);
-        assert_eq!(base3, "/MixedPoints");
-
-        // both
-        let srv_config4 = SrvConfig {
-            base_path: Some("/foo".to_string()),
-            ..Default::default()
-        };
-        let req4 = TestRequest::default()
-            .insert_header(("x-rewrite-url", "/bar"))
-            .to_http_request();
-        let path4 = Path::from(SourceIDsRequest {
-            source_ids: "MixedPoints".to_string(),
-        });
-
-        let base4 = generate_tiles_base(&srv_config4, &req4, &path4);
-        assert_eq!(base4, "/foo/MixedPoints");
-    }
-
     #[test]
     fn test_merge_tilejson() {
         let url = "http://localhost:8888/foo/{z}/{x}/{y}".to_string();

diff --git a/martin/src/utils/utilities.rs b/martin/src/utils/utilities.rs
@@ -33,16 +33,16 @@ pub fn encode_brotli(data: &[u8]) -> Result<Vec<u8>, std::io::Error> {
     Ok(encoder.into_inner())
 }
 
-pub fn parse_base_path(path: &String) -> MartinResult<String> {
+pub fn parse_base_path(path: &str) -> MartinResult<String> {
     if !path.starts_with('/') {
         return Err(BasePathError(path.to_string()));
     }
     if let Ok(uri) = path.parse::<Uri>() {
-        let mut result = uri.path().to_string().clone();
-        while result.chars().last().is_some_and(|v| v == '/') && result.len() > 1 {
-            result.pop();
+        let mut result = uri.path();
+        while result.len() > 1 {
+            result = result.trim_end_matches('/');
         }
-        return Ok(result);
+        return Ok(result.to_string());
     }
     Err(BasePathError(path.to_string()))
 }