maplibre/martin
1
1
Fork 0
mirror of https://github.com/maplibre/martin.git synced 2024-12-19 04:41:46 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
259b994d75
martin/Cargo.toml

111 lines
3.6 KiB
TOML
Raw Normal View History

Consolidate all crate dependencies (#694) This moves all dependency version management to one location
2023-06-01 16:05:06 +03:00
[workspace]
cleanup func docs, lints (#842) this also fixes new rust version lints
2023-08-28 04:07:29 +03:00
resolver = "2"
Rename martin-mbtiles crate to mbtiles (#976) This simplifies usage as both a crate and as a tool
2023-10-28 11:50:49 +03:00
members = ["martin", "martin-tile-utils", "mbtiles"]
Consolidate all crate dependencies (#694) This moves all dependency version management to one location
2023-06-01 16:05:06 +03:00
[workspace.package]
edition = "2021"
license = "MIT OR Apache-2.0"
update lock, minor toml sort cleanup
2023-07-06 03:56:23 +03:00
repository = "https://github.com/maplibre/martin"
Add binary diff for mbtiles (#1358) * `mbtiles diff` now has an additional `--patch-type` param with `whole`, `bin-diff-raw` and `bin-diff-gz` values: * `whole` stores different tiles as before - as whole tiles in the `tiles` table * `bin-diff-raw` computes binary difference between tiles, and stores them as brotli-encoded value in a `bsdiffraw` table, together with a `xxh3_64` hash of the tile as it will be stored after patching * `bin-diff-gz` same as `bin-diff-raw`, but assumes the tiles are gzip-compressed, so it uncompresses them before comparing. The `xxh3_64` stores the hash of the uncompressed tile. The data will be stored in the `bsdiffrawgz` table (identical structure with above) * `mbtiles copy --apply-patch` will automatically detect if `bsdiffrawgz` or `bsdiffraw` tables exist, and will use binary patching. * `mbtiles apply-patch` does not support binary patching yet * `mbtiles copy --diff-with-file ... --patch-type ...` is an alias to `mbtiles diff --patch-type ...`
2024-06-25 22:34:14 +03:00
rust-version = "1.76"
Debian package (#730) Add deb package by [cargo-deb](https://crates.io/crates/cargo-deb) - [ ] add deb package metadata - [ ] more research on systemd integration To inspect the package: ```shell # install cargo-deb dependices sudo apt install dpkg sudo apt install dpkg-dev sudo apt install liblzma-dev cargo install cargo-deb cd martin cargo deb The Debian package will be created in `target/debian/martin_0.8.7_amd64.deb` . ``` To decompress this package: ```shell dpkg -x martin_0.8.7_amd64.deb path_of_decompress ``` --------- Co-authored-by: Yuri Astrakhan <yuriastrakhan@gmail.com>
2023-07-10 21:38:48 +03:00
readme = "README.md"
homepage = "https://martin.maplibre.org/"
Consolidate all crate dependencies (#694) This moves all dependency version management to one location
2023-06-01 16:05:06 +03:00
Use Rust's 1.74 cargo lint section (#1006) https://blog.rust-lang.org/2023/11/16/Rust-1.74.0.html
2023-11-17 03:29:25 +03:00
[workspace.lints.rust]
mbtiles improvements, minor changes (#1013) # MBTiles * New `--agg-hash (update|verify|off)` flag replaces `--update-agg-tiles-hash` (still supported, but not shown in the help screen). This allows bypassing aggregate hash validation entirely, without either updating or validating it. * Simplify MBTiles SQL generation * MBTiles now uses faster `1 << zoom` everywhere, and a dedicated TMS inversion fn * split up metadata insert and delete into separate fn * consolidated schema initialization * ensure db settings (like pragma) are always reset on new files # Other * Always sort JSON-serialized keys for consistency * this affects `/catalog` key ordering, but content is the same * Minor code cleanup
2023-11-19 13:06:37 +03:00
unused_qualifications = "warn"
Minor cleanup (#1008) - Add separators to long literal. - Use first() instead of get(0) - Move some SQL-making code to their own functions - Minor mathematics and rounding cleanup --------- Co-authored-by: Yuri Astrakhan <YuriAstrakhan@gmail.com>
2023-11-17 21:55:05 +03:00
# Lints inheritance from workspace is not yet supported
# Crate mbtiles uses unsafe code, so we can't forbid it here
# unsafe_code = "forbid"
Use Rust's 1.74 cargo lint section (#1006) https://blog.rust-lang.org/2023/11/16/Rust-1.74.0.html
2023-11-17 03:29:25 +03:00
[workspace.lints.clippy]
Add `martin-cp` tool to bulk-copy tiles from any Martin-supported sources (#1011) This adds a new utility called `martin-cp` that allows copying any number of tiles from a single source (or a composite source) to an mbtiles file. `martin-cp` is a tool for generating tiles in bulk, and save retrieved tiles into a new or an existing MBTiles file. It can be used to generate tiles for a large area or multiple areas. If multiple areas overlap, it will generate tiles only once. `martin-cp` supports the same configuration file and CLI arguments as Martin server, so it can support all sources and even combining sources.
2023-11-20 09:27:51 +03:00
pedantic = { level = "warn", priority = -1 }
Use Rust's 1.74 cargo lint section (#1006) https://blog.rust-lang.org/2023/11/16/Rust-1.74.0.html
2023-11-17 03:29:25 +03:00
derive_partial_eq_without_eq = "allow"
implicit_hasher = "allow"
missing_errors_doc = "allow"
missing_panics_doc = "allow"
module_name_repetitions = "allow"
Consolidate all crate dependencies (#694) This moves all dependency version management to one location
2023-06-01 16:05:06 +03:00
[workspace.dependencies]
bump dependencies
2024-06-27 00:15:27 +03:00
actix-cors = "0.7"
feat: use latest actix, switch to bb8 (async everywhere), remove actions (#377) * remove all actions and other low-level magic code, making it more straightforward for the most common usage * replace r2d2 with bb8 to make it all async * use first significant version in cargo.toml - this makes it easier to maintain This fixes #349
2022-08-15 16:54:48 +03:00
actix-http = "3"
actix-rt = "2"
actix-web = "4"
Add `mbtiles meta-get` utility (#701) * Add functionality to retrieve a metadata value in an mbtiles file by key; simple implementation for one of the items in #667 * Also, disable TTY in docker-up `just` target
2023-06-03 03:40:22 +03:00
anyhow = "1.0"
Add mbtiles statistics command (#986) - [x] Add tile statistics to mbtiles tools - [x] Add test - [x] Use 4326 instead of 3857 for tile bounds - [x] Add document - [x] Use size-format to prettify output - [x] Statistics struct Refactor - [x] Cleanup and reformat Closes #964 --------- Co-authored-by: Yuri Astrakhan <yuriastrakhan@gmail.com>
2023-11-13 09:03:40 +03:00
approx = "0.5.1"
feat: use latest actix, switch to bb8 (async everywhere), remove actions (#377) * remove all actions and other low-level magic code, making it more straightforward for the most common usage * replace r2d2 with bb8 to make it all async * use first significant version in cargo.toml - this makes it easier to maintain This fixes #349
2022-08-15 16:54:48 +03:00
async-trait = "0.1"
Implement dynamic font support `/font/<name>/<start>-<end>` (#755) This implements dynamic font protobuf generation, allowing users to request font ranges on the fly, and combining them in any order, e.g. `Font1,Font2,Font3`, same as with sprites and tiles This is a first iteration, without any multithreading support. In theory, this could be done far faster by generating SDFs with multiple threads. ### Current process * during init, figure out all glyphs available in each font, and store them as a bitset * during request: * combine requested bitsets to figure out which glyph should come from which font file * load those glyphs from files (using a single instance of the freetype lib) * convert them to SDFs and package them into a protobuf --------- Co-authored-by: Lucas <zhangyijunmetro@hotmail.com>
2023-10-28 08:10:48 +03:00
bit-set = "0.5.3"
Fix a few CI issues and bump deps (#1341)
2024-05-17 08:05:19 +03:00
brotli = ">=5, <7"
Consolidate all crate dependencies (#694) This moves all dependency version management to one location
2023-06-01 16:05:06 +03:00
cargo-husky = { version = "1", features = ["user-hooks"], default-features = false }
Breakup config for pg and srv (#420) Getting ready for multi-backend system, where each backend would have its own configuration. All 3 config structs (clap args, config, and configbuilder) are now separated into 3 files - the main one, one for service (actix stuff), and one for PostgreSQL. The files have been moved to `/pg` and `/srv`, but otherwise the logic should be mostly intact.
2022-10-01 10:48:11 +03:00
clap = { version = "4", features = ["derive"] }
Consolidate all crate dependencies (#694) This moves all dependency version management to one location
2023-06-01 16:05:06 +03:00
criterion = { version = "0.5", features = ["async_futures", "async_tokio", "html_reports"] }
ctor = "0.2"
bump dependencies
2024-06-27 00:15:27 +03:00
deadpool-postgres = "0.14"
Add metadat copy/apply-diff, new testing framework (#921) * Fix metadata copying * Introduce a new metadata field `agg_tiles_hash_after_apply` for diff files * Added a lot of new info and debug logging * Simplified Copying interface - not much value in having all the complex builder pattern here it seems, might as well use a simple object. ## Testing * Generate SQLite DBs in memory on the fly to validate just what we need * Use `insta` for validating DB content There is now a function `dump(connection) -> Vec<Entry>` to dump the content of the entire SQLite DB into text with `serde`. At many steps through the testing, the DB content is validated with the corresponding .snap file with `insta` crate (which makes this process mega-simple, including a simple way to "bless" (update) any changes). ## Discovered bugs * Seems like normalized files do not get copied properly - they contain extras that should be removed.
2023-10-10 18:10:17 +03:00
enum-display = "0.1"
Bump dependencies
2024-01-21 03:52:09 +03:00
env_logger = "0.11"
Switch bb8 to DeadPool (#570) DeadPool seem to be better maintained, and most importantly, it properly reports connection errors - something bb8 does not support yet. I also removed connection timeout config param - it was introduced while trying to solve bb8 issue - not needed because connection string supports it already. This should resolve some of the issues in #496
2023-02-08 19:55:37 +03:00
flate2 = "1"
Add binary diff for mbtiles (#1358) * `mbtiles diff` now has an additional `--patch-type` param with `whole`, `bin-diff-raw` and `bin-diff-gz` values: * `whole` stores different tiles as before - as whole tiles in the `tiles` table * `bin-diff-raw` computes binary difference between tiles, and stores them as brotli-encoded value in a `bsdiffraw` table, together with a `xxh3_64` hash of the tile as it will be stored after patching * `bin-diff-gz` same as `bin-diff-raw`, but assumes the tiles are gzip-compressed, so it uncompresses them before comparing. The `xxh3_64` stores the hash of the uncompressed tile. The data will be stored in the `bsdiffrawgz` table (identical structure with above) * `mbtiles copy --apply-patch` will automatically detect if `bsdiffrawgz` or `bsdiffraw` tables exist, and will use binary patching. * `mbtiles apply-patch` does not support binary patching yet * `mbtiles copy --diff-with-file ... --patch-type ...` is an alias to `mbtiles diff --patch-type ...`
2024-06-25 22:34:14 +03:00
flume = "0.11"
Multi-source support, new path structure (#456) Partial implementation of the #430 * New endpoint structure: * `GET /` -- a placeholder for the future home page * `GET /catalog` -- get a list of available sources, as a list of json blobs. * `[{id, name, description, attribution, vector_layer}, ...]` (some fields might be missing) * `GET /<id>` -- get tilejson for the given source, or a combination of sources. No `.json` extension * `GET /<id>/<z>/<x>/<y>` -- get a tile. No format extension. * `GET /health` -- healthcheck * Introduce a new tile format support crate (using code from the maplibre/mbtileserve project) * Removed the `/rpc/...` routes - all source IDs are accessed in the same way * Can print auto-generated configuration or save it to a file * Refactored to support multiple sources from multiple backends, with a proper naming conflict resolution TODO: * benchmarks need to be rewritten - they were relying on some internal structures that are no longer there. This might be done as a separate PR due to a very different internal architecture - might need to rethink benchmarking approaches.
2022-11-26 12:46:40 +03:00
futures = "0.3"
Consolidate all crate dependencies (#694) This moves all dependency version management to one location
2023-06-01 16:05:06 +03:00
indoc = "2"
Fix martin integration tests (#952) Turns out some integration tests were not running after `martin` was moved to subdir
2023-10-20 06:40:08 +03:00
insta = "1"
Fix a few CI issues and bump deps (#1341)
2024-05-17 08:05:19 +03:00
itertools = "0.13"
json-patch = "2.0"
Add AWS Lambda support (#1127) This adds the lambda-web crate to adapt the actix App to speak to Lambda by way of the lambda_runtime crate. AWS Lambda has native support for scripting languages to execute a function directly; compiled languages must embed a runtime to fetch incoming events from Lambda and post the responses. This detects the environment variables to start up in Lambda mode instead of the normal HTTP server, and is added as an optional feature. Lambda has five (!) distinct ways of routing HTTP requests to a function; this supports some of them. (Specifically, the most obvious way to do this is with a Function URL, which is newest and simplest, and perhaps with CloudFront, which speaks to the Function URL and not Lambda directly.) The error handling could probably be refined, I was just trying to get this to compile. (Supported: API Gateway HTTP API with payload format version 2.0; API Gateway REST API; Lambda function URLs / Not supported: API Gateway HTTP API with payload format version 1.0; Application Load Balancer) Necessary for #1102 to be able to run the released packages directly, and only having to configure the appropriate environment. --------- Co-authored-by: Yuri Astrakhan <yuriastrakhan@gmail.com>
2024-02-01 21:56:40 +03:00
lambda-web = { version = "0.2.1", features = ["actix4"] }
Update sqlite-hashes dependency (#1268) Minor internal breaking changes
2024-03-23 00:04:16 +03:00
libsqlite3-sys = { version = ">=0.27", features = ["bundled"] }
WIP: refactoring
2018-03-26 14:12:43 +03:00
log = "0.4"
Optimize produced release binaries (#1385) Minor optimization to create a slightly more compact code (should be the same performance, or possibly even faster)
2024-06-27 03:31:41 +03:00
martin-tile-utils = { path = "./martin-tile-utils", version = "0.5.1" }
mbtiles = { path = "./mbtiles", version = "0.11.1" }
Add binary diff for mbtiles (#1358) * `mbtiles diff` now has an additional `--patch-type` param with `whole`, `bin-diff-raw` and `bin-diff-gz` values: * `whole` stores different tiles as before - as whole tiles in the `tiles` table * `bin-diff-raw` computes binary difference between tiles, and stores them as brotli-encoded value in a `bsdiffraw` table, together with a `xxh3_64` hash of the tile as it will be stored after patching * `bin-diff-gz` same as `bin-diff-raw`, but assumes the tiles are gzip-compressed, so it uncompresses them before comparing. The `xxh3_64` stores the hash of the uncompressed tile. The data will be stored in the `bsdiffrawgz` table (identical structure with above) * `mbtiles copy --apply-patch` will automatically detect if `bsdiffrawgz` or `bsdiffraw` tables exist, and will use binary patching. * `mbtiles apply-patch` does not support binary patching yet * `mbtiles copy --diff-with-file ... --patch-type ...` is an alias to `mbtiles diff --patch-type ...`
2024-06-25 22:34:14 +03:00
md5 = "0.7.0"
Implement http pmtiles (#991) PMTiles is a web-optimized format, allowing the actual file to be read with HTTP range requests. Supporting this use case instantly allows Martin to function as a lambda executable accessing PMTiles, but without any significant investment into devops or hosting large file. PMTiles config now also allows `http` and `https` protocol. ``` # Publish PMTiles files pmtiles: paths: # specific pmtiles file will be published as mypmtiles source # (use last portion of the URL without extension) - http://example.org/path/to/mypmtiles.pmtiles sources: # named source matching source name to a single file pm-src1: https://example.org/path/to/some_pmtiles.pmtiles ``` fixes #884 --------- Co-authored-by: Kyle Slugg-Urbino <35903887+kyleslugg@users.noreply.github.com>
2023-12-22 09:01:50 +03:00
moka = { version = "0.12", features = ["future"] }
feat: use latest actix, switch to bb8 (async everywhere), remove actions (#377) * remove all actions and other low-level magic code, making it more straightforward for the most common usage * replace r2d2 with bb8 to make it all async * use first significant version in cargo.toml - this makes it easier to maintain This fixes #349
2022-08-15 16:54:48 +03:00
num_cpus = "1"
chore(deps): Bump pbf_font_tools from 2.5.0 to 2.5.1 (#1191) Bumps [pbf_font_tools](https://github.com/stadiamaps/sdf_font_tools) from 2.5.0 to 2.5.1. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/stadiamaps/sdf_font_tools/releases">pbf_font_tools's releases</a>.</em></p> <blockquote> <h2>tools-v2.5.1</h2> <h2>What's Changed</h2> <ul> <li>Housekeeping by <a href="https://github.com/ianthetechie"><code>@​ianthetechie</code></a> in <a href="https://redirect.github.com/stadiamaps/sdf_font_tools/pull/17">stadiamaps/sdf_font_tools#17</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/stadiamaps/sdf_font_tools/compare/cli-v1.4.1...sdf-v1.0.1">https://github.com/stadiamaps/sdf_font_tools/compare/cli-v1.4.1...sdf-v1.0.1</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/stadiamaps/sdf_font_tools/commit/011f994a593af4b5bb3e95d3157cafe788fb207c"><code>011f994</code></a> Housekeeping (<a href="https://redirect.github.com/stadiamaps/sdf_font_tools/issues/17">#17</a>)</li> <li><a href="https://github.com/stadiamaps/sdf_font_tools/commit/97c5634b8e3515ac7761d0a4f67d12e7f688b042"><code>97c5634</code></a> Fix CI issues round 2</li> <li>See full diff in <a href="https://github.com/stadiamaps/sdf_font_tools/compare/tools-v2.5.0...tools-v2.5.1">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pbf_font_tools&package-manager=cargo&previous-version=2.5.0&new-version=2.5.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-13 05:59:51 +03:00
pbf_font_tools = { version = "2.5.1", features = ["freetype"] }
Fix a few CI issues and bump deps (#1341)
2024-05-17 08:05:19 +03:00
pmtiles = { version = "0.10", features = ["http-async", "mmap-async-tokio", "tilejson", "reqwest-rustls-tls-native-roots"] }
feat: use latest actix, switch to bb8 (async everywhere), remove actions (#377) * remove all actions and other low-level magic code, making it more straightforward for the most common usage * replace r2d2 with bb8 to make it all async * use first significant version in cargo.toml - this makes it easier to maintain This fixes #349
2022-08-15 16:54:48 +03:00
postgis = "0.9"
cargo update (#395) * bump postgres features * update to latest
2022-09-13 09:18:01 +03:00
postgres = { version = "0.19", features = ["with-time-0_3", "with-uuid-1", "with-serde_json-1"] }
feat: use latest actix, switch to bb8 (async everywhere), remove actions (#377) * remove all actions and other low-level magic code, making it more straightforward for the most common usage * replace r2d2 with bb8 to make it all async * use first significant version in cargo.toml - this makes it easier to maintain This fixes #349
2022-08-15 16:54:48 +03:00
postgres-protocol = "0.6"
better bench test
2023-12-27 21:50:07 +03:00
pprof = { version = "0.13", features = ["flamegraph", "criterion"] }
Add metadat copy/apply-diff, new testing framework (#921) * Fix metadata copying * Introduce a new metadata field `agg_tiles_hash_after_apply` for diff files * Added a lot of new info and debug logging * Simplified Copying interface - not much value in having all the complex builder pattern here it seems, might as well use a simple object. ## Testing * Generate SQLite DBs in memory on the fly to validate just what we need * Use `insta` for validating DB content There is now a function `dump(connection) -> Vec<Entry>` to dump the content of the entire SQLite DB into text with `serde`. At many steps through the testing, the DB content is validated with the corresponding .snap file with `insta` crate (which makes this process mega-simple, including a simple way to "bless" (update) any changes). ## Discovered bugs * Seems like normalized files do not get copied properly - they contain extras that should be removed.
2023-10-10 18:10:17 +03:00
pretty_assertions = "1"
Improve SSL support (#567) This is a partial fix for #496 * BREAKING: Now Martin behaves the same way as `psql` -- by default, if SSL is available on the server, it will be used, even though it will not verify that the server has a valid SSL certificate * Martin now understands `PGSSLCERT`, `PGSSLKEY`, and `PGSSLROOTCERT` env vars (and corresponding config keys) - same as psql. * Martin can now process `?sslmode=verify-ca` and `verify-full` (just like psql). The verify modes require root and/or client cert & key. * remove `danger_accept_invalid_certs` -- turns out that behavior is expected by default unless ssl mode is set to verify - which upstream lib [does not support](https://github.com/sfackler/rust-postgres/issues/768) - PR [submitted](https://github.com/sfackler/rust-postgres/pull/988). * added connection_timeout_ms option for postgres and set it to 5 seconds by default. This way it will fail out earlier. * added error reporting to bb8 - but it is currently [broken upstream](https://github.com/djc/bb8/issues/151) - not sure we can fix it easily, so may need to switch to deadpool later. * added docker-based TLS test (horray!) - wasn't trivial at all, despite ending up fairly simple.
2023-02-06 22:32:28 +03:00
regex = "1"
fix ci, dep bump
2024-06-14 01:33:29 +03:00
rstest = "0.21"
chore(deps): Bump rustls from 0.23.10 to 0.23.11 (#1410) Bumps [rustls](https://github.com/rustls/rustls) from 0.23.10 to 0.23.11. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/rustls/rustls/commit/7b521dadb98d9198bc8f5e56efe9c14c9690aa83"><code>7b521da</code></a> roadmap: reflect 0.23.11</li> <li><a href="https://github.com/rustls/rustls/commit/cd9be0d031e19dfc8a165e0fa728f73115eda591"><code>cd9be0d</code></a> Prepare 0.23.11</li> <li><a href="https://github.com/rustls/rustls/commit/f781276e6ed67e9e35de09c8dfb977a591b2f033"><code>f781276</code></a> x509.rs: move <code>asn1_wrap</code> below callers</li> <li><a href="https://github.com/rustls/rustls/commit/bc1e543e072b90f0272a7a2e848893d2529ef040"><code>bc1e543</code></a> ring::sign: tidy up pkcs8 conversion</li> <li><a href="https://github.com/rustls/rustls/commit/b5895c717c9a485156f9c8a50a1c3be0e1602d1e"><code>b5895c7</code></a> Add <code>public_key()</code> for all built-in <code>SigningKey</code>s</li> <li><a href="https://github.com/rustls/rustls/commit/20fdce6ad961c4b2901b42cc8c0289e4d51b3cd2"><code>20fdce6</code></a> Call CertifiedKey::keys_match from ConfigBuilder::with_single_cert*</li> <li><a href="https://github.com/rustls/rustls/commit/54b3b5ed05bbb64235a7a72f3a4a66132ace3155"><code>54b3b5e</code></a> Refactor AlwaysResolvesChain to take existing CertifiedKey</li> <li><a href="https://github.com/rustls/rustls/commit/0e2d2ac38a624255e5fb37bf46e9f9c8d4143984"><code>0e2d2ac</code></a> chore(deps): lock file maintenance</li> <li><a href="https://github.com/rustls/rustls/commit/8b8d5dc588f7602e025cd8d2e1ee44be38d07c30"><code>8b8d5dc</code></a> Refactor and explain bulk <code>total_data</code> behaviour</li> <li><a href="https://github.com/rustls/rustls/commit/fefc057f49b8c028c533ccef71a4cfd2b50b8a6b"><code>fefc057</code></a> Hoist Arc into <code>make_client/server_config</code> return type</li> <li>Additional commits viewable in <a href="https://github.com/rustls/rustls/compare/v/0.23.10...v/0.23.11">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=rustls&package-manager=cargo&previous-version=0.23.10&new-version=0.23.11)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-09 06:31:55 +03:00
rustls = "0.23.11"
upgrade dependencies, Nasm on Windows (#1295) * Install `nasm` when running CI on Windows (required by rustls new faster crypto-provider) * In integration testing, wrap connection in mutex due to `rstest` now requiring `once` fixtures to be `Sync` * Upgrade to Brotli v4, and disable FFI due to compilation conflict
2024-04-10 02:36:40 +03:00
# ring feature does not require NASM windows executable, but works slower
#rustls = { version = "0.23", default-features = false, features = ["logging", "std", "tls12", "ring"] }
Upgrade to Rustls 0.22 (#1136) Fix #1036
2024-01-17 04:42:11 +03:00
rustls-native-certs = "0.7"
rustls-pemfile = "2"
feat: use latest actix, switch to bb8 (async everywhere), remove actions (#377) * remove all actions and other low-level magic code, making it more straightforward for the most common usage * replace r2d2 with bb8 to make it all async * use first significant version in cargo.toml - this makes it easier to maintain This fixes #349
2022-08-15 16:54:48 +03:00
semver = "1"
Rework and consolidate CI (#467) Rework CI to run tests locally using the VM-installed Postgres on all target platforms. ### CI jobs * Build release versions on Linux/Win/Mac and save build results as output artifacts * In a separate VMs (Linux/Win/Mac) * use [nyurik/action-setup-postgis](https://github.com/nyurik/action-setup-postgis) to install postgis and run tests using the built artifacts * run `cargo test` on Linux only * copy built artifacts from the build step, and run tests using the release martin binary * package and publish if this is a release ### Other changes * Port some minor changes from the rewrite to porting easier * minor cleanups * remove all "expected" data files - too unstable to be usable
2022-10-31 23:28:21 +03:00
serde = { version = "1", features = ["derive"] }
Consolidate all crate dependencies (#694) This moves all dependency version management to one location
2023-06-01 16:05:06 +03:00
serde_json = "1"
simplify serde optional handling (#998)
2023-11-13 06:22:04 +03:00
serde_with = "3"
chore(deps): bump serde_yaml from 0.8.26 to 0.9.0 (#369) Bumps [serde_yaml](https://github.com/dtolnay/serde-yaml) from 0.8.26 to 0.9.0. - [Release notes](https://github.com/dtolnay/serde-yaml/releases) - [Commits](https://github.com/dtolnay/serde-yaml/compare/0.8.26...0.9.0) --- updated-dependencies: - dependency-name: serde_yaml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-29 12:20:49 +03:00
serde_yaml = "0.9"
Add mbtiles statistics command (#986) - [x] Add tile statistics to mbtiles tools - [x] Add test - [x] Use 4326 instead of 3857 for tile bounds - [x] Add document - [x] Use size-format to prettify output - [x] Statistics struct Refactor - [x] Cleanup and reformat Closes #964 --------- Co-authored-by: Yuri Astrakhan <yuriastrakhan@gmail.com>
2023-11-13 09:03:40 +03:00
size_format = "1.0.2"
bump lock
2023-12-07 10:20:32 +03:00
spreet = { version = "0.11", default-features = false }
Add binary diff for mbtiles (#1358) * `mbtiles diff` now has an additional `--patch-type` param with `whole`, `bin-diff-raw` and `bin-diff-gz` values: * `whole` stores different tiles as before - as whole tiles in the `tiles` table * `bin-diff-raw` computes binary difference between tiles, and stores them as brotli-encoded value in a `bsdiffraw` table, together with a `xxh3_64` hash of the tile as it will be stored after patching * `bin-diff-gz` same as `bin-diff-raw`, but assumes the tiles are gzip-compressed, so it uncompresses them before comparing. The `xxh3_64` stores the hash of the uncompressed tile. The data will be stored in the `bsdiffrawgz` table (identical structure with above) * `mbtiles copy --apply-patch` will automatically detect if `bsdiffrawgz` or `bsdiffraw` tables exist, and will use binary patching. * `mbtiles apply-patch` does not support binary patching yet * `mbtiles copy --diff-with-file ... --patch-type ...` is an alias to `mbtiles diff --patch-type ...`
2024-06-25 22:34:14 +03:00
sqlite-compressions = { version = "0.2.12", default-features = false, features = ["bsdiffraw", "gzip"] }
chore(deps): Bump sqlite-hashes from 0.7.2 to 0.7.3 (#1379) Bumps [sqlite-hashes](https://github.com/nyurik/sqlite-hashes) from 0.7.2 to 0.7.3. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/nyurik/sqlite-hashes/releases">sqlite-hashes's releases</a>.</em></p> <blockquote> <h2>v0.7.3</h2> <p>Minor dependency updates and readme fixes</p> <p><strong>Full Changelog</strong>: <a href="https://github.com/nyurik/sqlite-hashes/compare/v0.7.2...v0.7.3">https://github.com/nyurik/sqlite-hashes/compare/v0.7.2...v0.7.3</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/nyurik/sqlite-hashes/commit/51fdad1c2d8b6cf69b110878c17361d0fee05833"><code>51fdad1</code></a> bump deps, fix readme tests</li> <li><a href="https://github.com/nyurik/sqlite-hashes/commit/d55150b5032c8bc12c84ae1bf1a97ea8803d6e3d"><code>d55150b</code></a> readme</li> <li><a href="https://github.com/nyurik/sqlite-hashes/commit/1930cebc429f66691fff9834b073ae6fc3a959f6"><code>1930ceb</code></a> Fix SQLx example</li> <li>See full diff in <a href="https://github.com/nyurik/sqlite-hashes/compare/v0.7.2...v0.7.3">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=sqlite-hashes&package-manager=cargo&previous-version=0.7.2&new-version=0.7.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-20 05:54:00 +03:00
sqlite-hashes = { version = "0.7.3", default-features = false, features = ["md5", "aggregate", "hex"] }
mbtiles: remove tls features, CI streamlining (#908)
2023-09-30 03:40:32 +03:00
sqlx = { version = "0.7", features = ["sqlite", "runtime-tokio"] }
update lock
2023-09-06 07:30:40 +03:00
subst = { version = "0.3", features = ["yaml"] }
Strongly-type errors, fix bounds escaping (#516) * Since this is a library, all errors should have a strongly typed enum. * table bounds computing function was not escaping identifiers * table bounds computation was also silently ignoring all errors
2022-12-13 13:02:38 +03:00
thiserror = "1"
Bump all dependencies, fix CI (#1353)
2024-05-25 08:17:26 +03:00
tile-grid = "0.6"
Add `martin-cp` tool to bulk-copy tiles from any Martin-supported sources (#1011) This adds a new utility called `martin-cp` that allows copying any number of tiles from a single source (or a composite source) to an mbtiles file. `martin-cp` is a tool for generating tiles in bulk, and save retrieved tiles into a new or an existing MBTiles file. It can be used to generate tiles for a large area or multiple areas. If multiple areas overlap, it will generate tiles only once. `martin-cp` supports the same configuration file and CLI arguments as Martin server, so it can support all sources and even combining sources.
2023-11-20 09:27:51 +03:00
tilejson = "0.4"
bump lock
2023-11-10 06:28:15 +03:00
tokio = { version = "1", features = ["macros"] }
upgrade dependencies, Nasm on Windows (#1295) * Install `nasm` when running CI on Windows (required by rustls new faster crypto-provider) * In integration testing, wrap connection in mutex due to `rstest` now requiring `once` fixtures to be `Sync` * Upgrade to Brotli v4, and disable FFI due to compilation conflict
2024-04-10 02:36:40 +03:00
tokio-postgres-rustls = "0.12"
Implement http pmtiles (#991) PMTiles is a web-optimized format, allowing the actual file to be read with HTTP range requests. Supporting this use case instantly allows Martin to function as a lambda executable accessing PMTiles, but without any significant investment into devops or hosting large file. PMTiles config now also allows `http` and `https` protocol. ``` # Publish PMTiles files pmtiles: paths: # specific pmtiles file will be published as mypmtiles source # (use last portion of the URL without extension) - http://example.org/path/to/mypmtiles.pmtiles sources: # named source matching source name to a single file pm-src1: https://example.org/path/to/some_pmtiles.pmtiles ``` fixes #884 --------- Co-authored-by: Kyle Slugg-Urbino <35903887+kyleslugg@users.noreply.github.com>
2023-12-22 09:01:50 +03:00
url = "2.5"
Add binary diff for mbtiles (#1358) * `mbtiles diff` now has an additional `--patch-type` param with `whole`, `bin-diff-raw` and `bin-diff-gz` values: * `whole` stores different tiles as before - as whole tiles in the `tiles` table * `bin-diff-raw` computes binary difference between tiles, and stores them as brotli-encoded value in a `bsdiffraw` table, together with a `xxh3_64` hash of the tile as it will be stored after patching * `bin-diff-gz` same as `bin-diff-raw`, but assumes the tiles are gzip-compressed, so it uncompresses them before comparing. The `xxh3_64` stores the hash of the uncompressed tile. The data will be stored in the `bsdiffrawgz` table (identical structure with above) * `mbtiles copy --apply-patch` will automatically detect if `bsdiffrawgz` or `bsdiffraw` tables exist, and will use binary patching. * `mbtiles apply-patch` does not support binary patching yet * `mbtiles copy --diff-with-file ... --patch-type ...` is an alias to `mbtiles diff --patch-type ...`
2024-06-25 22:34:14 +03:00
xxhash-rust = { version = "0.8", features = ["xxh3"] }
Move Martin crate to its own subdir (#699) This cleans up the code a bit, making all crates to be on the same level.
2023-06-04 05:50:55 +03:00
add encoding=UTF8 pragma, refactoring (#919)
2023-10-04 04:20:41 +03:00
[profile.dev.package]
Move Martin crate to its own subdir (#699) This cleans up the code a bit, making all crates to be on the same level.
2023-06-04 05:50:55 +03:00
# See https://github.com/launchbadge/sqlx#compile-time-verification
add encoding=UTF8 pragma, refactoring (#919)
2023-10-04 04:20:41 +03:00
sqlx-macros.opt-level = 3
Add metadat copy/apply-diff, new testing framework (#921) * Fix metadata copying * Introduce a new metadata field `agg_tiles_hash_after_apply` for diff files * Added a lot of new info and debug logging * Simplified Copying interface - not much value in having all the complex builder pattern here it seems, might as well use a simple object. ## Testing * Generate SQLite DBs in memory on the fly to validate just what we need * Use `insta` for validating DB content There is now a function `dump(connection) -> Vec<Entry>` to dump the content of the entire SQLite DB into text with `serde`. At many steps through the testing, the DB content is validated with the corresponding .snap file with `insta` crate (which makes this process mega-simple, including a simple way to "bless" (update) any changes). ## Discovered bugs * Seems like normalized files do not get copied properly - they contain extras that should be removed.
2023-10-10 18:10:17 +03:00
# See https://docs.rs/insta/latest/insta/#optional-faster-runs
insta.opt-level = 3
similar.opt-level = 3
Preparing release, version bump
2023-12-19 04:24:43 +03:00
#[patch.crates-io]
Improve `mbtiles update`, update min/max zoom on `martin-cp` (#1096) * `mbtiles update` now allows different types of zoom updates - reset to content, grow only, or skip (dry run) * `martin-cp` will now update (grow-only) metadata zooms Addresses a few concerns in the #1081
2023-12-24 12:30:45 +03:00
#enum-display = { path = "../enum-display" }
Minor cleanup and just reorg (#992) Only run git push diff on linux to make development on non-linux easier, and a few preparations for pmtiles over http serving Fixes #855
2023-11-09 03:46:23 +03:00
#pmtiles = { path = "../pmtiles-rs" }
Add `martin-cp` tool to bulk-copy tiles from any Martin-supported sources (#1011) This adds a new utility called `martin-cp` that allows copying any number of tiles from a single source (or a composite source) to an mbtiles file. `martin-cp` is a tool for generating tiles in bulk, and save retrieved tiles into a new or an existing MBTiles file. It can be used to generate tiles for a large area or multiple areas. If multiple areas overlap, it will generate tiles only once. `martin-cp` supports the same configuration file and CLI arguments as Martin server, so it can support all sources and even combining sources.
2023-11-20 09:27:51 +03:00
#sqlite-hashes = { path = "../sqlite-hashes" }
mbtiles improvements, minor changes (#1013) # MBTiles * New `--agg-hash (update|verify|off)` flag replaces `--update-agg-tiles-hash` (still supported, but not shown in the help screen). This allows bypassing aggregate hash validation entirely, without either updating or validating it. * Simplify MBTiles SQL generation * MBTiles now uses faster `1 << zoom` everywhere, and a dedicated TMS inversion fn * split up metadata insert and delete into separate fn * consolidated schema initialization * ensure db settings (like pragma) are always reset on new files # Other * Always sort JSON-serialized keys for consistency * this affects `/catalog` key ordering, but content is the same * Minor code cleanup
2023-11-19 13:06:37 +03:00
#tilejson = { path = "../tilejson" }
Add `martin-cp` tool to bulk-copy tiles from any Martin-supported sources (#1011) This adds a new utility called `martin-cp` that allows copying any number of tiles from a single source (or a composite source) to an mbtiles file. `martin-cp` is a tool for generating tiles in bulk, and save retrieved tiles into a new or an existing MBTiles file. It can be used to generate tiles for a large area or multiple areas. If multiple areas overlap, it will generate tiles only once. `martin-cp` supports the same configuration file and CLI arguments as Martin server, so it can support all sources and even combining sources.
2023-11-20 09:27:51 +03:00
#pmtiles = { git = "https://github.com/nyurik/pmtiles-rs", branch = "override" }
#tilejson = { git = "https://github.com/nyurik/tilejson", branch = "btreemap" }
Optimize produced release binaries (#1385) Minor optimization to create a slightly more compact code (should be the same performance, or possibly even faster)
2024-06-27 03:31:41 +03:00
[profile.release]
# Make release binaries a bit smaller
lto = true
codegen-units = 1
Reference in New Issue Copy Permalink