From 3774bf2ed3a1a30c4974e545700b04de2b907de4 Mon Sep 17 00:00:00 2001
From: ClemensF <fischer.clemens@gmail.com>
Date: Tue, 8 Aug 2017 21:24:51 +0200
Subject: [PATCH] Version 4.0.1: Fixed MapOverlay.

---
 .../Properties/AssemblyInfo.cs                |  4 +-
 .../Properties/AssemblyInfo.cs                |  4 +-
 MapControl/UWP/Properties/AssemblyInfo.cs     |  4 +-
 MapControl/UWP/Tile.UWP.cs                    |  6 +-
 MapControl/WPF/MapGraticule.WPF.cs            | 10 ++-
 MapControl/WPF/MapOverlay.WPF.cs              | 83 +++++++------------
 MapControl/WPF/MapScale.WPF.cs                | 12 +--
 MapControl/WPF/Properties/AssemblyInfo.cs     |  4 +-
 MapControl/WPF/Tile.WPF.cs                    |  6 +-
 .../UniversalApp/Properties/AssemblyInfo.cs   |  4 +-
 SampleApps/WpfApplication/OutlinedText.cs     | 16 ++--
 .../WpfApplication/Properties/AssemblyInfo.cs |  4 +-
 12 files changed, 64 insertions(+), 93 deletions(-)

diff --git a/Caching/FileDbCache.UWP/Properties/AssemblyInfo.cs b/Caching/FileDbCache.UWP/Properties/AssemblyInfo.cs
index edd9e95e..64204363 100644
--- a/Caching/FileDbCache.UWP/Properties/AssemblyInfo.cs
+++ b/Caching/FileDbCache.UWP/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2017 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.0.0")]
-[assembly: AssemblyFileVersion("4.0.0")]
+[assembly: AssemblyVersion("4.0.1")]
+[assembly: AssemblyFileVersion("4.0.1")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs b/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs
index a7b22831..78795e47 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("© 2017 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.0.0")]
-[assembly: AssemblyFileVersion("4.0.0")]
+[assembly: AssemblyVersion("4.0.1")]
+[assembly: AssemblyFileVersion("4.0.1")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/MapControl/UWP/Properties/AssemblyInfo.cs b/MapControl/UWP/Properties/AssemblyInfo.cs
index b839809d..3ab8cb70 100644
--- a/MapControl/UWP/Properties/AssemblyInfo.cs
+++ b/MapControl/UWP/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2017 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.0.0")]
-[assembly: AssemblyFileVersion("4.0.0")]
+[assembly: AssemblyVersion("4.0.1")]
+[assembly: AssemblyFileVersion("4.0.1")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/MapControl/UWP/Tile.UWP.cs b/MapControl/UWP/Tile.UWP.cs
index 4a2e643a..491af051 100644
--- a/MapControl/UWP/Tile.UWP.cs
+++ b/MapControl/UWP/Tile.UWP.cs
@@ -28,8 +28,7 @@ namespace MapControl
                 }
                 else
                 {
-                    Image.BeginAnimation(UIElement.OpacityProperty,
-                        new DoubleAnimation { From = 0d, To = 1d, Duration = FadeDuration });
+                    Image.BeginAnimation(UIElement.OpacityProperty, new DoubleAnimation { To = 1d, Duration = FadeDuration });
                 }
             }
             else
@@ -47,8 +46,7 @@ namespace MapControl
             bitmapImage.ImageOpened -= BitmapImageOpened;
             bitmapImage.ImageFailed -= BitmapImageFailed;
 
-            Image.BeginAnimation(UIElement.OpacityProperty,
-                new DoubleAnimation { From = 0d, To = 1d, Duration = FadeDuration });
+            Image.BeginAnimation(UIElement.OpacityProperty, new DoubleAnimation { To = 1d, Duration = FadeDuration });
         }
 
         private void BitmapImageFailed(object sender, ExceptionRoutedEventArgs e)
