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

Conditional usings

Browse source
This commit is contained in:
ClemensFischer 2024-05-22 11:25:32 +02:00
parent 93b58fa01e
commit eb990ab9ee
74 changed files with 354 additions and 364 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
MBTiles/Shared/MBTileLayer.cs
View file

@ -3,12 +3,12 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System.Threading.Tasks;
#if WINUI
using Microsoft.UI.Xaml;
#if WPF
using System.Windows;
#elif UWP
using Windows.UI.Xaml;
#else
using System.Windows;
#elif WINUI
using Microsoft.UI.Xaml;
#endif
namespace MapControl.MBTiles

8
MBTiles/Shared/MBTileSource.cs
View file

@ -5,12 +5,12 @@
using System;
using System.Diagnostics;
using System.Threading.Tasks;
#if WINUI
using Microsoft.UI.Xaml.Media;
#if WPF
using System.Windows.Media;
#elif UWP
using Windows.UI.Xaml.Media;
#else
using System.Windows.Media;
#elif WINUI
using Microsoft.UI.Xaml.Media;
#endif
namespace MapControl.MBTiles

2
MBTiles/WPF/MBTiles.WPF.csproj
View file

@ -13,7 +13,7 @@
<DelaySign>false</DelaySign>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<PackageId>XAML.MapControl.MBTiles</PackageId>
<DefineConstants></DefineConstants>
<DefineConstants>WPF</DefineConstants>
</PropertyGroup>
<ItemGroup>

2
MapControl/Shared/AutoEquirectangularProjection.cs
View file

@ -3,7 +3,7 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if !WINUI && !UWP
#if WPF
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 && !UWP
#if WPF
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 && !UWP
#if WPF
using System.Windows;
#endif

12
MapControl/Shared/BindingHelper.cs
View file

@ -2,15 +2,15 @@
// Copyright © 2024 Clemens Fischer
// Licensed under the Microsoft Public License (Ms-PL)
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Data;
#if WPF
using System.Windows;
using System.Windows.Data;
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Data;
#else
using System.Windows;
using System.Windows.Data;
#elif WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Data;
#endif
namespace MapControl

8
MapControl/Shared/BingMapsTileLayer.cs
View file

@ -7,12 +7,12 @@ using System.Diagnostics;
using System.Globalization;
using System.Linq;
using System.Xml.Linq;
#if WINUI
using Microsoft.UI.Xaml;
#if WPF
using System.Windows;
#elif UWP
using Windows.UI.Xaml;
#else
using System.Windows;
#elif WINUI
using Microsoft.UI.Xaml;
#endif
namespace MapControl

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 WINUI || UWP
#if UWP || WINUI
[Windows.Foundation.Metadata.CreateFromString(MethodName = "Parse")]
#else
[System.ComponentModel.TypeConverter(typeof(BoundingBoxConverter))]

8
MapControl/Shared/BoundingBoxTileSource.cs
View file

@ -5,12 +5,12 @@
using System;
using System.Globalization;
using System.Threading.Tasks;
#if WINUI
using Microsoft.UI.Xaml.Media;
#if WPF
using System.Windows.Media;
#elif UWP
using Windows.UI.Xaml.Media;
#else
using System.Windows.Media;
#elif WINUI
using Microsoft.UI.Xaml.Media;
#endif
namespace MapControl

2
MapControl/Shared/EquirectangularProjection.cs
View file

@ -4,7 +4,7 @@
using System;
using System.Globalization;
#if !WINUI && !UWP
#if WPF
using System.Windows;
#endif

20
MapControl/Shared/GeoImage.cs
View file

@ -7,21 +7,21 @@ using System.Globalization;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Media.Imaging;
#if WPF
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Media.Imaging;
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Media.Imaging;
#else
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Media.Imaging;
#elif WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Media.Imaging;
#endif
namespace MapControl

2
MapControl/Shared/GnomonicProjection.cs
View file

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

