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

Revert commit

Browse source
This commit is contained in:
ClemensFischer 2025-03-22 17:11:58 +01:00
parent f1fa37a9a5
commit 4cabda97a4
8 changed files with 7 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

5
SampleApps/AvaloniaApp/MainWindow.axaml
View file

@ -64,10 +64,7 @@
<map:MapItemsControl ItemsSource="{Binding Pushpins}" <map:MapItemsControl ItemsSource="{Binding Pushpins}"
SelectedItem="{Binding SelectedPushpin}" SelectedItem="{Binding SelectedPushpin}"
SelectionMode="Multiple" SelectionMode="Multiple"
SelectionChanged="MapItemsControlSelectionChanged" SelectionChanged="MapItemsControlSelectionChanged">
PointerPressed="MapItemsControl_PointerPressed"
PointerReleased="MapItemsControl_PointerReleased"
Tapped="MapItemsControl_Tapped">
<map:MapItemsControl.Styles> <map:MapItemsControl.Styles>
<Style Selector="map|MapItem"> <Style Selector="map|MapItem">
<Setter Property="map:MapPanel.Location" Value="{Binding Location}"/> <Setter Property="map:MapPanel.Location" Value="{Binding Location}"/>

17
SampleApps/AvaloniaApp/MainWindow.axaml.cs
View file

@ -12,7 +12,7 @@ namespace SampleApplication
{ {
public MainWindow() public MainWindow()
{ {
TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder); //TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder);
Closed += (s, e) => (TileImageLoader.Cache as IDisposable)?.Dispose(); Closed += (s, e) => (TileImageLoader.Cache as IDisposable)?.Dispose();
InitializeComponent(); InitializeComponent();
@ -140,20 +140,5 @@ namespace SampleApplication
return string.Format(CultureInfo.InvariantCulture, "\n {0:" + distanceFormat + "} {1}", distance, unit); return string.Format(CultureInfo.InvariantCulture, "\n {0:" + distanceFormat + "} {1}", distance, unit);
} }
private void MapItemsControl_PointerPressed(object sender, Avalonia.Input.PointerPressedEventArgs e)
{
Debug.WriteLine("PointerPressed");
}
private void MapItemsControl_PointerReleased(object sender, Avalonia.Input.PointerReleasedEventArgs e)
{
Debug.WriteLine("PointerReleased");
}
private void MapItemsControl_Tapped(object sender, Avalonia.Input.TappedEventArgs e)
{
Debug.WriteLine("Tapped");
}
} }
} }

2
SampleApps/UniversalApp/MainPage.xaml.cs
View file

@ -15,7 +15,7 @@ namespace SampleApplication
{ {
public MainPage() public MainPage()
{ {
TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder); //TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder);
InitializeComponent(); InitializeComponent();
AddTestLayers(); AddTestLayers();

6
SampleApps/WinUiApp/MainWindow.xaml
View file

@ -164,11 +164,7 @@
SelectedItem="{Binding SelectedPushpin, Mode=TwoWay}" SelectedItem="{Binding SelectedPushpin, Mode=TwoWay}"
SelectionMode="Extended" SelectionMode="Extended"
LocationMemberPath="Location" LocationMemberPath="Location"
SelectionChanged="MapItemsControlSelectionChanged" SelectionChanged="MapItemsControlSelectionChanged"/>
PointerPressed="MapItemsControl_PointerPressed"
PointerReleased="MapItemsControl_PointerReleased"
Tapped="MapItemsControl_Tapped"
RightTapped="MapItemsControl_RightTapped"/>
<map:MapPath Location="53.5,8.2" Stroke="Blue" StrokeThickness="3" Fill="#1F007F00" IsHitTestVisible="False"> <map:MapPath Location="53.5,8.2" Stroke="Blue" StrokeThickness="3" Fill="#1F007F00" IsHitTestVisible="False">
<map:MapPath.Data> <map:MapPath.Data>

22
SampleApps/WinUiApp/MainWindow.xaml.cs
View file

@ -15,7 +15,7 @@ namespace SampleApplication
{ {
public MainWindow() public MainWindow()
{ {
TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder); //TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder);
//TileImageLoader.Cache = new MapControl.Caching.SQLiteCache(TileImageLoader.DefaultCacheFolder); //TileImageLoader.Cache = new MapControl.Caching.SQLiteCache(TileImageLoader.DefaultCacheFolder);
Closed += (s, e) => (TileImageLoader.Cache as IDisposable)?.Dispose(); Closed += (s, e) => (TileImageLoader.Cache as IDisposable)?.Dispose();
@ -148,25 +148,5 @@ namespace SampleApplication
return string.Format(CultureInfo.InvariantCulture, "\n {0:" + distanceFormat + "} {1}", distance, unit); return string.Format(CultureInfo.InvariantCulture, "\n {0:" + distanceFormat + "} {1}", distance, unit);
} }
private void MapItemsControl_Tapped(object sender, TappedRoutedEventArgs e)
{
Debug.WriteLine("MapItemsControl_Tapped");
}
private void MapItemsControl_RightTapped(object sender, RightTappedRoutedEventArgs e)
{
Debug.WriteLine("MapItemsControl_RightTapped");
}
private void MapItemsControl_PointerPressed(object sender, PointerRoutedEventArgs e)
{
Debug.WriteLine("MapItemsControl_PointerPressed");
}
private void MapItemsControl_PointerReleased(object sender, PointerRoutedEventArgs e)
{
Debug.WriteLine("MapItemsControl_PointerReleased");
}
} }
} }

