diff --git a/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs b/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs index a6c78ec7..3eb3f7c4 100644 --- a/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs +++ b/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.9")] -[assembly: AssemblyFileVersion("2.4.9")] +[assembly: AssemblyVersion("2.4.10")] +[assembly: AssemblyFileVersion("2.4.10")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs b/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs index 4d3368f8..f8da5bdb 100644 --- a/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs +++ b/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.9")] -[assembly: AssemblyFileVersion("2.4.9")] +[assembly: AssemblyVersion("2.4.10")] +[assembly: AssemblyFileVersion("2.4.10")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs b/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs index 51631342..fb3f2dfc 100644 --- a/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs +++ b/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.9")] -[assembly: AssemblyFileVersion("2.4.9")] +[assembly: AssemblyVersion("2.4.10")] +[assembly: AssemblyFileVersion("2.4.10")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs b/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs index dab87752..f089930b 100644 --- a/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs +++ b/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.9")] -[assembly: AssemblyFileVersion("2.4.9")] +[assembly: AssemblyVersion("2.4.10")] +[assembly: AssemblyFileVersion("2.4.10")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/MapPolyline.Silverlight.WinRT.cs b/MapControl/MapPolyline.Silverlight.WinRT.cs index 532d1678..9e1d67bf 100644 --- a/MapControl/MapPolyline.Silverlight.WinRT.cs +++ b/MapControl/MapPolyline.Silverlight.WinRT.cs @@ -4,8 +4,10 @@ using System.Linq; #if WINDOWS_RUNTIME +using Windows.UI.Xaml; using Windows.UI.Xaml.Media; #else +using System.Windows; using System.Windows.Media; #endif @@ -13,6 +15,10 @@ namespace MapControl { public partial class MapPolyline { + public static readonly DependencyProperty FillRuleProperty = DependencyProperty.Register( + "FillRule", typeof(FillRule), typeof(MapPolyline), new PropertyMetadata(FillRule.EvenOdd, + (o, e) => ((PathGeometry)((MapPolyline)o).Data).FillRule = (FillRule)e.NewValue)); + public MapPolyline() { Data = new PathGeometry(); diff --git a/MapControl/MapPolyline.WPF.cs b/MapControl/MapPolyline.WPF.cs index 2ae660cf..016b0860 100644 --- a/MapControl/MapPolyline.WPF.cs +++ b/MapControl/MapPolyline.WPF.cs @@ -3,12 +3,17 @@ // Licensed under the Microsoft Public License (Ms-PL) using System.Linq; +using System.Windows; using System.Windows.Media; namespace MapControl { public partial class MapPolyline { + public static readonly DependencyProperty FillRuleProperty = StreamGeometry.FillRuleProperty.AddOwner( + typeof(MapPolyline), new FrameworkPropertyMetadata( + (o, e) => ((StreamGeometry)((MapPolyline)o).Data).FillRule = (FillRule)e.NewValue)); + public MapPolyline() { Data = new StreamGeometry(); diff --git a/MapControl/MapPolyline.cs b/MapControl/MapPolyline.cs index fd38a4e5..9d3e7745 100644 --- a/MapControl/MapPolyline.cs +++ b/MapControl/MapPolyline.cs @@ -6,9 +6,11 @@ using System.Collections.Generic; using System.Collections.Specialized; #if WINDOWS_RUNTIME using Windows.UI.Xaml; +using Windows.UI.Xaml.Media; #else -using System.Windows; using System.ComponentModel; +using System.Windows; +using System.Windows.Media; #endif namespace MapControl @@ -47,6 +49,15 @@ namespace MapControl set { SetValue(IsClosedProperty, value); } } + /// + /// Gets or sets the FillRule of the PathGeometry that represents the polyline. + /// + public FillRule FillRule + { + get { return (FillRule)GetValue(FillRuleProperty); } + set { SetValue(FillRuleProperty, value); } + } + private void LocationCollectionChanged(object sender, NotifyCollectionChangedEventArgs e) { UpdateData(); diff --git a/MapControl/Properties/AssemblyInfo.cs b/MapControl/Properties/AssemblyInfo.cs index 1f887db5..c7fb5a86 100644 --- a/MapControl/Properties/AssemblyInfo.cs +++ b/MapControl/Properties/AssemblyInfo.cs @@ -17,8 +17,8 @@ using System.Windows; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.9")] -[assembly: AssemblyFileVersion("2.4.9")] +[assembly: AssemblyVersion("2.4.10")] +[assembly: AssemblyFileVersion("2.4.10")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/WinRT/Properties/AssemblyInfo.cs b/MapControl/WinRT/Properties/AssemblyInfo.cs index 1ba1ade1..705edef6 100644 --- a/MapControl/WinRT/Properties/AssemblyInfo.cs +++ b/MapControl/WinRT/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.9")] -[assembly: AssemblyFileVersion("2.4.9")] +[assembly: AssemblyVersion("2.4.10")] +[assembly: AssemblyFileVersion("2.4.10")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs b/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs index 09a0ccb5..6930fe47 100644 --- a/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.9")] -[assembly: AssemblyFileVersion("2.4.9")] +[assembly: AssemblyVersion("2.4.10")] +[assembly: AssemblyFileVersion("2.4.10")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs index 056cc611..ed095a7b 100644 --- a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs +++ b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.9")] -[assembly: AssemblyFileVersion("2.4.9")] +[assembly: AssemblyVersion("2.4.10")] +[assembly: AssemblyFileVersion("2.4.10")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs index f0fbeb02..a248b475 100644 --- a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.9")] -[assembly: AssemblyFileVersion("2.4.9")] +[assembly: AssemblyVersion("2.4.10")] +[assembly: AssemblyFileVersion("2.4.10")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs index ba1238d2..8c0ae429 100644 --- a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.9")] -[assembly: AssemblyFileVersion("2.4.9")] +[assembly: AssemblyVersion("2.4.10")] +[assembly: AssemblyFileVersion("2.4.10")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs index d9099d74..6128a7a6 100644 --- a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.9")] -[assembly: AssemblyFileVersion("2.4.9")] +[assembly: AssemblyVersion("2.4.10")] +[assembly: AssemblyFileVersion("2.4.10")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)]