Skip to content

armgit / Aleph

Public Imported from GitHub
0

Give satellite imagery, terrain data, buildings, streetview photos to your LLM

Use stops as progress marks

Belluxx6c3614fe660e
diff --git a/src/capture.py b/src/capture.py
index 4373ad2..3845211 100644
--- a/src/capture.py
+++ b/src/capture.py
@@ -290,7 +290,7 @@ def capture_spheres(stage, run, folder, client, progress):
photo.update(metadata)
photo["filename"] = f"streetview/photos/{index + 1:06d}_sphere.{options['streetview_format']}"
photo.update(streetview.save_sphere(
- client, metadata, options["sphere_zoom"], folder / photo["filename"], progress))
+ client, metadata, options["sphere_zoom"], folder / photo["filename"]))
photo.update(captured_at=now(), status="saved", source_url=streetview.metadata_url(sample["pano_id"]),
streetview_url=url("https://www.google.com/maps/@", api=1, map_action="pano",
pano=sample["pano_id"], viewpoint=f"{photo['lat']},{photo['lon']}"))
@@ -298,7 +298,7 @@ def capture_spheres(stage, run, folder, client, progress):
photo.update(status="skipped", reason=str(error))
stage["results"].append(photo)
yield
- progress("Street View spheres", index + 1, total(stage))
+ progress("Street View", index + 1, total(stage))
def capture_satellite(stage, folder, client, progress, satellite_format):
diff --git a/src/quick.py b/src/quick.py
index 38cad70..a989b25 100644
--- a/src/quick.py
+++ b/src/quick.py
@@ -101,6 +101,7 @@ def street_photos(client, output, progress, *, at=None, place=None, pano_id=None
offsets = {"forward": 0, "backward": 180, "left": -90, "right": 90}
directions = ("left", "right") if view == "both" else (view,)
try:
+ progress("Street View", 0, len(samples))
for index, sample in enumerate(samples, 1):
try:
metadata = streetview.parse_metadata(client.get(streetview.metadata_url(sample["pano_id"])),
@@ -116,7 +117,7 @@ def street_photos(client, output, progress, *, at=None, place=None, pano_id=None
photo = {**sample, **metadata}
if "heading" in photo:
photo["road_heading"] = photo.pop("heading")
- photo.update(streetview.save_sphere(client, metadata, sphere_zoom, folder / name, progress))
+ photo.update(streetview.save_sphere(client, metadata, sphere_zoom, folder / name))
photo.update(path=str(folder / name), source_url=streetview.metadata_url(sample["pano_id"]))
result["photos"].append(photo)
continue
diff --git a/src/streetview.py b/src/streetview.py
index fd8c6c5..1d7bf3d 100644
--- a/src/streetview.py
+++ b/src/streetview.py
@@ -152,7 +152,7 @@ def tile_url(pano_id, zoom, x, y):
cb_client="maps_sv.tactile", panoid=pano_id, zoom=zoom, x=x, y=y)
-def save_sphere(client, metadata, zoom, target, progress):
+def save_sphere(client, metadata, zoom, target):
"""Assemble native panorama tiles; retain partial tiles for retry/resume."""
zoom = min(validate_sphere_zoom(zoom), len(metadata["image_sizes"]) - 1)
width, height = metadata["image_sizes"][zoom]
@@ -161,7 +161,6 @@ def save_sphere(client, metadata, zoom, target, progress):
target = Path(target)
cache = target.parent / ".sphere-tiles" / metadata["pano_id"] / f"{zoom}-{width}x{height}-{tw}x{th}"
count = columns * rows
- progress("Panorama tiles", 0, count)
with Image.new("RGB", (width, height)) as sphere:
for y in range(rows):
for x in range(columns):
@@ -176,7 +175,6 @@ def save_sphere(client, metadata, zoom, target, progress):
if not path.is_file():
write_bytes(path, data)
sphere.paste(tile, (x * tw, y * th))
- progress("Panorama tiles", y * columns + x + 1, count)
client.check_cancel()
with atomic_path(target) as temporary:
sphere.save(temporary, format="PNG" if target.suffix == ".png" else "JPEG", quality=90)