mirror of
https://github.com/azaion/satellite-provider.git
synced 2026-04-22 09:06:38 +00:00
tiles are cached and reused properly
This commit is contained in:
@@ -46,72 +46,46 @@ public class TileService : ITileService
|
||||
}
|
||||
|
||||
var centerPoint = new GeoPoint(latitude, longitude);
|
||||
var downloadedTiles = await _downloader.GetTilesWithMetadataAsync(centerPoint, sizeMeters / 2, zoomLevel, cancellationToken);
|
||||
var downloadedTiles = await _downloader.GetTilesWithMetadataAsync(
|
||||
centerPoint,
|
||||
sizeMeters / 2,
|
||||
zoomLevel,
|
||||
existingTilesList,
|
||||
cancellationToken);
|
||||
|
||||
_logger.LogInformation("Downloaded {Count} tiles from Google:", downloadedTiles.Count);
|
||||
foreach (var dt in downloadedTiles)
|
||||
{
|
||||
_logger.LogInformation(" Downloaded: Lat={Lat:F12}, Lon={Lon:F12}, Zoom={Zoom}", dt.CenterLatitude, dt.CenterLongitude, dt.ZoomLevel);
|
||||
}
|
||||
_logger.LogInformation("Downloaded {Count} new tiles from Google", downloadedTiles.Count);
|
||||
|
||||
var result = new List<TileMetadata>();
|
||||
int reusedCount = 0;
|
||||
int downloadedCount = 0;
|
||||
int reusedCount = existingTilesList.Count;
|
||||
int downloadedCount = downloadedTiles.Count;
|
||||
|
||||
foreach (var existingTile in existingTilesList)
|
||||
{
|
||||
result.Add(MapToMetadata(existingTile));
|
||||
}
|
||||
|
||||
foreach (var downloadedTile in downloadedTiles)
|
||||
{
|
||||
var existingTile = existingTilesList.FirstOrDefault(t =>
|
||||
Math.Abs(t.Latitude - downloadedTile.CenterLatitude) < 0.0001 &&
|
||||
Math.Abs(t.Longitude - downloadedTile.CenterLongitude) < 0.0001 &&
|
||||
t.ZoomLevel == downloadedTile.ZoomLevel);
|
||||
|
||||
if (existingTile != null)
|
||||
var now = DateTime.UtcNow;
|
||||
var tileEntity = new TileEntity
|
||||
{
|
||||
reusedCount++;
|
||||
_logger.LogInformation("REUSED tile at ({Lat:F12}, {Lon:F12}) - matched DB tile ID {Id}", downloadedTile.CenterLatitude, downloadedTile.CenterLongitude, existingTile.Id);
|
||||
result.Add(MapToMetadata(existingTile));
|
||||
}
|
||||
else
|
||||
{
|
||||
downloadedCount++;
|
||||
_logger.LogInformation("NEW tile needed at ({Lat:F12}, {Lon:F12}) - no match in DB", downloadedTile.CenterLatitude, downloadedTile.CenterLongitude);
|
||||
|
||||
var closestTile = existingTilesList
|
||||
.Select(t => new {
|
||||
Tile = t,
|
||||
LatDiff = Math.Abs(t.Latitude - downloadedTile.CenterLatitude),
|
||||
LonDiff = Math.Abs(t.Longitude - downloadedTile.CenterLongitude)
|
||||
})
|
||||
.OrderBy(x => x.LatDiff + x.LonDiff)
|
||||
.FirstOrDefault();
|
||||
|
||||
if (closestTile != null)
|
||||
{
|
||||
_logger.LogInformation(" Closest DB tile: Lat={Lat:F12} (diff={LatDiff:F12}), Lon={Lon:F12} (diff={LonDiff:F12})",
|
||||
closestTile.Tile.Latitude, closestTile.LatDiff, closestTile.Tile.Longitude, closestTile.LonDiff);
|
||||
}
|
||||
|
||||
var now = DateTime.UtcNow;
|
||||
var tileEntity = new TileEntity
|
||||
{
|
||||
Id = Guid.NewGuid(),
|
||||
ZoomLevel = downloadedTile.ZoomLevel,
|
||||
Latitude = downloadedTile.CenterLatitude,
|
||||
Longitude = downloadedTile.CenterLongitude,
|
||||
TileSizeMeters = downloadedTile.TileSizeMeters,
|
||||
TileSizePixels = 256,
|
||||
ImageType = "jpg",
|
||||
MapsVersion = $"downloaded_{now:yyyy-MM-dd}",
|
||||
Version = currentVersion,
|
||||
FilePath = downloadedTile.FilePath,
|
||||
CreatedAt = now,
|
||||
UpdatedAt = now
|
||||
};
|
||||
Id = Guid.NewGuid(),
|
||||
ZoomLevel = downloadedTile.ZoomLevel,
|
||||
Latitude = downloadedTile.CenterLatitude,
|
||||
Longitude = downloadedTile.CenterLongitude,
|
||||
TileSizeMeters = downloadedTile.TileSizeMeters,
|
||||
TileSizePixels = 256,
|
||||
ImageType = "jpg",
|
||||
MapsVersion = $"downloaded_{now:yyyy-MM-dd}",
|
||||
Version = currentVersion,
|
||||
FilePath = downloadedTile.FilePath,
|
||||
CreatedAt = now,
|
||||
UpdatedAt = now
|
||||
};
|
||||
|
||||
await _tileRepository.InsertAsync(tileEntity);
|
||||
_logger.LogInformation("Saved new tile {Id} at ({Lat:F12}, {Lon:F12}) version {Version}", tileEntity.Id, tileEntity.Latitude, tileEntity.Longitude, currentVersion);
|
||||
result.Add(MapToMetadata(tileEntity));
|
||||
}
|
||||
await _tileRepository.InsertAsync(tileEntity);
|
||||
_logger.LogInformation("Saved new tile {Id} at ({Lat:F12}, {Lon:F12}) version {Version}", tileEntity.Id, tileEntity.Latitude, tileEntity.Longitude, currentVersion);
|
||||
result.Add(MapToMetadata(tileEntity));
|
||||
}
|
||||
|
||||
_logger.LogInformation("Tile processing summary: {Reused} reused, {Downloaded} new", reusedCount, downloadedCount);
|
||||
|
||||
Reference in New Issue
Block a user