16
MapControl/Shared/GroundOverlay.cs
View file

@ -11,18 +11,18 @@ using System.IO.Compression;
using System.Linq;
using System.Threading.Tasks;
using System.Xml;
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
#if WPF
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
#else
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
#elif WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
#endif
namespace MapControl

12
MapControl/Shared/ImageLoader.cs
View file

@ -9,14 +9,14 @@ using System.IO;
using System.Linq;
using System.Net.Http;
using System.Threading.Tasks;
#if AVALONIA
using ImageSource = Avalonia.Media.IImage;
#elif WINUI
using Microsoft.UI.Xaml.Media;
#if WPF
using System.Windows.Media;
#elif UWP
using Windows.UI.Xaml.Media;
#else
using System.Windows.Media;
#elif WINUI
using Microsoft.UI.Xaml.Media;
#elif AVALONIA
using ImageSource = Avalonia.Media.IImage;
#endif
namespace MapControl

2
MapControl/Shared/Intersections.cs
View file

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

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 WINUI || UWP
#if UWP || WINUI
[Windows.Foundation.Metadata.CreateFromString(MethodName = "Parse")]
#else
[System.ComponentModel.TypeConverter(typeof(LocationConverter))]

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 WINUI || UWP
#if UWP || WINUI
[Windows.Foundation.Metadata.CreateFromString(MethodName = "Parse")]
#else
[System.ComponentModel.TypeConverter(typeof(LocationCollectionConverter))]

22
MapControl/Shared/MapBase.cs
View file

@ -3,21 +3,21 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if AVALONIA
using Avalonia.Media;
using DependencyProperty = Avalonia.AvaloniaProperty;
using UIElement = Avalonia.Controls.Control;
#elif WINUI
using Microsoft.UI;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#if WPF
using System.Windows;
using System.Windows.Media;
#elif UWP
using Windows.UI;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
#else
using System.Windows;
using System.Windows.Media;
#elif WINUI
using Microsoft.UI;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#elif AVALONIA
using Avalonia.Media;
using DependencyProperty = Avalonia.AvaloniaProperty;
using UIElement = Avalonia.Controls.Control;
#endif
namespace MapControl

8
MapControl/Shared/MapBorderPanel.cs
View file

@ -2,12 +2,12 @@
// Copyright © 2024 Clemens Fischer
// Licensed under the Microsoft Public License (Ms-PL)
#if WINUI
using Microsoft.UI.Xaml;
#if WPF
using System.Windows;
#elif UWP
using Windows.UI.Xaml;
#else
using System.Windows;
#elif WINUI
using Microsoft.UI.Xaml;
#endif
namespace MapControl

16
MapControl/Shared/MapGraticule.cs
View file

@ -6,17 +6,15 @@ using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
#if WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
#else
#if WPF
using System.Windows;
using System.Windows.Media;
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
#elif WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#endif
namespace MapControl

32
MapControl/Shared/MapImageLayer.cs
View file

@ -6,28 +6,26 @@ using System;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
#if AVALONIA
#if WPF
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Threading;
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
#elif WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
using DispatcherTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer;
#elif AVALONIA
using Avalonia.Controls;
using Avalonia.Media;
using Avalonia.Threading;
using DependencyProperty = Avalonia.AvaloniaProperty;
using ImageSource = Avalonia.Media.IImage;
#elif WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
using DispatcherTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer;
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
#else
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Threading;
#endif
namespace MapControl

12
MapControl/Shared/MapItem.cs
View file

@ -2,15 +2,15 @@
// Copyright © 2024 Clemens Fischer
// Licensed under the Microsoft Public License (Ms-PL)
#if WINUI
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
#if WPF
using System.Windows.Controls;
using System.Windows.Media;
#elif UWP
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
#else
using System.Windows.Controls;
using System.Windows.Media;
#elif WINUI
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
#endif
namespace MapControl

20
MapControl/Shared/MapItemsControl.cs
View file

