mirror of
https://github.com/maplibre/martin.git
synced 2024-12-20 21:31:49 +03:00
2ee517d135
Can now handle several additional Postgres functions to get a tile, plus tons of small fixes ### Multiple result variants * `getmvt(z,x,y) -> [bytea,md5]` (single row with two columns) * `getmvt(z,x,y) -> [bytea]` (single row with a single column) * `getmvt(z,x,y) -> bytea` (value) ### Multiple input parameter variants * `getmvt(z, x, y)` or `getmvt(zoom, x, y)` (all 3 vars must be integers) * `getmvt(z, x, y, url_query)`, where instead of `url_query` it could be any other name, but must be of type JSON ### Breaking * srid is now the same type as PG -- `i32` * renamed config vals `table_sources` and `function_sources` into `tables` and `functions` ### Features and fixes * if postgis is v3.1+, uses margin parameter to extend the search box by the size of the buffer. I think we should make 3.1 minimal required. * fixes feature ID issue from #466 * fixes mixed case names for schemas, tables and columns, functions and parameter names per #389 ### Notes * More dynamic SQL generation in code instead of using external SQL files. Those should only be used when they are not parametrized. * The new function/table discovery mechanism: query for all functions in the database, and match up those functions with the ones configured (if any), plus adds all the rest of the un-declared ones if discovery mode is on. * During table and function discovery, the code generates a map of `(PgSqlInfo, FunctionInfo)` (or table) tupples containing SQL needed to get the tile. * Auto-discovery mode is currently hidden - the discovery is on only when no tables or functions are configured. TBD - how to configure it in the future * The new system allows for an easy way to auto-discover for the specific schemas only, solving #47 * predictable order of table/function instantiation * bounding boxes computed in parallel for all tables (when not configured) * proper identifier escaping * test cleanup fixes #378 fixes #466 fixes #65 fixes #389
95 lines
2.6 KiB
Rust
95 lines
2.6 KiB
Rust
use ctor::ctor;
|
|
use log::info;
|
|
use martin::source::Xyz;
|
|
use std::collections::HashMap;
|
|
|
|
#[path = "utils.rs"]
|
|
mod utils;
|
|
use utils::*;
|
|
|
|
#[ctor]
|
|
fn init() {
|
|
let _ = env_logger::builder().is_test(true).try_init();
|
|
}
|
|
|
|
#[actix_rt::test]
|
|
async fn table_source() {
|
|
let mock = mock_unconfigured().await;
|
|
assert!(!mock.0.is_empty());
|
|
|
|
let source = table(&mock, "table_source");
|
|
assert_eq!(source.schema, "public");
|
|
assert_eq!(source.table, "table_source");
|
|
assert_eq!(source.srid, 4326);
|
|
assert_eq!(source.geometry_column, "geom");
|
|
assert_eq!(source.id_column, None);
|
|
assert_eq!(source.minzoom, None);
|
|
assert_eq!(source.maxzoom, None);
|
|
assert!(source.bounds.is_some());
|
|
assert_eq!(source.extent, Some(4096));
|
|
assert_eq!(source.buffer, Some(64));
|
|
assert_eq!(source.clip_geom, Some(true));
|
|
assert_eq!(source.geometry_type, Some("GEOMETRY".to_owned()));
|
|
|
|
let mut properties = HashMap::new();
|
|
properties.insert("gid".to_owned(), "int4".to_owned());
|
|
assert_eq!(source.properties, properties);
|
|
}
|
|
|
|
#[actix_rt::test]
|
|
async fn tables_tilejson_ok() {
|
|
let mock = mock_unconfigured().await;
|
|
let tilejson = source(&mock, "table_source").get_tilejson();
|
|
|
|
info!("tilejson = {tilejson:#?}");
|
|
|
|
assert_eq!(tilejson.tilejson, "2.2.0");
|
|
assert_eq!(tilejson.version, Some("1.0.0".to_owned()));
|
|
assert_eq!(tilejson.name, Some("public.table_source.geom".to_owned()));
|
|
assert_eq!(tilejson.scheme, Some("xyz".to_owned()));
|
|
assert_eq!(tilejson.minzoom, Some(0));
|
|
assert_eq!(tilejson.maxzoom, Some(30));
|
|
assert!(tilejson.bounds.is_some());
|
|
assert!(tilejson.tiles.is_empty());
|
|
}
|
|
|
|
#[actix_rt::test]
|
|
async fn tables_tile_ok() {
|
|
let mock = mock_unconfigured().await;
|
|
let src = source(&mock, "table_source");
|
|
let tile = src
|
|
.get_tile(&Xyz { z: 0, x: 0, y: 0 }, &None)
|
|
.await
|
|
.unwrap();
|
|
|
|
assert!(!tile.is_empty());
|
|
}
|
|
|
|
#[actix_rt::test]
|
|
async fn tables_srid_ok() {
|
|
let mock = mock_unconfigured_srid(Some(900913)).await;
|
|
|
|
let source = table(&mock, "points1");
|
|
assert_eq!(source.srid, 4326);
|
|
|
|
let source = table(&mock, "points2");
|
|
assert_eq!(source.srid, 4326);
|
|
|
|
let source = table(&mock, "points3857");
|
|
assert_eq!(source.srid, 3857);
|
|
|
|
let source = table(&mock, "points_empty_srid");
|
|
assert_eq!(source.srid, 900913);
|
|
}
|
|
|
|
#[actix_rt::test]
|
|
async fn tables_multiple_geom_ok() {
|
|
let mock = mock_unconfigured().await;
|
|
|
|
let source = table(&mock, "table_source_multiple_geom");
|
|
assert_eq!(source.geometry_column, "geom1");
|
|
|
|
let source = table(&mock, "table_source_multiple_geom.1");
|
|
assert_eq!(source.geometry_column, "geom2");
|
|
}
|