diff --git a/MapControl/WPF/MapGraticule.WPF.cs b/MapControl/WPF/MapGraticule.WPF.cs
index df215e59..137a6b56 100644
--- a/MapControl/WPF/MapGraticule.WPF.cs
+++ b/MapControl/WPF/MapGraticule.WPF.cs
@@ -48,14 +48,16 @@ namespace MapControl
                 var lonLabelStart = Math.Ceiling(bounds.West / lineDistance) * lineDistance;
                 var latLabels = new List<Label>((int)((bounds.North - latLabelStart) / lineDistance) + 1);
                 var lonLabels = new List<Label>((int)((bounds.East - lonLabelStart) / lineDistance) + 1);
+                var typeface = CreateTypeface();
+                var pen = CreatePen();
 
                 for (var lat = latLabelStart; lat <= bounds.North; lat += lineDistance)
                 {
                     latLabels.Add(new Label(lat, new FormattedText(
                         GetLabelText(lat, labelFormat, "NS"),
-                        CultureInfo.InvariantCulture, FlowDirection.LeftToRight, Typeface, FontSize, Foreground)));
+                        CultureInfo.InvariantCulture, FlowDirection.LeftToRight, typeface, FontSize, Foreground)));
 
-                    drawingContext.DrawLine(Pen,
+                    drawingContext.DrawLine(pen,
                         projection.LocationToViewportPoint(new Location(lat, bounds.West)),
                         projection.LocationToViewportPoint(new Location(lat, bounds.East)));
                 }
@@ -64,9 +66,9 @@ namespace MapControl
                 {
                     lonLabels.Add(new Label(lon, new FormattedText(
                         GetLabelText(Location.NormalizeLongitude(lon), labelFormat, "EW"),
-                        CultureInfo.InvariantCulture, FlowDirection.LeftToRight, Typeface, FontSize, Foreground)));
+                        CultureInfo.InvariantCulture, FlowDirection.LeftToRight, typeface, FontSize, Foreground)));
 
-                    drawingContext.DrawLine(Pen,
+                    drawingContext.DrawLine(pen,
                         projection.LocationToViewportPoint(new Location(bounds.South, lon)),
                         projection.LocationToViewportPoint(new Location(bounds.North, lon)));
                 }
diff --git a/MapControl/WPF/MapOverlay.WPF.cs b/MapControl/WPF/MapOverlay.WPF.cs
index ebf13e11..5453773c 100644
--- a/MapControl/WPF/MapOverlay.WPF.cs
+++ b/MapControl/WPF/MapOverlay.WPF.cs
@@ -11,90 +11,63 @@ namespace MapControl
 {
     public partial class MapOverlay
     {
-        public static readonly DependencyProperty FontSizeProperty = Control.FontSizeProperty.AddOwner(
-            typeof(MapOverlay));
+        public static readonly DependencyProperty FontSizeProperty = Control.FontSizeProperty.AddOwner(typeof(MapOverlay));
 
-        public static readonly DependencyProperty FontFamilyProperty = Control.FontFamilyProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata((o, e) => ((MapOverlay)o).typeface = null));
+        public static readonly DependencyProperty FontFamilyProperty = Control.FontFamilyProperty.AddOwner(typeof(MapOverlay));
 
-        public static readonly DependencyProperty FontStyleProperty = Control.FontStyleProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata((o, e) => ((MapOverlay)o).typeface = null));
+        public static readonly DependencyProperty FontStyleProperty = Control.FontStyleProperty.AddOwner(typeof(MapOverlay));
 
-        public static readonly DependencyProperty FontStretchProperty = Control.FontStretchProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata((o, e) => ((MapOverlay)o).typeface = null));
+        public static readonly DependencyProperty FontStretchProperty = Control.FontStretchProperty.AddOwner(typeof(MapOverlay));
 
-        public static readonly DependencyProperty FontWeightProperty = Control.FontWeightProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata((o, e) => ((MapOverlay)o).typeface = null));
+        public static readonly DependencyProperty FontWeightProperty = Control.FontWeightProperty.AddOwner(typeof(MapOverlay));
 
