linting

Author: elegos

docs/ARCHITECTURE.md

@@ -94,7 +94,7 @@ Launches Blender headlessly and runs `blender_scripts/render_frames.py`, which p
 
 When `render/n_segments > 1`, the render is split into N sequential Blender passes. Each pass loads only the terrain tiles whose world-space bounding boxes intersect the camera's AABB for that frame range, expanded by `render/frustum_margin_km`. This keeps per-pass VRAM proportional to the visible terrain fraction. Each Blender process exits completely between segments, fully releasing GPU memory before the next segment starts.
 
-Output PNGs are stored in a temporary directory that is registered on `Pipeline._temp_dirs` for post-job cleanup.
+Output PNGs are stored in a temporary directory that is registered on `Pipeline.temp_dirs` for post-job cleanup.
 
 ### 8. Photo Overlay Compositor (`core/photo_compositor.py`)
 Groups consecutive pause keyframes into blocks and renders them as a photo carousel:
@@ -103,7 +103,7 @@ Groups consecutive pause keyframes into blocks and renders them as a photo carou
 - Letterboxing: blurred photo fill or black bars, preserving aspect ratio
 - Transition: fade (cross-dissolve) or cut (hard edit)
 
-Supports all resolution presets (landscape 16:9, portrait 9:16, square 1:1). Output is stored in a temporary directory registered on `Pipeline._temp_dirs` for post-job cleanup.
+Supports all resolution presets (landscape 16:9, portrait 9:16, square 1:1). Output is stored in a temporary directory registered on `Pipeline.temp_dirs` for post-job cleanup.
 
 ### 9. Video Assembler (`core/video_assembler.py`)
 Encodes the final frame sequence into a video file using FFmpeg. Configurable container (MKV/MP4), codec (H.264/H.265/AV1), and encoder with automatic detection of available hardware accelerators (NVIDIA NVENC, AMD AMF, Intel QSV, Apple VideoToolbox) and software fallbacks. For MKV output, the source GPX and render settings JSON are attached as named attachments.

src/georeel/core/camera_path.py

@@ -493,6 +493,37 @@ def _height_at_batch(
     return grid.elevation_at_batch(lats, lons)
 
 
+def _smooth_elevation(
+    grid: ElevationGrid,
+    lat: float,
+    lon: float,
+) -> float:
+    dlat = (grid.max_lat - grid.min_lat) / (grid.rows - 1) * 1.5
+    dlon = (grid.max_lon - grid.min_lon) / (grid.cols - 1) * 1.5
+    samples = [
+        grid.elevation_at(lat + r * dlat, lon + c * dlon)
+        for r in (-1, 0, 1)
+        for c in (-1, 0, 1)
+    ]
+    return float(np.mean(samples))
+
+
+def _height_at(
+    x: float,
+    y: float,
+    grid: ElevationGrid,
+    bbox: BoundingBox,
+    lat_m: float,
+    lon_m: float,
+    height_mode: str,
+    height_offset: float = 0.0,
+) -> float:
+    result = float(_height_at_batch(
+        np.array([x]), np.array([y]), grid, bbox, lat_m, lon_m, height_mode
+    )[0])
+    return result + height_offset
+
+
 # ------------------------------------------------------------------
 # Orientation helpers
 # ------------------------------------------------------------------

src/georeel/core/pipeline_memory.py

@@ -72,7 +72,7 @@ def log_pipeline_memory(pipeline: object, label: str = "") -> None:
                 f"  satellite     : {w}×{h} px  {bands}-band  {_fmt(sat_mb)}"
             )
         else:
-            src_zip = getattr(sat, "_source_zip", None)
+            src_zip = getattr(sat, "source_zip", None)
             td = getattr(sat, "_tiles_dir", None)
             if src_zip is not None:
                 lines.append(

src/georeel/core/project.py

@@ -173,7 +173,7 @@ def save_project(state: ProjectState, path: str) -> None:
       2. Renames the temporary file to *path*.
 
     This matters especially for the lazy-loaded satellite texture: when a
-    project is loaded, ``state.satellite_texture._source_zip`` points at
+    project is loaded, ``state.satellite_texture.source_zip`` points at
     *path* itself.  If we opened *path* for writing directly we would truncate
     the source while still trying to stream from it, producing a 0-byte
     ``satellite/texture.png`` in the saved ZIP.  Writing to a distinct temp
@@ -228,7 +228,7 @@ def save_project(state: ProjectState, path: str) -> None:
     }
 
     # Write to a sibling temp file so the original (which may be the satellite
-    # texture's _source_zip) stays intact during the entire write.
+    # texture's source_zip) stays intact during the entire write.
     tmp_path = path + ".tmp"
     try:
         with zipfile.ZipFile(tmp_path, "w", compression=zipfile.ZIP_DEFLATED) as zf:

