diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 49a9c9871..3efd57928 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,8 +57,8 @@ jobs: if: github.event_name != 'release' && github.event_name != 'workflow_dispatch' - run: cargo fmt --all -- --check - run: cargo clippy --package martin-tile-utils -- -D warnings - - run: cargo clippy --package martin-mbtiles --no-default-features -- -D warnings - - run: cargo clippy --package martin-mbtiles -- -D warnings + - run: cargo clippy --package mbtiles --no-default-features -- -D warnings + - run: cargo clippy --package mbtiles -- -D warnings - run: cargo clippy --package martin -- -D warnings - run: cargo clippy --package martin --features bless-tests -- -D warnings - run: cargo doc --no-deps --workspace @@ -72,8 +72,8 @@ jobs: run: | set -x cargo test --package martin-tile-utils - cargo test --package martin-mbtiles --no-default-features - cargo test --package martin-mbtiles + cargo test --package mbtiles --no-default-features + cargo test --package mbtiles cargo test --package martin cargo test --doc env: @@ -144,7 +144,7 @@ jobs: echo "Building $target" export "CARGO_TARGET_$(echo $target | tr 'a-z-' 'A-Z_')_RUSTFLAGS"='-C strip=debuginfo' - cross build --release --target $target --package martin-mbtiles + cross build --release --target $target --package mbtiles cross build --release --target $target --package martin mkdir -p target_releases/$target @@ -274,7 +274,7 @@ jobs: set -x rustup target add "${{ matrix.target }}" export RUSTFLAGS='-C strip=debuginfo' - cargo build --release --target ${{ matrix.target }} --package martin-mbtiles + cargo build --release --target ${{ matrix.target }} --package mbtiles cargo build --release --target ${{ matrix.target }} --package martin mkdir -p target_releases mv target/${{ matrix.target }}/release/mbtiles${{ matrix.ext }} target_releases/ diff --git a/Cargo.lock b/Cargo.lock index 22b36fc1a..c485d5305 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -471,9 +471,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1752,8 +1752,8 @@ dependencies = [ "itertools 0.11.0", "json-patch", "log", - "martin-mbtiles", "martin-tile-utils", + "mbtiles", "num_cpus", "pbf_font_tools", "pmtiles", @@ -1777,8 +1777,12 @@ dependencies = [ ] [[package]] -name = "martin-mbtiles" -version = "0.6.0" +name = "martin-tile-utils" +version = "0.1.3" + +[[package]] +name = "mbtiles" +version = "0.7.0" dependencies = [ "actix-rt", "anyhow", @@ -1802,10 +1806,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "martin-tile-utils" -version = "0.1.3" - [[package]] name = "md-5" version = "0.10.6" diff --git a/Cargo.toml b/Cargo.toml index 4c5718548..1bd28c932 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] resolver = "2" -members = ["martin", "martin-tile-utils", "martin-mbtiles"] +members = ["martin", "martin-tile-utils", "mbtiles"] [workspace.package] edition = "2021" @@ -33,8 +33,8 @@ insta = "1" itertools = "0.11" json-patch = "1.2" log = "0.4" -martin-mbtiles = { path = "./martin-mbtiles", version = "0.6.0", default-features = false } martin-tile-utils = { path = "./martin-tile-utils", version = "0.1.0" } +mbtiles = { path = "./mbtiles", version = "0.7.0", default-features = false } num_cpus = "1" pbf_font_tools = { version = "2.5.0", features = ["freetype"] } pmtiles = { version = "0.3", features = ["mmap-async-tokio", "tilejson"] } diff --git a/docs/src/50-tools.md b/docs/src/50-tools.md index 6d5c0dab6..e0d5ec06c 100644 --- a/docs/src/50-tools.md +++ b/docs/src/50-tools.md @@ -5,7 +5,7 @@ Martin has a few additional tools that can be used to interact with the data. ## MBTiles tool A small utility that allows users to interact with the `*.mbtiles` files from the command line. Use `mbtiles --help` to see a list of available commands, and `mbtiles --help` to see help for a specific command. -This tool can be installed by compiling the latest released version with `cargo install martin-mbtiles`, or by downloading a pre-built binary from the [releases page](https://github.com/maplibre/martin/releases/latest). +This tool can be installed by compiling the latest released version with `cargo install mbtiles`, or by downloading a pre-built binary from the [releases page](https://github.com/maplibre/martin/releases/latest). ### meta-all Print all metadata values to stdout, as well as the results of tile detection. The format of the values printed is not stable, and should only be used for visual inspection. diff --git a/justfile b/justfile index ece178f23..2f3862a3b 100644 --- a/justfile +++ b/justfile @@ -148,8 +148,8 @@ bless: restart clean-test bless-insta-martin bless-insta-mbtiles # Run integration tests and save its output as the new expected output bless-insta-mbtiles *ARGS: (cargo-install "cargo-insta") - #rm -rf martin-mbtiles/tests/snapshots - cargo insta test --accept --unreferenced=auto -p martin-mbtiles {{ ARGS }} + #rm -rf mbtiles/tests/snapshots + cargo insta test --accept --unreferenced=auto -p mbtiles {{ ARGS }} # Run integration tests and save its output as the new expected output bless-insta-martin *ARGS: (cargo-install "cargo-insta") @@ -256,8 +256,8 @@ git-pre-push: stop start # Update sqlite database schema. prepare-sqlite: install-sqlx - mkdir -p martin-mbtiles/.sqlx - cd martin-mbtiles && cargo sqlx prepare --database-url sqlite://$PWD/../tests/fixtures/mbtiles/world_cities.mbtiles -- --lib --tests + mkdir -p mbtiles/.sqlx + cd mbtiles && cargo sqlx prepare --database-url sqlite://$PWD/../tests/fixtures/mbtiles/world_cities.mbtiles -- --lib --tests # Install SQLX cli if not already installed. [private] diff --git a/martin/Cargo.toml b/martin/Cargo.toml index 08e7d06c2..cd9cfb791 100644 --- a/martin/Cargo.toml +++ b/martin/Cargo.toml @@ -66,8 +66,8 @@ futures.workspace = true itertools.workspace = true json-patch.workspace = true log.workspace = true -martin-mbtiles.workspace = true martin-tile-utils.workspace = true +mbtiles.workspace = true num_cpus.workspace = true pbf_font_tools.workspace = true pmtiles.workspace = true diff --git a/martin/src/mbtiles/mod.rs b/martin/src/mbtiles/mod.rs index 1190ffad1..ea4c84796 100644 --- a/martin/src/mbtiles/mod.rs +++ b/martin/src/mbtiles/mod.rs @@ -5,8 +5,8 @@ use std::sync::Arc; use async_trait::async_trait; use log::trace; -use martin_mbtiles::MbtilesPool; use martin_tile_utils::TileInfo; +use mbtiles::MbtilesPool; use tilejson::TileJSON; use crate::file_config::FileError; diff --git a/martin-mbtiles/.env b/mbtiles/.env similarity index 100% rename from martin-mbtiles/.env rename to mbtiles/.env diff --git a/martin-mbtiles/.sqlx/query-0a4540e8c33c71222a68ff5ecc1a167b406de9961ac3cc69649c6152a6d7a9b7.json b/mbtiles/.sqlx/query-0a4540e8c33c71222a68ff5ecc1a167b406de9961ac3cc69649c6152a6d7a9b7.json similarity index 100% rename from martin-mbtiles/.sqlx/query-0a4540e8c33c71222a68ff5ecc1a167b406de9961ac3cc69649c6152a6d7a9b7.json rename to mbtiles/.sqlx/query-0a4540e8c33c71222a68ff5ecc1a167b406de9961ac3cc69649c6152a6d7a9b7.json diff --git a/martin-mbtiles/.sqlx/query-176e99c6945b0789119d0d21a99de564de47dde1d588f17e68ec58115ac73a39.json b/mbtiles/.sqlx/query-176e99c6945b0789119d0d21a99de564de47dde1d588f17e68ec58115ac73a39.json similarity index 100% rename from martin-mbtiles/.sqlx/query-176e99c6945b0789119d0d21a99de564de47dde1d588f17e68ec58115ac73a39.json rename to mbtiles/.sqlx/query-176e99c6945b0789119d0d21a99de564de47dde1d588f17e68ec58115ac73a39.json diff --git a/martin-mbtiles/.sqlx/query-386a375cf65c3e5aef51deffc99d23bd852ba445c1058aed380fe83bed618c29.json b/mbtiles/.sqlx/query-386a375cf65c3e5aef51deffc99d23bd852ba445c1058aed380fe83bed618c29.json similarity index 100% rename from martin-mbtiles/.sqlx/query-386a375cf65c3e5aef51deffc99d23bd852ba445c1058aed380fe83bed618c29.json rename to mbtiles/.sqlx/query-386a375cf65c3e5aef51deffc99d23bd852ba445c1058aed380fe83bed618c29.json diff --git a/martin-mbtiles/.sqlx/query-428a035a55a07cbb9daac42c3ab05f2a7999788167f41c685af3ca6f5a1359f4.json b/mbtiles/.sqlx/query-428a035a55a07cbb9daac42c3ab05f2a7999788167f41c685af3ca6f5a1359f4.json similarity index 100% rename from martin-mbtiles/.sqlx/query-428a035a55a07cbb9daac42c3ab05f2a7999788167f41c685af3ca6f5a1359f4.json rename to mbtiles/.sqlx/query-428a035a55a07cbb9daac42c3ab05f2a7999788167f41c685af3ca6f5a1359f4.json diff --git a/martin-mbtiles/.sqlx/query-4d952966a8d8a030d2467c0701a6e16068c9897dd25d0ebd32929db9960596b4.json b/mbtiles/.sqlx/query-4d952966a8d8a030d2467c0701a6e16068c9897dd25d0ebd32929db9960596b4.json similarity index 100% rename from martin-mbtiles/.sqlx/query-4d952966a8d8a030d2467c0701a6e16068c9897dd25d0ebd32929db9960596b4.json rename to mbtiles/.sqlx/query-4d952966a8d8a030d2467c0701a6e16068c9897dd25d0ebd32929db9960596b4.json diff --git a/martin-mbtiles/.sqlx/query-5b298df51dccbf0d8a22433a99febc59c27dbf204d09a9c1fb0b3bf9aaad284b.json b/mbtiles/.sqlx/query-5b298df51dccbf0d8a22433a99febc59c27dbf204d09a9c1fb0b3bf9aaad284b.json similarity index 100% rename from martin-mbtiles/.sqlx/query-5b298df51dccbf0d8a22433a99febc59c27dbf204d09a9c1fb0b3bf9aaad284b.json rename to mbtiles/.sqlx/query-5b298df51dccbf0d8a22433a99febc59c27dbf204d09a9c1fb0b3bf9aaad284b.json diff --git a/martin-mbtiles/.sqlx/query-60264fa07915878b3f7ba0067f48c3a379e96acbdf5fc52d14e29bc726fefab7.json b/mbtiles/.sqlx/query-60264fa07915878b3f7ba0067f48c3a379e96acbdf5fc52d14e29bc726fefab7.json similarity index 100% rename from martin-mbtiles/.sqlx/query-60264fa07915878b3f7ba0067f48c3a379e96acbdf5fc52d14e29bc726fefab7.json rename to mbtiles/.sqlx/query-60264fa07915878b3f7ba0067f48c3a379e96acbdf5fc52d14e29bc726fefab7.json diff --git a/martin-mbtiles/.sqlx/query-7341bfc10beb4719811556a57ae8098085994c8fba93e0293359afd43079c50c.json b/mbtiles/.sqlx/query-7341bfc10beb4719811556a57ae8098085994c8fba93e0293359afd43079c50c.json similarity index 100% rename from martin-mbtiles/.sqlx/query-7341bfc10beb4719811556a57ae8098085994c8fba93e0293359afd43079c50c.json rename to mbtiles/.sqlx/query-7341bfc10beb4719811556a57ae8098085994c8fba93e0293359afd43079c50c.json diff --git a/martin-mbtiles/.sqlx/query-748436831449877b242d6e167a2f8fe1b1e7b6fb87c4e04ad7406a2bbfd35bec.json b/mbtiles/.sqlx/query-748436831449877b242d6e167a2f8fe1b1e7b6fb87c4e04ad7406a2bbfd35bec.json similarity index 100% rename from martin-mbtiles/.sqlx/query-748436831449877b242d6e167a2f8fe1b1e7b6fb87c4e04ad7406a2bbfd35bec.json rename to mbtiles/.sqlx/query-748436831449877b242d6e167a2f8fe1b1e7b6fb87c4e04ad7406a2bbfd35bec.json diff --git a/martin-mbtiles/.sqlx/query-77b2f46851c4e991230ec6a5d33aaca18373bbdd548a8378ae7fbeed351b4b87.json b/mbtiles/.sqlx/query-77b2f46851c4e991230ec6a5d33aaca18373bbdd548a8378ae7fbeed351b4b87.json similarity index 100% rename from martin-mbtiles/.sqlx/query-77b2f46851c4e991230ec6a5d33aaca18373bbdd548a8378ae7fbeed351b4b87.json rename to mbtiles/.sqlx/query-77b2f46851c4e991230ec6a5d33aaca18373bbdd548a8378ae7fbeed351b4b87.json diff --git a/martin-mbtiles/.sqlx/query-809e89c3b223e28c6716d405e13ba30fbf018805fe9ca2acd2b2e225183d1f13.json b/mbtiles/.sqlx/query-809e89c3b223e28c6716d405e13ba30fbf018805fe9ca2acd2b2e225183d1f13.json similarity index 100% rename from martin-mbtiles/.sqlx/query-809e89c3b223e28c6716d405e13ba30fbf018805fe9ca2acd2b2e225183d1f13.json rename to mbtiles/.sqlx/query-809e89c3b223e28c6716d405e13ba30fbf018805fe9ca2acd2b2e225183d1f13.json diff --git a/martin-mbtiles/.sqlx/query-85b46712c445679053e768cc98b22ea61633c21afb45d3d2b9aeec068d72cce0.json b/mbtiles/.sqlx/query-85b46712c445679053e768cc98b22ea61633c21afb45d3d2b9aeec068d72cce0.json similarity index 100% rename from martin-mbtiles/.sqlx/query-85b46712c445679053e768cc98b22ea61633c21afb45d3d2b9aeec068d72cce0.json rename to mbtiles/.sqlx/query-85b46712c445679053e768cc98b22ea61633c21afb45d3d2b9aeec068d72cce0.json diff --git a/martin-mbtiles/.sqlx/query-c8ef3dc53f1f6fd80e266aab2bf007c66a1cc45bdfcdc38f93d6ba759125a9aa.json b/mbtiles/.sqlx/query-c8ef3dc53f1f6fd80e266aab2bf007c66a1cc45bdfcdc38f93d6ba759125a9aa.json similarity index 100% rename from martin-mbtiles/.sqlx/query-c8ef3dc53f1f6fd80e266aab2bf007c66a1cc45bdfcdc38f93d6ba759125a9aa.json rename to mbtiles/.sqlx/query-c8ef3dc53f1f6fd80e266aab2bf007c66a1cc45bdfcdc38f93d6ba759125a9aa.json diff --git a/martin-mbtiles/.sqlx/query-d6ac76a234c97d0dc1fc4331d8b2cd90903d5401f8f0956245e5163bedd23a4d.json b/mbtiles/.sqlx/query-d6ac76a234c97d0dc1fc4331d8b2cd90903d5401f8f0956245e5163bedd23a4d.json similarity index 100% rename from martin-mbtiles/.sqlx/query-d6ac76a234c97d0dc1fc4331d8b2cd90903d5401f8f0956245e5163bedd23a4d.json rename to mbtiles/.sqlx/query-d6ac76a234c97d0dc1fc4331d8b2cd90903d5401f8f0956245e5163bedd23a4d.json diff --git a/martin-mbtiles/.sqlx/query-f547ff198e3bb604550a3f191e4ad8c695c4c2350f294aefd210eccec603d905.json b/mbtiles/.sqlx/query-f547ff198e3bb604550a3f191e4ad8c695c4c2350f294aefd210eccec603d905.json similarity index 100% rename from martin-mbtiles/.sqlx/query-f547ff198e3bb604550a3f191e4ad8c695c4c2350f294aefd210eccec603d905.json rename to mbtiles/.sqlx/query-f547ff198e3bb604550a3f191e4ad8c695c4c2350f294aefd210eccec603d905.json diff --git a/martin-mbtiles/Cargo.toml b/mbtiles/Cargo.toml similarity index 97% rename from martin-mbtiles/Cargo.toml rename to mbtiles/Cargo.toml index ef100d7fa..0028c4797 100644 --- a/martin-mbtiles/Cargo.toml +++ b/mbtiles/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "martin-mbtiles" -version = "0.6.0" +name = "mbtiles" +version = "0.7.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/martin-mbtiles/README.md b/mbtiles/README.md similarity index 84% rename from martin-mbtiles/README.md rename to mbtiles/README.md index 2963f4076..cc956ebc8 100644 --- a/martin-mbtiles/README.md +++ b/mbtiles/README.md @@ -1,11 +1,11 @@ -# martin-mbtiles +# mbtiles [![Book](https://img.shields.io/badge/docs-Book-informational)](https://maplibre.org/martin/50-tools.html) -[![docs.rs docs](https://docs.rs/martin-mbtiles/badge.svg)](https://docs.rs/martin-mbtiles) +[![docs.rs docs](https://docs.rs/mbtiles/badge.svg)](https://docs.rs/mbtiles) [![Slack chat](https://img.shields.io/badge/Chat-on%20Slack-blueviolet)](https://slack.openstreetmap.us/) [![GitHub](https://img.shields.io/badge/github-maplibre/martin-8da0cb?logo=github)](https://github.com/maplibre/martin) -[![crates.io version](https://img.shields.io/crates/v/martin-mbtiles.svg)](https://crates.io/crates/martin-mbtiles) -[![CI build](https://github.com/maplibre/martin/workflows/CI/badge.svg)](https://github.com/maplibre/martin-mbtiles/actions) +[![crates.io version](https://img.shields.io/crates/v/mbtiles.svg)](https://crates.io/crates/mbtiles) +[![CI build](https://github.com/maplibre/martin/workflows/CI/badge.svg)](https://github.com/maplibre/martin/actions) A library to help tile servers like [Martin](https://maplibre.org/martin) work with [MBTiles](https://github.com/mapbox/mbtiles-spec) files. When using as a lib, you may want to disable default features (i.e. the unused "cli" feature). diff --git a/martin-mbtiles/src/bin/main.rs b/mbtiles/src/bin/main.rs similarity index 98% rename from martin-mbtiles/src/bin/main.rs rename to mbtiles/src/bin/main.rs index 8842a64b3..9643e5f54 100644 --- a/martin-mbtiles/src/bin/main.rs +++ b/mbtiles/src/bin/main.rs @@ -2,7 +2,7 @@ use std::path::{Path, PathBuf}; use clap::{Parser, Subcommand}; use log::error; -use martin_mbtiles::{apply_patch, IntegrityCheckType, MbtResult, Mbtiles, MbtilesCopier}; +use mbtiles::{apply_patch, IntegrityCheckType, MbtResult, Mbtiles, MbtilesCopier}; #[derive(Parser, PartialEq, Eq, Debug)] #[command( @@ -148,7 +148,7 @@ mod tests { use clap::error::ErrorKind; use clap::Parser; - use martin_mbtiles::{CopyDuplicateMode, MbtilesCopier}; + use mbtiles::{CopyDuplicateMode, MbtilesCopier}; use crate::Commands::{ApplyPatch, Copy, MetaGetValue, MetaSetValue, Validate}; use crate::{Args, IntegrityCheckType}; diff --git a/martin-mbtiles/src/copier.rs b/mbtiles/src/copier.rs similarity index 100% rename from martin-mbtiles/src/copier.rs rename to mbtiles/src/copier.rs diff --git a/martin-mbtiles/src/errors.rs b/mbtiles/src/errors.rs similarity index 100% rename from martin-mbtiles/src/errors.rs rename to mbtiles/src/errors.rs diff --git a/martin-mbtiles/src/lib.rs b/mbtiles/src/lib.rs similarity index 100% rename from martin-mbtiles/src/lib.rs rename to mbtiles/src/lib.rs diff --git a/martin-mbtiles/src/mbtiles.rs b/mbtiles/src/mbtiles.rs similarity index 100% rename from martin-mbtiles/src/mbtiles.rs rename to mbtiles/src/mbtiles.rs diff --git a/martin-mbtiles/src/patcher.rs b/mbtiles/src/patcher.rs similarity index 100% rename from martin-mbtiles/src/patcher.rs rename to mbtiles/src/patcher.rs diff --git a/martin-mbtiles/src/pool.rs b/mbtiles/src/pool.rs similarity index 100% rename from martin-mbtiles/src/pool.rs rename to mbtiles/src/pool.rs diff --git a/martin-mbtiles/src/queries.rs b/mbtiles/src/queries.rs similarity index 100% rename from martin-mbtiles/src/queries.rs rename to mbtiles/src/queries.rs diff --git a/martin-mbtiles/tests/mbtiles.rs b/mbtiles/tests/mbtiles.rs similarity index 98% rename from martin-mbtiles/tests/mbtiles.rs rename to mbtiles/tests/mbtiles.rs index 2e7ec641b..8782cda8f 100644 --- a/martin-mbtiles/tests/mbtiles.rs +++ b/mbtiles/tests/mbtiles.rs @@ -5,11 +5,9 @@ use std::str::from_utf8; use ctor::ctor; use insta::{allow_duplicates, assert_display_snapshot}; use log::info; -use martin_mbtiles::IntegrityCheckType::Off; -use martin_mbtiles::MbtTypeCli::{Flat, FlatWithHash, Normalized}; -use martin_mbtiles::{ - apply_patch, create_flat_tables, MbtResult, MbtTypeCli, Mbtiles, MbtilesCopier, -}; +use mbtiles::IntegrityCheckType::Off; +use mbtiles::MbtTypeCli::{Flat, FlatWithHash, Normalized}; +use mbtiles::{apply_patch, create_flat_tables, MbtResult, MbtTypeCli, Mbtiles, MbtilesCopier}; use pretty_assertions::assert_eq as pretty_assert_eq; use rstest::{fixture, rstest}; use serde::Serialize; diff --git a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-flat.snap b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-flat.snap similarity index 95% rename from martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-flat.snap rename to mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-flat.snap index f0a89da1d..4570d4c73 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-flat.snap +++ b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-flat.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-hash.snap b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-hash.snap similarity index 96% rename from martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-hash.snap rename to mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-hash.snap index 19aa43b08..76f3e7040 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-hash.snap +++ b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-hash.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-norm.snap b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-norm.snap similarity index 98% rename from martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-norm.snap rename to mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-norm.snap index d129463dd..bce869b3b 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-norm.snap +++ b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__flat-norm.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-flat.snap b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-flat.snap similarity index 95% rename from martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-flat.snap rename to mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-flat.snap index f0a89da1d..4570d4c73 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-flat.snap +++ b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-flat.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-hash.snap b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-hash.snap similarity index 96% rename from martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-hash.snap rename to mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-hash.snap index 19aa43b08..76f3e7040 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-hash.snap +++ b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-hash.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-norm.snap b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-norm.snap similarity index 98% rename from martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-norm.snap rename to mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-norm.snap index d129463dd..bce869b3b 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-norm.snap +++ b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__hash-norm.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-flat.snap b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-flat.snap similarity index 95% rename from martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-flat.snap rename to mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-flat.snap index f0a89da1d..4570d4c73 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-flat.snap +++ b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-flat.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-hash.snap b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-hash.snap similarity index 96% rename from martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-hash.snap rename to mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-hash.snap index 19aa43b08..76f3e7040 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-hash.snap +++ b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-hash.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-norm.snap b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-norm.snap similarity index 98% rename from martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-norm.snap rename to mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-norm.snap index d129463dd..bce869b3b 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-norm.snap +++ b/mbtiles/tests/snapshots/mbtiles__convert@v1__z6__norm-norm.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__databases@flat__dif.snap b/mbtiles/tests/snapshots/mbtiles__databases@flat__dif.snap similarity index 96% rename from martin-mbtiles/tests/snapshots/mbtiles__databases@flat__dif.snap rename to mbtiles/tests/snapshots/mbtiles__databases@flat__dif.snap index 84ccfd9e1..d5b5003ec 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__databases@flat__dif.snap +++ b/mbtiles/tests/snapshots/mbtiles__databases@flat__dif.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__databases@flat__v1-no-hash.snap b/mbtiles/tests/snapshots/mbtiles__databases@flat__v1-no-hash.snap similarity index 96% rename from martin-mbtiles/tests/snapshots/mbtiles__databases@flat__v1-no-hash.snap rename to mbtiles/tests/snapshots/mbtiles__databases@flat__v1-no-hash.snap index 613d2e8ef..d2d27f6d4 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__databases@flat__v1-no-hash.snap +++ b/mbtiles/tests/snapshots/mbtiles__databases@flat__v1-no-hash.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__databases@flat__v1.snap b/mbtiles/tests/snapshots/mbtiles__databases@flat__v1.snap similarity index 96% rename from martin-mbtiles/tests/snapshots/mbtiles__databases@flat__v1.snap rename to mbtiles/tests/snapshots/mbtiles__databases@flat__v1.snap index cccaf7fb0..9f40369d0 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__databases@flat__v1.snap +++ b/mbtiles/tests/snapshots/mbtiles__databases@flat__v1.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__databases@flat__v2.snap b/mbtiles/tests/snapshots/mbtiles__databases@flat__v2.snap similarity index 96% rename from martin-mbtiles/tests/snapshots/mbtiles__databases@flat__v2.snap rename to mbtiles/tests/snapshots/mbtiles__databases@flat__v2.snap index c3b44ccb6..af065171f 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__databases@flat__v2.snap +++ b/mbtiles/tests/snapshots/mbtiles__databases@flat__v2.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__databases@hash__dif.snap b/mbtiles/tests/snapshots/mbtiles__databases@hash__dif.snap similarity index 97% rename from martin-mbtiles/tests/snapshots/mbtiles__databases@hash__dif.snap rename to mbtiles/tests/snapshots/mbtiles__databases@hash__dif.snap index 7d01a84f9..7584b75db 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__databases@hash__dif.snap +++ b/mbtiles/tests/snapshots/mbtiles__databases@hash__dif.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__databases@hash__v1-no-hash.snap b/mbtiles/tests/snapshots/mbtiles__databases@hash__v1-no-hash.snap similarity index 97% rename from martin-mbtiles/tests/snapshots/mbtiles__databases@hash__v1-no-hash.snap rename to mbtiles/tests/snapshots/mbtiles__databases@hash__v1-no-hash.snap index db7f84fd9..163c7566e 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__databases@hash__v1-no-hash.snap +++ b/mbtiles/tests/snapshots/mbtiles__databases@hash__v1-no-hash.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__databases@hash__v1.snap b/mbtiles/tests/snapshots/mbtiles__databases@hash__v1.snap similarity index 97% rename from martin-mbtiles/tests/snapshots/mbtiles__databases@hash__v1.snap rename to mbtiles/tests/snapshots/mbtiles__databases@hash__v1.snap index 0668dab3e..a9c1e4ea1 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__databases@hash__v1.snap +++ b/mbtiles/tests/snapshots/mbtiles__databases@hash__v1.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__databases@hash__v2.snap b/mbtiles/tests/snapshots/mbtiles__databases@hash__v2.snap similarity index 97% rename from martin-mbtiles/tests/snapshots/mbtiles__databases@hash__v2.snap rename to mbtiles/tests/snapshots/mbtiles__databases@hash__v2.snap index d4cedb545..abfa9ceff 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__databases@hash__v2.snap +++ b/mbtiles/tests/snapshots/mbtiles__databases@hash__v2.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__databases@norm__dif.snap b/mbtiles/tests/snapshots/mbtiles__databases@norm__dif.snap similarity index 98% rename from martin-mbtiles/tests/snapshots/mbtiles__databases@norm__dif.snap rename to mbtiles/tests/snapshots/mbtiles__databases@norm__dif.snap index cad93944a..95cf04a3b 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__databases@norm__dif.snap +++ b/mbtiles/tests/snapshots/mbtiles__databases@norm__dif.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__databases@norm__v1-no-hash.snap b/mbtiles/tests/snapshots/mbtiles__databases@norm__v1-no-hash.snap similarity index 98% rename from martin-mbtiles/tests/snapshots/mbtiles__databases@norm__v1-no-hash.snap rename to mbtiles/tests/snapshots/mbtiles__databases@norm__v1-no-hash.snap index 62067b4a5..79da9dcff 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__databases@norm__v1-no-hash.snap +++ b/mbtiles/tests/snapshots/mbtiles__databases@norm__v1-no-hash.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__databases@norm__v1.snap b/mbtiles/tests/snapshots/mbtiles__databases@norm__v1.snap similarity index 98% rename from martin-mbtiles/tests/snapshots/mbtiles__databases@norm__v1.snap rename to mbtiles/tests/snapshots/mbtiles__databases@norm__v1.snap index 5ee4cf9e4..32d7e7078 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__databases@norm__v1.snap +++ b/mbtiles/tests/snapshots/mbtiles__databases@norm__v1.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/martin-mbtiles/tests/snapshots/mbtiles__databases@norm__v2.snap b/mbtiles/tests/snapshots/mbtiles__databases@norm__v2.snap similarity index 98% rename from martin-mbtiles/tests/snapshots/mbtiles__databases@norm__v2.snap rename to mbtiles/tests/snapshots/mbtiles__databases@norm__v2.snap index 2bd5bbeb5..e7d9aac70 100644 --- a/martin-mbtiles/tests/snapshots/mbtiles__databases@norm__v2.snap +++ b/mbtiles/tests/snapshots/mbtiles__databases@norm__v2.snap @@ -1,5 +1,5 @@ --- -source: martin-mbtiles/tests/mbtiles.rs +source: mbtiles/tests/mbtiles.rs expression: actual_value --- [[]] diff --git a/tests/test.sh b/tests/test.sh index ec3dbb2dc..2ea687448 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -10,7 +10,7 @@ MARTIN_URL="http://localhost:${MARTIN_PORT}" MARTIN_ARGS="${MARTIN_ARGS:---listen-addresses localhost:${MARTIN_PORT}}" MARTIN_BIN="${MARTIN_BIN:-cargo run --} ${MARTIN_ARGS}" -MBTILES_BUILD="${MBTILES_BUILD:-cargo build -p martin-mbtiles}" +MBTILES_BUILD="${MBTILES_BUILD:-cargo build -p mbtiles}" MBTILES_BIN="${MBTILES_BIN:-target/debug/mbtiles}" LOG_DIR="${LOG_DIR:-target/test_logs}"