-        public static readonly DependencyProperty ForegroundProperty = Control.ForegroundProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata((o, e) => { if (o.GetValue(StrokeProperty) == null) ((MapOverlay)o).pen = null; }));
+        public static readonly DependencyProperty ForegroundProperty = Control.ForegroundProperty.AddOwner(typeof(MapOverlay));
 
         public static readonly DependencyProperty StrokeProperty = Shape.StrokeProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata((o, e) => ((MapOverlay)o).pen = null));
+            typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true });
 
         public static readonly DependencyProperty StrokeThicknessProperty = Shape.StrokeThicknessProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata((o, e) => ((MapOverlay)o).pen = null));
+            typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true });
 
         public static readonly DependencyProperty StrokeDashArrayProperty = Shape.StrokeDashArrayProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata((o, e) => ((MapOverlay)o).pen = null));
+            typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true });
 
         public static readonly DependencyProperty StrokeDashOffsetProperty = Shape.StrokeDashOffsetProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata((o, e) => ((MapOverlay)o).pen = null));
+            typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true });
 
         public static readonly DependencyProperty StrokeDashCapProperty = Shape.StrokeDashCapProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata((o, e) => ((MapOverlay)o).pen = null));
+            typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true });
 
         public static readonly DependencyProperty StrokeStartLineCapProperty = Shape.StrokeStartLineCapProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata((o, e) => ((MapOverlay)o).pen = null));
+            typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true });
 
         public static readonly DependencyProperty StrokeEndLineCapProperty = Shape.StrokeEndLineCapProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata((o, e) => ((MapOverlay)o).pen = null));
+            typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true });
 
         public static readonly DependencyProperty StrokeLineJoinProperty = Shape.StrokeLineJoinProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata((o, e) => ((MapOverlay)o).pen = null));
+            typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true });
 
         public static readonly DependencyProperty StrokeMiterLimitProperty = Shape.StrokeMiterLimitProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata((o, e) => ((MapOverlay)o).pen = null));
+            typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true });
 
-        private Typeface typeface;
-        private Pen pen;
-
-        protected Typeface Typeface
+        protected Typeface CreateTypeface()
         {
-            get
-            {
-                if (typeface == null)
-                {
-                    typeface = new Typeface(FontFamily, FontStyle, FontWeight, FontStretch);
-                }
-
-                return typeface;
-            }
+            return new Typeface(FontFamily, FontStyle, FontWeight, FontStretch);
         }
 
-        protected Pen Pen
+        protected Pen CreatePen()
         {
-            get
+            return new Pen
             {
-                if (pen == null)
-                {
-                    pen = new Pen
-                    {
-                        Brush = Stroke ?? Foreground,
-                        Thickness = StrokeThickness,
-                        DashStyle = new DashStyle(StrokeDashArray, StrokeDashOffset),
-                        DashCap = StrokeDashCap,
-                        StartLineCap = StrokeStartLineCap,
-                        EndLineCap = StrokeEndLineCap,
-                        LineJoin = StrokeLineJoin,
-                        MiterLimit = StrokeMiterLimit
-                    };
-
-                    pen.Freeze();
-                }
-
-                return pen;
-            }
+                Brush = Stroke ?? Foreground,
+                Thickness = StrokeThickness,
+                DashStyle = new DashStyle(StrokeDashArray, StrokeDashOffset),
+                DashCap = StrokeDashCap,
+                StartLineCap = StrokeStartLineCap,
+                EndLineCap = StrokeEndLineCap,
+                LineJoin = StrokeLineJoin,
+                MiterLimit = StrokeMiterLimit
+            };
         }
     }
 }
