GeoPakTile 2.1.0__tar.gz → 2.1.2__tar.gz

{geopaktile-2.1.0 → geopaktile-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeoPakTile
-Version: 2.1.0
+Version: 2.1.2
 Summary: Create a Geopackage XYZ Tile layer.
 Keywords: GIS,Geopackage,Tiles,XYZ,gpkg
 Author: apwebber

{geopaktile-2.1.0 → geopaktile-2.1.2}/pyproject.toml

@@ -1,50 +1,50 @@
-[project]
-name = "GeoPakTile"
-version = "2.1.0"
-description = "Create a Geopackage XYZ Tile layer."
-readme = "README.md"
-authors = [
-    { name = "apwebber", email = "39490780+apwebber@users.noreply.github.com" }
-]
-license = "MIT"
-license-files = ["LICENSE.md"]
-keywords = ["GIS", "Geopackage", "Tiles", "XYZ", "gpkg"]
-requires-python = ">=3.10"
-classifiers = [
-    "Development Status :: 4 - Beta",
-
-    # Specify the Python versions you support here.
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
-    "Programming Language :: Python :: 3.14",
-]
-dependencies = [
-    "typing_extensions>=4.0; python_version < '3.11'",
-    "morecantile>=6.2.0",
-    "numpy>=2.2.6",
-    "requests>=2.34.2",
-    "pillow>=12.3.0",
-]
-
-[project.urls]
-Homepage = "https://github.com/apwebber/GeoPakTile"
-Documentation = "https://github.com/apwebber/GeoPakTile"
-Repository = "https://github.com/apwebber/GeoPakTile.git"   
-Issues = "https://github.com/apwebber/GeoPakTile/issues"
-
-[project.scripts]
-geopaktile = "geopaktile:main"
-
-[build-system]
-requires = ["uv_build>=0.11.2,<0.12.0"]
-build-backend = "uv_build"
-
-[dependency-groups]
-dev = [
-    "pytest",
-    "diskcache",
-    "rasterio",
-    "rio-cogeo>=6.0.0",
-]
+[project]
+name = "GeoPakTile"
+version = "2.1.2"
+description = "Create a Geopackage XYZ Tile layer."
+readme = "README.md"
+authors = [
+    { name = "apwebber", email = "39490780+apwebber@users.noreply.github.com" }
+]
+license = "MIT"
+license-files = ["LICENSE.md"]
+keywords = ["GIS", "Geopackage", "Tiles", "XYZ", "gpkg"]
+requires-python = ">=3.10"
+classifiers = [
+    "Development Status :: 4 - Beta",
+
+    # Specify the Python versions you support here.
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+]
+dependencies = [
+    "typing_extensions>=4.0; python_version < '3.11'",
+    "morecantile>=6.2.0",
+    "numpy>=2.2.6",
+    "requests>=2.34.2",
+    "pillow>=12.3.0",
+]
+
+[project.urls]
+Homepage = "https://github.com/apwebber/GeoPakTile"
+Documentation = "https://github.com/apwebber/GeoPakTile"
+Repository = "https://github.com/apwebber/GeoPakTile.git"   
+Issues = "https://github.com/apwebber/GeoPakTile/issues"
+
+[project.scripts]
+geopaktile = "geopaktile:main"
+
+[build-system]
+requires = ["uv_build>=0.11.2,<0.12.0"]
+build-backend = "uv_build"
+
+[dependency-groups]
+dev = [
+    "pytest",
+    "diskcache",
+    "rasterio",
+    "rio-cogeo>=6.0.0",
+]

{geopaktile-2.1.0 → geopaktile-2.1.2}/src/geopaktile/geopaktile.py

@@ -159,6 +159,7 @@ class GeoPakTile:
             )
             VALUES (?, ?, ?, ?)
         """
+        tiles = list(tiles)
 
         zs = {t[0] for t in tiles}
         for z in zs:
@@ -170,9 +171,6 @@ class GeoPakTile:
             x = int(x)
             y = int(y)
 
-            if self.has_tile(z, x, y):
-                continue
-
             batch.append((z, x, y, sqlite3.Binary(tile_bytes)))
             if len(batch) >= batch_size:
                 self._cursor.executemany(insert_sql, batch)

{geopaktile-2.1.0 → geopaktile-2.1.2}/src/geopaktile/gpkg_to_cog.py

@@ -68,6 +68,35 @@ class _Plan:
     resampled: bool
 
 
+def _connect_readonly(path: str | Path) -> sqlite3.Connection:
+    r"""Open a GeoPackage read-only, trying resolve() first, then absolute().
+
+    resolve() can fail on network drives: it may raise, or turn a mapped
+    drive letter into a UNC path (\\server\share) whose file:// URI SQLite
+    rejects. absolute() keeps the path as given, which often works instead.
+    """
+    path = Path(path)
+    errors: list[str] = []
+    tried: set[str] = set()
+    for method in (Path.resolve, Path.absolute):
+        con = None
+        try:
+            uri = method(path).as_uri() + "?mode=ro"
+            if uri in tried:
+                continue
+            tried.add(uri)
+            con = sqlite3.connect(uri, uri=True)
+            con.execute("PRAGMA schema_version")  # make SQLite actually open the file
+            return con
+        except (OSError, RuntimeError, ValueError, sqlite3.Error) as exc:
+            if con is not None:
+                con.close()
+            errors.append(f"{method.__name__}(): {exc}")
+    raise sqlite3.OperationalError(
+        f"Could not open GeoPackage {path}: " + "; ".join(errors)
+    )
+
+
 def _quote_ident(name: str) -> str:
     return '"' + name.replace('"', '""') + '"'
 
@@ -84,7 +113,7 @@ def _as_int(value: float, what: str) -> int:
             "Zoom levels may not be exact multiples of each other.",
             stacklevel=3,
         )
-    return round(value)
+    return int(round(value))
 
 
 def gpkg_tiles_to_cog(
@@ -102,6 +131,7 @@ def gpkg_tiles_to_cog(
     compress: str = "DEFLATE",
     blocksize: int | None = None,
     overwrite: bool = False,
+    tmp_dir: str | Path | None = None,
 ) -> Path:
     """Convert a GeoPackage tile layer to a COG, using zoom levels as overviews.
 