src/georeel/core/satellite/texture.py

@@ -50,7 +50,7 @@ class SatelliteTexture:
     # Cached pixel dimensions — populated from image.size, tile manifest,
     # tile cache geometry, or the PNG IHDR header.
     dim_width: int | None = field(default=None, repr=False)
-    _dim_height: int | None = field(default=None, repr=False)
+    dim_height: int | None = field(default=None, repr=False)
 
     @property
     def width(self) -> int:
@@ -66,8 +66,8 @@ def width(self) -> int:
     def height(self) -> int:
         if self.image is not None:
             return self.image.height
-        if self._dim_height is not None:
-            return self._dim_height
+        if self.dim_height is not None:
+            return self.dim_height
         raise RuntimeError(
             "SatelliteTexture dimensions not available (image not loaded and no cached size)."
         )
@@ -100,10 +100,10 @@ def free_image(
         if tiles_manifest is not None:
             self._tiles_manifest = tiles_manifest
             self.dim_width  = tiles_manifest.get("image_width")
-            self._dim_height = tiles_manifest.get("image_height")
+            self.dim_height = tiles_manifest.get("image_height")
         if self.image is not None:
             self.dim_width  = self.image.width
-            self._dim_height = self.image.height
+            self.dim_height = self.image.height
         mb = self.memory_bytes() / 1024 ** 2
         self.image = None
         # Blender tiles are now on disk; the XYZ tile cache is no longer needed.
@@ -119,8 +119,8 @@ def write_png(self, dest: IO[bytes]) -> None:
 
         Priority order:
         1. Image in RAM — save directly.
-        2. Lazy ZIP source (_source_zip) — copy raw bytes, zero decode.
-        3. Tile cache (_tile_cache) — composite full bbox on demand.
+        2. Lazy ZIP source (source_zip) — copy raw bytes, zero decode.
+        3. Tile cache (tile_cache) — composite full bbox on demand.
         4. Blender tile manifest (_tiles_manifest) — reassemble from tile PNGs.
         """
         if self.image is not None:
@@ -281,7 +281,7 @@ def from_zip_lazy(
         obj.source_zip = zip_path
         obj._source_entry = entry
         obj.dim_width = dim_w
-        obj._dim_height = dim_h
+        obj.dim_height = dim_h
         return obj
 
     def load_image(self) -> Image.Image:
@@ -302,7 +302,7 @@ def load_image(self) -> Image.Image:
                             image = image.convert("RGB")
             self.image = image
             self.dim_width  = image.width
-            self._dim_height = image.height
+            self.dim_height = image.height
             return image
         raise RuntimeError(
             "SatelliteTexture has no image and no source ZIP to load from."

src/georeel/core/satellite/xyz_source.py

@@ -118,7 +118,7 @@ def fetch(
             quality=self._quality,
             tile_cache=cache,
             dim_width=W,
-            _dim_height=H,
+            dim_height=H,
         )
 
 

tests/test_pipeline.py

@@ -26,24 +26,24 @@ def test_cleanup_deletes_temp_dirs(self, tmp_path):
         d2 = tmp_path / "dir2"
         d1.mkdir()
         d2.mkdir()
-        p._temp_dirs.append(d1)
-        p._temp_dirs.append(d2)
+        p.temp_dirs.append(d1)
+        p.temp_dirs.append(d2)
         p.cleanup()
         assert not d1.exists()
         assert not d2.exists()
 
     def test_cleanup_tolerates_missing_dirs(self, tmp_path):
         p = Pipeline()
-        p._temp_dirs.append(tmp_path / "nonexistent")
+        p.temp_dirs.append(tmp_path / "nonexistent")
         p.cleanup()  # should not raise
 
     def test_cleanup_clears_temp_dirs_list(self, tmp_path):
         p = Pipeline()
         d = tmp_path / "d"
         d.mkdir()
-        p._temp_dirs.append(d)
+        p.temp_dirs.append(d)
         p.cleanup()
-        assert p._temp_dirs == []
+        assert p.temp_dirs == []
 
     def test_fields_assignable(self):
         p = Pipeline()

tests/test_pipeline_memory.py

@@ -109,7 +109,7 @@ def _pipeline_with_lazy_sat(source_zip_name="test.georeel"):
     from pathlib import Path
     sat = SimpleNamespace(
         image=None,
-        _source_zip=Path(source_zip_name),
+        source_zip=Path(source_zip_name),
         _tiles_dir=None,
     )
     p.satellite_texture = sat
@@ -121,7 +121,7 @@ def _pipeline_with_freed_sat(tiles_dir="/tmp/tiles"):
     from pathlib import Path
     sat = SimpleNamespace(
         image=None,
-        _source_zip=None,
+        source_zip=None,
         _tiles_dir=Path(tiles_dir),
     )
     p.satellite_texture = sat

tests/test_project.py

@@ -463,7 +463,7 @@ def test_lazy_texture_saved_correctly_when_source_is_target(self, tmp_path):
 
         loaded = load_project(path)
         assert loaded.satellite_texture is not None
-        assert loaded.satellite_texture._source_zip == Path(path)
+        assert loaded.satellite_texture.source_zip == Path(path)
 
         # Simulate "output file name changed, then Save":
         save_project(

tests/test_satellite_texture_extended.py

@@ -87,8 +87,8 @@ def test_width_from_dim_width_when_image_none(self):
             max_lat=1,
             min_lon=0,
             max_lon=1,
-            _dim_width=300,
-            _dim_height=200,
+            dim_width=300,
+            dim_height=200,
         )
         assert t.width == 300
         assert t.height == 200
@@ -118,14 +118,14 @@ def test_image_is_none_after_free(self):
     def test_dims_cached_from_image_before_free(self):
         t = _make_texture(200, 150)
         t.free_image()
-        assert t._dim_width == 200
-        assert t._dim_height == 150
+        assert t.dim_width == 200
+        assert t.dim_height == 150
 
     def test_tile_cache_cleared_on_free(self):
         t = _make_texture()
-        t._tile_cache = MagicMock()
+        t.tile_cache = MagicMock()
         t.free_image()
-        assert t._tile_cache is None
+        assert t.tile_cache is None
 
     def test_tiles_dir_set_on_free(self):
         t = _make_texture()
@@ -141,8 +141,8 @@ def test_manifest_dims_set_before_image_dims_override(self):
         manifest = {"image_width": 400, "image_height": 300, "tiles": []}
         t.free_image(tiles_manifest=manifest)
         # Image dims (100×80) override the manifest values (400×300).
-        assert t._dim_width == 100
-        assert t._dim_height == 80
+        assert t.dim_width == 100
+        assert t.dim_height == 80
         assert t._tiles_manifest is manifest
 
 
@@ -222,7 +222,7 @@ def test_delegates_to_tile_cache_composite(self):
         fake_img = Image.new("RGB", (128, 96), (50, 100, 150))
         mock_cache = MagicMock()
         mock_cache.composite.return_value = fake_img
-        t._tile_cache = mock_cache
+        t.tile_cache = mock_cache
 
         buf = io.BytesIO()
         t.write_png(buf)
@@ -243,7 +243,7 @@ def test_tile_cache_composite_rgba_converted(self):
         fake_img = Image.new("RGBA", (10, 10), (255, 0, 0, 200))
         mock_cache = MagicMock()
         mock_cache.composite.return_value = fake_img
-        t._tile_cache = mock_cache
+        t.tile_cache = mock_cache
 
         buf = io.BytesIO()
         t.write_png(buf)
@@ -278,8 +278,8 @@ def test_reassembles_from_tiles(self, tmp_path):
         t = SatelliteTexture(image=None, min_lat=0, max_lat=1, min_lon=0, max_lon=1)
         t._tiles_dir = tmp_path
         t._tiles_manifest = manifest
-        t._dim_width = 64
-        t._dim_height = 32
+        t.dim_width = 64
+        t.dim_height = 32
 
         buf = io.BytesIO()
         t.write_png(buf)
@@ -330,7 +330,7 @@ def test_source_zip_and_entry_set(self):
             t = SatelliteTexture.from_zip_lazy(
                 zip_path, entry, min_lat=0, max_lat=1, min_lon=0, max_lon=1
             )
-            assert t._source_zip == zip_path
+            assert t.source_zip == zip_path
             assert t._source_entry == entry
         finally:
             zip_path.unlink(missing_ok=True)
@@ -362,8 +362,8 @@ def test_corrupt_zip_dims_unavailable(self, tmp_path):
         t = SatelliteTexture.from_zip_lazy(
             bad_zip, "satellite.png", min_lat=0, max_lat=1, min_lon=0, max_lon=1
         )
-        assert t._dim_width is None
-        assert t._dim_height is None
+        assert t.dim_width is None
+        assert t.dim_height is None
 
 
 # ---------------------------------------------------------------------------
@@ -399,8 +399,8 @@ def test_load_image_caches_dims(self):
                 zip_path, entry, min_lat=0, max_lat=1, min_lon=0, max_lon=1
             )
             t.load_image()
-            assert t._dim_width == 64
-            assert t._dim_height == 48
+            assert t.dim_width == 64
+            assert t.dim_height == 48
         finally:
             zip_path.unlink(missing_ok=True)