Merge pull request #76 from unvt/main

Release 2026-01-17 11:57:37 UTC

Author: yuiseki

CHANGELOG.md

@@ -9,17 +9,28 @@ The format is based on Keep a Changelog and adheres to Semantic Versioning.
 ## [Unreleased]
 
 ### Added
-- Add `--unknown-filter` mode to control handling of unsupported style expressions during optimize.
+- TBD_UNVT_CHANGELOG_ADDED
 
 ### Changed
-- Remove unsupported `--style-mode none` option.
+- TBD_UNVT_CHANGELOG_CHANGED
 
 ### Fixed
 - TBD_UNVT_CHANGELOG_FIXED
 
 ### Security
 - TBD_UNVT_CHANGELOG_SECURITY
 
+## [0.4.6] - 2026-01-17
+### Added
+- Count tiles over `--max-tile-bytes` in inspect outputs for MBTiles/PMTiles.
+
+## [0.4.5] - 2026-01-17
+### Added
+- Add `--unknown-filter` mode to control handling of unsupported style expressions during optimize.
+
+### Changed
+- Remove unsupported `--style-mode none` option.
+
 ## [0.4.4] - 2026-01-15
 ### Added
 - Add tile size to tile summary output ("Size of tile").

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "vt-optimizer-rs"
-version = "0.4.5"
+version = "0.4.6"
 edition = "2024"
 license = "MIT"
 description = "A fast CLI to inspect and optimize MBTiles/PMTiles vector tiles."

Cargo.toml

@@ -445,6 +445,12 @@ fn run_inspect(args: vt_optimizer::cli::InspectArgs) -> Result<()> {
                     "{}",
                     format_summary_label("Max tile size", format_bytes(report.overall.max_bytes))
                 );
