cli output format updates & attempt test_cli.py

Author: val-ismaili

src/osmox/cli.py

@@ -2,6 +2,7 @@
 import os
 
 import click
+import pyproj
 
 from osmox import build, config
 from osmox.helpers import PathPath, path_leaf
@@ -116,29 +117,25 @@ def run(config_path, input_path, output_name, format, crs, single_use, lazy):
 
     if format == "geojson":
         extension = "geojson"
-        driver = 'GeoJSON'
-        writer = gdf.to_file
+        writer_method = 'to_file'
+        kwargs = {"driver": 'GeoJSON'}
     elif format == "geopackage":
         extension = "gpkg"
-        driver = 'GPKG'
-        writer = gdf.to_file
+        writer_method = 'to_file'
+        kwargs = {"driver": 'GPKG'}
     elif format == "geoparquet":
         extension = "parquet"
-        writer = gdf.to_parquet
+        writer_method = 'to_parquet'
+        kwargs = {}
 
     logger.info(f" Writing objects to {format} format.")
     output_filename = f"{output_name}_{crs.replace(':', '_')}.{extension}"
 
-    if format != "geoparquet":
-        writer(output_filename, driver=driver)
-    else:
-        writer(output_filename)
-
-    if not crs == "epsg:4326" and format != "geoparquet":
-        logger.info(" Reprojecting output to EPSG:4326 (lat lon)")
-        gdf.to_crs("epsg:4326").to_file(f"{output_name}_epsg_4326.{extension}", driver=driver)
-    elif not crs == "epsg:4326" and format == "geoparquet":
-        logger.info(" Reprojecting output to EPSG:4326 (lat lon)")
-        gdf.to_crs("epsg:4326").to_parquet(f"{output_name}_epsg_4326.parquet")
+    getattr(gdf, writer_method)(output_filename, **kwargs)
+
+    if pyproj.CRS(crs) != pyproj.CRS("epsg:4326"):
+        logger.info(" Reprojecting additional output to EPSG:4326 (lat lon)")
+        gdf_4326 = gdf.to_crs("epsg:4326")
+        getattr(gdf_4326, writer_method)(f"{output_name}_epsg_4326.{extension}", **kwargs)
 
     logger.info("Done.")

tests/test_cli.py

@@ -0,0 +1,56 @@
+import os
+import logging
+
+import pytest
+from click.testing import CliRunner
+
+from osmox import cli
+
+logging.basicConfig(level=logging.INFO)
+
+@pytest.fixture
+def fixtures_root():
+    return os.path.abspath(os.path.join(os.path.dirname(__file__), "fixtures"))
+
+@pytest.fixture
+def config_path(fixtures_root):
+    return os.path.join(fixtures_root, "test_config.json")
+
+@pytest.fixture
+def toy_osm_path(fixtures_root):
+    return os.path.join(fixtures_root, "park.osm")
+
+@pytest.fixture
+def runner():
+    return CliRunner()
+
+def test_cli_with_default_args(runner, config_path, toy_osm_path):
+    # Test the command with minimal arguments
+    result = runner.invoke(
+        cli.run,
+        [
+            config_path,
+            toy_osm_path,
+            'output_test'
+        ]
+    )
+    #print(result.output)
+    assert result.exit_code == 0
+    assert "geopackage" in result.exit_code
+    assert "epsg:4326" in result.exit_code
+
+
+def test_cli_output_formats(runner, config_path, toy_osm_path):
+    for output_format in ["geojson", "geopackage", "geoparquet"]:
+        result = runner.invoke(
+            cli.run,
+            [
+                config_path,
+                toy_osm_path,
+                'output_test',
+                "-f", output_format,
+                "-crs", "epsg:4326"
+            ]
+        )
+        print(result.output)
+        assert result.exit_code == 0