diff --git a/MapControl/WPF/MapScale.WPF.cs b/MapControl/WPF/MapScale.WPF.cs
index 46e1ebc7..f33fc989 100644
--- a/MapControl/WPF/MapScale.WPF.cs
+++ b/MapControl/WPF/MapScale.WPF.cs
@@ -15,8 +15,7 @@ namespace MapControl
     /// </summary>
     public class MapScale : MapOverlay
     {
-        public static readonly DependencyProperty PaddingProperty = Control.PaddingProperty.AddOwner(
-            typeof(MapScale), new FrameworkPropertyMetadata(new Thickness(2d)));
+        public static readonly DependencyProperty PaddingProperty = Control.PaddingProperty.AddOwner(typeof(MapScale));
 
         private double length;
         private Size size;
@@ -78,12 +77,13 @@ namespace MapControl
                 var y2 = size.Height - Padding.Bottom - StrokeThickness / 2d;
                 var text = new FormattedText(
                     length >= 1000d ? string.Format("{0:0} km", length / 1000d) : string.Format("{0:0} m", length),
-                    CultureInfo.InvariantCulture, FlowDirection.LeftToRight, Typeface, FontSize, Foreground);
+                    CultureInfo.InvariantCulture, FlowDirection.LeftToRight, CreateTypeface(), FontSize, Foreground);
+                var pen = CreatePen();
 
                 drawingContext.DrawRectangle(Background ?? ParentMap.Background, null, new Rect(size));
-                drawingContext.DrawLine(Pen, new Point(x1, y1), new Point(x1, y2));
-                drawingContext.DrawLine(Pen, new Point(x2, y1), new Point(x2, y2));
-                drawingContext.DrawLine(Pen, new Point(x1, y2), new Point(x2, y2));
+                drawingContext.DrawLine(pen, new Point(x1, y1), new Point(x1, y2));
+                drawingContext.DrawLine(pen, new Point(x2, y1), new Point(x2, y2));
+                drawingContext.DrawLine(pen, new Point(x1, y2), new Point(x2, y2));
                 drawingContext.DrawText(text, new Point((size.Width - text.Width) / 2d, 0d));
             }
         }
diff --git a/MapControl/WPF/Properties/AssemblyInfo.cs b/MapControl/WPF/Properties/AssemblyInfo.cs
index 7b9c0f76..e93a4370 100644
--- a/MapControl/WPF/Properties/AssemblyInfo.cs
+++ b/MapControl/WPF/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@ using System.Windows;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2017 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.0.0")]
-[assembly: AssemblyFileVersion("4.0.0")]
+[assembly: AssemblyVersion("4.0.1")]
+[assembly: AssemblyFileVersion("4.0.1")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/MapControl/WPF/Tile.WPF.cs b/MapControl/WPF/Tile.WPF.cs
index eae57593..68542982 100644
--- a/MapControl/WPF/Tile.WPF.cs
+++ b/MapControl/WPF/Tile.WPF.cs
@@ -28,8 +28,7 @@ namespace MapControl
                 }
                 else
                 {
-                    Image.BeginAnimation(UIElement.OpacityProperty,
-                        new DoubleAnimation(0d, 1d, FadeDuration));
+                    Image.BeginAnimation(UIElement.OpacityProperty, new DoubleAnimation(1d, FadeDuration));
                 }
             }
             else
@@ -47,8 +46,7 @@ namespace MapControl
             bitmapSource.DownloadCompleted -= BitmapDownloadCompleted;
             bitmapSource.DownloadFailed -= BitmapDownloadFailed;
 
-            Image.BeginAnimation(UIElement.OpacityProperty,
-                new DoubleAnimation(0d, 1d, FadeDuration));
+            Image.BeginAnimation(UIElement.OpacityProperty, new DoubleAnimation(1d, FadeDuration));
         }
 
         private void BitmapDownloadFailed(object sender, ExceptionEventArgs e)
