azaion/satellite-provider
1
0
Fork 0
mirror of https://github.com/azaion/satellite-provider.git synced 2026-04-22 03:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add CORS configuration and tile handling improvements

Browse Source
This commit is contained in:
Oleksandr Bezdieniezhnykh
2026-03-26 00:34:42 +02:00
parent 604f0e070d
commit f08058ea9c
9 changed files with 159 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SatelliteProvider.Api/Program.cs
+88 -2
View File
@@ -1,5 +1,6 @@
using System.ComponentModel.DataAnnotations;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.SwaggerGen;
using SatelliteProvider.DataAccess;
@@ -8,6 +9,7 @@ using SatelliteProvider.DataAccess.Repositories;
using SatelliteProvider.Common.Configs;
using SatelliteProvider.Common.DTO;
using SatelliteProvider.Common.Interfaces;
using SatelliteProvider.Common.Utils;
using SatelliteProvider.Services;
using Serilog;
@@ -28,9 +30,22 @@ builder.Services.AddSingleton<IRegionRepository>(sp => new RegionRepository(conn
builder.Services.AddSingleton<IRouteRepository>(sp => new RouteRepository(connectionString, sp.GetRequiredService<ILogger<RouteRepository>>()));
builder.Services.AddHttpClient();
builder.Services.AddMemoryCache();
builder.Services.AddSingleton<GoogleMapsDownloaderV2>();
builder.Services.AddSingleton<ITileService, TileService>();
var allowedOrigins = builder.Configuration.GetSection("CorsConfig:AllowedOrigins").Get<string[]>() ?? Array.Empty<string>();
builder.Services.AddCors(options =>
{
options.AddPolicy("TilesCors", policy =>
{
if (allowedOrigins.Length > 0)
policy.WithOrigins(allowedOrigins).AllowAnyHeader().AllowAnyMethod();
else
policy.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod();
});
});
var processingConfig = builder.Configuration.GetSection("ProcessingConfig").Get<ProcessingConfig>() ?? new ProcessingConfig();
builder.Services.AddSingleton<IRegionRequestQueue>(sp =>
{
@@ -93,6 +108,10 @@ if (app.Environment.IsDevelopment())
}
app.UseHttpsRedirection();
app.UseCors("TilesCors");
app.MapGet("/tiles/{z:int}/{x:int}/{y:int}", ServeTile)
.WithOpenApi(op => new(op) { Summary = "Get satellite tile image by z/x/y coordinates (Slippy Map tile server)" });
app.MapGet("/api/satellite/tiles/latlon", GetTileByLatLon)
.WithOpenApi(op => new(op) { Summary = "Get satellite tile by latitude and longitude coordinates" });
@@ -119,6 +138,71 @@ app.MapGet("/api/satellite/route/{id:guid}", GetRoute)
app.Run();
async Task<IResult> ServeTile(int z, int x, int y, HttpContext httpContext, ITileRepository tileRepository, GoogleMapsDownloaderV2 downloader, IMemoryCache cache, ILogger<Program> logger)
{
var cacheKey = $"tile_{z}_{x}_{y}";
try
{
if (cache.TryGetValue(cacheKey, out byte[]? cachedBytes) && cachedBytes != null)
{
httpContext.Response.Headers.CacheControl = "public, max-age=86400";
httpContext.Response.Headers.ETag = $"\"{z}_{x}_{y}\"";
return Results.Bytes(cachedBytes, "image/jpeg");
}
string? filePath = null;
var tile = await tileRepository.GetByTileCoordinatesAsync(z, x, y);
if (tile != null && File.Exists(tile.FilePath))
{
filePath = tile.FilePath;
}
else
{
var tileCenter = GeoUtils.TileToWorldPos(x, y, z);
var downloadedTile = await downloader.DownloadSingleTileAsync(tileCenter.Lat, tileCenter.Lon, z);
var now = DateTime.UtcNow;
var tileEntity = new TileEntity
{
Id = Guid.NewGuid(),
TileZoom = z,
TileX = downloadedTile.X,
TileY = downloadedTile.Y,
Latitude = downloadedTile.CenterLatitude,
Longitude = downloadedTile.CenterLongitude,
TileSizeMeters = downloadedTile.TileSizeMeters,
TileSizePixels = 256,
ImageType = "jpg",
MapsVersion = $"downloaded_{now:yyyy-MM-dd}",
Version = now.Year,
FilePath = downloadedTile.FilePath,
CreatedAt = now,
UpdatedAt = now
};
await tileRepository.InsertAsync(tileEntity);
filePath = tileEntity.FilePath;
}
var bytes = await File.ReadAllBytesAsync(filePath);
cache.Set(cacheKey, bytes, new MemoryCacheEntryOptions
{
AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(1),
SlidingExpiration = TimeSpan.FromMinutes(30)
});
httpContext.Response.Headers.CacheControl = "public, max-age=86400";
httpContext.Response.Headers.ETag = $"\"{z}_{x}_{y}\"";
return Results.Bytes(bytes, "image/jpeg");
}
catch (Exception ex)
{
logger.LogError(ex, "Failed to serve tile {Z}/{X}/{Y}", z, x, y);
return Results.Problem(detail: ex.Message, statusCode: 500);
}
}
async Task<IResult> GetTileByLatLon([FromQuery] double Latitude, [FromQuery] double Longitude, [FromQuery] int ZoomLevel, GoogleMapsDownloaderV2 downloader, ITileRepository tileRepository, ILogger<Program> logger)
{
try
@@ -133,7 +217,9 @@ async Task<IResult> GetTileByLatLon([FromQuery] double Latitude, [FromQuery] dou
var tileEntity = new TileEntity
{
Id = Guid.NewGuid(),
ZoomLevel = downloadedTile.ZoomLevel,
TileZoom = downloadedTile.ZoomLevel,
TileX = downloadedTile.X,
TileY = downloadedTile.Y,
Latitude = downloadedTile.CenterLatitude,
Longitude = downloadedTile.CenterLongitude,
TileSizeMeters = downloadedTile.TileSizeMeters,
@@ -151,7 +237,7 @@ async Task<IResult> GetTileByLatLon([FromQuery] double Latitude, [FromQuery] dou
var response = new DownloadTileResponse
{
Id = tileEntity.Id,
ZoomLevel = tileEntity.ZoomLevel,
ZoomLevel = tileEntity.TileZoom,
Latitude = tileEntity.Latitude,
Longitude = tileEntity.Longitude,
TileSizeMeters = tileEntity.TileSizeMeters,
SatelliteProvider.Api/appsettings.json
+3
View File
@@ -38,5 +38,8 @@
"QueueCapacity": 1000,
"DelayBetweenRequestsMs": 50,
"SessionTokenReuseCount": 100
},
"CorsConfig": {
"AllowedOrigins": []
}
}
SatelliteProvider.Common/DTO/TileMetadata.cs
+3 -2
View File
@@ -3,7 +3,9 @@ namespace SatelliteProvider.Common.DTO;
public class TileMetadata
{
public Guid Id { get; set; }
public int ZoomLevel { get; set; }
public int TileZoom { get; set; }
public int TileX { get; set; }
public int TileY { get; set; }
public double Latitude { get; set; }
public double Longitude { get; set; }
public double TileSizeMeters { get; set; }
@@ -15,4 +17,3 @@ public class TileMetadata
public DateTime CreatedAt { get; set; }
public DateTime UpdatedAt { get; set; }
}
SatelliteProvider.DataAccess/Migrations/011_AddTileCoordinates.sql
+18
View File
@@ -0,0 +1,18 @@
ALTER TABLE tiles RENAME COLUMN zoom_level TO tile_zoom;
ALTER TABLE tiles ADD COLUMN tile_x INT;
ALTER TABLE tiles ADD COLUMN tile_y INT;
UPDATE tiles SET
tile_x = FLOOR((longitude + 180.0) / 360.0 * POWER(2, tile_zoom))::INT,
tile_y = FLOOR((1.0 - LN(TAN(RADIANS(latitude)) + 1.0 / COS(RADIANS(latitude))) / PI()) / 2.0 * POWER(2, tile_zoom))::INT;
ALTER TABLE tiles ALTER COLUMN tile_x SET NOT NULL;
ALTER TABLE tiles ALTER COLUMN tile_y SET NOT NULL;
DROP INDEX IF EXISTS idx_tiles_zoom;
DROP INDEX IF EXISTS idx_tiles_unique_location;
CREATE INDEX idx_tiles_zoom ON tiles(tile_zoom);
CREATE UNIQUE INDEX idx_tiles_unique_location ON tiles(latitude, longitude, tile_zoom, tile_size_meters, version);
CREATE INDEX idx_tiles_coordinates ON tiles(tile_zoom, tile_x, tile_y, version);
SatelliteProvider.DataAccess/Models/TileEntity.cs
+3 -2
View File
@@ -3,7 +3,9 @@ namespace SatelliteProvider.DataAccess.Models;
public class TileEntity
{
public Guid Id { get; set; }
public int ZoomLevel { get; set; }
public int TileZoom { get; set; }
public int TileX { get; set; }
public int TileY { get; set; }
public double Latitude { get; set; }
public double Longitude { get; set; }
public double TileSizeMeters { get; set; }
@@ -15,4 +17,3 @@ public class TileEntity
public DateTime CreatedAt { get; set; }
public DateTime UpdatedAt { get; set; }
}
SatelliteProvider.DataAccess/Repositories/ITileRepository.cs
+1 -1
View File
@@ -5,10 +5,10 @@ namespace SatelliteProvider.DataAccess.Repositories;
public interface ITileRepository
{
Task<TileEntity?> GetByIdAsync(Guid id);
Task<TileEntity?> GetByTileCoordinatesAsync(int tileZoom, int tileX, int tileY);
Task<TileEntity?> FindExistingTileAsync(double latitude, double longitude, double tileSizeMeters, int zoomLevel, int version);
Task<IEnumerable<TileEntity>> GetTilesByRegionAsync(double latitude, double longitude, double sizeMeters, int zoomLevel);
Task<Guid> InsertAsync(TileEntity tile);
Task<int> UpdateAsync(TileEntity tile);
Task<int> DeleteAsync(Guid id);
}
SatelliteProvider.DataAccess/Repositories/TileRepository.cs
+36 -14
View File
@@ -20,22 +20,40 @@ public class TileRepository : ITileRepository
{
using var connection = new NpgsqlConnection(_connectionString);
const string sql = @"
SELECT id, zoom_level as ZoomLevel, latitude, longitude,
SELECT id, tile_zoom as TileZoom, tile_x as TileX, tile_y as TileY,
latitude, longitude,
tile_size_meters as TileSizeMeters, tile_size_pixels as TileSizePixels,
image_type as ImageType, maps_version as MapsVersion, version,
file_path as FilePath, created_at as CreatedAt, updated_at as UpdatedAt
FROM tiles
WHERE id = @Id";
var tile = await connection.QuerySingleOrDefaultAsync<TileEntity>(sql, new { Id = id });
return tile;
return await connection.QuerySingleOrDefaultAsync<TileEntity>(sql, new { Id = id });
}
public async Task<TileEntity?> GetByTileCoordinatesAsync(int tileZoom, int tileX, int tileY)
{
using var connection = new NpgsqlConnection(_connectionString);
const string sql = @"
SELECT id, tile_zoom as TileZoom, tile_x as TileX, tile_y as TileY,
latitude, longitude,
tile_size_meters as TileSizeMeters, tile_size_pixels as TileSizePixels,
image_type as ImageType, maps_version as MapsVersion, version,
file_path as FilePath, created_at as CreatedAt, updated_at as UpdatedAt
FROM tiles
WHERE tile_zoom = @TileZoom AND tile_x = @TileX AND tile_y = @TileY
ORDER BY version DESC
LIMIT 1";
return await connection.QuerySingleOrDefaultAsync<TileEntity>(sql, new { TileZoom = tileZoom, TileX = tileX, TileY = tileY });
}
public async Task<TileEntity?> FindExistingTileAsync(double latitude, double longitude, double tileSizeMeters, int zoomLevel, int version)
{
using var connection = new NpgsqlConnection(_connectionString);
const string sql = @"
SELECT id, zoom_level as ZoomLevel, latitude, longitude,
SELECT id, tile_zoom as TileZoom, tile_x as TileX, tile_y as TileY,
latitude, longitude,
tile_size_meters as TileSizeMeters, tile_size_pixels as TileSizePixels,
image_type as ImageType, maps_version as MapsVersion, version,
file_path as FilePath, created_at as CreatedAt, updated_at as UpdatedAt
@@ -43,7 +61,7 @@ public class TileRepository : ITileRepository
WHERE ABS(latitude - @Latitude) < 0.0001
AND ABS(longitude - @Longitude) < 0.0001
AND ABS(tile_size_meters - @TileSizeMeters) < 1
AND zoom_level = @ZoomLevel
AND tile_zoom = @TileZoom
AND version = @Version
LIMIT 1";
@@ -52,7 +70,7 @@ public class TileRepository : ITileRepository
Latitude = latitude,
Longitude = longitude,
TileSizeMeters = tileSizeMeters,
ZoomLevel = zoomLevel,
TileZoom = zoomLevel,
Version = version
});
}
@@ -73,14 +91,15 @@ public class TileRepository : ITileRepository
var lonRange = expandedSizeMeters / (111000.0 * Math.Cos(latitude * Math.PI / 180.0));
const string sql = @"
SELECT id, zoom_level as ZoomLevel, latitude, longitude,
SELECT id, tile_zoom as TileZoom, tile_x as TileX, tile_y as TileY,
latitude, longitude,
tile_size_meters as TileSizeMeters, tile_size_pixels as TileSizePixels,
image_type as ImageType, maps_version as MapsVersion, version,
file_path as FilePath, created_at as CreatedAt, updated_at as UpdatedAt
FROM tiles
WHERE latitude BETWEEN @MinLat AND @MaxLat
AND longitude BETWEEN @MinLon AND @MaxLon
AND zoom_level = @ZoomLevel
AND tile_zoom = @TileZoom
ORDER BY version DESC, latitude DESC, longitude ASC";
return await connection.QueryAsync<TileEntity>(sql, new
@@ -89,7 +108,7 @@ public class TileRepository : ITileRepository
MaxLat = latitude + latRange / 2,
MinLon = longitude - lonRange / 2,
MaxLon = longitude + lonRange / 2,
ZoomLevel = zoomLevel
TileZoom = zoomLevel
});
}
@@ -97,15 +116,17 @@ public class TileRepository : ITileRepository
{
using var connection = new NpgsqlConnection(_connectionString);
const string sql = @"
INSERT INTO tiles (id, zoom_level, latitude, longitude, tile_size_meters,
INSERT INTO tiles (id, tile_zoom, tile_x, tile_y, latitude, longitude, tile_size_meters,
tile_size_pixels, image_type, maps_version, version, file_path,
created_at, updated_at)
VALUES (@Id, @ZoomLevel, @Latitude, @Longitude, @TileSizeMeters,
VALUES (@Id, @TileZoom, @TileX, @TileY, @Latitude, @Longitude, @TileSizeMeters,
@TileSizePixels, @ImageType, @MapsVersion, @Version, @FilePath,
@CreatedAt, @UpdatedAt)
ON CONFLICT (latitude, longitude, zoom_level, tile_size_meters, version)
ON CONFLICT (latitude, longitude, tile_zoom, tile_size_meters, version)
DO UPDATE SET
file_path = EXCLUDED.file_path,
tile_x = EXCLUDED.tile_x,
tile_y = EXCLUDED.tile_y,
updated_at = EXCLUDED.updated_at
RETURNING id";
@@ -117,7 +138,9 @@ public class TileRepository : ITileRepository
using var connection = new NpgsqlConnection(_connectionString);
const string sql = @"
UPDATE tiles
SET zoom_level = @ZoomLevel,
SET tile_zoom = @TileZoom,
tile_x = @TileX,
tile_y = @TileY,
latitude = @Latitude,
longitude = @Longitude,
tile_size_meters = @TileSizeMeters,
@@ -139,4 +162,3 @@ public class TileRepository : ITileRepository
return await connection.ExecuteAsync(sql, new { Id = id });
}
}
SatelliteProvider.Services/GoogleMapsDownloaderV2.cs
+1 -1
View File
@@ -256,7 +256,7 @@ public class GoogleMapsDownloaderV2
var existingTile = existingTiles.FirstOrDefault(t =>
Math.Abs(t.Latitude - tileCenter.Lat) < 0.0001 &&
Math.Abs(t.Longitude - tileCenter.Lon) < 0.0001 &&
t.ZoomLevel == zoomLevel);
t.TileZoom == zoomLevel);
if (existingTile != null)
{
SatelliteProvider.Services/TileService.cs
+6 -3
View File
@@ -59,7 +59,9 @@ public class TileService : ITileService
var tileEntity = new TileEntity
{
Id = Guid.NewGuid(),
ZoomLevel = downloadedTile.ZoomLevel,
TileZoom = downloadedTile.ZoomLevel,
TileX = downloadedTile.X,
TileY = downloadedTile.Y,
Latitude = downloadedTile.CenterLatitude,
Longitude = downloadedTile.CenterLongitude,
TileSizeMeters = downloadedTile.TileSizeMeters,
@@ -100,7 +102,9 @@ public class TileService : ITileService
return new TileMetadata
{
Id = entity.Id,
ZoomLevel = entity.ZoomLevel,
TileZoom = entity.TileZoom,
TileX = entity.TileX,
TileY = entity.TileY,
Latitude = entity.Latitude,
Longitude = entity.Longitude,
TileSizeMeters = entity.TileSizeMeters,
@@ -114,4 +118,3 @@ public class TileService : ITileService
};
}
}