Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
nyurik committed Dec 30, 2023
1 parent d34b5c3 commit c06a56d
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion martin-tile-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lints.workspace = true

[package]
name = "martin-tile-utils"
version = "0.4.0"
version = "0.4.1"
authors = ["Yuri Astrakhan <YuriAstrakhan@gmail.com>", "MapLibre contributors"]
description = "Utilites to help with map tile processing, such as type and compression detection. Used by the MapLibre's Martin tile server."
keywords = ["maps", "tiles", "mvt", "tileserver"]
Expand Down
2 changes: 1 addition & 1 deletion martin/src/args/root.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ impl Args {
pub fn merge_into_config<'a>(
self,
config: &mut Config,
env: &impl Env<'a>,
#[allow(unused_variables)] env: &impl Env<'a>,
) -> MartinResult<()> {
if self.meta.watch {
warn!("The --watch flag is no longer supported, and will be ignored");
Expand Down
11 changes: 3 additions & 8 deletions martin/src/pmtiles/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,6 @@ impl DirectoryCache for PmtCache {
#[serde_with::skip_serializing_none]
#[derive(Debug, Default, Serialize, Deserialize)]
pub struct PmtConfig {
/// This field is deprecated, will not be serialized, and will be eventually removed
#[serde(skip_serializing)]
pub dir_cache_size_mb: Option<u64>,

#[serde(flatten)]
pub unrecognized: UnrecognizedValues,

Expand All @@ -90,15 +86,14 @@ pub struct PmtConfig {

impl PartialEq for PmtConfig {
fn eq(&self, other: &Self) -> bool {
self.dir_cache_size_mb == other.dir_cache_size_mb && self.unrecognized == other.unrecognized
self.unrecognized == other.unrecognized
}
}

impl Clone for PmtConfig {
fn clone(&self) -> Self {
// State is not shared between clones, only the serialized config
Self {
dir_cache_size_mb: self.dir_cache_size_mb,
unrecognized: self.unrecognized.clone(),
..Default::default()
}
Expand All @@ -121,8 +116,8 @@ impl ConfigExtras for PmtConfig {
self.client = Some(Client::new());
self.cache = cache;

if self.dir_cache_size_mb.is_some() {
warn!("dir_cache_size_mb is no longer used. Use global cache_size_mb instead.");
if self.unrecognized.contains_key("dir_cache_size_mb") {
warn!("dir_cache_size_mb is no longer used. Instead, use cache_size_mb param in the root of the config file.");
}

Ok(())
Expand Down
2 changes: 1 addition & 1 deletion mbtiles/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lints.workspace = true

[package]
name = "mbtiles"
version = "0.9.0"
version = "0.9.1"
authors = ["Yuri Astrakhan <YuriAstrakhan@gmail.com>", "MapLibre contributors"]
description = "A simple low-level MbTiles access and processing library, with some tile format detection and other relevant heuristics."
keywords = ["mbtiles", "maps", "tiles", "mvt", "tilejson"]
Expand Down

0 comments on commit c06a56d

Please sign in to comment.