ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-04-05 14:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

ImageLoader

Browse source
This commit is contained in:
ClemensFischer 2025-01-01 19:45:40 +01:00
parent 560f44a139
commit 069072ce34
6 changed files with 73 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

16
MapControl/WinUI/GeoImage.WinUI.cs
View file

@ -18,9 +18,9 @@ namespace MapControl
{
private static async Task<GeoBitmap> LoadGeoTiffAsync(string sourcePath)
{
BitmapSource bitmapSource;
Matrix transformMatrix;
MapProjection mapProjection = null;
BitmapSource bitmap;
Matrix transform;
MapProjection projection = null;
var file = await StorageFile.GetFileFromPathAsync(FilePath.GetFullPath(sourcePath));
@ -28,7 +28,7 @@ namespace MapControl
{
var decoder = await BitmapDecoder.CreateAsync(stream);
bitmapSource = await ImageLoader.LoadWriteableBitmapAsync(decoder);
bitmap = await ImageLoader.LoadWriteableBitmapAsync(decoder);
var geoKeyDirectoryQuery = QueryString(GeoKeyDirectoryTag);
var pixelScaleQuery = QueryString(ModelPixelScaleTag);
@ -50,13 +50,13 @@ namespace MapControl
tiePointValue.Value is double[] tiePoint &&
tiePoint.Length >= 6)
{
transformMatrix = new Matrix(pixelScale[0], 0d, 0d, -pixelScale[1], tiePoint[3], tiePoint[4]);
transform = new Matrix(pixelScale[0], 0d, 0d, -pixelScale[1], tiePoint[3], tiePoint[4]);
}
else if (metadata.TryGetValue(transformationQuery, out BitmapTypedValue transformValue) &&
transformValue.Value is double[] transformValues &&
transformValues.Length == 16)
{
transformMatrix = new Matrix(transformValues[0], transformValues[1],
transform = new Matrix(transformValues[0], transformValues[1],
transformValues[4], transformValues[5],
transformValues[3], transformValues[7]);
}
@ -68,11 +68,11 @@ namespace MapControl
if (metadata.TryGetValue(geoKeyDirectoryQuery, out BitmapTypedValue geoKeyDirValue) &&
geoKeyDirValue.Value is short[] geoKeyDirectory)
{
mapProjection = GetProjection(geoKeyDirectory);
projection = GetProjection(geoKeyDirectory);
}
}
return new GeoBitmap(bitmapSource, transformMatrix, mapProjection);
return new GeoBitmap(bitmap, transform, projection);
}
}
}

36
MapControl/WinUI/ImageLoader.WinUI.cs
View file

@ -72,13 +72,15 @@ namespace MapControl
internal static async Task<WriteableBitmap> LoadWriteableBitmapAsync(Uri uri)
{
WriteableBitmap image = null;
WriteableBitmap bitmap = null;
try
{
using (var stream = await RandomAccessStreamReference.CreateFromUri(uri).OpenReadAsync())
{
image = await LoadWriteableBitmapAsync(await BitmapDecoder.CreateAsync(stream));
var decoder = await BitmapDecoder.CreateAsync(stream);
bitmap = await LoadWriteableBitmapAsync(decoder);
}
}
catch (Exception ex)
@ -86,32 +88,32 @@ namespace MapControl
Debug.WriteLine($"{nameof(ImageLoader)}: {uri}: {ex.Message}");
}
return image;
return bitmap;
}
internal static async Task<ImageSource> LoadMergedImageAsync(Uri uri1, Uri uri2, IProgress<double> progress)
{
WriteableBitmap mergedImage = null;
WriteableBitmap mergedBitmap = null;
progress?.Report(0d);
var images = await Task.WhenAll(LoadWriteableBitmapAsync(uri1), LoadWriteableBitmapAsync(uri2));
var bitmaps = await Task.WhenAll(LoadWriteableBitmapAsync(uri1), LoadWriteableBitmapAsync(uri2));
if (images.Length == 2 &&
images[0] != null &&
images[1] != null &&
images[0].PixelHeight == images[1].PixelHeight)
if (bitmaps.Length == 2 &&
bitmaps[0] != null &&
bitmaps[1] != null &&
bitmaps[0].PixelHeight == bitmaps[1].PixelHeight)
{
var buffer1 = images[0].PixelBuffer;
var buffer2 = images[1].PixelBuffer;
var stride1 = (uint)images[0].PixelWidth * 4;
var stride2 = (uint)images[1].PixelWidth * 4;
var buffer1 = bitmaps[0].PixelBuffer;
var buffer2 = bitmaps[1].PixelBuffer;
var stride1 = (uint)bitmaps[0].PixelWidth * 4;
var stride2 = (uint)bitmaps[1].PixelWidth * 4;
var stride = stride1 + stride2;
var height = images[0].PixelHeight;
var height = bitmaps[0].PixelHeight;
mergedImage = new WriteableBitmap(images[0].PixelWidth + images[1].PixelWidth, height);
mergedBitmap = new WriteableBitmap(bitmaps[0].PixelWidth + bitmaps[1].PixelWidth, height);
var buffer = mergedImage.PixelBuffer;
var buffer = mergedBitmap.PixelBuffer;
for (uint y = 0; y < height; y++)
{
@ -122,7 +124,7 @@ namespace MapControl
progress?.Report(1d);
return mergedImage;
return mergedBitmap;
}
}
}