14
SampleApps/WpfApplication/MainWindow.xaml
View file

@ -136,19 +136,7 @@
ItemsSource="{Binding Pushpins}" ItemsSource="{Binding Pushpins}"
SelectedItem="{Binding SelectedPushpin}" SelectedItem="{Binding SelectedPushpin}"
SelectionMode="Extended" SelectionMode="Extended"
SelectionChanged="MapItemsControlSelectionChanged" SelectionChanged="MapItemsControlSelectionChanged"/>
PreviewMouseLeftButtonDown="MapItemsControl_PreviewMouseLeftButtonDown"
PreviewMouseLeftButtonUp="MapItemsControl_PreviewMouseLeftButtonUp"
PreviewMouseRightButtonDown="MapItemsControl_PreviewMouseRightButtonDown"
PreviewMouseRightButtonUp="MapItemsControl_PreviewMouseRightButtonUp"
PreviewTouchDown="MapItemsControl_PreviewTouchDown"
PreviewTouchUp="MapItemsControl_PreviewTouchUp"
MouseLeftButtonDown="MapItemsControl_MouseLeftButtonDown"
MouseLeftButtonUp="MapItemsControl_MouseLeftButtonUp"
MouseRightButtonDown="MapItemsControl_MouseRightButtonDown"
MouseRightButtonUp="MapItemsControl_MouseRightButtonUp"
TouchDown="MapItemsControl_TouchDown"
TouchUp="MapItemsControl_TouchUp"/>
<map:Pushpin AutoCollapse="True" Location="65,-18" Content="Iceland"/> <map:Pushpin AutoCollapse="True" Location="65,-18" Content="Iceland"/>
<map:Pushpin AutoCollapse="True" Location="71,25" Content="Norway"/> <map:Pushpin AutoCollapse="True" Location="71,25" Content="Norway"/>

2
SampleApps/WpfApplication/MainWindow.xaml.cs
View file

@ -14,7 +14,7 @@ namespace SampleApplication
public MainWindow() public MainWindow()
{ {
//TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder); //TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder);
TileImageLoader.Cache = new MapControl.Caching.SQLiteCache(TileImageLoader.DefaultCacheFolder); //TileImageLoader.Cache = new MapControl.Caching.SQLiteCache(TileImageLoader.DefaultCacheFolder);
//TileImageLoader.Cache = new MapControl.Caching.FileDbCache(TileImageLoader.DefaultCacheFolder); //TileImageLoader.Cache = new MapControl.Caching.FileDbCache(TileImageLoader.DefaultCacheFolder);
Closed += (s, e) => (TileImageLoader.Cache as IDisposable)?.Dispose(); Closed += (s, e) => (TileImageLoader.Cache as IDisposable)?.Dispose();

2
SampleApps/WpfApplication/WpfApplication.csproj
View file

@ -30,8 +30,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Caches\FileDbCache\FileDbCache.csproj" />
<ProjectReference Include="..\..\Caches\SQLiteCache\SQLiteCache.csproj" />
<ProjectReference Include="..\..\MapUiTools\WPF\MapUiTools.WPF.csproj" /> <ProjectReference Include="..\..\MapUiTools\WPF\MapUiTools.WPF.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>