From 8eedb82a9d3a97912d0a58bcf8d03d04ea43c6bc Mon Sep 17 00:00:00 2001
From: ClemensF <fischer.clemens@gmail.com>
Date: Tue, 5 Nov 2013 18:00:03 +0100
Subject: [PATCH] Version 1.7.0. Signed assemblies, marked Location as
 serializable, simplified LocationCollection.

---
 Caching/FileDbCache/FileDbCache.csproj        |  11 ++++++
 .../FileDbCache/Properties/AssemblyInfo.cs    |   4 +-
 Caching/ImageFileCache/ImageFileCache.csproj  |  11 ++++++
 .../ImageFileCache/Properties/AssemblyInfo.cs |   4 +-
 MapControl.snk                                | Bin 0 -> 596 bytes
 MapControl/Location.cs                        |  34 ++++++++---------
 MapControl/LocationCollection.cs              |  20 +++++-----
 MapControl/MapControl.Silverlight.csproj      |  16 ++++++--
 MapControl/MapControl.WPF.csproj              |  36 +++++++++++-------
 MapControl/MercatorTransform.cs               |  12 +++---
 MapControl/Properties/AssemblyInfo.cs         |   4 +-
 MapControl/TileImageLoader.WPF.cs             |  28 ++++++++------
 MapControl/WinRT/MapControl.WinRT.csproj      |  12 +++++-
 MapControl/WinRT/Properties/AssemblyInfo.cs   |   4 +-
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../WpfApplication/Properties/AssemblyInfo.cs |   4 +-
 .../Properties/Settings.Designer.cs           |   4 +-
 20 files changed, 135 insertions(+), 85 deletions(-)
 create mode 100644 MapControl.snk

diff --git a/Caching/FileDbCache/FileDbCache.csproj b/Caching/FileDbCache/FileDbCache.csproj
index 30c9400b..8f4d183d 100644
--- a/Caching/FileDbCache/FileDbCache.csproj
+++ b/Caching/FileDbCache/FileDbCache.csproj
@@ -33,6 +33,12 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="FileDb, Version=3.10.0.0, Culture=neutral, PublicKeyToken=68cc942b9efb3282, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -50,6 +56,11 @@
     <Content Include="FileDb\FileDb.dll" />
     <Content Include="FileDb\FileDb.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\MapControl.snk">
