EOPF-Explorer
diff --git a/‎.vscode/launch.json‎
Lines changed: 30 additions & 1 deletion b/‎.vscode/launch.json‎
Lines changed: 30 additions & 1 deletion
diff --git a/‎src/eopf_geozarr/cli.py‎
Lines changed: 111 additions & 1 deletion b/‎src/eopf_geozarr/cli.py‎
Lines changed: 111 additions & 1 deletion
diff --git a/‎src/eopf_geozarr/conversion/geozarr.py‎
Lines changed: 2 additions & 2 deletions b/‎src/eopf_geozarr/conversion/geozarr.py‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/eopf_geozarr/s2_optimization/__init__.py‎
Lines changed: 2 additions & 0 deletions b/‎src/eopf_geozarr/s2_optimization/__init__.py‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/eopf_geozarr/s2_optimization/s2_band_mapping.py‎
Lines changed: 51 additions & 0 deletions b/‎src/eopf_geozarr/s2_optimization/s2_band_mapping.py‎
Lines changed: 51 additions & 0 deletions
@@ -156,6 +156,34 @@
                 "AWS_ENDPOINT_URL": "https://s3.de.io.cloud.ovh.net/"
             },
 
+        },
+        {
+            // eopf_geozarr convert https://objectstore.eodc.eu:2222/e05ab01a9d56408d82ac32d69a5aae2a:sample-data/tutorial_data/cpm_v253/S2B_MSIL1C_20250113T103309_N0511_R108_T32TLQ_20250113T122458.zarr /tmp/tmp7mmjkjk3/s2b_subset_test.zarr --groups /measurements/reflectance/r10m --spatial-chunk 512 --min-dimension 128 --tile-width 256 --max-retries 2 --verbose
+            "name": "Convert to GeoZarr S2L2A Optimized (S3)",
+            "type": "debugpy",
+            "request": "launch",
+            "module": "eopf_geozarr",
+            "args": [
+                "convert-s2-optimized",
+                "https://objects.eodc.eu/e05ab01a9d56408d82ac32d69a5aae2a:202509-s02msil2a/08/products/cpm_v256/S2A_MSIL2A_20250908T100041_N0511_R122_T32TQM_20250908T115116.zarr",
+                // "s3://esa-zarr-sentinel-explorer-fra/tests-output/sentinel-2-l2a-opt/S2A_MSIL2A_20250908T100041_N0511_R122_T32TQM_20250908T115116.zarr",
+                "./tests-output/eopf_geozarr/s2l2_optimized.zarr",
+                "--spatial-chunk", "1024",
+                "--compression-level", "5",
+                "--enable-sharding",
+                "--dask-cluster",
+                "--verbose"
+            ],
+            "cwd": "${workspaceFolder}",
+            "justMyCode": false,
+            "console": "integratedTerminal",
+            "env": {
+                "PYTHONPATH": "${workspaceFolder}/.venv/bin",
+                "AWS_PROFILE": "eopf-explorer",
+                "AWS_DEFAULT_REGION": "de",
+                "AWS_ENDPOINT_URL": "https://s3.de.io.cloud.ovh.net/"
+            },
+
         },
         {
             "name": "Convert to GeoZarr Sentinel-1 GRD (Local)",
@@ -261,7 +289,8 @@
             "module": "eopf_geozarr",
             "args": [
                 "info",
-                "s3://esa-zarr-sentinel-explorer-fra/tests-output/sentinel-2-l2a/S2A_MSIL2A_20250704T094051_N0511_R036_T33SWB_20250704T115824.zarr",
+                // "s3://esa-zarr-sentinel-explorer-fra/tests-output/sentinel-2-l2a/S2A_MSIL2A_20250704T094051_N0511_R036_T33SWB_20250704T115824.zarr",
+                "s3://esa-zarr-sentinel-explorer-fra/tests-output/sentinel-2-l2a-opt/S2A_MSIL2A_20250908T100041_N0511_R122_T32TQM_20250908T115116.zarr",
                 "--verbose",
                 "--html-output", "dataset_info.html"
             ],
 
@@ -13,6 +13,8 @@
 
 import xarray as xr
 
+from eopf_geozarr.s2_optimization.s2_converter import convert_s2_optimized
+
 from . import create_geozarr_dataset
 from .conversion.fs_utils import (
     get_s3_credentials_info,
@@ -52,7 +54,7 @@ def setup_dask_cluster(enable_dask: bool, verbose: bool = False) -> Any | None:
         from dask.distributed import Client
 
         # Set up local cluster with high memory limits
-        client = Client(memory_limit="8GB")  # set up local cluster
+        client = Client(n_workers=3, memory_limit="8GB")  # set up local cluster with 3 workers and 8GB memory each
         # client = Client()  # set up local cluster
 
         if verbose:
@@ -1145,9 +1147,117 @@ def create_parser() -> argparse.ArgumentParser:
     )
     validate_parser.set_defaults(func=validate_command)
 
+    # Add S2 optimization commands
+    add_s2_optimization_commands(subparsers)
+
     return parser
 
 
+def add_s2_optimization_commands(subparsers):
+    """Add S2 optimization commands to CLI parser."""
+
+    # Convert S2 optimized command
+    s2_parser = subparsers.add_parser(
+        "convert-s2-optimized", help="Convert Sentinel-2 dataset to optimized structure"
+    )
+    s2_parser.add_argument(
+        "input_path", type=str, help="Path to input Sentinel-2 dataset (Zarr format)"
+    )
+    s2_parser.add_argument(
+        "output_path", type=str, help="Path for output optimized dataset"
+    )
+    s2_parser.add_argument(
+        "--spatial-chunk",
+        type=int,
+        default=256,
+        help='Spatial chunk size (default: 256)'
+    )
+    s2_parser.add_argument(
+        "--enable-sharding", action="store_true", help="Enable Zarr v3 sharding"
+    )
+    s2_parser.add_argument(
+        "--compression-level",
+        type=int,
+        default=3,
+        choices=range(1, 10),
+        help="Compression level 1-9 (default: 3)",
+    )
+    s2_parser.add_argument(
+        "--skip-geometry", action="store_true", help="Skip creating geometry group"
+    )
+    s2_parser.add_argument(
+        "--skip-meteorology",
+        action="store_true",
+        help="Skip creating meteorology group",
+    )
+    s2_parser.add_argument(
+        "--skip-validation", action="store_true", help="Skip output validation"
+    )
+    s2_parser.add_argument(
+        "--verbose", action="store_true", help="Enable verbose output"
+    )
+    s2_parser.add_argument(
+        "--dask-cluster",
+        action="store_true",
+        help="Start a local dask cluster for parallel processing and progress bars",
+    )
+    s2_parser.set_defaults(func=convert_s2_optimized_command)
+
+
+def convert_s2_optimized_command(args):
+    """Execute S2 optimized conversion command."""
+    # Set up dask cluster if requested
+    dask_client = setup_dask_cluster(
+        enable_dask=getattr(args, "dask_cluster", False), verbose=args.verbose
+    )
+
+    try:
+        # Load input dataset
+        print(f"Loading Sentinel-2 dataset from: {args.input_path}")
+        storage_options = get_storage_options(str(args.input_path))
+        dt_input = xr.open_datatree(
+            str(args.input_path),
+            engine="zarr",
+            chunks="auto",
+            storage_options=storage_options,
+        )
+
+        # Convert
+        dt_optimized = convert_s2_optimized(
+            dt_input=dt_input,
+            output_path=args.output_path,
+            enable_sharding=args.enable_sharding,
+            spatial_chunk=args.spatial_chunk,
+            compression_level=args.compression_level,
+            create_geometry_group=not args.skip_geometry,
+            create_meteorology_group=not args.skip_meteorology,
+            validate_output=not args.skip_validation,
+            verbose=args.verbose,
+        )
+
+        print(f"✅ S2 optimization completed: {args.output_path}")
+        return 0
+
+    except Exception as e:
+        print(f"❌ Error during S2 optimization: {e}")
+        if args.verbose:
+            import traceback
+
+            traceback.print_exc()
+        return 1
+    finally:
+        # Clean up dask client if it was created
+        if dask_client is not None:
+            try:
+                if hasattr(dask_client, "close"):
+                    dask_client.close()
+                if args.verbose:
+                    print("🔄 Dask cluster closed")
+            except Exception as e:
+                if args.verbose:
+                    print(f"Warning: Error closing dask cluster: {e}")
+
+
 def main() -> None:
     """Execute main entry point for the CLI."""
     parser = create_parser()
 
@@ -853,8 +853,8 @@ def create_native_crs_tile_matrix_set(
         scale_denominator = cell_size * 3779.5275
 
         # Calculate matrix dimensions
-        tile_width = 256
-        tile_height = 256
+        tile_width = overview["chunks"][1][0] if "chunks" in overview else 256
+        tile_height = overview["chunks"][0][0] if "chunks" in overview else 256
         matrix_width = int(np.ceil(width / tile_width))
         matrix_height = int(np.ceil(height / tile_height))
 
 
@@ -0,0 +1,2 @@
+# Sentinel-2 Optimization Module
+# This package contains tools for optimizing Sentinel-2 Zarr datasets.
@@ -0,0 +1,51 @@
+"""
+Band mapping and resolution definitions for Sentinel-2 optimization.
+"""
+
+from dataclasses import dataclass
+from typing import Dict, List, Set
+
+
+@dataclass
+class BandInfo:
+    """Information about a spectral band."""
+
+    name: str
+    native_resolution: int  # meters
+    data_type: str
+    wavelength_center: float  # nanometers
+    wavelength_width: float  # nanometers
+
+
+# Native resolution definitions
+NATIVE_BANDS: Dict[int, List[str]] = {
+    10: ["b02", "b03", "b04", "b08"],  # Blue, Green, Red, NIR
+    20: ["b05", "b06", "b07", "b11", "b12", "b8a"],  # Red Edge, SWIR
+    60: ["b01", "b09", "b10"],  # Coastal, Water Vapor, Cirrus
+}
+
+# Complete band information
+BAND_INFO: Dict[str, BandInfo] = {
+    "b01": BandInfo("b01", 60, "uint16", 443, 21),  # Coastal aerosol
+    "b02": BandInfo("b02", 10, "uint16", 490, 66),  # Blue
+    "b03": BandInfo("b03", 10, "uint16", 560, 36),  # Green
+    "b04": BandInfo("b04", 10, "uint16", 665, 31),  # Red
+    "b05": BandInfo("b05", 20, "uint16", 705, 15),  # Red Edge 1
+    "b06": BandInfo("b06", 20, "uint16", 740, 15),  # Red Edge 2
+    "b07": BandInfo("b07", 20, "uint16", 783, 20),  # Red Edge 3
+    "b08": BandInfo("b08", 10, "uint16", 842, 106),  # NIR
+    "b8a": BandInfo("b8a", 20, "uint16", 865, 21),  # NIR Narrow
+    "b09": BandInfo("b09", 60, "uint16", 945, 20),  # Water Vapor
+    "b10": BandInfo("b10", 60, "uint16", 1375, 30),  # Cirrus
+    "b11": BandInfo("b11", 20, "uint16", 1614, 91),  # SWIR 1
+    "b12": BandInfo("b12", 20, "uint16", 2202, 175),  # SWIR 2
+}
+
+# Quality data mapping - defines which auxiliary data exists at which resolutions
+QUALITY_DATA_NATIVE: Dict[str, int] = {
+    "scl": 20,  # Scene Classification Layer - native 20m
+    "aot": 20,  # Aerosol Optical Thickness - native 20m
+    "wvp": 20,  # Water Vapor - native 20m
+    "cld": 20,  # Cloud probability - native 20m
+    "snw": 20,  # Snow probability - native 20m
+}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Sentinel-2 Optimization Module`
	`2`	`+# This package contains tools for optimizing Sentinel-2 Zarr datasets.`