Skip to content

Commit

Permalink
Prepare for release
Browse files Browse the repository at this point in the history
  • Loading branch information
nyurik committed Nov 20, 2023
1 parent aeef27d commit 9991790
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 13 deletions.
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion martin-tile-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lints.workspace = true

[package]
name = "martin-tile-utils"
version = "0.1.4"
version = "0.1.5"
authors = ["Yuri Astrakhan <[email protected]>", "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"]
Expand Down
2 changes: 1 addition & 1 deletion martin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>", "Yuri Astrakhan <[email protected]>", "MapLibre contributors"]
description = "Blazing fast and lightweight tile server with PostGIS, MBTiles, and PMTiles support"
keywords = ["maps", "tiles", "mbtiles", "pmtiles", "postgis"]
Expand Down
4 changes: 2 additions & 2 deletions martin/src/utils/utilities.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ 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)]
pub fn sorted_opt_set<S: serde::Serializer>(
value: &Option<std::collections::HashSet<String>>,
serializer: S,
) -> Result<S::Ok, S::Error> {
use serde::Serialize as _;

value
.as_ref()
.map(|v| {
Expand Down
2 changes: 1 addition & 1 deletion mbtiles/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lints.workspace = true

[package]
name = "mbtiles"
version = "0.7.4"
version = "0.8.0"
authors = ["Yuri Astrakhan <[email protected]>", "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"]
Expand Down
3 changes: 2 additions & 1 deletion mbtiles/src/metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;
Expand Down
2 changes: 1 addition & 1 deletion tests/expected/martin-cp/flat-with-hash_metadata.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}

2 changes: 1 addition & 1 deletion tests/expected/martin-cp/flat_metadata.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}

2 changes: 1 addition & 1 deletion tests/expected/martin-cp/normalized_metadata.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}

0 comments on commit 9991790

Please sign in to comment.