@ -3,20 +3,18 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Data;
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Data;
#else
#if WPF
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Data;
#elif WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Data;
#endif
namespace MapControl

12
MapControl/Shared/MapOverlay.cs
View file

@ -2,15 +2,15 @@
// Copyright © 2024 Clemens Fischer
// Licensed under the Microsoft Public License (Ms-PL)
#if WINUI
using Microsoft.UI.Xaml.Media;
using Windows.UI.Text;
#if WPF
using System.Windows;
using System.Windows.Media;
#elif UWP
using Windows.UI.Text;
using Windows.UI.Xaml.Media;
#else
using System.Windows;
using System.Windows.Media;
#elif WINUI
using Microsoft.UI.Xaml.Media;
using Windows.UI.Text;
#endif
namespace MapControl

31
MapControl/Shared/MapPanel.cs
View file

@ -2,28 +2,27 @@
// Copyright © 2024 Clemens Fischer
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if AVALONIA
#if WPF
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
#elif WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
#elif AVALONIA
using Avalonia.Controls;
using Avalonia.Media;
using DependencyProperty = Avalonia.AvaloniaProperty;
using FrameworkElement = Avalonia.Controls.Control;
using HorizontalAlignment = Avalonia.Layout.HorizontalAlignment;
using VerticalAlignment = Avalonia.Layout.VerticalAlignment;
#elif WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
#else
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
#endif
/// <summary>

13
MapControl/Shared/MapPath.cs
View file

@ -4,16 +4,15 @@
using System.Collections.Generic;
using System.Linq;
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Shapes;
#if WPF
using System.Windows;
using System.Windows.Media;
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
#else
using System.Windows;
using System.Windows.Media;
#elif WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#endif
namespace MapControl

14
MapControl/Shared/MapPolygon.cs
View file

@ -3,15 +3,15 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System.Collections.Generic;
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#if WPF
using System.Windows;
using System.Windows.Media;
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
#else
using System.Windows;
using System.Windows.Media;
#elif WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#endif
namespace MapControl
@ -32,7 +32,7 @@ namespace MapControl
/// <summary>
/// Gets or sets the Locations that define the polygon points.
/// </summary>
#if !WINUI && !UWP
#if WPF
[System.ComponentModel.TypeConverter(typeof(LocationCollectionConverter))]
#endif
public IEnumerable<Location> Locations

14
MapControl/Shared/MapPolyline.cs
View file

@ -3,15 +3,15 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System.Collections.Generic;
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#if WPF
using System.Windows;
using System.Windows.Media;
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
#else
using System.Windows;
using System.Windows.Media;
#elif WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#endif
namespace MapControl
@ -32,7 +32,7 @@ namespace MapControl
/// <summary>
/// Gets or sets the Locations that define the polyline points.
/// </summary>
#if !WINUI && !UWP
#if WPF
[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 && !UWP
#if WPF
using System.Windows;
#endif

24
MapControl/Shared/MapScale.cs
View file

@ -4,23 +4,23 @@
using System;
using System.Globalization;
#if WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Shapes;
#if WPF
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Shapes;
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Shapes;
#else
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Shapes;
#elif WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Shapes;
#endif
namespace MapControl
@ -56,7 +56,7 @@ namespace MapControl
line.SetBinding(Shape.StrokeProperty, this.GetOrCreateBinding(StrokeProperty, nameof(Stroke)));
line.SetBinding(Shape.StrokeThicknessProperty, this.GetOrCreateBinding(StrokeThicknessProperty, nameof(StrokeThickness)));
#if WINUI || UWP
#if UWP || WINUI
label.SetBinding(TextBlock.ForegroundProperty, this.GetOrCreateBinding(ForegroundProperty, nameof(Foreground)));
#endif
}

20
MapControl/Shared/MapTileLayer.cs
View file

