Merge pull request #92 from yuiseki/feat/explicit-layer-list-flag

Inspect: make layer list opt-in

Author: yuiseki

docs/SPEC.md

@@ -176,6 +176,7 @@ vt-optimizer -m <mbtiles> [-s <style.json>] [-o <output>] [-z <z> -x <x> -y <y>
   * `--histogram-buckets 10`（デフォルト 10）
   * `--topn <k>`: 最大タイル（サイズ）上位 k 件（z/x/y、bytes、layer count 等）
   * `--sample <count|ratio>`: サンプリングは **ズームごと**に適用する
+  * `--include-layer-list`: レイヤー統計を出力する（明示指定がない場合は省略）
 
 ### 4.5 optimize
 

src/cli.rs

@@ -151,6 +151,10 @@ pub struct InspectArgs {
     #[arg(long, default_value_t = false)]
     pub ndjson_compact: bool,
 
+    /// Include per-layer stats (expensive; requires reading and decoding tiles).
+    #[arg(long, default_value_t = false)]
+    pub include_layer_list: bool,
+
     /// Tile summary detail level (full or compact).
     #[arg(long, value_enum, default_value_t = TileInfoFormat::Full)]
     pub tile_info_format: TileInfoFormat,

src/main.rs

@@ -237,6 +237,7 @@ fn main() -> Result<()> {
                     sort: vt_optimizer::cli::TileSortArg::Size,
                     ndjson_lite: false,
                     ndjson_compact: false,
+                    include_layer_list: false,
                     tile_info_format: vt_optimizer::cli::TileInfoFormat::Full,
                 };
                 run_inspect(args)?;
@@ -266,6 +267,7 @@ fn main() -> Result<()> {
                 sort: vt_optimizer::cli::TileSortArg::Size,
                 ndjson_lite: false,
                 ndjson_compact: false,
+                include_layer_list: false,
                 tile_info_format: vt_optimizer::cli::TileInfoFormat::Full,
             };
             run_inspect(args)?;
@@ -350,9 +352,7 @@ fn run_inspect(args: vt_optimizer::cli::InspectArgs) -> Result<()> {
         summary,
         layers,
         recommend: args.recommend,
-        include_layer_list: output == ReportFormat::Text
-            && (stats_filter.includes(vt_optimizer::output::StatsSection::Layers)
-                || stats_filter.includes(vt_optimizer::output::StatsSection::Summary)),
+        include_layer_list: args.include_layer_list,
         list_tiles: if args.list_tiles {
             Some(TileListOptions {
                 limit: args.limit,
@@ -376,7 +376,9 @@ fn run_inspect(args: vt_optimizer::cli::InspectArgs) -> Result<()> {
         }
     };
     let report = vt_optimizer::output::apply_tile_info_format(report, args.tile_info_format);
-    let summary_totals = if stats_filter.includes(vt_optimizer::output::StatsSection::Summary) {
+    let summary_totals = if args.include_layer_list
+        && stats_filter.includes(vt_optimizer::output::StatsSection::Summary)
+    {
         vt_optimizer::output::summarize_file_layers(&report.file_layers)
     } else {
         None
@@ -411,8 +413,12 @@ fn run_inspect(args: vt_optimizer::cli::InspectArgs) -> Result<()> {
                 stats_filter.includes(vt_optimizer::output::StatsSection::Histogram);
             let include_histogram_by_zoom = args.stats.is_some()
                 && stats_filter.includes(vt_optimizer::output::StatsSection::HistogramByZoom);
-            let include_layers = stats_filter.includes(vt_optimizer::output::StatsSection::Layers);
             let hide_tile_summary_sections = args.x.is_some() && args.y.is_some();
+            let include_layers = args.include_layer_list
+                && stats_filter.includes(vt_optimizer::output::StatsSection::Layers);
+            let show_layers_tip = !args.include_layer_list
+                && stats_filter.includes(vt_optimizer::output::StatsSection::Layers)
+                && !hide_tile_summary_sections;
             let include_recommendations =
                 stats_filter.includes(vt_optimizer::output::StatsSection::Recommendations);
             let include_bucket = stats_filter.includes(vt_optimizer::output::StatsSection::Bucket);
@@ -502,6 +508,10 @@ fn run_inspect(args: vt_optimizer::cli::InspectArgs) -> Result<()> {
                         format_summary_label("Values in this tile", totals.property_value_count)
                     );
                 }
+                if show_layers_tip {
+                    println!();
+                    println!("Tip: use --include-layer-list to include layer statistics.");
+                }
             }
             if include_zoom && !report.by_zoom.is_empty() {
                 println!();
@@ -603,6 +613,10 @@ fn run_inspect(args: vt_optimizer::cli::InspectArgs) -> Result<()> {
                     );
                 }
             }
+            if show_layers_tip && !include_summary {
+                println!();
+                println!("Tip: use --include-layer-list to include layer statistics.");
+            }
             if include_recommendations && !report.recommended_buckets.is_empty() {
                 println!();
                 println!("{}", emphasize_section_heading("## Recommendations"));

tests/cli.rs

@@ -143,6 +143,7 @@ fn parse_inspect_options() {
         "zxy",
         "--ndjson-lite",
         "--ndjson-compact",
+        "--include-layer-list",
         "--tile-info-format",
         "compact",
     ]);
@@ -173,6 +174,7 @@ fn parse_inspect_options() {
             assert_eq!(args.sort, vt_optimizer::cli::TileSortArg::Zxy);
             assert!(args.ndjson_lite);
             assert!(args.ndjson_compact);
+            assert!(args.include_layer_list);
             assert_eq!(args.tile_info_format, TileInfoFormat::Compact);
         }
         _ => panic!("expected inspect command"),
@@ -250,5 +252,6 @@ fn inspect_help_describes_fields() {
     assert!(help.contains("Fast defaults"));
     assert!(help.contains("Histogram bucket index"));
     assert!(help.contains("NDJSON"));
+    assert!(help.contains("Include per-layer stats"));
     assert!(help.contains("Tile summary detail level"));
 }