diff --git a/Cargo.lock b/Cargo.lock index b0f7fc29a..353a514de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1898,7 +1898,7 @@ version = "0.1.5" [[package]] name = "mbtiles" -version = "0.8.2" +version = "0.8.3" dependencies = [ "actix-rt", "anyhow", @@ -2135,9 +2135,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" diff --git a/mbtiles/Cargo.toml b/mbtiles/Cargo.toml index 4c0665ba4..a7fd1ae6f 100644 --- a/mbtiles/Cargo.toml +++ b/mbtiles/Cargo.toml @@ -2,7 +2,7 @@ lints.workspace = true [package] name = "mbtiles" -version = "0.8.2" +version = "0.8.3" 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/bin/mbtiles.rs b/mbtiles/src/bin/mbtiles.rs index 2682a348b..551792f74 100644 --- a/mbtiles/src/bin/mbtiles.rs +++ b/mbtiles/src/bin/mbtiles.rs @@ -20,7 +20,7 @@ pub struct Args { #[derive(Subcommand, PartialEq, Eq, Debug)] enum Commands { - /// Show MBTiels file summary statistics + /// Show MBTiles file summary statistics #[command(name = "summary", alias = "info")] Summary { file: PathBuf }, /// Prints all values in the metadata table in a free-style, unstable YAML format @@ -37,7 +37,7 @@ enum Commands { /// Value to read key: String, }, - /// Sets a single value in the MBTiles' file metadata table or deletes it if no value. + /// Sets a single value in the MBTiles metadata table or deletes it if no value. #[command(name = "meta-set")] MetaSetValue { /// MBTiles file to modify @@ -77,7 +77,7 @@ enum Commands { #[tokio::main] async fn main() { - let env = env_logger::Env::default().default_filter_or("info"); + let env = env_logger::Env::default().default_filter_or("mbtiles=info"); env_logger::Builder::from_env(env) .format_indent(None) .format_module_path(false) diff --git a/tests/expected/mbtiles/help.txt b/tests/expected/mbtiles/help.txt deleted file mode 100644 index f12a43114..000000000 --- a/tests/expected/mbtiles/help.txt +++ /dev/null @@ -1,17 +0,0 @@ -A utility to work with .mbtiles file content - -Usage: mbtiles - -Commands: - summary Show MBTiels file summary statistics - meta-all Prints all values in the metadata table in a free-style, unstable YAML format - meta-get Gets a single value from the MBTiles metadata table - meta-set Sets a single value in the MBTiles' file metadata table or deletes it if no value - copy Copy tiles from one mbtiles file to another - apply-patch Apply diff file generated from 'copy' command - validate Validate tile data if hash of tile data exists in file - help Print this message or the help of the given subcommand(s) - -Options: - -h, --help Print help - -V, --version Print version diff --git a/tests/test.sh b/tests/test.sh index 798ea9026..e38ec0397 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -420,7 +420,6 @@ if [[ "$MBTILES_BIN" != "-" ]]; then set -x - $MBTILES_BIN --help 2>&1 | tee "$TEST_OUT_DIR/help.txt" $MBTILES_BIN summary ./tests/fixtures/mbtiles/world_cities.mbtiles 2>&1 | tee "$TEST_OUT_DIR/summary.txt" $MBTILES_BIN meta-all --help 2>&1 | tee "$TEST_OUT_DIR/meta-all_help.txt" $MBTILES_BIN meta-all ./tests/fixtures/mbtiles/world_cities.mbtiles 2>&1 | tee "$TEST_OUT_DIR/meta-all.txt"