@ -4,20 +4,20 @@
using System;
using System.Threading.Tasks;
#if AVALONIA
using Avalonia.Media;
using DependencyProperty = Avalonia.AvaloniaProperty;
#elif WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#if WPF
using System.Windows;
using System.Windows.Media;
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
#else
using System.Windows;
using System.Windows.Media;
#elif WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#elif AVALONIA
using Avalonia.Media;
using DependencyProperty = Avalonia.AvaloniaProperty;
#endif
namespace MapControl

30
MapControl/Shared/MapTileLayerBase.cs
View file

@ -5,25 +5,25 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
#if AVALONIA
using Avalonia.Controls;
using Avalonia.Media;
using Avalonia.Threading;
using DependencyProperty = Avalonia.AvaloniaProperty;
#if WPF
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Threading;
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
#elif WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
using DispatcherTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer;
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
#else
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Threading;
#elif AVALONIA
using Avalonia.Controls;
using Avalonia.Media;
using Avalonia.Threading;
using DependencyProperty = Avalonia.AvaloniaProperty;
#endif
namespace MapControl
@ -72,7 +72,7 @@ namespace MapControl
updateTimer = this.CreateTimer(UpdateInterval);
updateTimer.Tick += async (s, e) => await Update(false);
#if WINUI || UWP
#if UWP || WINUI
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 && !UWP
#if WPF
using System.Windows;
#endif

2
MapControl/Shared/PolarStereographicProjection.cs
View file

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

14
MapControl/Shared/PushpinBorder.cs
View file

@ -3,17 +3,17 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#if WPF
using System.Windows;
using System.Windows.Media;
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
#else
using System.Windows;
using System.Windows.Media;
#elif WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#endif
namespace MapControl

2
MapControl/Shared/StereographicProjection.cs
View file

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

20
MapControl/Shared/Tile.cs
View file

@ -3,19 +3,19 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if AVALONIA
using Avalonia.Controls;
using Avalonia.Media;
using ImageSource = Avalonia.Media.IImage;
#elif WINUI
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
#if WPF
using System.Windows.Controls;
using System.Windows.Media;
#elif UWP
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
#else
using System.Windows.Controls;
using System.Windows.Media;
#elif WINUI
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
#elif AVALONIA
using Avalonia.Controls;
using Avalonia.Media;
using ImageSource = Avalonia.Media.IImage;
#endif
namespace MapControl

14
MapControl/Shared/TileSource.cs
View file

@ -4,14 +4,14 @@
using System;
using System.Threading.Tasks;
#if AVALONIA
using ImageSource = Avalonia.Media.IImage;
#elif WINUI
using Microsoft.UI.Xaml.Media;
#if WPF
using System.Windows.Media;
#elif UWP
using Windows.UI.Xaml.Media;
#else
using System.Windows.Media;
#elif WINUI
using Microsoft.UI.Xaml.Media;
#elif AVALONIA
using ImageSource = Avalonia.Media.IImage;
#endif
namespace MapControl
@ -19,7 +19,7 @@ namespace MapControl
/// <summary>
/// Provides the download Uri or ImageSource of map tiles.
/// </summary>
#if WINUI || UWP
#if UWP || WINUI
[Windows.Foundation.Metadata.CreateFromString(MethodName = "Parse")]
#else
[System.ComponentModel.TypeConverter(typeof(TileSourceConverter))]

2
MapControl/Shared/TransverseMercatorProjection.cs
View file

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

2
MapControl/Shared/ViewRect.cs
View file

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

12
MapControl/Shared/ViewTransform.cs
View file

@ -3,15 +3,15 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml.Media;
#if WPF
using System.Windows;
using System.Windows.Media;
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml.Media;
#else
using System.Windows;
using System.Windows.Media;
#elif WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml.Media;
#endif
namespace MapControl

2
MapControl/Shared/WebMercatorProjection.cs
View file

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

18
MapControl/Shared/WmsImageLayer.cs
View file

