mirror of
https://github.com/maplibre/martin.git
synced 2024-12-19 12:51:37 +03:00
3fcad46500
Compression middleware turned out to be hard to use for image cases - it simply looks at the content-encoding, and if not set, tries to compress if accepted by the client. Instead, now individual routes are configured with either that middleware, or for tiles, I decompress and optionally recompress if applicable. Now encoding is tracked separately from the tile content, making it cleaner too. Plus lots of tests for mbtiles & pmtiles. Fixes #577
120 lines
4.2 KiB
Rust
120 lines
4.2 KiB
Rust
use actix_web::http::header::{ACCEPT_ENCODING, CONTENT_ENCODING, CONTENT_TYPE};
|
|
use actix_web::test::{call_service, read_body, read_body_json, TestRequest};
|
|
use ctor::ctor;
|
|
use indoc::indoc;
|
|
use martin::decode_gzip;
|
|
use martin::srv::IndexEntry;
|
|
use tilejson::TileJSON;
|
|
|
|
pub mod utils;
|
|
pub use utils::*;
|
|
|
|
#[ctor]
|
|
fn init() {
|
|
let _ = env_logger::builder().is_test(true).try_init();
|
|
}
|
|
|
|
macro_rules! create_app {
|
|
($sources:expr) => {{
|
|
let sources = mock_sources(mock_cfg($sources)).await.0;
|
|
let state = crate::utils::mock_app_data(sources).await;
|
|
::actix_web::test::init_service(
|
|
::actix_web::App::new()
|
|
.app_data(state)
|
|
.configure(::martin::srv::router),
|
|
)
|
|
.await
|
|
}};
|
|
}
|
|
|
|
fn test_get(path: &str) -> TestRequest {
|
|
TestRequest::get().uri(path)
|
|
}
|
|
|
|
const CONFIG: &str = indoc! {"
|
|
pmtiles:
|
|
sources:
|
|
p_png: tests/fixtures/files/stamen_toner__raster_CC-BY+ODbL_z3.pmtiles
|
|
"};
|
|
|
|
#[actix_rt::test]
|
|
async fn pmt_get_catalog() {
|
|
let path = "pmtiles: tests/fixtures/files/stamen_toner__raster_CC-BY+ODbL_z3.pmtiles";
|
|
let app = create_app! { path };
|
|
|
|
let req = test_get("/catalog").to_request();
|
|
let response = call_service(&app, req).await;
|
|
assert!(response.status().is_success());
|
|
let body = read_body(response).await;
|
|
let sources: Vec<IndexEntry> = serde_json::from_slice(&body).unwrap();
|
|
|
|
let expected = "stamen_toner__raster_CC-BY-ODbL_z3";
|
|
assert_eq!(sources.iter().filter(|v| v.id == expected).count(), 1);
|
|
}
|
|
|
|
#[actix_rt::test]
|
|
async fn pmt_get_catalog_gzip() {
|
|
let app = create_app! { CONFIG };
|
|
let accept = (ACCEPT_ENCODING, "gzip");
|
|
let req = test_get("/catalog").insert_header(accept).to_request();
|
|
let response = call_service(&app, req).await;
|
|
assert!(response.status().is_success());
|
|
let body = decode_gzip(&read_body(response).await).unwrap();
|
|
let sources: Vec<IndexEntry> = serde_json::from_slice(&body).unwrap();
|
|
assert_eq!(sources.iter().filter(|v| v.id == "p_png").count(), 1);
|
|
}
|
|
|
|
#[actix_rt::test]
|
|
async fn pmt_get_tilejson() {
|
|
let app = create_app! { CONFIG };
|
|
let req = test_get("/p_png").to_request();
|
|
let response = call_service(&app, req).await;
|
|
assert!(response.status().is_success());
|
|
let headers = response.headers();
|
|
assert_eq!(headers.get(CONTENT_TYPE).unwrap(), "application/json");
|
|
assert!(headers.get(CONTENT_ENCODING).is_none());
|
|
let body: TileJSON = read_body_json(response).await;
|
|
assert_eq!(body.maxzoom, Some(3));
|
|
}
|
|
|
|
#[actix_rt::test]
|
|
async fn pmt_get_tilejson_gzip() {
|
|
let app = create_app! { CONFIG };
|
|
let accept = (ACCEPT_ENCODING, "gzip");
|
|
let req = test_get("/p_png").insert_header(accept).to_request();
|
|
let response = call_service(&app, req).await;
|
|
assert!(response.status().is_success());
|
|
let headers = response.headers();
|
|
assert_eq!(headers.get(CONTENT_TYPE).unwrap(), "application/json");
|
|
assert_eq!(headers.get(CONTENT_ENCODING).unwrap(), "gzip");
|
|
let body = decode_gzip(&read_body(response).await).unwrap();
|
|
let body: TileJSON = serde_json::from_slice(body.as_slice()).unwrap();
|
|
assert_eq!(body.maxzoom, Some(3));
|
|
}
|
|
|
|
#[actix_rt::test]
|
|
async fn pmt_get_raster() {
|
|
let app = create_app! { CONFIG };
|
|
let req = test_get("/p_png/0/0/0").to_request();
|
|
let response = call_service(&app, req).await;
|
|
assert!(response.status().is_success());
|
|
assert_eq!(response.headers().get(CONTENT_TYPE).unwrap(), "image/png");
|
|
assert!(response.headers().get(CONTENT_ENCODING).is_none());
|
|
let body = read_body(response).await;
|
|
assert_eq!(body.len(), 18404);
|
|
}
|
|
|
|
/// get a raster tile with accepted gzip enc, but should still be non-gzipped
|
|
#[actix_rt::test]
|
|
async fn pmt_get_raster_gzip() {
|
|
let app = create_app! { CONFIG };
|
|
let accept = (ACCEPT_ENCODING, "gzip");
|
|
let req = test_get("/p_png/0/0/0").insert_header(accept).to_request();
|
|
let response = call_service(&app, req).await;
|
|
assert!(response.status().is_success());
|
|
assert_eq!(response.headers().get(CONTENT_TYPE).unwrap(), "image/png");
|
|
assert!(response.headers().get(CONTENT_ENCODING).is_none());
|
|
let body = read_body(response).await;
|
|
assert_eq!(body.len(), 18404);
|
|
}
|