viewtif 0.1.2__tar.gz → 0.1.4__tar.gz

{viewtif-0.1.2 → viewtif-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: viewtif
-Version: 0.1.2
+Version: 0.1.4
 Summary: Simple GeoTIFF viewer with optional shapefile overlay.
 Project-URL: Homepage, https://github.com/nkeikon/tifviewer
 Project-URL: Source, https://github.com/nkeikon/tifviewer
@@ -13,6 +13,9 @@ Requires-Dist: matplotlib>=3.7
 Requires-Dist: numpy>=1.23
 Requires-Dist: pyside6>=6.5
 Requires-Dist: rasterio>=1.3
+Provides-Extra: geo
+Requires-Dist: geopandas>=0.13; extra == 'geo'
+Requires-Dist: shapely>=2.0; extra == 'geo'
 Description-Content-Type: text/markdown
 
 # viewtif
@@ -29,6 +32,13 @@ You can visualize single-band GeoTIFFs, RGB composites, and shapefile overlays i
 pip install viewtif
 ```
 
+If you want to enable shapefile overlays, install with optional dependencies:
+```bash
+pip install "viewtif[geo]"
+```
+Note for macOS(zsh) users:
+Make sure to include the quotes, or zsh will interpret it as a pattern.
+
 ## Quick Start
 ```bash
 # View a GeoTIFF

{viewtif-0.1.2 → viewtif-0.1.4}/README.md

@@ -12,6 +12,13 @@ You can visualize single-band GeoTIFFs, RGB composites, and shapefile overlays i
 pip install viewtif
 ```
 
+If you want to enable shapefile overlays, install with optional dependencies:
+```bash
+pip install "viewtif[geo]"
+```
+Note for macOS(zsh) users:
+Make sure to include the quotes, or zsh will interpret it as a pattern.
+
 ## Quick Start
 ```bash
 # View a GeoTIFF

{viewtif-0.1.2 → viewtif-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "viewtif"
-version = "0.1.2"
+version = "0.1.4"
 description = "Simple GeoTIFF viewer with optional shapefile overlay."
 readme = "README.md"
 requires-python = ">=3.9"
@@ -18,6 +18,9 @@ dependencies = [
   "PySide6>=6.5"
 ]
 
+[project.optional-dependencies]
+geo = ["geopandas>=0.13", "shapely>=2.0"]
+
 [project.scripts]
 viewtif = "viewtif.tif_viewer:main"
 

{viewtif-0.1.2 → viewtif-0.1.4}/src/viewtif/tif_viewer.py

@@ -74,8 +74,8 @@ class TiffViewer(QMainWindow):
         rgb: list[int] | None = None,
         rgbfiles: list[str] | None = None,
         shapefiles: list[str] | None = None,
-        shp_color: str = "cyan",
-        shp_width: float = 1.5,
+        shp_color: str = "white",
+        shp_width: float = 2,
     ):
         super().__init__()
 
@@ -482,14 +482,36 @@ def run_viewer(
 import click
 
 @click.command()
-@click.argument("tif_path")
+@click.argument("tif_path", required=False)
 @click.option("--band", default=1, show_default=True, type=int, help="Band number to display")
 @click.option("--scale", default=1.0, show_default=True, type=float, help="Scale factor for display")
-@click.option("--shapefile", type=str, help="Optional shapefile to overlay")
-@click.option("--shp-width", default=1.0, show_default=True, type=float, help="Line width for shapefile overlay")
-def main(tif_path, band, scale, shapefile, shp_width):
+@click.option("--rgb", nargs=3, type=int, help="Three band numbers for RGB, e.g. --rgb 4 3 2")
+@click.option("--rgbfiles", nargs=3, type=str, help="Three single-band TIFFs for RGB, e.g. --rgbfiles B4.tif B3.tif B2.tif")
+@click.option("--shapefile", multiple=True, type=str, help="One or more shapefiles to overlay")
+@click.option("--shp-color", default="white", show_default=True, help="Overlay color (name or #RRGGBB).")
+@click.option("--shp-width", default=1.0, show_default=True, type=float, help="Overlay line width (screen pixels).")
+def main(tif_path, band, scale, rgb, rgbfiles, shapefile, shp_color, shp_width):
     """Lightweight GeoTIFF viewer."""
-    run_viewer(tif_path, scale=scale, band=band, shapefile=shapefile, shp_width=shp_width)
+
+    # --- Warn early if shapefile requested but geopandas missing ---
+    if shapefile and not HAVE_GEO:
+        print(
+            "[WARN] --shapefile requires geopandas and shapely.\n"
+            "       Install them with: pip install viewtif[geo]\n"
+            "       Proceeding without shapefile overlay."
+        )
+
+    run_viewer(
+        tif_path,
+        scale=scale,
+        band=band,
+        rgb=rgb,
+        rgbfiles=rgbfiles,
+        shapefile=shapefile,
+        shp_color=shp_color,
+        shp_width=shp_width,
+    )
+
 
 if __name__ == "__main__":
     main()