Give satellite imagery, terrain data, buildings, streetview photos to your LLM
Allow png/jpg choice in satellite too
Belluxxcb195ad0a30a
diff --git a/aleph.py b/aleph.pyindex 7367e0f..e640178 100644--- a/aleph.py+++ b/aleph.py@@ -87,7 +87,7 @@ def parser():street.add_argument("--pitch", type=float, default=0, help="vertical angle, positive up and negative down; any finite float32 degrees (default: 0)")street.add_argument("--fov", type=int, default=75, help="horizontal field of view, 5–175 whole degrees (default: 75)")street.add_argument("--radius", type=float, help="maximum panorama search distance in meters (default: 50)")- street.add_argument("--image-format", choices=("jpg", "png"), default="jpg")+ street.add_argument("--streetview-format", choices=("jpg", "png"), default="jpg")output(street)network(street)@@ -97,6 +97,8 @@ def parser():source.add_argument("--tile", type=tile_coordinates, metavar="Z/X/Y")satellite.add_argument("--size", type=float, help="square width in meters around a point (default: 200)")satellite.add_argument("--zoom", type=int, help="satellite zoom, 1–21 (default: 19)")+ satellite.add_argument("--satellite-format", choices=("jpg", "png"), default="jpg",+ help="saved tile format; merged PNG and COG are always produced (default: jpg)")output(satellite)network(satellite)@@ -118,7 +120,9 @@ def parser():area.add_argument("--step", type=float, help="target Street View spacing in meters (default: 30)")area.add_argument("--fov", type=int, help="horizontal field of view, 5–175 whole degrees (default: 75)")area.add_argument("--depth", choices=("main", "roads", "all"), help="road/path selection (default: roads)")- area.add_argument("--image-format", choices=("jpg", "png"))+ area.add_argument("--streetview-format", choices=("jpg", "png"), help="Street View photo format (default: jpg)")+ area.add_argument("--satellite-format", choices=("jpg", "png"),+ help="saved satellite tile format; merged PNG and COG are always produced (default: jpg)")area.add_argument("--satellite-zoom", type=int, help="satellite zoom, 1–21 (default: 18)")area.add_argument("--terrain-zoom", type=int, help="terrain zoom, 1–14 (default: 14)")area.set_defaults(**capture.DEFAULT_OPTIONS)@@ -221,14 +225,14 @@ def query(args, progress):if args.pano_id and args.radius is not None:raise ValueError("--radius applies to coordinates or a place name.")keys += ("pano_id", "street", "route", "reverse", "stops", "view", "heading",- "look_at", "pitch", "fov", "radius", "image_format")+ "look_at", "pitch", "fov", "radius", "streetview_format")operation = quick.street_photoselse:if args.size is not None and (args.bbox is not None or args.tile is not None):raise ValueError("--size applies to coordinates or a place name.")if args.tile is not None and args.zoom is not None:raise ValueError("--tile already includes its zoom; omit --zoom.")- keys += ("bbox", "tile", "size", "zoom")+ keys += ("bbox", "tile", "size", "zoom", "satellite_format")operation = quick.satellitevalues = {key: getattr(args, key) for key in keys if getattr(args, key) is not None}result = operation(client, args.output, progress, endpoint=args.geocoder, **values)diff --git a/docs/cli.md b/docs/cli.mdindex 9ac7b38..967928e 100644--- a/docs/cli.md+++ b/docs/cli.md@@ -20,6 +20,16 @@ Satellite captures produce `satellite.tif`, a lossless RGBA Cloud Optimized GeoTEach capture also includes `satellite.png` with identical full-resolution pixels and transparency.+Choose the saved satellite tile format with `satellite --satellite-format png`+or `satellite --satellite-format jpg` (default). For area captures, use+`capture create --satellite-format png`; the dashboard has the same choice+under **Advanced → Satellite → Tile format**. This only changes files in+`satellite/patches/`: both `satellite.png` and `satellite.tif` are always generated.+Missing tiles remain transparent PNGs, including when JPEG is selected.++Choose Street View photo formats with `streetview --streetview-format png`+or `capture create --streetview-format png` (default: `jpg`).+## Use coordinatesCoordinates are `LAT LON`; distances are in meters.diff --git a/src/assets/app.js b/src/assets/app.jsindex 208acaf..f220a87 100644--- a/src/assets/app.js+++ b/src/assets/app.js@@ -930,7 +930,8 @@ async function planCapture(event) {}$("form-error").hidden = true;const data = new FormData(form);- const options = {include: data.getAll("include"), depth: data.get("depth"), image_format: data.get("image_format")};+ const options = {include: data.getAll("include"), depth: data.get("depth"),+ streetview_format: data.get("streetview_format"), satellite_format: data.get("satellite_format")};for (const key of ["step", "fov", "delay", "satellite_zoom", "terrain_zoom"]) options[key] = Number(data.get(key));const bounds = [...state.draftBounds];state.submitting = true;diff --git a/src/assets/index.html b/src/assets/index.htmlindex 5e59391..8e15637 100644--- a/src/assets/index.html+++ b/src/assets/index.html@@ -119,11 +119,17 @@</fieldset><details id="advanced-settings" class="settings"><summary>Advanced</summary>+ <div class="settings-group" data-source="satellite">+ <h3 class="settings-divider">Satellite</h3>+ <div class="settings-grid">+ <label>Tile format<select name="satellite_format"><option value="jpg">JPEG</option><option value="png">PNG</option></select></label>+ </div>+ </div><div class="settings-group" data-source="streetview"><h3 class="settings-divider"><svg viewBox="0 0 24 24" fill="none" aria-hidden="true"><path d="M3 7h4l2-3h6l2 3h4v13H3Z"/><circle cx="12" cy="13" r="4"/></svg>Street View</h3><div class="settings-grid"><label>Road coverage<select name="depth"><option value="main">Main roads</option><option value="roads">All roads</option><option value="all">Roads + paths</option></select></label>- <label>Photo format<select name="image_format"><option value="jpg">JPEG</option><option value="png">PNG</option></select></label>+ <label>Photo format<select name="streetview_format"><option value="jpg">JPEG</option><option value="png">PNG</option></select></label></div></div><div class="settings-group" data-source="osm">diff --git a/src/capture.py b/src/capture.pyindex 2456f46..4b3b743 100644--- a/src/capture.py+++ b/src/capture.py@@ -35,8 +35,8 @@ from .geo import (SOURCES = ("streetview", "satellite", "osm")FORMAT_VERSION = 3DEFAULT_OPTIONS = dict(- include=list(SOURCES), step=30, fov=75, depth="roads", image_format="jpg",- delay=0, satellite_zoom=18, terrain_zoom=14,+ include=list(SOURCES), step=30, fov=75, depth="roads", streetview_format="jpg",+ delay=0, satellite_zoom=18, satellite_format="jpg", terrain_zoom=14,)OSM_NOTES = {@@ -78,8 +78,9 @@ def settings(values=None):options[key] = int(value)if options["depth"] not in ("main", "roads", "all"):raise ValueError("Choose main, roads, or all for depth.")- if options["image_format"] not in ("jpg", "png"):- raise ValueError("Choose jpg or png for image format.")+ for key in ("streetview_format", "satellite_format"):+ if options[key] not in ("jpg", "png"):+ raise ValueError(f"{key}: choose jpg or png.")return options@@ -230,7 +231,7 @@ def capture_streets(stage, run, folder, client, progress):photo["pano_id"], photo["heading"], photo["fov"])data = client.get(photo["source_url"], missing_ok=True)- extension = options["image_format"]+ extension = options["streetview_format"]photo["filename"] = "streetview/photos/" + streetview.photo_name(photo, extension)with (open_image(data, (1024, 576)) as image,@@ -258,20 +259,27 @@ def capture_streets(stage, run, folder, client, progress):progress("Street View", index + 1, total(stage))-def capture_satellite(stage, folder, client, progress):+def capture_satellite(stage, folder, client, progress, satellite_format):for i, tile in enumerate(tiles(stage["grid"])):if i < len(stage["results"]):continueaddress = f"https://mt1.google.com/vt/lyrs=s&x={tile['x']}&y={tile['y']}&z={tile['zoom']}"+ extension = satellite_formattry:data = client.get(address, missing_ok=True)except MissingImagery:# Persist the gap so resume and offline export keep it transparent.+ extension = "png"with BytesIO() as buffer, Image.new("RGBA", (256, 256)) as image:image.save(buffer, format="PNG")data = buffer.getvalue()with open_image(data, (256, 256)) as image:- extension = "jpg" if image.format == "JPEG" else "png"+ target = "JPEG" if extension == "jpg" else "PNG"+ # Preserve the original bytes when they already have the chosen format.+ if image.format != target:+ with BytesIO() as buffer, image.convert("RGB" if extension == "jpg" else "RGBA") as converted:+ converted.save(buffer, format=target, quality=80)+ data = buffer.getvalue()name = (f"satellite/patches/satellite_z{tile['zoom']}_r{tile['row'] + 1:04d}_c{tile['column'] + 1:04d}"f"_x{tile['x']}_y{tile['y']}.{extension}"@@ -446,7 +454,7 @@ def download(run, folder, client, progress):if stage["mode"] == "streetview":work = capture_streets(stage, run, folder, client, progress)elif stage["mode"] == "satellite":- work = capture_satellite(stage, folder, client, progress)+ work = capture_satellite(stage, folder, client, progress, run["options"]["satellite_format"])else:work = capture_osm(stage, run["bounds"], folder, client, progress)for _ in work:diff --git a/src/quick.py b/src/quick.pyindex 5a90c6a..ec6f360 100644--- a/src/quick.py+++ b/src/quick.py@@ -35,7 +35,7 @@ def location(client, *, at=None, place=None, match=None, best_match=False, endpodef street_photos(client, output, progress, *, at=None, place=None, pano_id=None,street=None, match=None, best_match=False, endpoint=places.GEOCODER, route=None,reverse=False, stops=10, view="forward", heading=0, look_at=None,- pitch=0, fov=75, radius=50, image_format="jpg"):+ pitch=0, fov=75, radius=50, streetview_format="jpg"):streetview.validate_angle(heading, "heading")streetview.validate_angle(pitch, "pitch")fov = streetview.validate_fov(fov)@@ -96,9 +96,9 @@ def street_photos(client, output, progress, *, at=None, place=None, pano_id=Noneangle = bearing(actual, look_at)address = streetview.image_url(sample["pano_id"], angle, fov, pitch)data = client.get(address, missing_ok=True)- name = f"{len(result['photos']) + 1:03d}.{image_format}"+ name = f"{len(result['photos']) + 1:03d}.{streetview_format}"with capture.open_image(data, (1024, 576)) as image, atomic_path(folder / name) as temporary:- image.convert("RGB").save(temporary, format="PNG" if image_format == "png" else "JPEG", quality=80)+ image.convert("RGB").save(temporary, format="PNG" if streetview_format == "png" else "JPEG", quality=80)photo = {**sample, **metadata}photo.update(heading=angle, pitch=pitch, fov=fov,path=str(folder / name), source_url=address, width=1024, height=576)@@ -126,7 +126,7 @@ def street_photos(client, output, progress, *, at=None, place=None, pano_id=Nonedef satellite(client, output, progress, *, at=None, place=None, match=None, best_match=False,- endpoint=places.GEOCODER, bbox=None, tile=None, size=200, zoom=19):+ endpoint=places.GEOCODER, bbox=None, tile=None, size=200, zoom=19, satellite_format="jpg"):if tile is not None:zoom, x, y = tileplaces.number(zoom, "zoom", 1, 21)@@ -144,7 +144,8 @@ def satellite(client, output, progress, *, at=None, place=None, match=None, bestbest_match=best_match, endpoint=endpoint)area = places.around(center, size)g = grid(area, zoom)- run = capture.plan(client, area, dict(include=["satellite"], satellite_zoom=zoom), progress)+ run = capture.plan(client, area, dict(include=["satellite"], satellite_zoom=zoom,+ satellite_format=satellite_format), progress)folder = capture.create_folder(run, output)try:capture.download(run, folder, client, progress)diff --git a/tests/test_capture.py b/tests/test_capture.pyindex 25a5ab4..640631f 100644--- a/tests/test_capture.py+++ b/tests/test_capture.py@@ -118,7 +118,7 @@ class CaptureRecoveryTests(unittest.TestCase):north, west = geo.coordinate(384, 384, 2)south, east = geo.coordinate(640, 640, 2)run = capture.plan(self.client, [south, west, north, east],- dict(include=["satellite"], satellite_zoom=2), self.progress)+ dict(include=["satellite"], satellite_zoom=2, satellite_format="png"), self.progress)colors = [(255, 0, 0), (0, 255, 0), (0, 0, 255), (255, 255, 0)]self.client.get.side_effect = [image_bytes((256, 256), color) for color in colors]previous = image_bytes((1, 1), "black")@@ -188,11 +188,40 @@ class CaptureRecoveryTests(unittest.TestCase):self.assertEqual(actual.mode, "RGBA")self.assertEqual(actual.tobytes(), expected.tobytes())+ def test_satellite_tile_formats_preserve_source_bytes_and_transparent_gaps(self):+ north, west = geo.coordinate(256, 256, 2)+ south, east = geo.coordinate(512, 512, 2)+ for source in ("JPEG", "PNG", "missing"):+ for extension in ("jpg", "png"):+ with self.subTest(source=source, requested=extension):+ folder = self.folder / f"{source}-{extension}"+ folder.mkdir()+ run = capture.plan(self.client, [south, west, north, east],+ dict(include=["satellite"], satellite_zoom=2,+ satellite_format=extension), self.progress)+ with BytesIO() as buffer, Image.new("RGB", (256, 256), (72, 105, 210)) as image:+ image.save(buffer, format="PNG" if source == "missing" else source)+ data = buffer.getvalue()+ self.client.get.side_effect = [MissingImagery("missing") if source == "missing" else data]+ capture.download(run, folder, self.client, self.progress)+ filename = run["stages"][0]["results"][0]["filename"]+ expected = "png" if source == "missing" else extension+ self.assertEqual(Path(filename).suffix, "." + expected)+ with Image.open(folder / filename) as tile, tile.convert("RGBA") as rgba:+ self.assertEqual(tile.format, "JPEG" if expected == "jpg" else "PNG")+ if source == "missing":+ self.assertEqual(rgba.getchannel("A").getextrema(), (0, 0))+ elif tile.format == source:+ self.assertEqual((folder / filename).read_bytes(), data)+ for name in ("satellite.png", "satellite.tif"):+ with Image.open(folder / name) as merged:+ self.assertEqual(merged.tobytes(), rgba.tobytes())+def test_satellite_404_leaves_transparent_tile_without_retrying_on_resume(self):north, west = geo.coordinate(384, 384, 2)south, east = geo.coordinate(640, 640, 2)run = capture.plan(self.client, [south, west, north, east],- dict(include=["satellite"], satellite_zoom=2), self.progress)+ dict(include=["satellite"], satellite_zoom=2, satellite_format="png"), self.progress)missing = HTTPError("https://mt1.google.com/vt/", 404, "Not Found", {}, BytesIO())responses = [BytesIO(image_bytes((256, 256), "red")), missing,BytesIO(image_bytes((256, 256), "blue")),diff --git a/tests/test_queries.py b/tests/test_queries.pyindex b86b775..90c52be 100644--- a/tests/test_queries.py+++ b/tests/test_queries.py@@ -81,12 +81,16 @@ class QueryTests(unittest.TestCase):def test_exact_satellite_tile_is_cached_and_can_be_exported_offline(self):self.get.return_value = image_bytes((256, 256), "red")for attempt in range(2):- status, result = self.invoke("satellite", "--tile", "19/280337/194891", "-o", str(self.directory))+ extension = ("png", "jpg")[attempt]+ status, result = self.invoke("satellite", "--tile", "19/280337/194891",+ "--satellite-format", extension, "-o", str(self.directory))self.assertEqual(status, 0)self.assertEqual((result["width"], result["height"]), (256, 256))self.assertEqual(result["cache"]["hits"], attempt)folder = Path(result["folder"])run = capture.load(folder)+ self.assertEqual(run["options"]["satellite_format"], extension)+ self.assertTrue(run["stages"][0]["results"][0]["filename"].endswith("." + extension))capture.export(run, folder, lambda *args: None)self.assertTrue(Path(result["path"]).is_file())self.assertEqual(self.get.call_count, 1)