2022-11-26 12:46:40 +03:00
|
|
|
use ctor::ctor;
|
2023-01-03 19:09:41 +03:00
|
|
|
use indoc::indoc;
|
2022-12-10 23:11:11 +03:00
|
|
|
use itertools::Itertools;
|
2022-12-27 09:56:27 +03:00
|
|
|
use martin::Xyz;
|
2021-10-23 17:02:18 +03:00
|
|
|
|
2023-01-03 19:09:41 +03:00
|
|
|
pub mod utils;
|
|
|
|
pub use utils::*;
|
2022-11-26 12:46:40 +03:00
|
|
|
|
|
|
|
#[ctor]
|
2021-10-23 17:02:18 +03:00
|
|
|
fn init() {
|
|
|
|
let _ = env_logger::builder().is_test(true).try_init();
|
|
|
|
}
|
|
|
|
|
|
|
|
#[actix_rt::test]
|
2022-11-26 12:46:40 +03:00
|
|
|
async fn function_source_tilejson() {
|
2023-01-03 19:09:41 +03:00
|
|
|
let mock = mock_sources(mock_pgcfg("connection_string: $DATABASE_URL")).await;
|
Support z,x,y and record-returning funcs, table rework (#380)
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
2022-12-10 17:20:42 +03:00
|
|
|
let tilejson = source(&mock, "function_zxy_query").get_tilejson();
|
2021-10-23 17:02:18 +03:00
|
|
|
|
Add .mbtiles support (#549)
Adds a new [.mbtiles](https://github.com/mapbox/mbtiles-spec/blob/master/1.3/spec.md)
backend, without the grid support. Uses extensive tile content
detection, i.e. if the content is gzipped, png, jpeg, gif, webp.
From CLI, can be as easy as adding a path to a directory that contains a
.mbtiles file (works just like pmtiles support)
```bash
# All *.mbtiles files in this dir will be published.
# The filename will be used as the source ID
martin ./tests/fixtures
```
From configuration file, the path can be specified in a number of ways
(same as pmtiles)
```yaml
mbtiles:
paths:
# scan this whole dir, matching all *.mbtiles files
- /dir-path
# specific mbtiles file will be published as mbtiles2 source
- /path/to/mbtiles2.mbtiles
sources:
# named source matching source name to a single file
pm-src1: /tmp/mbtiles.mbtiles
# named source, where the filename is explicitly set. This way we will be able to add more options later
pm-src2:
path: /tmp/mbtiles.mbtiles
```
Fixes #494
2023-01-09 08:10:23 +03:00
|
|
|
assert_eq!(tilejson.tilejson, "3.0.0");
|
2022-12-27 09:56:27 +03:00
|
|
|
assert_eq!(tilejson.name, some("public.function_zxy_query"));
|
2021-10-23 17:02:18 +03:00
|
|
|
assert!(tilejson.tiles.is_empty());
|
|
|
|
}
|
|
|
|
|
|
|
|
#[actix_rt::test]
|
2022-11-26 12:46:40 +03:00
|
|
|
async fn function_source_tile() {
|
2023-01-03 19:09:41 +03:00
|
|
|
let mock = mock_sources(mock_pgcfg("connection_string: $DATABASE_URL")).await;
|
Support z,x,y and record-returning funcs, table rework (#380)
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
2022-12-10 17:20:42 +03:00
|
|
|
let src = source(&mock, "function_zxy_query");
|
|
|
|
let tile = src
|
|
|
|
.get_tile(&Xyz { z: 0, x: 0, y: 0 }, &None)
|
2022-08-15 16:54:48 +03:00
|
|
|
.await
|
2021-10-23 17:02:18 +03:00
|
|
|
.unwrap();
|
2022-12-27 09:56:27 +03:00
|
|
|
assert!(!tile.is_empty());
|
2021-10-23 17:02:18 +03:00
|
|
|
|
2022-12-27 09:56:27 +03:00
|
|
|
let src = source(&mock, "function_zxy_query_jsonb");
|
|
|
|
let tile = src
|
|
|
|
.get_tile(&Xyz { z: 0, x: 0, y: 0 }, &None)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2021-10-23 17:02:18 +03:00
|
|
|
assert!(!tile.is_empty());
|
|
|
|
}
|
2022-12-10 23:11:11 +03:00
|
|
|
|
|
|
|
#[actix_rt::test]
|
|
|
|
async fn function_source_schemas() {
|
2023-01-03 19:09:41 +03:00
|
|
|
let cfg = mock_pgcfg(indoc! {"
|
|
|
|
connection_string: $DATABASE_URL
|
|
|
|
auto_publish:
|
|
|
|
tables: false
|
|
|
|
functions:
|
|
|
|
from_schemas: MixedCase
|
|
|
|
"});
|
2022-12-10 23:11:11 +03:00
|
|
|
let sources = mock_sources(cfg).await.0;
|
|
|
|
assert_eq!(
|
|
|
|
sources.keys().sorted().collect::<Vec<_>>(),
|
|
|
|
vec!["function_Mixed_Name"],
|
|
|
|
);
|
|
|
|
}
|