maplibre/martin
1
1
Fork 0
mirror of https://github.com/maplibre/martin.git synced 2024-12-18 20:31:54 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Prepare for release

Browse Source
This commit is contained in:
Yuri Astrakhan 2023-11-20 01:46:11 -05:00
parent aeef27d168
commit 999179029b
10 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -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",

2
Cargo.toml
View File

@ -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"] }

2
martin-tile-utils/Cargo.toml
View File

@ -2,7 +2,7 @@ lints.workspace = true
[package]
name = "martin-tile-utils"
version = "0.1.4"
version = "0.1.5"
authors = ["Yuri Astrakhan <YuriAstrakhan@gmail.com>", "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"]

2
martin/Cargo.toml
View File

@ -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 <to.stepan.kuzmin@gmail.com>", "Yuri Astrakhan <YuriAstrakhan@gmail.com>", "MapLibre contributors"]
description = "Blazing fast and lightweight tile server with PostGIS, MBTiles, and PMTiles support"
keywords = ["maps", "tiles", "mbtiles", "pmtiles", "postgis"]

4
martin/src/utils/utilities.rs
View File

@ -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<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| {

2
mbtiles/Cargo.toml
View File

@ -2,7 +2,7 @@ lints.workspace = true
[package]
name = "mbtiles"
version = "0.7.4"
version = "0.8.0"
authors = ["Yuri Astrakhan <YuriAstrakhan@gmail.com>", "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"]

3
mbtiles/src/metadata.rs
View File

@ -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::*;

2
tests/expected/martin-cp/flat-with-hash_metadata.txt
View File

@ -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
tests/expected/martin-cp/flat_metadata.txt
View File

@ -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
tests/expected/martin-cp/normalized_metadata.txt
View File

@ -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: {}