+                if args.max_tile_bytes > 0 {
+                    println!(
+                        "{}",
+                        format_summary_label("Tiles over limit", report.over_limit_tiles)
+                    );
+                }
                 println!(
                     "{}",
                     format_summary_label(

src/main.rs

@@ -41,6 +41,7 @@ pub struct MbtilesReport {
     pub by_zoom: Vec<MbtilesZoomStats>,
     pub empty_tiles: u64,
     pub empty_ratio: f64,
+    pub over_limit_tiles: u64,
     pub sampled: bool,
     pub sample_total_tiles: u64,
     pub sample_used_tiles: u64,
@@ -1601,6 +1602,7 @@ pub fn inspect_mbtiles_with_options(path: &Path, options: InspectOptions) -> Res
     let mut by_zoom: BTreeMap<u8, MbtilesStats> = BTreeMap::new();
     let mut zoom_minmax: BTreeMap<u8, (u64, u64)> = BTreeMap::new();
     let mut empty_tiles: u64 = 0;
+    let mut over_limit_tiles: u64 = 0;
     let mut processed: u64 = 0;
     let mut used: u64 = 0;
 
@@ -1649,6 +1651,10 @@ pub fn inspect_mbtiles_with_options(path: &Path, options: InspectOptions) -> Res
 
         processed += 1;
 
+        if options.max_tile_bytes > 0 && length > options.max_tile_bytes {
+            over_limit_tiles += 1;
+        }
+
         if include_sample(processed, total_tiles, options.sample.as_ref()) {
             used += 1;
 
@@ -1945,6 +1951,7 @@ pub fn inspect_mbtiles_with_options(path: &Path, options: InspectOptions) -> Res
         by_zoom,
         empty_tiles,
         empty_ratio,
+        over_limit_tiles,
         sampled: options.sample.is_some(),
         sample_total_tiles: total_tiles,
         sample_used_tiles: used,

src/mbtiles.rs

@@ -136,6 +136,7 @@ pub fn apply_stats_filter(mut report: MbtilesReport, filter: &StatsFilter) -> Mb
         report.overall.avg_bytes = 0;
         report.empty_tiles = 0;
         report.empty_ratio = 0.0;
+        report.over_limit_tiles = 0;
         report.sampled = false;
         report.sample_total_tiles = 0;
         report.sample_used_tiles = 0;
@@ -185,6 +186,7 @@ pub fn ndjson_lines(report: &MbtilesReport, mut options: NdjsonOptions) -> Resul
             "by_zoom": report.by_zoom,
             "empty_tiles": report.empty_tiles,
             "empty_ratio": report.empty_ratio,
+            "over_limit_tiles": report.over_limit_tiles,
             "sampled": report.sampled,
             "sample_total_tiles": report.sample_total_tiles,
             "sample_used_tiles": report.sample_used_tiles,

src/output.rs

@@ -725,9 +725,11 @@ fn accumulate_tile_counts(
     overall: &mut StatAccum,
     by_zoom: &mut BTreeMap<u8, StatAccum>,
     empty_tiles: &mut u64,
+    over_limit_tiles: &mut u64,
     min_len: &mut Option<u64>,
     max_len: &mut Option<u64>,
     zoom_minmax: &mut BTreeMap<u8, (u64, u64)>,
+    max_tile_bytes: u64,
     mut progress: Option<&mut ProgressTracker>,
 ) -> Result<()> {
     for entry in entries {
@@ -746,9 +748,11 @@ fn accumulate_tile_counts(
                 overall,
                 by_zoom,
                 empty_tiles,
+                over_limit_tiles,
                 min_len,
                 max_len,
                 zoom_minmax,
+                max_tile_bytes,
                 progress.as_deref_mut(),
             )?;
             continue;
@@ -772,6 +776,9 @@ fn accumulate_tile_counts(
                     max_bytes: 0,
                 })
                 .add_tile(length);
+            if max_tile_bytes > 0 && length > max_tile_bytes {
+                *over_limit_tiles += 1;
+            }
             if length <= EMPTY_TILE_MAX_BYTES {
                 *empty_tiles += 1;
             }
@@ -1281,6 +1288,7 @@ pub fn inspect_pmtiles_with_options(
     };
     let mut by_zoom: BTreeMap<u8, StatAccum> = BTreeMap::new();
     let mut empty_tiles = 0u64;
+    let mut over_limit_tiles = 0u64;
     let mut min_len: Option<u64> = None;
     let mut max_len: Option<u64> = None;
     let mut zoom_minmax: BTreeMap<u8, (u64, u64)> = BTreeMap::new();
@@ -1298,9 +1306,11 @@ pub fn inspect_pmtiles_with_options(
         &mut overall,
         &mut by_zoom,
         &mut empty_tiles,
+        &mut over_limit_tiles,
         &mut min_len,
         &mut max_len,
         &mut zoom_minmax,
+        options.max_tile_bytes,
         counting_progress.as_mut(),
     )?;
     if let Some(progress) = counting_progress {
@@ -1465,6 +1475,7 @@ pub fn inspect_pmtiles_with_options(
         by_zoom,
         empty_tiles,
         empty_ratio,
+        over_limit_tiles,
         sampled: false,
         sample_total_tiles: 0,
         sample_used_tiles: 0,

src/pmtiles.rs

@@ -107,6 +107,7 @@ fn inspect_mbtiles_reports_minimal_stats() {
     );
     assert_eq!(report.empty_tiles, 2);
     assert_eq!(report.empty_ratio, 1.0);
+    assert_eq!(report.over_limit_tiles, 0);
     assert!(!report.sampled);
     assert_eq!(report.sample_total_tiles, 2);
     assert_eq!(report.sample_used_tiles, 2);
@@ -140,6 +141,24 @@ fn inspect_mbtiles_reports_metadata() {
     assert_eq!(report.metadata.get("minzoom"), Some(&"0".to_string()));
 }
 
+#[test]
+fn inspect_mbtiles_counts_over_limit_tiles() {
+    let dir = tempfile::tempdir().expect("tempdir");
+    let path = dir.path().join("input.mbtiles");
+    create_sample_mbtiles(&path);
+
+    let report = inspect_mbtiles_with_options(
+        &path,
+        InspectOptions {
+            max_tile_bytes: 15,
+            ..InspectOptions::default()
+        },
+    )
+    .expect("inspect");
+
+    assert_eq!(report.over_limit_tiles, 1);
+}
+
 #[test]
 fn copy_mbtiles_copies_tiles_and_metadata() {
     let dir = tempfile::tempdir().expect("tempdir");

tests/mbtiles.rs

@@ -30,6 +30,7 @@ fn ndjson_splits_histograms_and_top_tile_summaries() {
         }],
         empty_tiles: 0,
         empty_ratio: 0.0,
+        over_limit_tiles: 0,
         sampled: false,
         sample_total_tiles: 1,
         sample_used_tiles: 1,
@@ -155,6 +156,7 @@ fn ndjson_lite_omits_summary() {
         by_zoom: vec![],
         empty_tiles: 0,
         empty_ratio: 0.0,
+        over_limit_tiles: 0,
         sampled: false,
         sample_total_tiles: 1,
         sample_used_tiles: 1,
@@ -198,6 +200,7 @@ fn ndjson_sorts_zoom_histograms_and_recommendations() {
         by_zoom: vec![],
         empty_tiles: 0,
         empty_ratio: 0.0,
+        over_limit_tiles: 0,
         sampled: false,
         sample_total_tiles: 1,
         sample_used_tiles: 1,
@@ -271,6 +274,7 @@ fn ndjson_compact_minimizes_payloads() {
         by_zoom: vec![],
         empty_tiles: 0,
         empty_ratio: 0.0,
+        over_limit_tiles: 0,
         sampled: false,
         sample_total_tiles: 1,
         sample_used_tiles: 1,
@@ -362,6 +366,7 @@ fn ndjson_compact_omits_summary_even_when_requested() {
         by_zoom: vec![],
         empty_tiles: 0,
         empty_ratio: 0.0,
+        over_limit_tiles: 0,
         sampled: false,
         sample_total_tiles: 1,
         sample_used_tiles: 1,
@@ -405,6 +410,7 @@ fn ndjson_tile_info_format_compact_omits_property_keys() {
         by_zoom: vec![],
         empty_tiles: 0,
         empty_ratio: 0.0,
+        over_limit_tiles: 0,
         sampled: false,
         sample_total_tiles: 1,
         sample_used_tiles: 1,

tests/output_ndjson.rs

@@ -24,6 +24,7 @@ fn apply_stats_filter_removes_unlisted_sections() {
         by_zoom: vec![],
         empty_tiles: 1,
         empty_ratio: 1.0,
+        over_limit_tiles: 0,
         sampled: true,
         sample_total_tiles: 10,
         sample_used_tiles: 1,