maplibre/martin
1
1
Fork 0
mirror of https://github.com/maplibre/martin.git synced 2024-12-19 12:51:37 +03:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Clean up actix routes, HEAD support (#416)

Browse Source 
Use attribute-based routing, and support HEAD requests (same as GET)

attribute routes are better because they keep route declaration (i.e. parameters) together with the code that uses it.
This commit is contained in:
Yuri Astrakhan 2022-09-27 12:06:25 -04:00 committed by GitHub
parent 2c44dc2ac3
commit 23655c6a60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/server.rs
View File

@ -7,7 +7,8 @@ use actix_web::dev::Server;
use actix_web::http::Uri; use actix_web::http::Uri;
use actix_web::middleware::TrailingSlash; use actix_web::middleware::TrailingSlash;
use actix_web::{ use actix_web::{
error, middleware, web, App, Error, HttpRequest, HttpResponse, HttpServer, Result, error, middleware, route, web, App, Error, HttpRequest, HttpResponse, HttpServer, Responder,
Result,
}; };
use log::error; use log::error;
use serde::Deserialize; use serde::Deserialize;
@ -58,25 +59,26 @@ struct CompositeTileRequest {
} }
fn map_internal_error<T: std::fmt::Display>(e: T) -> Error { fn map_internal_error<T: std::fmt::Display>(e: T) -> Error {
// FIXME: is e.to_string() needed here, or can it just be error!("{e}") ? error!("{e}");
error!("{}", e.to_string());
error::ErrorInternalServerError(e.to_string()) error::ErrorInternalServerError(e.to_string())
} }
async fn get_health() -> Result<HttpResponse, Error> { #[route("/healthz", method = "GET", method = "HEAD")]
let response = HttpResponse::Ok().body("OK"); async fn get_health() -> &'static str {
Ok(response) "OK"
} }
async fn get_table_sources(state: web::Data<AppState>) -> Result<HttpResponse, Error> { #[route("/index.json", method = "GET", method = "HEAD")]
Ok(HttpResponse::Ok().json(state.table_sources.as_ref())) async fn get_table_sources(state: web::Data<AppState>) -> impl Responder {
HttpResponse::Ok().json(state.table_sources.as_ref())
} }
#[route("/{source_ids}.json", method = "GET", method = "HEAD")]
async fn get_composite_source( async fn get_composite_source(
req: HttpRequest, req: HttpRequest,
path: web::Path<CompositeSourceRequest>, path: web::Path<CompositeSourceRequest>,
state: web::Data<AppState>, state: web::Data<AppState>,
) -> Result<HttpResponse> { ) -> impl Responder {
let table_sources = state let table_sources = state
.table_sources .table_sources
.as_ref() .as_ref()
@ -129,10 +131,11 @@ async fn get_composite_source(
Ok(HttpResponse::Ok().json(tilejson)) Ok(HttpResponse::Ok().json(tilejson))
} }
#[route("/{source_ids}/{z}/{x}/{y}.{format}", method = "GET", method = "HEAD")]
async fn get_composite_source_tile( async fn get_composite_source_tile(
path: web::Path<CompositeTileRequest>, path: web::Path<CompositeTileRequest>,
state: web::Data<AppState>, state: web::Data<AppState>,
) -> Result<HttpResponse, Error> { ) -> impl Responder {
let table_sources = state let table_sources = state
.table_sources .table_sources
.as_ref() .as_ref()
@ -158,11 +161,12 @@ async fn get_composite_source_tile(
get_tile(&state, path.z, path.x, path.y, None, Box::new(source)).await get_tile(&state, path.z, path.x, path.y, None, Box::new(source)).await
} }
async fn get_function_sources(state: web::Data<AppState>) -> Result<HttpResponse, Error> { #[route("/rpc/index.json", method = "GET", method = "HEAD")]
let function_sources = state.function_sources.as_ref(); async fn get_function_sources(state: web::Data<AppState>) -> impl Responder {
Ok(HttpResponse::Ok().json(function_sources)) HttpResponse::Ok().json(state.function_sources.as_ref())
} }
#[route("/rpc/{source_id}.json", method = "GET", method = "HEAD")]
async fn get_function_source( async fn get_function_source(
req: HttpRequest, req: HttpRequest,
path: web::Path<SourceRequest>, path: web::Path<SourceRequest>,
@ -208,11 +212,16 @@ async fn get_function_source(
Ok(HttpResponse::Ok().json(tilejson)) Ok(HttpResponse::Ok().json(tilejson))
} }
#[route(
"/rpc/{source_id}/{z}/{x}/{y}.{format}",
method = "GET",
method = "HEAD"
)]
async fn get_function_source_tile( async fn get_function_source_tile(
path: web::Path<TileRequest>, path: web::Path<TileRequest>,
query: web::Query<HashMap<String, String>>, query: web::Query<HashMap<String, String>>,
state: web::Data<AppState>, state: web::Data<AppState>,
) -> Result<HttpResponse, Error> { ) -> impl Responder {
let function_sources = state let function_sources = state
.function_sources .function_sources
.as_ref() .as_ref()
@ -269,19 +278,13 @@ async fn get_tile(
} }
pub fn router(cfg: &mut web::ServiceConfig) { pub fn router(cfg: &mut web::ServiceConfig) {
cfg.route("/healthz", web::get().to(get_health)) cfg.service(get_health)
.route("/index.json", web::get().to(get_table_sources)) .service(get_table_sources)
.route("/{source_ids}.json", web::get().to(get_composite_source)) .service(get_composite_source)
.route( .service(get_composite_source_tile)
"/{source_ids}/{z}/{x}/{y}.{format}", .service(get_function_sources)
web::get().to(get_composite_source_tile), .service(get_function_source)
) .service(get_function_source_tile);
.route("/rpc/index.json", web::get().to(get_function_sources))
.route("/rpc/{source_id}.json", web::get().to(get_function_source))
.route(
"/rpc/{source_id}/{z}/{x}/{y}.{format}",
web::get().to(get_function_source_tile),
);
} }
fn create_state(pool: Pool, config: Config) -> AppState { fn create_state(pool: Pool, config: Config) -> AppState {