Skip to content

Commit 227e1ed

Browse files
chore: release (#2278)
## 🤖 New release * `martin-tile-utils`: 0.6.4 -> 0.6.5 (✓ API compatible changes) * `mbtiles`: 0.13.1 -> 0.14.0 (⚠ API breaking changes) * `martin-core`: 0.1.3 -> 0.2.0 (⚠ API breaking changes) * `martin`: 0.19.3 -> 0.20.0 ### ⚠ `mbtiles` breaking changes ```text --- failure inherent_method_missing: pub method removed or renamed --- Description: A publicly-visible method or associated fn is no longer available under its prior name. It may have been renamed or removed entirely. ref: https://doc.rust-lang.org/cargo/reference/semver.html#item-remove impl: https://github.com/obi1kenobi/cargo-semver-checks/tree/v0.43.0/src/lints/inherent_method_missing.ron Failed in: MbtilesPool::new, previously in file /tmp/.tmpKSs4So/mbtiles/src/pool.rs:18 ``` ### ⚠ `martin-core` breaking changes ```text --- failure constructible_struct_adds_field: externally-constructible struct adds field --- Description: A pub struct constructible with a struct literal has a new pub field. Existing struct literals must be updated to include the new field. ref: https://doc.rust-lang.org/reference/expressions/struct-expr.html impl: https://github.com/obi1kenobi/cargo-semver-checks/tree/v0.43.0/src/lints/constructible_struct_adds_field.ron Failed in: field Tile.etag in /tmp/.tmpBzV0yh/martin/martin-core/src/tiles/tile.rs:27 --- failure declarative_macro_missing: macro_rules declaration removed or renamed --- Description: A `macro_rules!` declarative macro cannot be invoked by its prior name. The macro may have been renamed or removed entirely. ref: https://doc.rust-lang.org/reference/macros-by-example.html#path-based-scope impl: https://github.com/obi1kenobi/cargo-semver-checks/tree/v0.43.0/src/lints/declarative_macro_missing.ron Failed in: macro get_cached_value, previously in file /tmp/.tmpKSs4So/martin-core/src/cache.rs:62 macro from_cache_value, previously in file /tmp/.tmpKSs4So/martin-core/src/cache.rs:48 macro get_or_insert_cached_value, previously in file /tmp/.tmpKSs4So/martin-core/src/cache.rs:81 --- failure enum_missing: pub enum removed or renamed --- Description: A publicly-visible enum cannot be imported by its prior path. A `pub use` may have been removed, or the enum itself may have been renamed or removed entirely. ref: https://doc.rust-lang.org/cargo/reference/semver.html#item-remove impl: https://github.com/obi1kenobi/cargo-semver-checks/tree/v0.43.0/src/lints/enum_missing.ron Failed in: enum martin_core::cache::CacheValue, previously in file /tmp/.tmpKSs4So/martin-core/src/cache.rs:27 enum martin_core::cache::CacheKey, previously in file /tmp/.tmpKSs4So/martin-core/src/cache.rs:15 --- failure enum_variant_missing: pub enum variant removed or renamed --- Description: A publicly-visible enum has at least one variant that is no longer available under its prior name. It may have been renamed or removed entirely. ref: https://doc.rust-lang.org/cargo/reference/semver.html#item-remove impl: https://github.com/obi1kenobi/cargo-semver-checks/tree/v0.43.0/src/lints/enum_variant_missing.ron Failed in: variant PmtilesError::S3BucketNameNotString, previously in file /tmp/.tmpKSs4So/martin-core/src/tiles/pmtiles/error.rs:14 variant PmtilesError::InvalidUrlMetadata, previously in file /tmp/.tmpKSs4So/martin-core/src/tiles/pmtiles/error.rs:26 variant PmtilesError::IoError, previously in file /tmp/.tmpKSs4So/martin-core/src/tiles/pmtiles/error.rs:34 --- failure feature_missing: package feature removed or renamed --- Description: A feature has been removed from this package's Cargo.toml. This will break downstream crates which enable that feature. ref: https://doc.rust-lang.org/cargo/reference/semver.html#cargo-feature-remove impl: https://github.com/obi1kenobi/cargo-semver-checks/tree/v0.43.0/src/lints/feature_missing.ron Failed in: feature cog in the package's Cargo.toml --- failure function_missing: pub fn removed or renamed --- Description: A publicly-visible function cannot be imported by its prior path. A `pub use` may have been removed, or the function itself may have been renamed or removed entirely. ref: https://doc.rust-lang.org/cargo/reference/semver.html#item-remove impl: https://github.com/obi1kenobi/cargo-semver-checks/tree/v0.43.0/src/lints/function_missing.ron Failed in: function martin_core::cache::trace_cache, previously in file /tmp/.tmpKSs4So/martin-core/src/cache.rs:37 --- failure inherent_method_missing: pub method removed or renamed --- Description: A publicly-visible method or associated fn is no longer available under its prior name. It may have been renamed or removed entirely. ref: https://doc.rust-lang.org/cargo/reference/semver.html#item-remove impl: https://github.com/obi1kenobi/cargo-semver-checks/tree/v0.43.0/src/lints/inherent_method_missing.ron Failed in: Tile::new, previously in file /tmp/.tmpKSs4So/martin-core/src/tiles/tile.rs:29 --- failure module_missing: pub module removed or renamed --- Description: A publicly-visible module cannot be imported by its prior path. A `pub use` may have been removed, or the module may have been renamed, removed, or made non-public. ref: https://doc.rust-lang.org/cargo/reference/semver.html#item-remove impl: https://github.com/obi1kenobi/cargo-semver-checks/tree/v0.43.0/src/lints/module_missing.ron Failed in: mod martin_core::cache, previously in file /tmp/.tmpKSs4So/martin-core/src/cache.rs:1 --- failure pub_module_level_const_missing: pub module-level const is missing --- Description: A public const is missing or renamed ref: https://doc.rust-lang.org/cargo/reference/semver.html#item-remove impl: https://github.com/obi1kenobi/cargo-semver-checks/tree/v0.43.0/src/lints/pub_module_level_const_missing.ron Failed in: NO_MAIN_CACHE in file /tmp/.tmpKSs4So/martin-core/src/cache.rs:11 --- failure struct_missing: pub struct removed or renamed --- Description: A publicly-visible struct cannot be imported by its prior path. A `pub use` may have been removed, or the struct itself may have been renamed or removed entirely. ref: https://doc.rust-lang.org/cargo/reference/semver.html#item-remove impl: https://github.com/obi1kenobi/cargo-semver-checks/tree/v0.43.0/src/lints/struct_missing.ron Failed in: struct martin_core::tiles::pmtiles::PmtHttpSource, previously in file /tmp/.tmpKSs4So/martin-core/src/tiles/pmtiles/source.rs:218 struct martin_core::tiles::pmtiles::PmtS3Source, previously in file /tmp/.tmpKSs4So/martin-core/src/tiles/pmtiles/source.rs:241 struct martin_core::tiles::pmtiles::PmtFileSource, previously in file /tmp/.tmpKSs4So/martin-core/src/tiles/pmtiles/source.rs:288 ``` <details><summary><i><b>Changelog</b></i></summary><p> ## `mbtiles` <blockquote> ## [0.14.0](mbtiles-v0.13.1...mbtiles-v0.14.0) - 2025-10-27 ### Added - *(cache)* implement sprite caching ([#2295](#2295)) - *(pmtiles)* [**breaking**] change pmtiles to base the implementation on `object_storage` instead ([#2251](#2251)) ### Other - *(lints)* audit all allows, add reasons and remove unnessesary ones ([#2288](#2288)) - *(config)* [**breaking**] remove deprecated `--watch` from the CLI options and `MbtilesPool::new` ([#2294](#2294)) - *(lints)* migrate a few of our expects to unwraps ([#2284](#2284)) - *(lints)* applly `clippy::panic_in_result_fn` and `clippy::todo` as warnings ([#2283](#2283)) - *(mbtiles)* Generate mbtiles dynamically from SQL files to increase debuggability and transparency ([#1868](#1868)) - release ([#2265](#2265)) </blockquote> ## `martin-core` <blockquote> ## [0.2.0](martin-core-v0.1.3...martin-core-v0.2.0) - 2025-10-27 ### Added - unstable style rendering ([#2306](#2306)) - *(cache)* implement sprite caching ([#2295](#2295)) - add font caching ([#2304](#2304)) - *(cache)* [**breaking**] split the cache configuration of tiles and pmtiles directories ([#2303](#2303)) - *(core)* enable overriding of the automatic hashing for source traits ([#2293](#2293)) - *(pmtiles)* [**breaking**] change pmtiles to base the implementation on `object_storage` instead ([#2251](#2251)) ### Fixed - *(cog)* [**breaking**] rename `cog` feature to `unstable-cog` ([#2285](#2285)) ### Other - *(lints)* audit all allows, add reasons and remove unnessesary ones ([#2288](#2288)) - *(core)* add a `_tiles` feature to simplify our feature configuration ([#2296](#2296)) - move `MainCache` to be a `TileCache` ([#2297](#2297)) - *(lints)* migrate a few of our expects to unwraps ([#2284](#2284)) </blockquote> ## `martin` <blockquote> ## [0.20.0](martin-v0.19.3...martin-v0.20.0) - 2025-10-27 ### Added - unstable style rendering ([#2306](#2306)) - *(cache)* implement sprite caching ([#2295](#2295)) - add font caching ([#2304](#2304)) - *(cache)* [**breaking**] split the cache configuration of tiles and pmtiles directories ([#2303](#2303)) - *(core)* enable overriding of the automatic hashing for source traits ([#2293](#2293)) - *(pg)* Add benchmark for source discovery timing ([#2263](#2263)) - *(pmtiles)* [**breaking**] change pmtiles to base the implementation on `object_storage` instead ([#2251](#2251)) ### Fixed - *(cog)* [**breaking**] rename `cog` feature to `unstable-cog` ([#2285](#2285)) ### Other - *(admin)* move functionality into better modules ([#2315](#2315)) - *(deps-dev)* Bump vite from 7.1.7 to 7.1.11 in /martin/martin-ui in the all-npm-ui-security-updates group across 1 directory ([#2308](#2308)) - *(lints)* enable `clippy::unimplemented` and `clippy::panic` ([#2287](#2287)) - *(lints)* audit all allows, add reasons and remove unnessesary ones ([#2288](#2288)) - move config files to new folders ([#2298](#2298)) - *(core)* add a `_tiles` feature to simplify our feature configuration ([#2296](#2296)) - move `MainCache` to be a `TileCache` ([#2297](#2297)) - *(config)* [**breaking**] remove deprecated `--watch` from the CLI options and `MbtilesPool::new` ([#2294](#2294)) - Make mbtiles dependency properly optional again ([#2292](#2292)) - *(config)* refactor the livecycle hooks to be cleaner and better documented ([#2282](#2282)) - *(lints)* migrate a few of our expects to unwraps ([#2284](#2284)) - *(lints)* applly `clippy::panic_in_result_fn` and `clippy::todo` as warnings ([#2283](#2283)) - *(mbtiles)* Generate mbtiles dynamically from SQL files to increase debuggability and transparency ([#1868](#1868)) - *(deps-dev)* Bump the all-npm-ui-version-updates group in /martin/martin-ui with 2 updates ([#2277](#2277)) - release ([#2265](#2265)) </blockquote> </p></details> --- This PR was generated with [release-plz](https://github.com/release-plz/release-plz/). --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 21bf46e commit 227e1ed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+691
-736
lines changed

Cargo.lock

Lines changed: 523 additions & 569 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ json-patch = "4"
6363
lambda-web = { version = "0.2.1", features = ["actix4"] }
6464
log = "0.4"
6565
maplibre_native = "0.4.1"
66-
martin-core = { path = "./martin-core", version = "0.1.3", default-features = false }
67-
martin-tile-utils = { path = "./martin-tile-utils", version = "0.6.4" }
68-
mbtiles = { path = "./mbtiles", version = "0.13.1" }
66+
martin-core = { path = "./martin-core", version = "0.2.0", default-features = false }
67+
martin-tile-utils = { path = "./martin-tile-utils", version = "0.6.5" }
68+
mbtiles = { path = "./mbtiles", version = "0.14.0" }
6969
md5 = "0.8.0"
7070
moka = { version = "0.12", features = ["future"] }
7171
num_cpus = "1"
7272
object_store = { version = "0.12.4", features = ["gcp", "aws", "azure", "fs", "http"] }
7373
pbf_font_tools = { version = "3.0.0", features = ["freetype"] }
74-
pmtiles = { version = "0.17", features = ["http-async", "mmap-async-tokio", "tilejson", "reqwest-rustls-tls-native-roots", "aws-s3-async"] }
74+
pmtiles = { version = "0.18", features = ["http-async", "mmap-async-tokio", "tilejson", "reqwest-rustls-tls-native-roots", "aws-s3-async"] }
7575
png = "0.18.0"
7676
postgis = "0.9"
7777
postgres = { version = "0.19", features = ["with-time-0_3", "with-uuid-1", "with-serde_json-1"] }

docs/src/sources-styles.md

Lines changed: 9 additions & 1 deletion

martin-core/CHANGELOG.md

Lines changed: 22 additions & 0 deletions

martin-core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "martin-core"
3-
version = "0.1.3"
3+
version = "0.2.0"
44
authors = ["Yuri Astrakhan <[email protected]>", "MapLibre contributors"]
55
description = "Basic building blocks of MapLibre's Martin tile server."
66
keywords = ["maps", "tiles", "mvt", "tileserver"]

martin-tile-utils/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "martin-tile-utils"
3-
version = "0.6.4"
3+
version = "0.6.5"
44
authors = ["Yuri Astrakhan <[email protected]>", "MapLibre contributors"]
55
description = "Utilities to help with map tile processing, such as type and compression detection. Used by the MapLibre's Martin tile server."
66
keywords = ["maps", "tiles", "mvt", "tileserver"]

martin/CHANGELOG.md

Lines changed: 96 additions & 0 deletions

martin/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "martin"
3-
version = "0.19.3"
3+
version = "0.20.0"
44
authors = [
55
"Stepan Kuzmin <[email protected]>",
66
"Yuri Astrakhan <[email protected]>",
@@ -95,7 +95,6 @@ default = [
9595
"postgres",
9696
"sprites",
9797
"styles",
98-
"unstable-cog",
9998
"webui",
10099
]
101100
unstable-cog = ["martin-core/unstable-cog", "_tiles"]

martin/src/config/file/resources/styles.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub struct InnerStyleConfig {
2020
/// We are not currently happy with the performance of this endpoint and intend to improve this in the future
2121
/// Marking this experimental means that we are not stuck with single threaded performance as a default until v2.0
2222
#[cfg(all(feature = "unstable-rendering", target_os = "linux"))]
23-
pub experimental_rendering: OptBoolObj<RendererConfig>,
23+
pub rendering: OptBoolObj<RendererConfig>,
2424

2525
#[serde(flatten, skip_serializing)]
2626
pub unrecognized: UnrecognizedValues,
@@ -35,12 +35,12 @@ impl ConfigurationLivecycleHooks for InnerStyleConfig {
3535
.cloned()
3636
.collect::<UnrecognizedKeys>();
3737
#[cfg(all(feature = "unstable-rendering", target_os = "linux"))]
38-
match &self.experimental_rendering {
38+
match &self.rendering {
3939
OptBoolObj::NoValue | OptBoolObj::Bool(_) => {}
4040
OptBoolObj::Object(o) => keys.extend(
4141
o.get_unrecognized_keys()
4242
.iter()
43-
.map(|k| format!("experimental_rendering.{k}")),
43+
.map(|k| format!("rendering.{k}")),
4444
),
4545
}
4646
keys
@@ -50,7 +50,7 @@ impl ConfigurationLivecycleHooks for InnerStyleConfig {
5050
#[cfg(all(feature = "unstable-rendering", target_os = "linux"))]
5151
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
5252
pub struct RendererConfig {
53-
// Same effect as experimental_rendering: true|false shorthands
53+
// Same effect as rendering: true|false shorthands
5454
enabled: bool,
5555

5656
#[serde(flatten, skip_serializing)]
@@ -74,7 +74,7 @@ impl StyleConfig {
7474
let mut results = StyleSources::default();
7575

7676
#[cfg(all(feature = "unstable-rendering", target_os = "linux"))]
77-
match cfg.custom.experimental_rendering {
77+
match cfg.custom.rendering {
7878
OptBoolObj::NoValue | OptBoolObj::Bool(false) => results.set_rendering_enabled(false),
7979
OptBoolObj::Object(ref o) if !o.enabled => results.set_rendering_enabled(false),
8080
_ => {

martin/tests/styles_server_test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fn test_get(path: &str) -> TestRequest {
3939
#[cfg(all(feature = "unstable-rendering", target_os = "linux"))]
4040
const CONFIG_STYLES: &str = indoc! {"
4141
styles:
42-
experimental_rendering: true
42+
rendering: true
4343
sources:
4444
maplibre_demo: ../tests/fixtures/styles/maplibre_demo.json
4545
"};

0 commit comments

Comments
 (0)