@ -8,18 +8,18 @@ using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
using System.Xml.Linq;
#if AVALONIA
using DependencyProperty = Avalonia.AvaloniaProperty;
using ImageSource = Avalonia.Media.IImage;
#elif WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#if WPF
using System.Windows;
using System.Windows.Media;
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
#else
using System.Windows;
using System.Windows.Media;
#elif WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#elif AVALONIA
using DependencyProperty = Avalonia.AvaloniaProperty;
using ImageSource = Avalonia.Media.IImage;
#endif
namespace MapControl

2
MapControl/Shared/WmtsCapabilities.cs
View file

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

10
MapControl/Shared/WmtsTileLayer.cs
View file

@ -7,14 +7,14 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
#if WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml;
#if WPF
using System.Windows;
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml;
#else
using System.Windows;
#elif WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml;
#endif
namespace MapControl

2
MapControl/Shared/WmtsTileMatrix.cs
View file

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

16
MapControl/Shared/WmtsTileMatrixLayer.cs
View file

@ -3,18 +3,18 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
#if WPF
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
#elif UWP
using Windows.Foundation;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
#else
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
#elif WINUI
using Windows.Foundation;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
#endif
namespace MapControl

2
MapControl/Shared/WorldMercatorProjection.cs
View file

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

2
MapControl/WPF/MapControl.WPF.csproj
View file

@ -13,7 +13,7 @@
<DelaySign>false</DelaySign>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<PackageId>XAML.MapControl</PackageId>
<DefineConstants></DefineConstants>
<DefineConstants>WPF</DefineConstants>
</PropertyGroup>
<ItemGroup>

8
MapControl/WPF/Timer.WPF.cs
View file

@ -3,12 +3,12 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if AVALONIA
using Avalonia.Threading;
#if WPF
using System.Windows.Threading;
#elif UWP
using Windows.UI.Xaml;
#else
using System.Windows.Threading;
#elif AVALONIA
using Avalonia.Threading;
#endif
namespace MapControl

6
MapControl/WinUI/DependencyPropertyHelper.WinUI.cs
View file

@ -3,10 +3,10 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if WINUI
using Microsoft.UI.Xaml;
#else
#if UWP
using Windows.UI.Xaml;
#else
using Microsoft.UI.Xaml;
#endif
#pragma warning disable IDE0060 // Remove unused parameter

8
MapControl/WinUI/ImageLoader.WinUI.cs
View file

@ -9,12 +9,12 @@ using System.Threading.Tasks;
using Windows.Graphics.Imaging;
using Windows.Storage;
using Windows.Storage.Streams;
#if WINUI
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Media.Imaging;
#else
#if UWP
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Media.Imaging;
#else
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Media.Imaging;
#endif
namespace MapControl

10
MapControl/WinUI/Map.WinUI.cs
View file

@ -4,14 +4,14 @@
using System;
using Windows.System;
#if WINUI
using Microsoft.UI.Input;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Input;
#else
#if UWP
using Windows.Devices.Input;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Input;
#else
using Microsoft.UI.Input;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Input;
#endif
namespace MapControl

12
MapControl/WinUI/MapBase.WinUI.cs
View file

@ -2,16 +2,16 @@
// Copyright © 2024 Clemens Fischer
// Licensed under the Microsoft Public License (Ms-PL)
#if WINUI
using Microsoft.UI;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Media.Animation;
#else
#if UWP
using Windows.UI;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Media.Animation;
#else
using Microsoft.UI;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Media.Animation;
#endif
namespace MapControl

8
MapControl/WinUI/MapContentControl.WinUI.cs
View file

@ -2,12 +2,12 @@
// Copyright © 2024 Clemens Fischer
// Licensed under the Microsoft Public License (Ms-PL)
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
#else
#if UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
#else
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
#endif
namespace MapControl

10
MapControl/WinUI/MapGraticule.WinUI.cs
View file

