diff --git a/Cargo.lock b/Cargo.lock index c17a0414..707c9b02 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1852,7 +1852,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "martin" -version = "0.10.1" +version = "0.11.0" dependencies = [ "actix-cors", "actix-http", @@ -1901,11 +1901,11 @@ dependencies = [ [[package]] name = "martin-tile-utils" -version = "0.1.4" +version = "0.1.5" [[package]] name = "mbtiles" -version = "0.7.4" +version = "0.8.0" dependencies = [ "actix-rt", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index 099d8a50..fcd34f26 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ itertools = "0.12" json-patch = "1.2" log = "0.4" martin-tile-utils = { path = "./martin-tile-utils", version = "0.1.0" } -mbtiles = { path = "./mbtiles", version = "0.7.0" } +mbtiles = { path = "./mbtiles", version = "0.8.0" } num_cpus = "1" pbf_font_tools = { version = "2.5.0", features = ["freetype"] } pmtiles = { version = "0.5", features = ["mmap-async-tokio", "tilejson"] } diff --git a/martin-tile-utils/Cargo.toml b/martin-tile-utils/Cargo.toml index 2b413a94..deb38938 100644 --- a/martin-tile-utils/Cargo.toml +++ b/martin-tile-utils/Cargo.toml @@ -2,7 +2,7 @@ lints.workspace = true [package] name = "martin-tile-utils" -version = "0.1.4" +version = "0.1.5" authors = ["Yuri Astrakhan ", "MapLibre contributors"] description = "Utilites to help with map tile processing, such as type and compression detection. Used by the MapLibre's Martin tile server." keywords = ["maps", "tiles", "mvt", "tileserver"] diff --git a/martin/Cargo.toml b/martin/Cargo.toml index 892d7a49..9923961b 100644 --- a/martin/Cargo.toml +++ b/martin/Cargo.toml @@ -3,7 +3,7 @@ lints.workspace = true [package] name = "martin" # Once the release is published with the hash, update https://github.com/maplibre/homebrew-martin -version = "0.10.1" +version = "0.11.0" authors = ["Stepan Kuzmin ", "Yuri Astrakhan ", "MapLibre contributors"] description = "Blazing fast and lightweight tile server with PostGIS, MBTiles, and PMTiles support" keywords = ["maps", "tiles", "mbtiles", "pmtiles", "postgis"] diff --git a/martin/src/utils/utilities.rs b/martin/src/utils/utilities.rs index 93bb844f..ac4e68b6 100644 --- a/martin/src/utils/utilities.rs +++ b/martin/src/utils/utilities.rs @@ -5,8 +5,6 @@ use std::time::Duration; use flate2::read::GzDecoder; use flate2::write::GzEncoder; use futures::pin_mut; -#[cfg(test)] -use serde::Serialize as _; use tokio::time::timeout; #[cfg(test)] @@ -14,6 +12,8 @@ pub fn sorted_opt_set( value: &Option>, serializer: S, ) -> Result { + use serde::Serialize as _; + value .as_ref() .map(|v| { diff --git a/mbtiles/Cargo.toml b/mbtiles/Cargo.toml index 5c7707dd..7bc01cf0 100644 --- a/mbtiles/Cargo.toml +++ b/mbtiles/Cargo.toml @@ -2,7 +2,7 @@ lints.workspace = true [package] name = "mbtiles" -version = "0.7.4" +version = "0.8.0" authors = ["Yuri Astrakhan ", "MapLibre contributors"] description = "A simple low-level MbTiles access and processing library, with some tile format detection and other relevant heuristics." keywords = ["mbtiles", "maps", "tiles", "mvt", "tilejson"] diff --git a/mbtiles/src/metadata.rs b/mbtiles/src/metadata.rs index e16408d0..e2abf4cf 100644 --- a/mbtiles/src/metadata.rs +++ b/mbtiles/src/metadata.rs @@ -211,9 +211,10 @@ impl Mbtiles { #[cfg(test)] mod tests { + use std::collections::BTreeMap; + use martin_tile_utils::{Encoding, Format}; use sqlx::Executor as _; - use std::collections::BTreeMap; use tilejson::VectorLayer; use super::*; diff --git a/tests/expected/martin-cp/flat-with-hash_metadata.txt b/tests/expected/martin-cp/flat-with-hash_metadata.txt index 20a8945e..af72a14b 100644 --- a/tests/expected/martin-cp/flat-with-hash_metadata.txt +++ b/tests/expected/martin-cp/flat-with-hash_metadata.txt @@ -20,6 +20,6 @@ tilejson: name: table_source foo: '{"bar":"foo"}' format: mvt - generator: martin-cp v0.10.1 + generator: martin-cp v0.11.0 json: {} diff --git a/tests/expected/martin-cp/flat_metadata.txt b/tests/expected/martin-cp/flat_metadata.txt index 4b2beb39..c9791008 100644 --- a/tests/expected/martin-cp/flat_metadata.txt +++ b/tests/expected/martin-cp/flat_metadata.txt @@ -20,6 +20,6 @@ tilejson: name: table_source foo: '{"bar":"foo"}' format: mvt - generator: martin-cp v0.10.1 + generator: martin-cp v0.11.0 json: {} diff --git a/tests/expected/martin-cp/normalized_metadata.txt b/tests/expected/martin-cp/normalized_metadata.txt index 98228dc0..6822fbf5 100644 --- a/tests/expected/martin-cp/normalized_metadata.txt +++ b/tests/expected/martin-cp/normalized_metadata.txt @@ -20,6 +20,6 @@ tilejson: name: table_source foo: '{"bar":"foo"}' format: mvt - generator: martin-cp v0.10.1 + generator: martin-cp v0.11.0 json: {}