+      <Link>MapControl.snk</Link>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Caching/FileDbCache/Properties/AssemblyInfo.cs b/Caching/FileDbCache/Properties/AssemblyInfo.cs
index 53145655..fcdf257d 100644
--- a/Caching/FileDbCache/Properties/AssemblyInfo.cs
+++ b/Caching/FileDbCache/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.6.1")]
-[assembly: AssemblyFileVersion("1.6.1")]
+[assembly: AssemblyVersion("1.7.0")]
+[assembly: AssemblyFileVersion("1.7.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/Caching/ImageFileCache/ImageFileCache.csproj b/Caching/ImageFileCache/ImageFileCache.csproj
index d8233864..75ce1be8 100644
--- a/Caching/ImageFileCache/ImageFileCache.csproj
+++ b/Caching/ImageFileCache/ImageFileCache.csproj
@@ -33,6 +33,12 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -42,6 +48,11 @@
     <Compile Include="ImageFileCache.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\MapControl.snk">
+      <Link>MapControl.snk</Link>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Caching/ImageFileCache/Properties/AssemblyInfo.cs b/Caching/ImageFileCache/Properties/AssemblyInfo.cs
index 8b705751..a652f9a1 100644
--- a/Caching/ImageFileCache/Properties/AssemblyInfo.cs
+++ b/Caching/ImageFileCache/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.6.1")]
-[assembly: AssemblyFileVersion("1.6.1")]
+[assembly: AssemblyVersion("1.7.0")]
+[assembly: AssemblyFileVersion("1.7.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/MapControl.snk b/MapControl.snk
new file mode 100644
index 0000000000000000000000000000000000000000..35c2ef11863dba88763421bd1994216d502086f2
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa500991O?HD4txDL?pU`z2a$x6^(i3t1-9ZE6
zWQ{gKId|<<$S483s2uQKxTz;U{w|$Qg*qfIly6uh$32HUef`KayZdLyq2)Y!1BX9z
zN&he0ho@-iN2!iZbcLO!s^bu-Q^1URU?)~=Kk{+#H7COMXNFK?USy@sG~ZyT$i#@}
zG_0318-pxTYHXAh6>jC{Z*Niw>ua}U+*F22!tsA>#sc(h@L*ePOW!80BE+IdGr}#l
z;Xe=p$ZjzpJomjR;~z4Pw)BK$yH}`dq2{iT8P_UWpd<Zx<J{s^%G&}ppbY@TagP^C
zMLn<eTG?xnMI&iX`$yD@!WC^dpHH}D_me?oz<49U`{IE4Siiz5Y4_ItwQ*r`bQ*o*
zU<GpjKN_q?qdtl1HU)(0&bJJYr8=SErh9FiC$$NCRAN%OF@CuTl9tmv4I}(C!<IA?
zECoBaCPu92wq!d`es+X^T0wxWEJXz9e=z#UBc%~|=+^Y>YS@k9&FtvwIU_XDg5*SJ
zZ4cPEtDJtNVngq}t4j$c;#n?S<Bn?lpx~T$WFs4UPE4huChCX}dN)1YVGSTLoGf9?
z_A{zFuY)L|1;udH&YIQ@jD8G;za=lMKEr4p3tEY*)-5aOQb8rbk<#3%K?-W9+CD~y
zgtm;$+wyT)IM+XBRIbuj<0@+!G%gy^vg%5bEYp{CjOmRzhXE9i>3-w;z!+=ibWZUm
i(Cy|0A^usim#$}Zp+4ZkM%KQU#VL^<f83)GJ~#xHbs!-C

literal 0
HcmV?d00001

diff --git a/MapControl/Location.cs b/MapControl/Location.cs
index d6d0bd27..2ef8f8e0 100644
--- a/MapControl/Location.cs
+++ b/MapControl/Location.cs
@@ -8,13 +8,24 @@ using System.Globalization;
 namespace MapControl
 {
     /// <summary>
-    /// A geographic location given as latitude and longitude.
+    /// A geographic location with latitude and longitude values in degrees.
     /// </summary>
-    public partial class Location : IEquatable<Location>
+#if !SILVERLIGHT && !NETFX_CORE
+    [Serializable]
+#endif
+    public partial class Location
     {
+        /// <summary>
+        /// TransformedLatitude is set by the Transform methods in MercatorTransform.
+        /// It holds the transformed latitude value to avoid redundant recalculation. 
+        /// </summary>
+#if !SILVERLIGHT && !NETFX_CORE
+        [NonSerialized]
+#endif
+        internal double TransformedLatitude;
+
         private double latitude;
         private double longitude;
-        internal double Y;
 
         public Location()
         {
@@ -32,7 +43,7 @@ namespace MapControl
             set
             {
                 latitude = Math.Min(Math.Max(value, -90d), 90d);
-                Y = double.NaN;
+                TransformedLatitude = double.NaN;
             }
         }
 
@@ -42,21 +53,6 @@ namespace MapControl
             set { longitude = value; }
         }
 
-        public bool Equals(Location other)
-        {
-            return other != null && other.latitude == latitude && other.longitude == longitude;
-        }
-
-        public override bool Equals(object obj)
-        {
-            return Equals(obj as Location);
-        }
-
-        public override int GetHashCode()
-        {
-            return latitude.GetHashCode() ^ longitude.GetHashCode();
-        }
-
         public override string ToString()
         {
             return string.Format(CultureInfo.InvariantCulture, "{0:F5},{1:F5}", latitude, longitude);
diff --git a/MapControl/LocationCollection.cs b/MapControl/LocationCollection.cs
index 791feaad..6b6ed5cf 100644
--- a/MapControl/LocationCollection.cs
+++ b/MapControl/LocationCollection.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 
 namespace MapControl
 {
@@ -18,23 +19,20 @@ namespace MapControl
         }
 
         public LocationCollection(IEnumerable<Location> locations)
+            : base(locations)
+        {
+        }
+
+        public LocationCollection(List<Location> locations)
+            : base(locations)
         {
-            foreach (var location in locations)
-            {
-                Add(location);
-            }
         }
 
         public static LocationCollection Parse(string s)
         {
-            LocationCollection locations = new LocationCollection();
+            var strings = s.Split(new char[] { ' ', ';' }, StringSplitOptions.RemoveEmptyEntries);
 
-            foreach (var locString in s.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries))
-            {
-                locations.Add(Location.Parse(locString));
-            }
-
-            return locations;
+            return new LocationCollection(strings.Select(l => Location.Parse(l)));
         }
     }
 }
diff --git a/MapControl/MapControl.Silverlight.csproj b/MapControl/MapControl.Silverlight.csproj
index 3aeca3a1..a48ec921 100644
--- a/MapControl/MapControl.Silverlight.csproj
+++ b/MapControl/MapControl.Silverlight.csproj
@@ -51,6 +51,12 @@
   <PropertyGroup>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\MapControl.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="System.Windows" />
@@ -81,10 +87,10 @@
     <Compile Include="MapPanel.cs" />
     <Compile Include="MapPanel.Silverlight.WinRT.cs" />
     <Compile Include="MapPath.cs" />
-    <Compile Include="MapRectangle.cs" />
+    <Compile Include="MapPath.Silverlight.WinRT.cs" />
     <Compile Include="MapPolyline.cs" />
     <Compile Include="MapPolyline.Silverlight.WinRT.cs" />
-    <Compile Include="MapPath.Silverlight.WinRT.cs" />
+    <Compile Include="MapRectangle.cs" />
     <Compile Include="MapTransform.cs" />
     <Compile Include="MatrixEx.cs" />
     <Compile Include="MercatorTransform.cs" />
@@ -101,13 +107,17 @@
     <Compile Include="TileSource.cs" />
     <Compile Include="TileSourceConverter.cs" />
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <Page Include="Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\MapControl.snk">
+      <Link>MapControl.snk</Link>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
diff --git a/MapControl/MapControl.WPF.csproj b/MapControl/MapControl.WPF.csproj
index d63ffd51..46a2e8a7 100644
--- a/MapControl/MapControl.WPF.csproj
+++ b/MapControl/MapControl.WPF.csproj
@@ -35,6 +35,12 @@
   <PropertyGroup>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\MapControl.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -45,27 +51,30 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Map.WPF.cs" />
-    <Compile Include="MapGraticule.WPF.cs" />
+    <Compile Include="GlyphRunText.cs" />
+    <Compile Include="ImageTileSource.cs" />
     <Compile Include="Location.cs" />
     <Compile Include="LocationCollection.cs" />
     <Compile Include="LocationCollectionConverter.cs" />
     <Compile Include="LocationConverter.cs" />
-    <Compile Include="MapBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="Map.WPF.cs" />
+    <Compile Include="MapBase.cs" />
     <Compile Include="MapBase.WPF.cs" />
+    <Compile Include="MapGraticule.cs" />
+    <Compile Include="MapGraticule.WPF.cs" />
     <Compile Include="MapImage.cs" />
     <Compile Include="MapImageLayer.cs" />
     <Compile Include="MapItem.WPF.cs" />
     <Compile Include="MapItemsControl.WPF.cs" />
+    <Compile Include="MapOverlay.cs" />
     <Compile Include="MapPanel.cs" />
     <Compile Include="MapPanel.WPF.cs" />
+    <Compile Include="MapPath.cs" />
+    <Compile Include="MapPath.WPF.cs" />
     <Compile Include="MapPolyline.cs" />
     <Compile Include="MapPolyline.WPF.cs" />
     <Compile Include="MapRectangle.cs" />
-    <Compile Include="MapPath.cs" />
-    <Compile Include="MapPath.WPF.cs" />
+    <Compile Include="MapScale.cs" />
     <Compile Include="MapTransform.cs" />
     <Compile Include="MercatorTransform.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -74,17 +83,12 @@
     <Compile Include="Tile.WPF.cs" />
     <Compile Include="TileContainer.cs" />
     <Compile Include="TileContainer.WPF.cs" />
+    <Compile Include="TileImageLoader.WPF.cs" />
     <Compile Include="TileLayer.cs" />
     <Compile Include="TileLayer.WPF.cs" />
     <Compile Include="TileLayerCollection.cs" />
     <Compile Include="TileSource.cs" />
     <Compile Include="TileSourceConverter.cs" />
-    <Compile Include="GlyphRunText.cs" />
-    <Compile Include="ImageTileSource.cs" />
-    <Compile Include="MapGraticule.cs" />
-    <Compile Include="MapOverlay.cs" />
-    <Compile Include="MapScale.cs" />
-    <Compile Include="TileImageLoader.WPF.cs" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="Themes\Generic.xaml">
@@ -92,7 +96,11 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="..\MapControl.snk">
+      <Link>MapControl.snk</Link>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
diff --git a/MapControl/MercatorTransform.cs b/MapControl/MercatorTransform.cs
index 23d4f7a2..398caa2e 100644
--- a/MapControl/MercatorTransform.cs
+++ b/MapControl/MercatorTransform.cs
@@ -41,30 +41,30 @@ namespace MapControl
 
         public override Point Transform(Location location)
         {
-            if (double.IsNaN(location.Y))
+            if (double.IsNaN(location.TransformedLatitude))
             {
                 if (location.Latitude <= -90d)
                 {
-                    location.Y = double.NegativeInfinity;
+                    location.TransformedLatitude = double.NegativeInfinity;
                 }
                 else if (location.Latitude >= 90d)
                 {
-                    location.Y = double.PositiveInfinity;
+                    location.TransformedLatitude = double.PositiveInfinity;
                 }
                 else
                 {
                     var lat = location.Latitude * Math.PI / 180d;
-                    location.Y = Math.Log(Math.Tan(lat) + 1d / Math.Cos(lat)) / Math.PI * 180d;
+                    location.TransformedLatitude = Math.Log(Math.Tan(lat) + 1d / Math.Cos(lat)) / Math.PI * 180d;
                 }
             }
 
-            return new Point(location.Longitude, location.Y);
+            return new Point(location.Longitude, location.TransformedLatitude);
         }
 
         public override Location Transform(Point point)
         {
             var location = new Location(Math.Atan(Math.Sinh(point.Y * Math.PI / 180d)) / Math.PI * 180d, point.X);
-            location.Y = point.Y;
+            location.TransformedLatitude = point.Y;
             return location;
         }
     }
diff --git a/MapControl/Properties/AssemblyInfo.cs b/MapControl/Properties/AssemblyInfo.cs
index 97e075f4..96bcf68c 100644
--- a/MapControl/Properties/AssemblyInfo.cs
+++ b/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.6.1")]
-[assembly: AssemblyFileVersion("1.6.1")]
+[assembly: AssemblyVersion("1.7.0")]
+[assembly: AssemblyFileVersion("1.7.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/MapControl/TileImageLoader.WPF.cs b/MapControl/TileImageLoader.WPF.cs
index 171b2652..47550801 100644
--- a/MapControl/TileImageLoader.WPF.cs
+++ b/MapControl/TileImageLoader.WPF.cs
@@ -9,6 +9,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Cache;
 using System.Runtime.Caching;
 using System.Threading;
 using System.Windows.Media;
@@ -73,7 +74,7 @@ namespace MapControl
 
         internal void StartGetTiles(IEnumerable<Tile> tiles)
         {
-            if (tiles.Any())
+            if (tileLayer.TileSource != null && tiles.Any())
             {
                 ThreadPool.QueueUserWorkItem(GetTilesAsync, tiles.ToList());
             }
@@ -94,22 +95,21 @@ namespace MapControl
         {
             var tiles = (List<Tile>)tileList;
             var imageTileSource = tileLayer.TileSource as ImageTileSource;
-            var animateOpacity = tileLayer.AnimateTileOpacity;
 
             if (imageTileSource != null && !imageTileSource.CanLoadAsync)
             {
                 foreach (var tile in tiles)
                 {
                     tileLayer.Dispatcher.BeginInvoke(
-                        (Action<Tile, ImageTileSource>)((t, ts) => t.SetImageSource(ts.LoadImage(t.XIndex, t.Y, t.ZoomLevel), animateOpacity)),
+                        (Action<Tile, ImageTileSource>)((t, ts) => t.SetImageSource(ts.LoadImage(t.XIndex, t.Y, t.ZoomLevel), tileLayer.AnimateTileOpacity)),
                         DispatcherPriority.Background, tile, imageTileSource);
                 }
             }
             else
             {
                 if (imageTileSource == null && Cache != null &&
-                    !tileLayer.TileSource.UriFormat.StartsWith("file://") &&
-                    !string.IsNullOrWhiteSpace(tileLayer.SourceName))
+                    !string.IsNullOrWhiteSpace(tileLayer.SourceName) &&
+                    !tileLayer.TileSource.UriFormat.StartsWith("file://"))
                 {
                     var outdatedTiles = new List<Tile>(tiles.Count);
 
@@ -122,7 +122,7 @@ namespace MapControl
                         if (image != null)
                         {
                             tileLayer.Dispatcher.BeginInvoke(
-                                (Action<Tile, ImageSource>)((t, i) => t.SetImageSource(i, animateOpacity)),
+                                (Action<Tile, ImageSource>)((t, i) => t.SetImageSource(i, tileLayer.AnimateTileOpacity)),
                                 DispatcherPriority.Background, tile, image);
 
                             long creationTime = BitConverter.ToInt64(buffer, 0);
@@ -151,13 +151,14 @@ namespace MapControl
                 {
                     Interlocked.Increment(ref downloadThreadCount);
 
-                    ThreadPool.QueueUserWorkItem(o => LoadTiles(imageTileSource, animateOpacity));
+                    ThreadPool.QueueUserWorkItem(LoadTiles);
                 }
             }
         }
 
-        private void LoadTiles(ImageTileSource imageTileSource, bool animateOpacity)
+        private void LoadTiles(object o)
         {
+            var imageTileSource = tileLayer.TileSource as ImageTileSource;
             Tile tile;
 
             while (pendingTiles.TryDequeue(out tile))
@@ -197,7 +198,7 @@ namespace MapControl
                 if (image != null)
                 {
                     tileLayer.Dispatcher.BeginInvoke(
-                        (Action<Tile, ImageSource>)((t, i) => t.SetImageSource(i, animateOpacity)),
+                        (Action<Tile, ImageSource>)((t, i) => t.SetImageSource(i, tileLayer.AnimateTileOpacity)),
                         DispatcherPriority.Background, tile, image);
 
                     if (buffer != null && Cache != null)
@@ -268,6 +269,11 @@ namespace MapControl
                 var request = (HttpWebRequest)WebRequest.Create(uri);
                 request.UserAgent = "XAML Map Control";
 
+                if (Cache != null)
+                {
+                    request.CachePolicy = new HttpRequestCachePolicy(HttpRequestCacheLevel.NoCacheNoStore);
+                }
+
                 using (var response = (HttpWebResponse)request.GetResponse())
                 using (var responseStream = response.GetResponseStream())
                 {
@@ -284,7 +290,7 @@ namespace MapControl
                     }
                 }
 
-                Trace.TraceInformation("Downloaded {0}", uri);
+                //Trace.TraceInformation("Downloaded {0}", uri);
             }
             catch (WebException ex)
             {
@@ -293,7 +299,7 @@ namespace MapControl
                     var statusCode = ((HttpWebResponse)ex.Response).StatusCode;
                     if (statusCode != HttpStatusCode.NotFound)
                     {
-                        Trace.TraceInformation("Downloading {0} failed: {1}", uri, ex.Message);
+                        Trace.TraceWarning("Downloading {0} failed: {1}", uri, ex.Message);
                     }
                 }
                 else
diff --git a/MapControl/WinRT/MapControl.WinRT.csproj b/MapControl/WinRT/MapControl.WinRT.csproj
index 342e6d4c..eba43c73 100644
--- a/MapControl/WinRT/MapControl.WinRT.csproj
+++ b/MapControl/WinRT/MapControl.WinRT.csproj
@@ -140,7 +140,11 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="..\..\MapControl.snk">
+      <Link>MapControl.snk</Link>
+    </None>
+  </ItemGroup>
   <ItemGroup>
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -153,6 +157,12 @@
   <PropertyGroup>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
diff --git a/MapControl/WinRT/Properties/AssemblyInfo.cs b/MapControl/WinRT/Properties/AssemblyInfo.cs
index 3719eafa..c1ad64c9 100644
--- a/MapControl/WinRT/Properties/AssemblyInfo.cs
+++ b/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.6.1")]
-[assembly: AssemblyFileVersion("1.6.1")]
+[assembly: AssemblyVersion("1.7.0")]
+[assembly: AssemblyFileVersion("1.7.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs
index 884aca6e..bb72502c 100644
--- a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs
+++ b/SampleApps/SilverlightApplication.Web/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.6.1")]
-[assembly: AssemblyFileVersion("1.6.1")]
+[assembly: AssemblyVersion("1.7.0")]
+[assembly: AssemblyFileVersion("1.7.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs
index 71944080..bd39e599 100644
--- a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/SilverlightApplication/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.6.1")]
-[assembly: AssemblyFileVersion("1.6.1")]
+[assembly: AssemblyVersion("1.7.0")]
+[assembly: AssemblyFileVersion("1.7.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs
index 487625fe..ac38d10c 100644
--- a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/StoreApplication/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.6.1")]
-[assembly: AssemblyFileVersion("1.6.1")]
+[assembly: AssemblyVersion("1.7.0")]
+[assembly: AssemblyFileVersion("1.7.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs b/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs
index cf888779..4939301b 100644
--- a/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/SurfaceApplication/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.6.1")]
-[assembly: AssemblyFileVersion("1.6.1")]
+[assembly: AssemblyVersion("1.7.0")]
+[assembly: AssemblyFileVersion("1.7.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs
index b5b521a4..e0bcf062 100644
--- a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/WpfApplication/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.6.1")]
-[assembly: AssemblyFileVersion("1.6.1")]
+[assembly: AssemblyVersion("1.7.0")]
+[assembly: AssemblyFileVersion("1.7.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/WpfApplication/Properties/Settings.Designer.cs b/SampleApps/WpfApplication/Properties/Settings.Designer.cs
index 6dc3c897..5fcde2a0 100644
--- a/SampleApps/WpfApplication/Properties/Settings.Designer.cs
+++ b/SampleApps/WpfApplication/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.33440
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace WpfApplication.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));