@ -5,14 +5,14 @@
using Windows.Foundation;
using System.Collections.Generic;
using System.Linq;
#if WINUI
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Shapes;
#else
#if UWP
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Shapes;
#else
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Shapes;
#endif
namespace MapControl

10
MapControl/WinUI/MapItem.WinUI.cs
View file

@ -3,14 +3,14 @@
// Licensed under the Microsoft Public License (Ms-PL)
using Windows.System;
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Input;
#else
#if UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Input;
#else
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Input;
#endif
namespace MapControl

6
MapControl/WinUI/MapItemsControl.WinUI.cs
View file

@ -2,10 +2,10 @@
// Copyright © 2024 Clemens Fischer
// Licensed under the Microsoft Public License (Ms-PL)
#if WINUI
using Microsoft.UI.Xaml;
#else
#if UWP
using Windows.UI.Xaml;
#else
using Microsoft.UI.Xaml;
#endif
namespace MapControl

11
MapControl/WinUI/MapOverlay.WinUI.cs
View file

@ -2,15 +2,14 @@
// Copyright © 2024 Clemens Fischer
// Licensed under the Microsoft Public License (Ms-PL)
#if WINUI
using Windows.UI.Text;
#if UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
#else
using Microsoft.UI.Text;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
using Windows.UI.Text;
#else
using Windows.UI.Text;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
#endif
namespace MapControl

8
MapControl/WinUI/MapPanel.WinUI.cs
View file

@ -4,12 +4,12 @@
using System.Collections.Generic;
using System.Linq;
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#else
#if UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
#else
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
#endif
namespace MapControl

11
MapControl/WinUI/MapPath.WinUI.cs
View file

@ -5,15 +5,14 @@
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Linq;
using Windows.Foundation;
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Shapes;
#else
#if UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Shapes;
#else
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Shapes;
#endif
namespace MapControl

6
MapControl/WinUI/Matrix.WinUI.cs
View file

@ -3,10 +3,10 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
#if WINUI
using WindowsUI = Microsoft.UI;
#else
#if UWP
using WindowsUI = Windows.UI;
#else
using WindowsUI = Microsoft.UI;
#endif
namespace MapControl

8
MapControl/WinUI/OpacityHelper.WinUI.cs
View file

@ -4,12 +4,12 @@
using System;
using System.Threading.Tasks;
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media.Animation;
#else
#if UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media.Animation;
#else
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media.Animation;
#endif
namespace MapControl

16
MapControl/WinUI/PushpinBorder.WinUI.cs
View file

@ -3,20 +3,20 @@
// Licensed under the Microsoft Public License (Ms-PL)
using Windows.Foundation;
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Data;
using Microsoft.UI.Xaml.Markup;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Shapes;
#else
#if UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Data;
using Windows.UI.Xaml.Markup;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Shapes;
#else
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Data;
using Microsoft.UI.Xaml.Markup;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Shapes;
#endif
namespace MapControl

10
MapControl/WinUI/Tile.WinUI.cs
View file

@ -2,14 +2,14 @@
// Copyright © 2024 Clemens Fischer
// Licensed under the Microsoft Public License (Ms-PL)
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media.Animation;
using Microsoft.UI.Xaml.Media.Imaging;
#else
#if UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media.Animation;
using Windows.UI.Xaml.Media.Imaging;
#else
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media.Animation;
using Microsoft.UI.Xaml.Media.Imaging;
#endif
namespace MapControl

2
MapProjections/Shared/GeoApiProjection.cs
View file

@ -8,7 +8,7 @@ using GeoAPI.Geometries;
using ProjNet.CoordinateSystems;
using ProjNet.CoordinateSystems.Transformations;
using System;
#if !WINUI && !UWP
#if WPF
using System.Windows;
#endif

2
MapProjections/Shared/WebMercatorProjection.cs
View file

@ -4,7 +4,7 @@
using ProjNet.CoordinateSystems;
using System;
#if !WINUI && !UWP
#if WPF
using System.Windows;
#endif