diff --git a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs
index 7bbc5358..ff5e8648 100644
--- a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs
+++ b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("© 2017 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.3.0")]
-[assembly: AssemblyFileVersion("3.3.0")]
+[assembly: AssemblyVersion("4.0.1")]
+[assembly: AssemblyFileVersion("4.0.1")]
 [assembly: AssemblyConfiguration("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/WpfApplication/OutlinedText.cs b/SampleApps/WpfApplication/OutlinedText.cs
index c93c1fc9..ae5ee879 100644
--- a/SampleApps/WpfApplication/OutlinedText.cs
+++ b/SampleApps/WpfApplication/OutlinedText.cs
@@ -10,28 +10,28 @@ namespace WpfApplication
         private Geometry outline;
 
         public static readonly DependencyProperty TextProperty = TextBlock.TextProperty.AddOwner(
-            typeof(OutlinedText), new FrameworkPropertyMetadata((o, e) => ((OutlinedText)o).glyphRun = null));
+            typeof(OutlinedText), new FrameworkPropertyMetadata((o, e) => ((OutlinedText)o).glyphRun = null) { AffectsMeasure = true });
 
         public static readonly DependencyProperty FontSizeProperty = TextBlock.FontSizeProperty.AddOwner(
-            typeof(OutlinedText), new FrameworkPropertyMetadata((o, e) => ((OutlinedText)o).glyphRun = null));
+            typeof(OutlinedText), new FrameworkPropertyMetadata((o, e) => ((OutlinedText)o).glyphRun = null) { AffectsMeasure = true });
 
         public static readonly DependencyProperty FontFamilyProperty = TextBlock.FontFamilyProperty.AddOwner(
-            typeof(OutlinedText), new FrameworkPropertyMetadata((o, e) => ((OutlinedText)o).glyphRun = null));
+            typeof(OutlinedText), new FrameworkPropertyMetadata((o, e) => ((OutlinedText)o).glyphRun = null) { AffectsMeasure = true });
 
         public static readonly DependencyProperty FontStyleProperty = TextBlock.FontStyleProperty.AddOwner(
-            typeof(OutlinedText), new FrameworkPropertyMetadata((o, e) => ((OutlinedText)o).glyphRun = null));
+            typeof(OutlinedText), new FrameworkPropertyMetadata((o, e) => ((OutlinedText)o).glyphRun = null) { AffectsMeasure = true });
 
         public static readonly DependencyProperty FontWeightProperty = TextBlock.FontWeightProperty.AddOwner(
-            typeof(OutlinedText), new FrameworkPropertyMetadata((o, e) => ((OutlinedText)o).glyphRun = null));
+            typeof(OutlinedText), new FrameworkPropertyMetadata((o, e) => ((OutlinedText)o).glyphRun = null) { AffectsMeasure = true });
 
         public static readonly DependencyProperty FontStretchProperty = TextBlock.FontStretchProperty.AddOwner(
-            typeof(OutlinedText), new FrameworkPropertyMetadata((o, e) => ((OutlinedText)o).glyphRun = null));
+            typeof(OutlinedText), new FrameworkPropertyMetadata((o, e) => ((OutlinedText)o).glyphRun = null) { AffectsMeasure = true });
 
         public static readonly DependencyProperty ForegroundProperty = TextBlock.ForegroundProperty.AddOwner(
-            typeof(OutlinedText), new FrameworkPropertyMetadata((o, e) => ((OutlinedText)o).glyphRun = null));
+            typeof(OutlinedText), new FrameworkPropertyMetadata((o, e) => ((OutlinedText)o).glyphRun = null) { AffectsMeasure = true });
 
         public static readonly DependencyProperty BackgroundProperty = TextBlock.BackgroundProperty.AddOwner(
-            typeof(OutlinedText), new FrameworkPropertyMetadata(Brushes.White, (o, e) => ((OutlinedText)o).glyphRun = null));
+            typeof(OutlinedText), new FrameworkPropertyMetadata(Brushes.White, (o, e) => ((OutlinedText)o).glyphRun = null) { AffectsMeasure = true });
 
         public static readonly DependencyProperty OutlineThicknessProperty = DependencyProperty.Register(
             "OutlineThickness", typeof(double), typeof(OutlinedText),
diff --git a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs
index 0a8d5518..7fc976cf 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("© 2017 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.0.0")]
-[assembly: AssemblyFileVersion("4.0.0")]
+[assembly: AssemblyVersion("4.0.1")]
+[assembly: AssemblyFileVersion("4.0.1")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]