Clarify raster terrain texture diagnostics

Author: esnya

src/PlateauResoniteLink/Targets/Resonite/ResoniteQueuedTexturePreparer.cs

@@ -167,7 +167,7 @@ private static string DescribeTerrainTextureSource(TerrainTextureSource source)
         {
             TerrainTextureGeoReferencedRasterSource rasterSource => string.Create(
                 CultureInfo.InvariantCulture,
-                $"GeoTIFF(source='{rasterSource.ContentSource.Description}', crs='{rasterSource.Metadata.CoordinateSystemIdentifier}')"),
+                $"Geo-referenced raster(source='{rasterSource.ContentSource.Description}', crs='{rasterSource.Metadata.CoordinateSystemIdentifier}')"),
             TerrainTextureTileSource tileSource when IsGsiFallbackSource(tileSource) => string.Create(
                 CultureInfo.InvariantCulture,
                 $"GSI seamless photo tile(z={tileSource.ZoomLevel})"),

src/PlateauResoniteLink/Targets/Resonite/TerrainTextureAssetGenerator.cs

@@ -220,21 +220,37 @@ private static async Task<TerrainTextureSourceImage> CreateTextureFromGeoReferen
         TerrainTextureGeoReferencedRasterSource rasterSource,
         CancellationToken cancellationToken)
     {
-        await using Stream sourceStream = await rasterSource.OpenReadAsync(cancellationToken);
-        using Image<Rgba32> sourceImage = await Image.LoadAsync<Rgba32>(sourceStream, cancellationToken);
-        Image<Rgba32>? cropped = TerrainTextureGeoReferencedRasterCropper.TryCrop(
-            sourceImage,
-            rasterSource.Metadata,
-            terrainTextureOverlay.GeographicBounds);
-        if (cropped is null)
+        Image<Rgba32> sourceImage;
+        try
+        {
+            await using Stream sourceStream = await rasterSource.OpenReadAsync(cancellationToken);
+            sourceImage = await Image.LoadAsync<Rgba32>(sourceStream, cancellationToken);
+        }
+        catch (Exception exception) when (exception is not OperationCanceledException)
         {
             throw new InvalidOperationException(
                 string.Create(
                     CultureInfo.InvariantCulture,
-                    $"Geo-referenced raster source '{rasterSource.ContentSource.Description}' does not overlap terrain overlay bounds '{TerrainTextureDescriptorFormatting.FormatBounds(terrainTextureOverlay.GeographicBounds)}'."));
+                    $"Failed to open or decode geo-referenced raster source '{rasterSource.ContentSource.Description}' for terrain overlay bounds '{TerrainTextureDescriptorFormatting.FormatBounds(terrainTextureOverlay.GeographicBounds)}'."),
+                exception);
         }
 
-        return new TerrainTextureSourceImage(cropped, null);
+        using (sourceImage)
+        {
+            Image<Rgba32>? cropped = TerrainTextureGeoReferencedRasterCropper.TryCrop(
+                sourceImage,
+                rasterSource.Metadata,
+                terrainTextureOverlay.GeographicBounds);
+            if (cropped is null)
+            {
+                throw new InvalidOperationException(
+                    string.Create(
+                        CultureInfo.InvariantCulture,
+                        $"Geo-referenced raster source '{rasterSource.ContentSource.Description}' does not overlap terrain overlay bounds '{TerrainTextureDescriptorFormatting.FormatBounds(terrainTextureOverlay.GeographicBounds)}'."));
+            }
+
+            return new TerrainTextureSourceImage(cropped, null);
+        }
     }
 
     private static GeneratedTerrainTexture CreateGeneratedTexture(

tests/PlateauResoniteLink.Tests/Targets/TerrainTextureGeoReferencedRasterSupportTests.cs

@@ -516,9 +516,12 @@ public async Task EnsureTextureAsyncRejectsUnavailableGeoReferencedRasterSourceW
         using HttpClient httpClient = new(handler);
         TerrainTextureAssetGenerator generator = new(httpClient, disablePersistentCache: true);
 
-        await Assert.ThrowsAsync<FileNotFoundException>(
+        InvalidOperationException exception = await Assert.ThrowsAsync<InvalidOperationException>(
             async () => await generator.EnsureTextureAsync(overlay, CancellationToken.None));
 
+        Assert.Contains("missing.tif", exception.Message, StringComparison.Ordinal);
+        Assert.Contains(TerrainTextureDescriptorFormatting.FormatBounds(bounds), exception.Message, StringComparison.Ordinal);
+        Assert.IsType<FileNotFoundException>(exception.InnerException);
         Assert.Equal(0, handler.RequestCount);
     }