2
MapProjections/Shared/WorldMercatorProjection.cs
View file

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

2
MapProjections/WPF/MapProjections.WPF.csproj
View file

@ -13,7 +13,7 @@
<DelaySign>false</DelaySign>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<PackageId>XAML.MapControl.MapProjections</PackageId>
<DefineConstants></DefineConstants>
<DefineConstants>WPF</DefineConstants>
</PropertyGroup>
<ItemGroup>

24
MapUiTools/Shared/MapLayersMenuButton.cs
View file

@ -6,23 +6,23 @@ using System;
using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.Linq;
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Markup;
#if WPF
using System.Windows;
using System.Windows.Markup;
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Markup;
#else
using System.Windows;
using System.Windows.Markup;
#elif WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Markup;
#endif
namespace MapControl.UiTools
{
#if WINUI || UWP
[ContentProperty(Name = nameof(Layer))]
#else
#if WPF
[ContentProperty(nameof(Layer))]
#else
[ContentProperty(Name = nameof(Layer))]
#endif
public class MapLayerItem
{
@ -33,10 +33,10 @@ namespace MapControl.UiTools
public UIElement GetLayer() => Layer ?? (Layer = LayerFactory?.Invoke());
}
#if WINUI || UWP
[ContentProperty(Name = nameof(MapLayers))]
#else
#if WPF
[ContentProperty(nameof(MapLayers))]
#else
[ContentProperty(Name = nameof(MapLayers))]
#endif
public class MapLayersMenuButton : MenuButton
{

24
MapUiTools/Shared/MapProjectionsMenuButton.cs
View file

@ -5,23 +5,23 @@
using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.Linq;
#if WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Markup;
#if WPF
using System.Windows;
using System.Windows.Markup;
#elif UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Markup;
#else
using System.Windows;
using System.Windows.Markup;
#elif WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Markup;
#endif
namespace MapControl.UiTools
{
#if WINUI || UWP
[ContentProperty(Name = nameof(Projection))]
#else
#if WPF
[ContentProperty(nameof(Projection))]
#else
[ContentProperty(Name = nameof(Projection))]
#endif
public class MapProjectionItem
{
@ -29,10 +29,10 @@ namespace MapControl.UiTools
public string Projection { get; set; }
}
#if WINUI || UWP
[ContentProperty(Name = nameof(MapProjections))]
#else
#if WPF
[ContentProperty(nameof(MapProjections))]
#else
[ContentProperty(Name = nameof(MapProjections))]
#endif
public class MapProjectionsMenuButton : MenuButton
{

2
MapUiTools/WPF/MapUiTools.WPF.csproj
View file

@ -11,7 +11,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<DefineConstants></DefineConstants>
<DefineConstants>WPF</DefineConstants>
</PropertyGroup>
<ItemGroup>

6
SampleApps/ProjectionDemo/MainWindow.xaml.cs
View file

@ -28,7 +28,7 @@ namespace ProjectionDemo
new WmsImageLayer
{
ServiceUri = new Uri("http://ows.terrestris.de/osm/service"),
Layers = "OSM-WMS"
WmsLayers = "OSM-WMS"
});
viewModel.Layers.Add(
@ -36,7 +36,7 @@ namespace ProjectionDemo
new WmsImageLayer
{
ServiceUri = new Uri("https://sgx.geodatenzentrum.de/wms_topplus_open"),
Layers = "web"
WmsLayers = "web"
});
viewModel.Layers.Add(
@ -44,7 +44,7 @@ namespace ProjectionDemo
new WmsImageLayer
{
ServiceUri = new Uri("https://geoportal.wiesbaden.de/cgi-bin/mapserv.fcgi?map=d:/openwimap/umn/map/orthophoto/orthophotos.map"),
Layers = "orthophoto2017"
WmsLayers = "orthophoto2017"
});
viewModel.CurrentProjection = viewModel.Projections[0];