refactorings and a bunch of small changes as well as lint cli start

Cargo.toml

@@ -1,9 +1,10 @@
 [package]
 name = "pyutiles"
-version = "0.2.0"
-edition = "2021"
+version.workspace = true
 include = ["src/**/*", "Cargo.toml", "LICENSE", "README.md"]
-license = "MIT OR Apache-2.0"
+edition.workspace = true
+license.workspace = true
+authors.workspace = true
 
 [[bin]]
 name = "utiles"
@@ -29,9 +30,43 @@ opt-level = 0
 [profile.release]
 opt-level = 3
 strip = true
+lto = true
 
 [dev-dependencies]
-pyo3 = { version = "0.20.0", features = ["auto-initialize"] }
+pyo3= { workspace = true , features = ["auto-initialize"] }
 
 [build-dependencies]
+pyo3-build-config.workspace = true
+
+[workspace]
+resolver = "2"
+members = [
+    "crates/utiles",
+    "crates/utilesqlite",
+    "crates/utiles-cli"
+]
+
+[workspace.package]
+edition = "2021"
+version = "0.2.0"
+homepage = "https://github.com/jessekrubin/utiles"
+documentation = "https://github.com/jessekrubin/utiles"
+repository = "https://github.com/jessekrubin/utiles"
+authors = ["Jesse K. Rubin <[email protected]>"]
+license = "MIT OR Apache-2.0"
+
+[workspace.dependencies]
+anyhow = "1.0.75"
+fast_hilbert = "2.0.0"
+geo-types = "0.7.9"
+geojson = "0.24.1"
+pyo3 = "0.20.0"
 pyo3-build-config = "0.20.0"
+rusqlite = { version = "0.29.0", features = ["bundled", "vtab", "blob"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0.96"
+thiserror = "1.0.50"
+tilejson = "0.3.2"
+tokio = { version = "1.33.0", features = ["full"] }
+tracing = "0.1.40"
+tracing-subscriber = { version = "0.3.17", features = ["serde", "serde_json", "env-filter"] }

bench/test_bench.py

@@ -4,6 +4,7 @@
 import mercantile
 import pytest
 from pytest_benchmark.fixture import BenchmarkFixture
+from pmtiles.tile import zxy_to_tileid, tileid_to_zxy
 
 import utiles
 
@@ -29,12 +30,6 @@
 )
 
 
-# @pytest.mark.parametrize(
-#     "tile",
-#     [
-#         pytest.param(t, id=str(t)) for t in TEST_TILES
-#     ],
-# )
 @tile_pytest_params
 @pytest.mark.parametrize(
     "func",
@@ -175,3 +170,86 @@ def test_feature(
 ) -> None:
     """Get feature of tile"""
     benchmark(func, mercantile.Tile(1, 2, 3))
+
+
+# ===================================================================
+# PMTILES ~ PMTILES ~ PMTILES ~ PMTILES ~ PMTILES ~ PMTILES ~ PMTILES
+# ===================================================================
+def _ut_xyz2pmtileid(x: int, y: int, z: int) -> int:
+    return utiles.pmtileid(x, y, z)
+
+
+def _pm_xyz2pmtileid(x: int, y: int, z: int) -> int:
+    return zxy_to_tileid(z, x, y)
+
+
+def _ut_pmtileid2xyz(tileid: int) -> Tuple[int, int, int]:
+    return utiles.from_pmtileid(tileid)
+
+
+def _pm_pmtileid2xyz(tileid: int) -> Tuple[int, int, int]:
+    return tileid_to_zxy(tileid)
+
+
+def test_xyz2pmtileid_eq():
+    for tile in TEST_TILES:
+        x, y, z = tile
+        pmtileid_from_pmtiles = zxy_to_tileid(
+            z,
+            x,
+            y,
+        )
+        pmtileid_from_utiles = utiles.pmtileid(x, y, z)
+        assert pmtileid_from_pmtiles == pmtileid_from_utiles
+
+        # round trip
+        (x, y, z) = _ut_pmtileid2xyz(pmtileid_from_utiles)
+        zxy_from_pmtiles = tileid_to_zxy(pmtileid_from_pmtiles)
+        assert (z, x, y) == zxy_from_pmtiles
+
+
+@pytest.mark.benchmark(
+    group="xyz2pmtile",
+)
+@pytest.mark.parametrize(
+    "tile",
+    [pytest.param(t, id=str(t)) for t in TEST_TILES],
+)
+@pytest.mark.parametrize(
+    "func",
+    [
+        pytest.param(_pm_xyz2pmtileid, id="pmtiles"),
+        pytest.param(_ut_xyz2pmtileid, id="utiles"),
+    ],
+)
+def test_xyz2pmtileid(
+    tile: Tuple[int, int, int],
+    func: Callable[[int, int, int], List[str]],
+    benchmark: BenchmarkFixture,
+) -> None:
+    """Get feature of tile"""
+    benchmark(func, *tile)
+
+
+@pytest.mark.benchmark(
+    group="pmtile2xyz",
+)
+@pytest.mark.parametrize(
+    "tile",
+    [pytest.param(t, id=str(t)) for t in TEST_TILES],
+)
+@pytest.mark.parametrize(
+    "func",
+    [
+        pytest.param(tileid_to_zxy, id="pmtiles"),
+        pytest.param(utiles.pmtileid2xyz, id="utiles"),
+    ],
+)
+def test_pmtileid2xyz(
+    tile: Tuple[int, int, int],
+    func: Callable[[int, int, int], List[str]],
+    benchmark: BenchmarkFixture,
+) -> None:
+    """Get feature of tile"""
+    pmid = utiles.pmtileid(*tile)
+    benchmark(func, pmid)