@@ -128,6 +158,9 @@ def gpkg_tiles_to_cog(
         compress: COG compression, e.g. "DEFLATE", "ZSTD", "LZW", "WEBP", "JPEG".
         blocksize: COG internal tile size. Defaults to the GeoPackage tile width.
         overwrite: Replace an existing output file.
+        tmp_dir: Directory for the temporary per-zoom mosaics, which can need
+            about as much space as the output. Defaults to the output file's
+            directory, so they go on the same drive as the COG.
 
     Returns:
         Path to the written COG.
@@ -146,8 +179,7 @@ def gpkg_tiles_to_cog(
     if cog_path.exists() and not overwrite:
         raise FileExistsError(f"{cog_path} exists; pass overwrite=True")
 
-    uri = Path(gpkg_path).resolve().as_uri() + "?mode=ro"
-    con = sqlite3.connect(uri, uri=True)
+    con = _connect_readonly(gpkg_path)
     try:
         # --- Tile table, tile matrix set and CRS ----------------------------
         tables = [
@@ -293,7 +325,9 @@ def gpkg_tiles_to_cog(
         if blocksize is None:
             blocksize = base.tile_width
 
-        with tempfile.TemporaryDirectory(prefix="gpkg2cog_") as tmp:
+        if tmp_dir is None:
+            tmp_dir = cog_path.absolute().parent  # absolute(): resolve() can fail on network drives
+        with tempfile.TemporaryDirectory(prefix="gpkg2cog_", dir=tmp_dir) as tmp:
             tmpdir = Path(tmp)
             level_files: list[Path] = []
 
@@ -505,4 +539,41 @@ def _pyramid_vrt(
             ]
         parts.append("  </VRTRasterBand>")
     parts.append("</VRTDataset>")
-    return "\n".join(parts)
+    return "\n".join(parts)
+
+
+if __name__ == "__main__":
+    import argparse
+
+    parser = argparse.ArgumentParser(description=__doc__.splitlines()[0])
+    parser.add_argument("gpkg")
+    parser.add_argument("cog")
+    parser.add_argument("--table")
+    parser.add_argument(
+        "--bbox", type=float, nargs=4, metavar=("MINX", "MINY", "MAXX", "MAXY")
+    )
+    parser.add_argument("--bbox-crs")
+    parser.add_argument("--min-zoom", type=int)
+    parser.add_argument("--max-zoom", type=int)
+    parser.add_argument("--resample-unaligned", action="store_true")
+    parser.add_argument("--resampling", default="bilinear")
+    parser.add_argument("--bands", default="RGBA", choices=sorted(SUPPORTED_BANDS))
+    parser.add_argument("--compress", default="DEFLATE")
+    parser.add_argument("--overwrite", action="store_true")
+    parser.add_argument("--tmp-dir", help="directory for temporary files")
+    args = parser.parse_args()
+    gpkg_tiles_to_cog(
+        args.gpkg,
+        args.cog,
+        args.table,
+        bbox=args.bbox,
+        bbox_crs=args.bbox_crs,
+        min_zoom=args.min_zoom,
+        max_zoom=args.max_zoom,
+        resample_unaligned=args.resample_unaligned,
+        resampling=args.resampling,
+        bands=args.bands,
+        compress=args.compress,
+        overwrite=args.overwrite,
+        tmp_dir=args.tmp_dir,
+    )