diff --git a/SampleApps/Shared/BingMapsLayers.cs b/SampleApps/Shared/BingMapsLayers.cs deleted file mode 100644 index 121ff41c..00000000 --- a/SampleApps/Shared/BingMapsLayers.cs +++ /dev/null @@ -1,76 +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 AddBingMapsLayers() - { -#if UWP - var bingMapsApiKeyPath = "BingMapsApiKey.txt"; -#else - var bingMapsApiKeyPath = Path.Combine( - Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "MapControl", "BingMapsApiKey.txt"); -#endif - if (File.Exists(bingMapsApiKeyPath)) - { - BingMapsTileLayer.ApiKey = File.ReadAllText(bingMapsApiKeyPath)?.Trim(); - - mapLayersMenuButton.MapLayers.Add(new MapLayerItem - { - Text = "Bing Maps Road", - Layer = new BingMapsTileLayer - { - Mode = BingMapsTileLayer.MapMode.Road, - SourceName = "Bing Maps Road", - Description = "© [Microsoft](http://www.bing.com/maps/)" - } - }); - - mapLayersMenuButton.MapLayers.Add(new MapLayerItem - { - Text = "Bing Maps Aerial", - Layer = new BingMapsTileLayer - { - Mode = BingMapsTileLayer.MapMode.Aerial, - SourceName = "Bing Maps Aerial", - Description = "© [Microsoft](http://www.bing.com/maps/)", - MapForeground = new SolidColorBrush(Colors.White), - MapBackground = new SolidColorBrush(Colors.Black) - } - }); - - mapLayersMenuButton.MapLayers.Add(new MapLayerItem - { - Text = "Bing Maps Aerial with Labels", - Layer = new BingMapsTileLayer - { - Mode = BingMapsTileLayer.MapMode.AerialWithLabels, - SourceName = "Bing Maps Hybrid", - Description = "© [Microsoft](http://www.bing.com/maps/)", - MapForeground = new SolidColorBrush(Colors.White), - MapBackground = new SolidColorBrush(Colors.Black) - } - }); - } - } - } -} \ No newline at end of file diff --git a/SampleApps/Shared/MapTilerLayers.cs b/SampleApps/Shared/MapTilerLayers.cs new file mode 100644 index 00000000..73d7953f --- /dev/null +++ b/SampleApps/Shared/MapTilerLayers.cs @@ -0,0 +1,50 @@ +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 = "BingMapsApiKey.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/)" + } + }); + } + } + } +} \ No newline at end of file diff --git a/SampleApps/UniversalApp/MainPage.xaml.cs b/SampleApps/UniversalApp/MainPage.xaml.cs index c4146db4..498f30c7 100644 --- a/SampleApps/UniversalApp/MainPage.xaml.cs +++ b/SampleApps/UniversalApp/MainPage.xaml.cs @@ -25,11 +25,11 @@ namespace SampleApplication { InitializeComponent(); - AddBingMapsLayers(); + AddMapTilerLayers(); AddTestLayers(); } - partial void AddBingMapsLayers(); + 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 4d2e26c9..5fe5ebde 100644 --- a/SampleApps/UniversalApp/UniversalApp.csproj +++ b/SampleApps/UniversalApp/UniversalApp.csproj @@ -48,12 +48,12 @@ false - - BingMapsLayers.cs - HyperlinkText.cs + + MapTilerLayers.cs + MapViewModel.cs diff --git a/SampleApps/WinUiApp/MainWindow.xaml.cs b/SampleApps/WinUiApp/MainWindow.xaml.cs index 6fd4b759..dd935d11 100644 --- a/SampleApps/WinUiApp/MainWindow.xaml.cs +++ b/SampleApps/WinUiApp/MainWindow.xaml.cs @@ -26,11 +26,11 @@ namespace SampleApplication Title = "XAML Map Control - WinUI Sample Application"; - AddBingMapsLayers(); + AddMapTilerLayers(); AddTestLayers(); } - partial void AddBingMapsLayers(); + 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 fd98a5f7..6cefee33 100644 --- a/SampleApps/WpfApplication/MainWindow.xaml.cs +++ b/SampleApps/WpfApplication/MainWindow.xaml.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Windows; using System.Windows.Controls; using System.Windows.Input; +using System.Windows.Media; namespace SampleApplication { @@ -29,11 +30,11 @@ namespace SampleApplication { InitializeComponent(); - AddBingMapsLayers(); + AddMapTilerLayers(); AddTestLayers(); } - partial void AddBingMapsLayers(); + partial void AddMapTilerLayers(); partial void AddTestLayers(); private void MapItemsControlSelectionChanged(object sender, SelectionChangedEventArgs e)