diff --git a/SampleApps/AvaloniaApp/MainWindow.axaml.cs b/SampleApps/AvaloniaApp/MainWindow.axaml.cs index e351be37..d582398a 100644 --- a/SampleApps/AvaloniaApp/MainWindow.axaml.cs +++ b/SampleApps/AvaloniaApp/MainWindow.axaml.cs @@ -13,19 +13,15 @@ namespace SampleApplication static MainWindow() { //MapProjectionFactory.Instance = new MapControl.Projections.GeoApiProjectionFactory(); - //TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder); } public MainWindow() { InitializeComponent(); - - AddMapTilerLayers(); AddTestLayers(); } - partial void AddMapTilerLayers(); partial void AddTestLayers(); private void MapItemsControlSelectionChanged(object sender, SelectionChangedEventArgs e) diff --git a/SampleApps/Shared/MapTilerLayers.cs b/SampleApps/Shared/MapTilerLayers.cs deleted file mode 100644 index 404e4641..00000000 --- a/SampleApps/Shared/MapTilerLayers.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using System.IO; -using MapControl; -using MapControl.UiTools; -#if WPF -using System.Windows.Media; -#elif WINUI -using Microsoft.UI; -using Microsoft.UI.Xaml.Media; -#elif UWP -using Windows.UI; -using Windows.UI.Xaml.Media; -#elif AVALONIA -using Avalonia.Media; -#endif - -namespace SampleApplication -{ -#if UWP - public partial class MainPage -#else - public partial class MainWindow -#endif - { - partial void AddMapTilerLayers() - { -#if UWP - var mapTilerApiKeyPath = "MapTilerApiKey.txt"; -#else - var mapTilerApiKeyPath = Path.Combine( - Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "MapControl", "MapTilerApiKey.txt"); -#endif - if (File.Exists(mapTilerApiKeyPath)) - { - string apiKey = File.ReadAllText(mapTilerApiKeyPath)?.Trim(); - - mapLayersMenuButton.MapLayers.Add(new MapLayerItem - { - Text = "MapTiler Satellite", - Layer = new MapTileLayer - { - TileSource = new TileSource { UriTemplate = "https://api.maptiler.com/maps/satellite/{z}/{x}/{y}.jpg?key=" + apiKey }, - SourceName = "MapTiler Satellite", - Description = "© [MapTiler](https://www.maptiler.com/)", - MapBackground = new SolidColorBrush { Color = Colors.Black }, - MapForeground = new SolidColorBrush { Color = Colors.White }, - } - }); - } - } - } -} \ No newline at end of file diff --git a/SampleApps/UniversalApp/MainPage.xaml.cs b/SampleApps/UniversalApp/MainPage.xaml.cs index 7f71de24..3961564a 100644 --- a/SampleApps/UniversalApp/MainPage.xaml.cs +++ b/SampleApps/UniversalApp/MainPage.xaml.cs @@ -17,19 +17,15 @@ namespace SampleApplication static MainPage() { //MapProjectionFactory.Instance = new MapControl.Projections.GeoApiProjectionFactory(); - //TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(ApplicationData.Current.LocalCacheFolder); } public MainPage() { InitializeComponent(); - - AddMapTilerLayers(); AddTestLayers(); } - partial void AddMapTilerLayers(); partial void AddTestLayers(); private void MapItemsControlSelectionChanged(object sender, SelectionChangedEventArgs e) diff --git a/SampleApps/UniversalApp/UniversalApp.csproj b/SampleApps/UniversalApp/UniversalApp.csproj index 5fe5ebde..0ec2f9c6 100644 --- a/SampleApps/UniversalApp/UniversalApp.csproj +++ b/SampleApps/UniversalApp/UniversalApp.csproj @@ -51,9 +51,6 @@ HyperlinkText.cs - - MapTilerLayers.cs - MapViewModel.cs diff --git a/SampleApps/WinUiApp/MainWindow.xaml.cs b/SampleApps/WinUiApp/MainWindow.xaml.cs index dd935d11..c280d6ab 100644 --- a/SampleApps/WinUiApp/MainWindow.xaml.cs +++ b/SampleApps/WinUiApp/MainWindow.xaml.cs @@ -16,21 +16,16 @@ namespace SampleApplication static MainWindow() { //MapProjectionFactory.Instance = new MapControl.Projections.GeoApiProjectionFactory(); - //TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder); } public MainWindow() { InitializeComponent(); - - Title = "XAML Map Control - WinUI Sample Application"; - - AddMapTilerLayers(); AddTestLayers(); + Title = "XAML Map Control - WinUI Sample Application"; } - partial void AddMapTilerLayers(); partial void AddTestLayers(); private void MapItemsControlSelectionChanged(object sender, SelectionChangedEventArgs e) diff --git a/SampleApps/WpfApplication/MainWindow.xaml.cs b/SampleApps/WpfApplication/MainWindow.xaml.cs index 6cefee33..c10e1b41 100644 --- a/SampleApps/WpfApplication/MainWindow.xaml.cs +++ b/SampleApps/WpfApplication/MainWindow.xaml.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Windows; using System.Windows.Controls; using System.Windows.Input; -using System.Windows.Media; namespace SampleApplication { @@ -15,7 +14,6 @@ namespace SampleApplication static MainWindow() { //MapProjectionFactory.Instance = new MapControl.Projections.GeoApiProjectionFactory(); - //TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder); //TileImageLoader.Cache = new MapControl.Caching.FileDbCache(TileImageLoader.DefaultCacheFolder); //TileImageLoader.Cache = new MapControl.Caching.SQLiteCache(TileImageLoader.DefaultCacheFolder); @@ -29,12 +27,9 @@ namespace SampleApplication public MainWindow() { InitializeComponent(); - - AddMapTilerLayers(); AddTestLayers(); } - partial void AddMapTilerLayers(); partial void AddTestLayers(); private void MapItemsControlSelectionChanged(object sender, SelectionChangedEventArgs e)