Merge pull request #25 from eniehack/feat/script-typer

script周りの修正

Author: eniehack

.gitignore

@@ -20,3 +20,10 @@ Thumbs.db
 # Vite
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
+
+atm*.json
+bank*.json
+convenience*.json
+!static/atm.json
+!static/bank.json
+!static/convenience.json

script/generate.sh

@@ -31,4 +31,4 @@ uv run -- quackosm \
     --work-dir "$QUACKOSM_WORKDIR" \
     "$PBF_FILE"
 
-uv run src/atmjsongen/main.py --parquet "$GEOPARQUET_FILE" --geojson_dir .
+uv run src/atmjsongen/main.py "$GEOPARQUET_FILE" 

script/pyproject.toml

@@ -8,14 +8,14 @@ authors = [
 dependencies = [
     "geopandas>=1.0.1",
     "quackosm[cli]>=0.12.1",
-    "classopt>=0.2.1",
+    "typer>=0.17.3",
 ]
 readme = "README.md"
 requires-python = ">= 3.12"
 
-[dependencies-groups]
+[dependency-groups]
 dev = [
-    "ruff>=0.8.6",
+    "ruff>=0.14.10",
 ]
 
 [build-system]

script/src/atmjsongen/main.py

@@ -1,25 +1,19 @@
-import quackosm as qosm
-from argparse import ArgumentParser
 from typing import Callable
 from pathlib import Path
 import geopandas
-from classopt import classopt, config
-from time import strftime
+import typer
 
 
-@classopt
-class CLIOpt:
-    parquet: Path = config(long=True)
-    geojson_dir: Path = config(long=True)
-
 def get_sometag(target_tag: str) -> Callable[dict, str | None]:
     def func(tags):
         if target_tag in tags:
             return tags[target_tag]
         else:
             return None
+
     return func
 
+
 def is_atm(tags):
     if "amenity" in tags and tags["amenity"] == "atm":
         return True
@@ -28,47 +22,56 @@ def is_atm(tags):
     else:
         return False
 
+
 def is_bank(tags):
     if "amenity" in tags and tags["amenity"] == "bank":
         return True
     else:
         return False
 
+
 def is_convenience(tags):
     if "shop" in tags and tags["shop"] == "convenience":
         return True
     return False
 
+
 def get_openinghours(tags):
     atm_opening = get_sometag("opening_hours:atm")(tags)
     if atm_opening is None:
         return get_sometag("opening_hours")(tags)
     return atm_opening
 
 
-if __name__ == "__main__":
-    # argparser = ArgumentParser()
-    # argparser.add_argument("-f", "--parquet", type=Path)
-    # argparser.add_argument("-t", "--geojson_dir", type=Path)
-    # argparser.parse_args()
-    opt: CLIOpt = CLIOpt.from_args()
-
-    gdf = geopandas.read_parquet(opt.parquet)
+def main(parquet: Path, geojson_dir: Path = Path.cwd()):
+    gdf = geopandas.read_parquet(parquet)
     gdf["tags"] = gdf["tags"].apply(lambda l: {i[0]: i[1] for i in l})
     gdf["brand"] = gdf["tags"].apply(get_sometag("brand"))
     gdf["name"] = gdf["tags"].apply(get_sometag("name"))
     gdf["atm"] = gdf["tags"].apply(is_atm)
     gdf["bank"] = gdf["tags"].apply(is_bank)
     gdf["convenience"] = gdf["tags"].apply(is_convenience)
     gdf["opening_hours"] = gdf["tags"].apply(get_openinghours)
+
     gdf.geometry = gdf.representative_point()
     gdf.geometry = gdf.geometry.set_precision(grid_size=0.0000001)
+
     atm_gdf = gdf[gdf["atm"]]
     atm_gdf = atm_gdf[["feature_id", "brand", "name", "opening_hours", "geometry"]]
-    atm_gdf.to_file(opt.geojson_dir / f"atm.json", driver="GeoJSON")
+    atm_gdf.to_file(geojson_dir / "atm.json", driver="GeoJSON", separator=(",", ":"))
+
     bank_gdf = gdf[gdf["bank"] & ~gdf["atm"]]
     bank_gdf = bank_gdf[["feature_id", "brand", "name", "opening_hours", "geometry"]]
-    bank_gdf.to_file(opt.geojson_dir / f"bank.json", driver="GeoJSON")
+    bank_gdf.to_file(geojson_dir / "bank.json", driver="GeoJSON", separator=(",", ":"))
+
     convenience_gdf = gdf[gdf["convenience"] & ~gdf["atm"]]
-    convenience_gdf = convenience_gdf[["feature_id", "brand", "name", "opening_hours", "geometry"]]
-    convenience_gdf.to_file(opt.geojson_dir / f"convenience.json", driver="GeoJSON")
+    convenience_gdf = convenience_gdf[
+        ["feature_id", "brand", "name", "opening_hours", "geometry"]
+    ]
+    convenience_gdf.to_file(
+        geojson_dir / "convenience.json", driver="GeoJSON", separator=(",", ":")
+    )
+
+
+if __name__ == "__main__":
+    typer.run(main)