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

Version 7.0: WinUI

Browse source
This commit is contained in:
Clemens 2021-11-17 23:17:11 +01:00
parent 448f599d96
commit 9f61b90795
56 changed files with 94 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MapControl/Shared/AutoEquirectangularProjection.cs
View file

@ -3,7 +3,7 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if !WINUI && !WINDOWS_UWP
#if !WINUI && !UWP
using System.Windows;
#endif

2
MapControl/Shared/AzimuthalEquidistantProjection.cs
View file

@ -3,7 +3,7 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if !WINUI && !WINDOWS_UWP
#if !WINUI && !UWP
using System.Windows;
#endif

2
MapControl/Shared/AzimuthalProjection.cs
View file

@ -3,7 +3,7 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if WINUI || WINDOWS_UWP
#if WINUI || UWP
using Windows.Foundation;
#else
using System.Windows;

2
MapControl/Shared/BindingHelper.cs
View file

@ -5,7 +5,7 @@
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Data;
#elif WINDOWS_UWP
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Data;
#else

2
MapControl/Shared/BingMapsTileLayer.cs
View file

@ -9,7 +9,7 @@ using System.Linq;
using System.Xml.Linq;
#if WINUI
using Microsoft.UI.Xaml;
#elif WINDOWS_UWP
#elif UWP
using Windows.UI.Xaml;
#else
using System.Windows;

2
MapControl/Shared/BoundingBox.cs
View file

@ -10,7 +10,7 @@ namespace MapControl
/// <summary>
/// A geographic bounding box with south and north latitude and west and east longitude values in degrees.
/// </summary>
#if !WINDOWS_UWP
#if !UWP
[System.ComponentModel.TypeConverter(typeof(BoundingBoxConverter))]
#endif
public class BoundingBox

2
MapControl/Shared/EquirectangularProjection.cs
View file

@ -4,7 +4,7 @@
using System;
using System.Globalization;
#if WINUI || WINDOWS_UWP
#if WINUI || UWP
using Windows.Foundation;
#else
using System.Windows;

2
MapControl/Shared/GnomonicProjection.cs
View file

@ -3,7 +3,7 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if !WINUI && !WINDOWS_UWP
#if !WINUI && !UWP
using System.Windows;
#endif

2
MapControl/Shared/ImageLoader.cs
View file

@ -11,7 +11,7 @@ using System.Threading.Tasks;
#if WINUI
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Media.Imaging;
#elif WINDOWS_UWP
#elif UWP
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Media.Imaging;
#else

2
MapControl/Shared/Intersections.cs
View file

@ -3,7 +3,7 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if WINUI || WINDOWS_UWP
#if WINUI || UWP
using Windows.Foundation;
#else
using System.Windows;

2
MapControl/Shared/Location.cs
View file

@ -10,7 +10,7 @@ namespace MapControl
/// <summary>
/// A geographic location with latitude and longitude values in degrees.
/// </summary>
#if !WINDOWS_UWP
#if !UWP
[System.ComponentModel.TypeConverter(typeof(LocationConverter))]
#endif
public class Location : IEquatable<Location>

2
MapControl/Shared/LocationCollection.cs
View file

@ -12,7 +12,7 @@ namespace MapControl
/// A collection of Locations with support for string parsing
/// and calculation of great circle and rhumb line locations.
/// </summary>
#if !WINDOWS_UWP
#if !UWP
[System.ComponentModel.TypeConverter(typeof(LocationCollectionConverter))]
#endif
public class LocationCollection : List<Location>

2
MapControl/Shared/MapBase.cs
View file

@ -8,7 +8,7 @@ using Windows.Foundation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Media.Animation;
#elif WINDOWS_UWP
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;

2
MapControl/Shared/MapGraticule.cs
View file

@ -6,7 +6,7 @@ using System;
using System.Globalization;
#if WINUI
using Microsoft.UI.Xaml;
#elif WINDOWS_UWP
#elif UWP
using Windows.UI.Xaml;
#else
using System.Windows;

2
MapControl/Shared/MapImageLayer.cs
View file

@ -13,7 +13,7 @@ using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Media.Animation;
#elif WINDOWS_UWP
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;

2
MapControl/Shared/MapItemsControl.cs
View file

@ -8,7 +8,7 @@ using Windows.Foundation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Data;
#elif WINDOWS_UWP
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;

2
MapControl/Shared/MapOverlay.cs
View file

@ -5,7 +5,7 @@
#if WINUI
using Microsoft.UI.Xaml.Media;
using Windows.UI.Text;
#elif WINDOWS_UWP
#elif UWP
using Windows.UI.Text;
using Windows.UI.Xaml.Media;
#else

2
MapControl/Shared/MapPanel.cs
View file

@ -9,7 +9,7 @@ using Windows.Foundation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
#elif WINDOWS_UWP
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;

2
MapControl/Shared/MapPath.cs
View file

@ -5,7 +5,7 @@
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#elif WINDOWS_UWP
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
#else

4
MapControl/Shared/MapPolygon.cs
View file

@ -7,7 +7,7 @@ using System.Linq;
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#elif WINDOWS_UWP
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
#else
@ -29,7 +29,7 @@ namespace MapControl
/// <summary>
/// Gets or sets the Locations that define the polygon points.
/// </summary>
#if !WINDOWS_UWP
#if !UWP
[System.ComponentModel.TypeConverter(typeof(LocationCollectionConverter))]
#endif
public IEnumerable<Location> Locations

