azaion/satellite-provider
1
0
Fork 0
mirror of https://github.com/azaion/satellite-provider.git synced 2026-04-22 08: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.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 });
}
}