ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: ClemensFischer:eebf17e6feac68c5376c2c18bd650e9c55d28b44
Branches Tags
ClemensFischer:master
...
compare: ClemensFischer:f63fba98c119166b026a3d9b4dffac29800a3cb1
Branches Tags
ClemensFischer:master

2 commits
eebf17e6fe ... f63fba98c1

Author SHA1 Message Date
ClemensFischer f63fba98c1 Updated PackageReferences 2025-11-23 18:39:05 +01:00
ClemensFischer 8c53587643 TilePyramidLayer overrides 2025-11-23 17:29:30 +01:00
7 changed files with 31 additions and 31 deletions
Show stats Expand all files Collapse all files

2
MBTiles/Avalonia/MBTiles.Avalonia.csproj
View file

@ -19,7 +19,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.3.8" /> <PackageReference Include="Avalonia" Version="11.3.9" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" /> <PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
MapControl/Avalonia/MapControl.Avalonia.csproj
View file

@ -16,7 +16,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.3.8" /> <PackageReference Include="Avalonia" Version="11.3.9" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
</ItemGroup> </ItemGroup>

28
MapControl/Shared/MapTileLayer.cs
View file

@ -115,6 +115,20 @@ namespace MapControl
return finalSize; return finalSize;
} }
protected override void UpdateRenderTransform()
{
if (TileMatrix != null)
{
// Tile matrix origin in pixels.
//
var tileMatrixOrigin = new Point(TileSize * TileMatrix.XMin, TileSize * TileMatrix.YMin);
var tileMatrixScale = MapBase.ZoomLevelToScale(TileMatrix.ZoomLevel);
((MatrixTransform)RenderTransform).Matrix =
ParentMap.ViewTransform.GetTileLayerTransform(tileMatrixScale, MapTopLeft, tileMatrixOrigin);
}
}
protected override void UpdateTileCollection(bool reset) protected override void UpdateTileCollection(bool reset)
{ {
if (ParentMap == null || !SupportedCrsIds.Contains(ParentMap.MapProjection.CrsId)) if (ParentMap == null || !SupportedCrsIds.Contains(ParentMap.MapProjection.CrsId))
@ -132,20 +146,6 @@ namespace MapControl
} }
} }
protected override void UpdateRenderTransform()
{
if (TileMatrix != null)
{
// Tile matrix origin in pixels.
//
var tileMatrixOrigin = new Point(TileSize * TileMatrix.XMin, TileSize * TileMatrix.YMin);
var tileMatrixScale = MapBase.ZoomLevelToScale(TileMatrix.ZoomLevel);
((MatrixTransform)RenderTransform).Matrix =
ParentMap.ViewTransform.GetTileLayerTransform(tileMatrixScale, MapTopLeft, tileMatrixOrigin);
}
}
private bool SetTileMatrix() private bool SetTileMatrix()
{ {
// Add 0.001 to avoid rounding issues. // Add 0.001 to avoid rounding issues.

16
MapControl/Shared/WmtsTileLayer.cs
View file

@ -100,6 +100,14 @@ namespace MapControl
return finalSize; return finalSize;
} }
protected override void UpdateRenderTransform()
{
foreach (var layer in ChildLayers)
{
layer.UpdateRenderTransform(ParentMap.ViewTransform);
}
}
protected override void UpdateTileCollection(bool reset) protected override void UpdateTileCollection(bool reset)
{ {
// reset parameter is ignored here because it is always false. // reset parameter is ignored here because it is always false.
@ -133,14 +141,6 @@ namespace MapControl
} }
} }
protected override void UpdateRenderTransform()
{
foreach (var layer in ChildLayers)
{
layer.UpdateRenderTransform(ParentMap.ViewTransform);
}
}
private bool UpdateChildLayers(WmtsTileMatrixSet tileMatrixSet) private bool UpdateChildLayers(WmtsTileMatrixSet tileMatrixSet)
{ {
// Multiply scale by 1.001 to avoid rounding issues. // Multiply scale by 1.001 to avoid rounding issues.

2
MapProjections/Avalonia/MapProjections.Avalonia.csproj
View file

@ -19,7 +19,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.3.8" /> <PackageReference Include="Avalonia" Version="11.3.9" />
<PackageReference Include="ProjNET4GeoAPI" Version="1.4.1" /> <PackageReference Include="ProjNET4GeoAPI" Version="1.4.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
MapUiTools/Avalonia/MapUiTools.Avalonia.csproj
View file

@ -25,7 +25,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.3.8" /> <PackageReference Include="Avalonia" Version="11.3.9" />
<PackageReference Include="Markdown.Avalonia.Tight" Version="11.0.2" /> <PackageReference Include="Markdown.Avalonia.Tight" Version="11.0.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

10
SampleApps/AvaloniaApp/AvaloniaApp.csproj
View file

@ -28,11 +28,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.3.8" /> <PackageReference Include="Avalonia" Version="11.3.9" />
<PackageReference Include="Avalonia.Desktop" Version="11.3.8" /> <PackageReference Include="Avalonia.Desktop" Version="11.3.9" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.8" /> <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.9" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.8" /> <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.9" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.8" /> <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.9" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>