4
MapControl/Shared/MapPolyline.cs
View file

@ -7,7 +7,7 @@ using System.Linq;
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#elif WINDOWS_UWP
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
#else
@ -29,7 +29,7 @@ namespace MapControl
/// <summary>
/// Gets or sets the Locations that define the polyline points.
/// </summary>
#if !WINDOWS_UWP
#if !UWP
[System.ComponentModel.TypeConverter(typeof(LocationCollectionConverter))]
#endif
public IEnumerable<Location> Locations

2
MapControl/Shared/MapProjection.cs
View file

@ -4,7 +4,7 @@
using System;
using System.Globalization;
#if WINUI || WINDOWS_UWP
#if WINUI || UWP
using Windows.Foundation;
#else
using System.Windows;

4
MapControl/Shared/MapScale.cs
View file

@ -10,7 +10,7 @@ using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Shapes;
#elif WINDOWS_UWP
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
@ -48,7 +48,7 @@ namespace MapControl
line.SetBinding(Shape.StrokeProperty, this.GetBinding(nameof(Stroke)));
line.SetBinding(Shape.StrokeThicknessProperty, this.GetBinding(nameof(StrokeThickness)));
#if WINUI || WINDOWS_UWP
#if WINUI || UWP
label.SetBinding(TextBlock.ForegroundProperty, this.GetBinding(nameof(Foreground)));
#endif
Children.Add(line);

2
MapControl/Shared/MapTileLayer.cs
View file

@ -10,7 +10,7 @@ using System.Threading.Tasks;
using Windows.Foundation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#elif WINDOWS_UWP
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;

4
MapControl/Shared/MapTileLayerBase.cs
View file

@ -10,7 +10,7 @@ using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
#elif WINDOWS_UWP
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
@ -75,7 +75,7 @@ namespace MapControl
updateTimer.Interval = UpdateInterval;
updateTimer.Tick += async (s, e) => await Update();
#if WINUI || WINDOWS_UWP
#if WINUI || UWP
MapPanel.InitMapElement(this);
#endif
}

2
MapControl/Shared/OrthographicProjection.cs
View file

@ -3,7 +3,7 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if !WINUI && !WINDOWS_UWP
#if !WINUI && !UWP
using System.Windows;
#endif

2
MapControl/Shared/StereographicProjection.cs
View file

@ -3,7 +3,7 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if !WINUI && !WINDOWS_UWP
#if !WINUI && !UWP
using System.Windows;
#endif

2
MapControl/Shared/Tile.cs
View file

@ -7,7 +7,7 @@ using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Media.Animation;
#elif WINDOWS_UWP
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;

4
MapControl/Shared/TileSource.cs
View file

@ -6,7 +6,7 @@ using System;
using System.Threading.Tasks;
#if WINUI
using Microsoft.UI.Xaml.Media;
#elif WINDOWS_UWP
#elif UWP
using Windows.UI.Xaml.Media;
#else
using System.Windows.Media;
@ -17,7 +17,7 @@ namespace MapControl
/// <summary>
/// Provides the download Uri or ImageSource of map tiles.
/// </summary>
#if !WINDOWS_UWP
#if !UWP
[System.ComponentModel.TypeConverter(typeof(TileSourceConverter))]
#endif
public class TileSource

2
MapControl/Shared/ViewTransform.cs
View file

@ -6,7 +6,7 @@ using System;
#if WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml.Media;
#elif WINDOWS_UWP
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml.Media;
#else

2
MapControl/Shared/WebMercatorProjection.cs
View file

@ -3,7 +3,7 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if !WINUI && !WINDOWS_UWP
#if !WINUI && !UWP
using System.Windows;
#endif

2
MapControl/Shared/WmsImageLayer.cs
View file

@ -12,7 +12,7 @@ using System.Xml.Linq;
using Windows.Foundation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#elif WINDOWS_UWP
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;

2
MapControl/Shared/WmtsCapabilities.cs
View file

@ -8,7 +8,7 @@ using System.Globalization;
using System.Linq;
using System.Xml.Linq;
using System.Threading.Tasks;
#if !WINUI && !WINDOWS_UWP
#if !WINUI && !UWP
using System.Windows;
#endif

2
MapControl/Shared/WmtsTileLayer.cs
View file

@ -10,7 +10,7 @@ using System.Threading.Tasks;
#if WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml;
#elif WINDOWS_UWP
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
#else

2
MapControl/Shared/WmtsTileMatrix.cs
View file

@ -2,7 +2,7 @@
// © 2021 Clemens Fischer
// Licensed under the Microsoft Public License (Ms-PL)
#if !WINUI && !WINDOWS_UWP
#if !WINUI && !UWP
using System.Windows;
#endif

2
MapControl/Shared/WmtsTileMatrixLayer.cs
View file

@ -9,7 +9,7 @@ using System.Linq;
using Windows.Foundation;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
#elif WINDOWS_UWP
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;

2
MapControl/Shared/WorldMercatorProjection.cs
View file

@ -3,7 +3,7 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if !WINUI && !WINDOWS_UWP
#if !WINUI && !UWP
using System.Windows;
#endif