* clean up reporting of the un-used config params - instead of printing,
collect them and print in one place if needed (allows testing too)
* remove `vector_layer` in catalog - too verbose, not needed - can be
received via tilejson for individual source
* clean up tests so that they all use the same config yaml
Adds a new [.mbtiles](https://github.com/mapbox/mbtiles-spec/blob/master/1.3/spec.md)
backend, without the grid support. Uses extensive tile content
detection, i.e. if the content is gzipped, png, jpeg, gif, webp.
From CLI, can be as easy as adding a path to a directory that contains a
.mbtiles file (works just like pmtiles support)
```bash
# All *.mbtiles files in this dir will be published.
# The filename will be used as the source ID
martin ./tests/fixtures
```
From configuration file, the path can be specified in a number of ways
(same as pmtiles)
```yaml
mbtiles:
paths:
# scan this whole dir, matching all *.mbtiles files
- /dir-path
# specific mbtiles file will be published as mbtiles2 source
- /path/to/mbtiles2.mbtiles
sources:
# named source matching source name to a single file
pm-src1: /tmp/mbtiles.mbtiles
# named source, where the filename is explicitly set. This way we will be able to add more options later
pm-src2:
path: /tmp/mbtiles.mbtiles
```
Fixes#494
Merge after #548
Adds a new [.pmtiles](https://protomaps.com/docs/pmtiles/) backend.
Supports all formats like png, vector, etc.
From CLI, can be as easy as adding a path to a directory that contains a
.pmtiles file:
```bash
# All *.pmtiles files in this dir will be published.
# The filename will be used as the source ID
martin ./tests/fixtures
```
From configuration file, the path can be specified in a number of ways:
```yaml
pmtiles:
paths:
# scan this whole dir, matching all *.pmtiles files
- /dir-path
# specific pmtiles file will be published as pmtiles2 source
- /path/to/pmtiles2.pmtiles
sources:
# named source matching source name to a single file
pm-src1: /tmp/pmtiles.pmtiles
# named source, where the filename is explicitly set. This way we will be able to add more options later
pm-src2:
path: /tmp/pmtiles.pmtiles
```
Fixes#508
* introduce a new Connections object to track all positional strings
passed as the CLI arguments
* each tile provider can now indicate if it can take a positional CLI
arg, and if the value can be shared between multiple providers, i.e. if
its a directory that could contain files for multiple providers
* make xyz use better types - u8 for zoom, u32 for x&y. Postgres casts
those to INT2 and INT8
* minor bug in pre-push git hook to abort in case of a testingerror
* added GIF detection/type
* combine MVT and compression concepts into one enum more explicitly. It
is not ideal (technically they are separate concerns), but it keeps it a
bit simpler for now for multiple providers.
* set content encoding and content type on HTTP responses if known, and
also include them in the `/catalog` response (json)
* raise an error if the user attempts to merge non-concatenatable tiles
from multiple sources. We may want to implement it in the future, e.g.
combine multiple semi-transparent PNGs. Or even combine GIF & PNG & JPEG
* do not set content-type on empty responses (http 204)
* add tilejson outputs to testing
* NEW: support for #512 - pg table/function auto-discovery
* can filter schemas
* can use patterns like `{schema}.{table}.{column}` and
`{schema}.{function}`
* NEW: add `disable_bounds` bool flag to allow disabling of the bounds
computation
* reworked integration tests to use yaml
* fixed SQL to work on older PG versions
* re-enable CI to test expected `test.sh` output against the one stored
in the `tests/expected`
* add postgres in docker tests on linux - one for the oldest supported
DB, and another using the more recent version
* minor justfile cleanup
* ensure config files are sorted alphabetically
* added manual coverage justfile command
* a lot of small refactorings of config and argument parsing
* feature: support jsonb query param for functions
* cleaned up public/private access
* make all tests populate with a predefined values to avoid issues with
random data
* Support `postgres` config key to be either a list or an object
* Use `PathBuf` instead of `String` where dealing with files
* Merge `SrvConfigBuilder` into `SrvConfig`
* Parse keep_alive as u64
* More config tests
Bumps [clap](https://github.com/clap-rs/clap) from 4.0.29 to 4.0.30.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/releases">clap's
releases</a>.</em></p>
<blockquote>
<h2>v4.0.30</h2>
<h2>[4.0.30] - 2022-12-21</h2>
<h3>Fixes</h3>
<ul>
<li><em>(error)</em> Improve error for
<code>args_conflicts_with_subcommand</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/blob/master/CHANGELOG.md">clap's
changelog</a>.</em></p>
<blockquote>
<h2>[4.0.30] - 2022-12-21</h2>
<h3>Fixes</h3>
<ul>
<li><em>(error)</em> Improve error for
<code>args_conflicts_with_subcommand</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="d2d022248b"><code>d2d0222</code></a>
chore: Release</li>
<li><a
href="56a0bb624f"><code>56a0bb6</code></a>
docs: Update changelog</li>
<li><a
href="b941a3eaef"><code>b941a3e</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4567">#4567</a>
from epage/error</li>
<li><a
href="453ac0bfb9"><code>453ac0b</code></a>
fix(parser): Be less confusing with args/subcommand conflicts</li>
<li><a
href="2a374db639"><code>2a374db</code></a>
test(parser): Show bad behavior</li>
<li><a
href="f632424e65"><code>f632424</code></a>
test(parser): Consolidate args_conflicts_with tests</li>
<li><a
href="a72f962d35"><code>a72f962</code></a>
docs(builder): Escape non-tags</li>
<li><a
href="ac48e2d5e4"><code>ac48e2d</code></a>
docs: Make less brittle for rust versions</li>
<li><a
href="a3381a2c05"><code>a3381a2</code></a>
docs(readme): Fix build status badge (<a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4559">#4559</a>)</li>
<li><a
href="aa5420469e"><code>aa54204</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4555">#4555</a>
from epage/reset</li>
<li>Additional commits viewable in <a
href="https://github.com/clap-rs/clap/compare/v4.0.29...v4.0.30">compare
view</a></li>
</ul>
</details>
<br />
[](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 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>
Bumps [num_cpus](https://github.com/seanmonstar/num_cpus) from 1.14.0 to
1.15.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/seanmonstar/num_cpus/releases">num_cpus's
releases</a>.</em></p>
<blockquote>
<h2>v1.15.0</h2>
<h2>Fixes</h2>
<ul>
<li>update hermit-abi</li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/striezel"><code>@striezel</code></a>
made their first contribution in <a
href="https://github-redirect.dependabot.com/seanmonstar/num_cpus/pull/126">seanmonstar/num_cpus#126</a></li>
<li><a href="https://github.com/buffet"><code>@buffet</code></a> made
their first contribution in <a
href="https://github-redirect.dependabot.com/seanmonstar/num_cpus/pull/127">seanmonstar/num_cpus#127</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/seanmonstar/num_cpus/blob/master/CHANGELOG.md">num_cpus's
changelog</a>.</em></p>
<blockquote>
<h2>v1.15.0</h2>
<h3>Fixes</h3>
<ul>
<li>update hermit-abi</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="5bea3c7986"><code>5bea3c7</code></a>
v1.15.0</li>
<li><a
href="ccb5a67925"><code>ccb5a67</code></a>
chore: update hermit-abi to 0.2.6 (<a
href="https://github-redirect.dependabot.com/seanmonstar/num_cpus/issues/127">#127</a>)</li>
<li><a
href="e437b9d908"><code>e437b9d</code></a>
ci: update actions/checkout in GitHub Actions workflows to v3 (<a
href="https://github-redirect.dependabot.com/seanmonstar/num_cpus/issues/126">#126</a>)</li>
<li>See full diff in <a
href="https://github.com/seanmonstar/num_cpus/compare/v1.14.0...v1.15.0">compare
view</a></li>
</ul>
</details>
<br />
[](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 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>
Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.44
to 0.10.45.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="7df56869c5"><code>7df5686</code></a>
Release openssl v0.10.45</li>
<li><a
href="f32af9f4aa"><code>f32af9f</code></a>
Release openssl-sys v0.9.80</li>
<li><a
href="deac6b7b86"><code>deac6b7</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1763">#1763</a>
from CfirTsabari/cfirtsabari/deperecated-functions-1745</li>
<li><a
href="27edce9340"><code>27edce9</code></a>
Mark Openssl # deprecated functions</li>
<li><a
href="f0ff8a7e48"><code>f0ff8a7</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1762">#1762</a>
from wiktor-k/fix-broken-relaxation</li>
<li><a
href="45e5dce285"><code>45e5dce</code></a>
Expose <code>Cipher::cipher_final_unchecked</code></li>
<li><a
href="71013f7efd"><code>71013f7</code></a>
Fix output buffer check introduced in <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1733">#1733</a></li>
<li><a
href="64ba480226"><code>64ba480</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1761">#1761</a>
from vishwin/master</li>
<li><a
href="0d8d502258"><code>0d8d502</code></a>
Expose EVP_PKEY_security_bits for LibreSSL 3.6.0 and later</li>
<li><a
href="e01fbac4b3"><code>e01fbac</code></a>
openssl-sys: add LibreSSL 3.6.0 to cfgs</li>
<li>Additional commits viewable in <a
href="https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.44...openssl-v0.10.45">compare
view</a></li>
</ul>
</details>
<br />
[](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 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>
Pedantic lints often offer some good insight into the code. It is
usually easier to sprinkle a few "allow"-s around, than to miss some
important life hack offered by clippy.
Also, make use a different martin port when running integration tests
locally (make sure `git push` works even if martin is running).
* Ensure the source ID only contains ascii alphanumerics, dots, dashes,
and underscores.
* optimize the most common case of getting a single source
* optimize the case of sources with no query parameters
* 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
This extracts some of the code from #511 but without breaking changes
* Use `PathBuf` instead of `String` where dealing with files
* Parse keep_alive as u64
* More config tests to crash if martin output contains warnings or
errors
Can now handle several additional Postgres functions to get a tile, plus
tons of small fixes
### Multiple result variants
* `getmvt(z,x,y) -> [bytea,md5]` (single row with two columns)
* `getmvt(z,x,y) -> [bytea]` (single row with a single column)
* `getmvt(z,x,y) -> bytea` (value)
### Multiple input parameter variants
* `getmvt(z, x, y)` or `getmvt(zoom, x, y)` (all 3 vars must be
integers)
* `getmvt(z, x, y, url_query)`, where instead of `url_query` it could be
any other name, but must be of type JSON
### Breaking
* srid is now the same type as PG -- `i32`
* renamed config vals `table_sources` and `function_sources` into
`tables` and `functions`
### Features and fixes
* if postgis is v3.1+, uses margin parameter to extend the search box by
the size of the buffer. I think we should make 3.1 minimal required.
* fixes feature ID issue from #466
* fixes mixed case names for schemas, tables and columns, functions and
parameter names per #389
### Notes
* More dynamic SQL generation in code instead of using external SQL
files. Those should only be used when they are not parametrized.
* The new function/table discovery mechanism: query for all functions in
the database, and match up those functions with the ones configured (if
any), plus adds all the rest of the un-declared ones if discovery mode
is on.
* During table and function discovery, the code generates a map of
`(PgSqlInfo, FunctionInfo)` (or table) tupples containing SQL needed to
get the tile.
* Auto-discovery mode is currently hidden - the discovery is on only
when no tables or functions are configured. TBD - how to configure it in
the future
* The new system allows for an easy way to auto-discover for the
specific schemas only, solving #47
* predictable order of table/function instantiation
* bounding boxes computed in parallel for all tables (when not
configured)
* proper identifier escaping
* test cleanup
fixes#378fixes#466fixes#65fixes#389
Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.43
to 0.10.44.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="e0b937c48d"><code>e0b937c</code></a>
Release openssl v0.10.44</li>
<li><a
href="a1b82a2d83"><code>a1b82a2</code></a>
Release openssl-sys v0.9.79</li>
<li><a
href="54d4496e94"><code>54d4496</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1741">#1741</a>
from wiktor-k/improve-docs</li>
<li><a
href="6643d07213"><code>6643d07</code></a>
rustfmt</li>
<li><a
href="d299bbcf23"><code>d299bbc</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1740">#1740</a>
from alexanderjordanbaker/X509LoadCertFile</li>
<li><a
href="5ae938ee55"><code>5ae938e</code></a>
Add support for X509_load_cert_file</li>
<li><a
href="d390c414ec"><code>d390c41</code></a>
Add more elaborate ECDH example to <code>openssl::derive</code></li>
<li><a
href="9b851cdf76"><code>9b851cd</code></a>
Add documentation to several <code>openssl::ec</code> items</li>
<li><a
href="a6af54eee1"><code>a6af54e</code></a>
Move <code>openssl::hash</code> documentation to respective
functions</li>
<li><a
href="b42a2b7714"><code>b42a2b7</code></a>
Add documentation to <code>openssl::sign::Verifier</code></li>
<li>Additional commits viewable in <a
href="https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.43...openssl-v0.10.44">compare
view</a></li>
</ul>
</details>
<br />
[](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 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>
* bump docker compose to use latest supported db and postgis
* update justfile to allow simple legacy testing
* update readme
Followup: implement CI testing -- see #502
* All tests and internal code now uses ST_TileEnvelope function
* Remove `tile_bbox`
* Rename test function sources for clarity - this will be needed in a
subsequent PR to add other function tests
Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.58
to 0.1.59.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/dtolnay/async-trait/releases">async-trait's
releases</a>.</em></p>
<blockquote>
<h2>0.1.59</h2>
<ul>
<li>Support <code>self: Arc<Self></code> async methods that have a
default implementation provided by the trait (<a
href="https://github-redirect.dependabot.com/dtolnay/async-trait/issues/210">#210</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="c1fba00e2e"><code>c1fba00</code></a>
Release 0.1.59</li>
<li><a
href="b0466bb302"><code>b0466bb</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/dtolnay/async-trait/issues/223">#223</a>
from dtolnay/arc</li>
<li><a
href="066f06ec0d"><code>066f06e</code></a>
Match specifically Arc<Self>, not any other Arc</li>
<li><a
href="d1a4a23e97"><code>d1a4a23</code></a>
Infer Sync+Send bound for Arc<Self> methods with default body</li>
<li><a
href="e5828bf9e1"><code>e5828bf</code></a>
Add regression test for issue 210</li>
<li><a
href="9ed6489ee0"><code>9ed6489</code></a>
Format with rustfmt 1.5.1-nightly</li>
<li><a
href="b100ace3bc"><code>b100ace</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/dtolnay/async-trait/issues/222">#222</a>
from dtolnay/bound</li>
<li><a
href="643c07c0d1"><code>643c07c</code></a>
Generalize support for inferred multiple bounds</li>
<li><a
href="6c13d6fb80"><code>6c13d6f</code></a>
Move absolute path of bound into InferredBound</li>
<li><a
href="cfa9c10f53"><code>cfa9c10</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/dtolnay/async-trait/issues/221">#221</a>
from dtolnay/bound</li>
<li>Additional commits viewable in <a
href="https://github.com/dtolnay/async-trait/compare/0.1.58...0.1.59">compare
view</a></li>
</ul>
</details>
<br />
[](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 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>
* Fix incorrect printing of the xyz value - implements Display trait
instead to keep it simpler
* Remove the possibly-incorrect macro capture of a simple string - in
case the string contains inline vars
* Handle optional extra comma properly
* Rename it to a shorter name
* Inline vars where possible
[//]: # (dependabot-start)
⚠️ **Dependabot is rebasing this PR** ⚠️
Rebasing might not happen immediately, so don't worry if this takes some
time.
Note: if you make any changes to this PR yourself, they will take
precedence over the rebase.
---
[//]: # (dependabot-end)
Bumps [env_logger](https://github.com/rust-cli/env_logger) from 0.9.3 to
0.10.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/rust-cli/env_logger/blob/main/CHANGELOG.md">env_logger's
changelog</a>.</em></p>
<blockquote>
<h2>[0.10.0] - 2022-11-24</h2>
<p>MSRV changed to 1.60 to hide optional dependencies</p>
<h3>Fixes</h3>
<ul>
<li>Resolved soundness issue by switching from <code>atty</code> to
<code>is-terminal</code></li>
</ul>
<h3>Breaking Changes</h3>
<p>To open room for changing dependencies:</p>
<ul>
<li>Renamed <code>termcolor</code> feature to <code>color</code></li>
<li>Renamed <code>atty</code> feature to <code>auto-color</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="ff029fa8b6"><code>ff029fa</code></a>
chore: Release</li>
<li><a
href="389cc52d5a"><code>389cc52</code></a>
docs: Fix changelog links</li>
<li><a
href="2979c4b7b8"><code>2979c4b</code></a>
docs: Update changelog</li>
<li><a
href="4c379170f7"><code>4c37917</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/rust-cli/env_logger/issues/248">#248</a>
from epage/atty</li>
<li><a
href="d55d26980f"><code>d55d269</code></a>
style: Make clippy happy</li>
<li><a
href="066c2192c1"><code>066c219</code></a>
fix: Replace atty with is_terminal</li>
<li><a
href="4db5e87931"><code>4db5e87</code></a>
fix!: Rename termcolor/atty features</li>
<li><a
href="660cf7feb2"><code>660cf7f</code></a>
fix: Bump MSRV to 1.60.0</li>
<li><a
href="e572d04872"><code>e572d04</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/rust-cli/env_logger/issues/244">#244</a>
from epage/update</li>
<li><a
href="f1ff331fa2"><code>f1ff331</code></a>
docs: Fix typos</li>
<li>Additional commits viewable in <a
href="https://github.com/rust-cli/env_logger/compare/v0.9.3...v0.10.0">compare
view</a></li>
</ul>
</details>
<br />
[](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 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>
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.
Bumps [clap](https://github.com/clap-rs/clap) from 4.0.26 to 4.0.27.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/blob/master/CHANGELOG.md">clap's
changelog</a>.</em></p>
<blockquote>
<h2>[4.0.27] - 2022-11-24</h2>
<h3>Features</h3>
<ul>
<li>Have <code>Arg::value_parser</code> accept <code>Vec<impl
Into<PossibleValue>></code></li>
<li>Implement <code>Display</code> and <code>FromStr</code> for
<code>ColorChoice</code></li>
</ul>
<h3>Fixes</h3>
<ul>
<li>Remove soundness issue by switching from <code>atty</code> to
<code>is-terminal</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="3262016c26"><code>3262016</code></a>
chore: Release</li>
<li><a
href="757f95b2e9"><code>757f95b</code></a>
docs: Update changelog</li>
<li><a
href="20e02eb34e"><code>20e02eb</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4509">#4509</a>
from epage/possible</li>
<li><a
href="fb1d960fe2"><code>fb1d960</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4249">#4249</a>
from jcgruenhage/replace-atty</li>
<li><a
href="94aca92e44"><code>94aca92</code></a>
feat: Create ValueParser from Vec<PossibleValue></li>
<li><a
href="3bccfced1a"><code>3bccfce</code></a>
docs: Clarify PossibleValue is likely not needed</li>
<li><a
href="19981a2455"><code>19981a2</code></a>
docs: Clarify ColorChoice impls ValueEnum</li>
<li><a
href="8d92f3e7a8"><code>8d92f3e</code></a>
feat: Add Display/FromStr to ColorChoice</li>
<li><a
href="ed683ef248"><code>ed683ef</code></a>
fix: Always expose ColorChoice</li>
<li><a
href="789bfd6813"><code>789bfd6</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4508">#4508</a>
from epage/style</li>
<li>Additional commits viewable in <a
href="https://github.com/clap-rs/clap/compare/v4.0.26...v4.0.27">compare
view</a></li>
</ul>
</details>
<br />
[](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 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>
Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.42
to 0.10.43.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="7db5cc72d3"><code>7db5cc7</code></a>
Release openssl v0.10.43</li>
<li><a
href="d5037d4dca"><code>d5037d4</code></a>
Release openssl-sys v0.9.78</li>
<li><a
href="d43b2e117b"><code>d43b2e1</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1736">#1736</a>
from wiktor-k/improve-pkey-docs</li>
<li><a
href="6c52dd4928"><code>6c52dd4</code></a>
Improve <code>PKey</code> documentation related to ed25519/ed448</li>
<li><a
href="9ab49ba3e3"><code>9ab49ba</code></a>
Fix lint error on clippy 1.65</li>
<li><a
href="b30313a977"><code>b30313a</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1710">#1710</a>
from alexanderjordanbaker/X509VerifyTimeDepth</li>
<li><a
href="2aed206e9b"><code>2aed206</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1728">#1728</a>
from wiktor-k/fix-elliptic</li>
<li><a
href="520f6efb94"><code>520f6ef</code></a>
Fix reference to ECC</li>
<li><a
href="0ba0c716ea"><code>0ba0c71</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1709">#1709</a>
from wiktor-k/add-dsa-sig</li>
<li><a
href="808b9519c4"><code>808b951</code></a>
Add support for X509_VERIFY_PARAM_set_time and
X509_VERIFY_PARAM_set_depth</li>
<li>Additional commits viewable in <a
href="https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.42...openssl-v0.10.43">compare
view</a></li>
</ul>
</details>
<br />
[](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 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>
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.88 to
1.0.89.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/serde-rs/json/releases">serde_json's
releases</a>.</em></p>
<blockquote>
<h2>v1.0.89</h2>
<ul>
<li>Fix invalid JSON incorrectly accepted when a large number has no
digits after decimal point (<a
href="https://github-redirect.dependabot.com/serde-rs/json/issues/953">#953</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="d2f936855d"><code>d2f9368</code></a>
Release 1.0.89</li>
<li><a
href="0b898369f9"><code>0b89836</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/serde-rs/json/issues/956">#956</a>
from dtolnay/decimal</li>
<li><a
href="9d94e920ef"><code>9d94e92</code></a>
Require at least one digit after decimal point</li>
<li><a
href="c27b02334b"><code>c27b023</code></a>
Add regression test for issue 953</li>
<li><a
href="586fefb5a1"><code>586fefb</code></a>
Resolve semicolon_if_nothing_returned pedantic clippy lint</li>
<li>See full diff in <a
href="https://github.com/serde-rs/json/compare/v1.0.88...v1.0.89">compare
view</a></li>
</ul>
</details>
<br />
[](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 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>
