Version 1.6.0: Retargeted WinRT version to 8.1. Improved MapGraticule performance for WPF.

MapControl/MapGraticule.WPF.cs

@@ -3,6 +3,7 @@
 // Licensed under the Microsoft Public License (Ms-PL)
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
@@ -11,13 +12,27 @@ namespace MapControl
 {
     public partial class MapGraticule : MapOverlay
     {
+        private class Label
+        {
+            public readonly double Position;
+            public readonly string Text;
+
+            public Label(double position, string text)
+            {
+                Position = position;
+                Text = text;
+            }
+        }
+
+        private Dictionary<string, GlyphRun> glyphRuns = new Dictionary<string, GlyphRun>();
+
         static MapGraticule()
         {
             UIElement.IsHitTestVisibleProperty.OverrideMetadata(
                 typeof(MapGraticule), new FrameworkPropertyMetadata(false));
 
             MapOverlay.StrokeThicknessProperty.OverrideMetadata(
-                typeof(MapGraticule), new FrameworkPropertyMetadata(0.5));
+                typeof(MapGraticule), new FrameworkPropertyMetadata(0.5, (o, e) => ((MapGraticule)o).glyphRuns.Clear()));
         }
 
         protected override void OnViewportChanged()
@@ -40,45 +55,79 @@ namespace MapControl
                     spacing = LineSpacings.FirstOrDefault(s => s >= minSpacing);
                 }
 
-                var labelsStart = new Location(
+                var labelFormat = spacing < 1d ? "{0} {1}°{2:00}'" : "{0} {1}°";
+                var labelStart = new Location(
                     Math.Ceiling(start.Latitude / spacing) * spacing,
                     Math.Ceiling(start.Longitude / spacing) * spacing);
 
-                for (var lat = labelsStart.Latitude; lat <= end.Latitude; lat += spacing)
+                var latLabels = new List<Label>(16);
+                var lonLabels = new List<Label>(16);
+
+                for (var lat = labelStart.Latitude; lat <= end.Latitude; lat += spacing)
                 {
+                    latLabels.Add(new Label(lat, CoordinateString(lat, labelFormat, "NS")));
+
                     drawingContext.DrawLine(Pen,
                         ParentMap.LocationToViewportPoint(new Location(lat, start.Longitude)),
                         ParentMap.LocationToViewportPoint(new Location(lat, end.Longitude)));
                 }
 
-                for (var lon = labelsStart.Longitude; lon <= end.Longitude; lon += spacing)
+                for (var lon = labelStart.Longitude; lon <= end.Longitude; lon += spacing)
                 {
+                    lonLabels.Add(new Label(lon, CoordinateString(Location.NormalizeLongitude(lon), labelFormat, "EW")));
+
                     drawingContext.DrawLine(Pen,
                         ParentMap.LocationToViewportPoint(new Location(start.Latitude, lon)),
                         ParentMap.LocationToViewportPoint(new Location(end.Latitude, lon)));
                 }
 
-                if (Foreground != null && Foreground != Brushes.Transparent)
+                if (Foreground != null && Foreground != Brushes.Transparent && latLabels.Count > 0 && lonLabels.Count > 0)
                 {
-                    var format = spacing < 1d ? "{0} {1}°{2:00}'" : "{0} {1}°";
+                    var latLabelOrigin = new Point(StrokeThickness / 2d + 2d, -StrokeThickness / 2d - FontSize / 4d);
+                    var lonLabelOrigin = new Point(StrokeThickness / 2d + 2d, StrokeThickness / 2d + FontSize);
+                    var transform = Matrix.Identity;
+                    transform.Rotate(ParentMap.Heading);
 
-                    for (var lat = labelsStart.Latitude; lat <= end.Latitude; lat += spacing)
+                    foreach (var latLabel in latLabels)
                     {
-                        for (var lon = labelsStart.Longitude; lon <= end.Longitude; lon += spacing)
+                        foreach (var lonLabel in lonLabels)
                         {
-                            var t = StrokeThickness / 2d;
-                            var p = ParentMap.LocationToViewportPoint(new Location(lat, lon));
-                            var latPos = new Point(p.X + t + 2d, p.Y - t - FontSize / 4d);
-                            var lonPos = new Point(p.X + t + 2d, p.Y + t + FontSize);
-                            var latLabel = CoordinateString(lat, format, "NS");
-                            var lonLabel = CoordinateString(Location.NormalizeLongitude(lon), format, "EW");
+                            GlyphRun latGlyphRun;
+                            GlyphRun lonGlyphRun;
 
-                            drawingContext.PushTransform(new RotateTransform(ParentMap.Heading, p.X, p.Y));
-                            drawingContext.DrawGlyphRun(Foreground, GlyphRunText.Create(latLabel, Typeface, FontSize, latPos));
-                            drawingContext.DrawGlyphRun(Foreground, GlyphRunText.Create(lonLabel, Typeface, FontSize, lonPos));
+                            if (!glyphRuns.TryGetValue(latLabel.Text, out latGlyphRun))
+                            {
+                                latGlyphRun = GlyphRunText.Create(latLabel.Text, Typeface, FontSize, latLabelOrigin);
+                                glyphRuns.Add(latLabel.Text, latGlyphRun);
+                            }
+
+                            if (!glyphRuns.TryGetValue(lonLabel.Text, out lonGlyphRun))
+                            {
+                                lonGlyphRun = GlyphRunText.Create(lonLabel.Text, Typeface, FontSize, lonLabelOrigin);
+                                glyphRuns.Add(lonLabel.Text, lonGlyphRun);
+                            }
+
+                            var position = ParentMap.LocationToViewportPoint(new Location(latLabel.Position, lonLabel.Position));
+
+                            drawingContext.PushTransform(new MatrixTransform(
+                                transform.M11, transform.M12, transform.M21, transform.M22, position.X, position.Y));
+
+                            drawingContext.DrawGlyphRun(Foreground, latGlyphRun);
+                            drawingContext.DrawGlyphRun(Foreground, lonGlyphRun);
                             drawingContext.Pop();
                         }
                     }
+
+                    var removeKeys = glyphRuns.Keys.Where(k => !latLabels.Any(l => l.Text == k) && !lonLabels.Any(l => l.Text == k));
+
+                    foreach (var key in removeKeys.ToList())
+                    {
+                        glyphRuns.Remove(key);
+                    }
+                }
+                else
+                {
+                    glyphRuns.Clear();
                 }
             }
         }

MapControl/Properties/AssemblyInfo.cs

@@ -15,8 +15,8 @@ using System.Windows;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("1.5.0")]
-[assembly: AssemblyFileVersion("1.5.0")]
+[assembly: AssemblyVersion("1.6.0")]
+[assembly: AssemblyFileVersion("1.6.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]

MapControl/WinRT/MapControl.WinRT.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -14,6 +14,9 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetPlatformVersion>8.1</TargetPlatformVersion>
+    <MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
+    <TargetFrameworkVersion />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -144,8 +147,8 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
-    <VisualStudioVersion>11.0</VisualStudioVersion>
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
+    <VisualStudioVersion>12.0</VisualStudioVersion>
   </PropertyGroup>
   <PropertyGroup>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>

MapControl/WinRT/Properties/AssemblyInfo.cs

@@ -8,8 +8,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("1.5.0")]
-[assembly: AssemblyFileVersion("1.5.0")]
+[assembly: AssemblyVersion("1.6.0")]
+[assembly: AssemblyFileVersion("1.6.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]