From 37789eb96c71b53e1b741f7468be97f3a759efc1 Mon Sep 17 00:00:00 2001 From: ClemensF Date: Fri, 10 Jan 2014 20:11:39 +0100 Subject: [PATCH] Version 1.11.2: Fixed TileImageLoader and MapImageLayer. --- Caching/FileDbCache/FileDbCache.cs | 2 +- Caching/FileDbCache/Properties/AssemblyInfo.cs | 6 +++--- Caching/ImageFileCache/ImageFileCache.cs | 2 +- Caching/ImageFileCache/Properties/AssemblyInfo.cs | 6 +++--- MapControl/AnimationEx.Silverlight.cs | 2 +- MapControl/AnimationEx.WinRT.cs | 2 +- MapControl/GlyphRunText.cs | 2 +- MapControl/ImageTileSource.WPF.cs | 2 +- MapControl/ImageTileSource.cs | 2 +- MapControl/Int32Rect.cs | 2 +- MapControl/Location.cs | 2 +- MapControl/LocationCollection.cs | 2 +- MapControl/LocationCollectionConverter.cs | 2 +- MapControl/LocationConverter.cs | 2 +- MapControl/Map.Silverlight.cs | 2 +- MapControl/Map.WPF.cs | 2 +- MapControl/Map.WinRT.cs | 2 +- MapControl/MapBase.Silverlight.WinRT.cs | 2 +- MapControl/MapBase.WPF.cs | 2 +- MapControl/MapBase.cs | 2 +- MapControl/MapGraticule.Silverlight.WinRT.cs | 2 +- MapControl/MapGraticule.WPF.cs | 2 +- MapControl/MapGraticule.cs | 2 +- MapControl/MapImage.WPF.cs | 2 +- MapControl/MapImage.cs | 2 +- MapControl/MapImageLayer.cs | 3 ++- MapControl/MapItem.Silverlight.WinRT.cs | 2 +- MapControl/MapItem.WPF.cs | 2 +- MapControl/MapItemsControl.Silverlight.WinRT.cs | 2 +- MapControl/MapItemsControl.WPF.cs | 2 +- MapControl/MapOverlay.cs | 2 +- MapControl/MapPanel.Silverlight.WinRT.cs | 2 +- MapControl/MapPanel.WPF.cs | 2 +- MapControl/MapPanel.cs | 2 +- MapControl/MapPath.Silverlight.WinRT.cs | 2 +- MapControl/MapPath.WPF.cs | 2 +- MapControl/MapPath.cs | 2 +- MapControl/MapPolyline.Silverlight.WinRT.cs | 2 +- MapControl/MapPolyline.WPF.cs | 2 +- MapControl/MapPolyline.cs | 2 +- MapControl/MapRectangle.WPF.cs | 2 +- MapControl/MapRectangle.cs | 2 +- MapControl/MapScale.cs | 2 +- MapControl/MapTransform.cs | 2 +- MapControl/MatrixEx.cs | 2 +- MapControl/MercatorTransform.cs | 2 +- MapControl/Properties/AssemblyInfo.cs | 6 +++--- MapControl/Pushpin.Silverlight.WinRT.cs | 2 +- MapControl/Pushpin.WPF.cs | 2 +- MapControl/Tile.Silverlight.WinRT.cs | 2 +- MapControl/Tile.WPF.cs | 2 +- MapControl/Tile.cs | 2 +- MapControl/TileContainer.Silverlight.WinRT.cs | 2 +- MapControl/TileContainer.WPF.cs | 2 +- MapControl/TileContainer.cs | 2 +- MapControl/TileImageLoader.Silverlight.WinRT.cs | 2 +- MapControl/TileImageLoader.WPF.cs | 9 +++++++-- MapControl/TileLayer.Silverlight.WinRT.cs | 2 +- MapControl/TileLayer.WPF.cs | 2 +- MapControl/TileLayer.cs | 2 +- MapControl/TileLayerCollection.cs | 2 +- MapControl/TileSource.cs | 2 +- MapControl/TileSourceConverter.cs | 2 +- MapControl/TransformEx.WinRT.cs | 2 +- MapControl/WinRT/Properties/AssemblyInfo.cs | 6 +++--- .../Properties/AssemblyInfo.cs | 6 +++--- .../SilverlightApplication/Properties/AssemblyInfo.cs | 6 +++--- SampleApps/StoreApplication/Properties/AssemblyInfo.cs | 6 +++--- SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs | 6 +++--- SampleApps/WpfApplication/MainWindow.xaml | 8 ++++---- SampleApps/WpfApplication/Properties/AssemblyInfo.cs | 6 +++--- 71 files changed, 99 insertions(+), 93 deletions(-) diff --git a/Caching/FileDbCache/FileDbCache.cs b/Caching/FileDbCache/FileDbCache.cs index b17eea40..b7d1bf36 100644 --- a/Caching/FileDbCache/FileDbCache.cs +++ b/Caching/FileDbCache/FileDbCache.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/Caching/FileDbCache/Properties/AssemblyInfo.cs b/Caching/FileDbCache/Properties/AssemblyInfo.cs index e8fda2c3..8790eb45 100644 --- a/Caching/FileDbCache/Properties/AssemblyInfo.cs +++ b/Caching/FileDbCache/Properties/AssemblyInfo.cs @@ -6,10 +6,10 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("XAML Map Control")] [assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")] +[assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("1.11.1")] -[assembly: AssemblyFileVersion("1.11.1")] +[assembly: AssemblyVersion("1.11.2")] +[assembly: AssemblyFileVersion("1.11.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/Caching/ImageFileCache/ImageFileCache.cs b/Caching/ImageFileCache/ImageFileCache.cs index e27f6b9e..452e4375 100644 --- a/Caching/ImageFileCache/ImageFileCache.cs +++ b/Caching/ImageFileCache/ImageFileCache.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/Caching/ImageFileCache/Properties/AssemblyInfo.cs b/Caching/ImageFileCache/Properties/AssemblyInfo.cs index 5735d16a..88d8f77c 100644 --- a/Caching/ImageFileCache/Properties/AssemblyInfo.cs +++ b/Caching/ImageFileCache/Properties/AssemblyInfo.cs @@ -6,10 +6,10 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("XAML Map Control")] [assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")] +[assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("1.11.1")] -[assembly: AssemblyFileVersion("1.11.1")] +[assembly: AssemblyVersion("1.11.2")] +[assembly: AssemblyFileVersion("1.11.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/AnimationEx.Silverlight.cs b/MapControl/AnimationEx.Silverlight.cs index 0ec00673..ed662105 100644 --- a/MapControl/AnimationEx.Silverlight.cs +++ b/MapControl/AnimationEx.Silverlight.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Windows; diff --git a/MapControl/AnimationEx.WinRT.cs b/MapControl/AnimationEx.WinRT.cs index aa6c8885..25939843 100644 --- a/MapControl/AnimationEx.WinRT.cs +++ b/MapControl/AnimationEx.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using Windows.UI.Xaml; diff --git a/MapControl/GlyphRunText.cs b/MapControl/GlyphRunText.cs index 179fcaf1..04b9de2b 100644 --- a/MapControl/GlyphRunText.cs +++ b/MapControl/GlyphRunText.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/ImageTileSource.WPF.cs b/MapControl/ImageTileSource.WPF.cs index 6eb5f869..f9aafcd9 100644 --- a/MapControl/ImageTileSource.WPF.cs +++ b/MapControl/ImageTileSource.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) namespace MapControl diff --git a/MapControl/ImageTileSource.cs b/MapControl/ImageTileSource.cs index b24339d0..e4ff935a 100644 --- a/MapControl/ImageTileSource.cs +++ b/MapControl/ImageTileSource.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/Int32Rect.cs b/MapControl/Int32Rect.cs index 0f32b0df..6dea4511 100644 --- a/MapControl/Int32Rect.cs +++ b/MapControl/Int32Rect.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) namespace MapControl diff --git a/MapControl/Location.cs b/MapControl/Location.cs index ffe1d91b..89286a46 100644 --- a/MapControl/Location.cs +++ b/MapControl/Location.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/LocationCollection.cs b/MapControl/LocationCollection.cs index 6b6ed5cf..1a327d14 100644 --- a/MapControl/LocationCollection.cs +++ b/MapControl/LocationCollection.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/LocationCollectionConverter.cs b/MapControl/LocationCollectionConverter.cs index 696a3b96..136d1738 100644 --- a/MapControl/LocationCollectionConverter.cs +++ b/MapControl/LocationCollectionConverter.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/LocationConverter.cs b/MapControl/LocationConverter.cs index 536b98c2..1c9c8bde 100644 --- a/MapControl/LocationConverter.cs +++ b/MapControl/LocationConverter.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/Map.Silverlight.cs b/MapControl/Map.Silverlight.cs index ffc05cd4..ffabcefa 100644 --- a/MapControl/Map.Silverlight.cs +++ b/MapControl/Map.Silverlight.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Windows; diff --git a/MapControl/Map.WPF.cs b/MapControl/Map.WPF.cs index 63843104..7538eac3 100644 --- a/MapControl/Map.WPF.cs +++ b/MapControl/Map.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Windows; diff --git a/MapControl/Map.WinRT.cs b/MapControl/Map.WinRT.cs index defde643..2d00341f 100644 --- a/MapControl/Map.WinRT.cs +++ b/MapControl/Map.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using Windows.Devices.Input; diff --git a/MapControl/MapBase.Silverlight.WinRT.cs b/MapControl/MapBase.Silverlight.WinRT.cs index 33097bd2..5d6b88f7 100644 --- a/MapControl/MapBase.Silverlight.WinRT.cs +++ b/MapControl/MapBase.Silverlight.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/MapBase.WPF.cs b/MapControl/MapBase.WPF.cs index 88d9c8fa..20bbc897 100644 --- a/MapControl/MapBase.WPF.cs +++ b/MapControl/MapBase.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Windows; diff --git a/MapControl/MapBase.cs b/MapControl/MapBase.cs index 5d33e139..6f6a07d8 100644 --- a/MapControl/MapBase.cs +++ b/MapControl/MapBase.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/MapGraticule.Silverlight.WinRT.cs b/MapControl/MapGraticule.Silverlight.WinRT.cs index ff01f086..747a2aa3 100644 --- a/MapControl/MapGraticule.Silverlight.WinRT.cs +++ b/MapControl/MapGraticule.Silverlight.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/MapGraticule.WPF.cs b/MapControl/MapGraticule.WPF.cs index 99bc10ee..9da38a78 100644 --- a/MapControl/MapGraticule.WPF.cs +++ b/MapControl/MapGraticule.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/MapGraticule.cs b/MapControl/MapGraticule.cs index 5872a2da..3a3808f6 100644 --- a/MapControl/MapGraticule.cs +++ b/MapControl/MapGraticule.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/MapImage.WPF.cs b/MapControl/MapImage.WPF.cs index 72d91f1b..28f23574 100644 --- a/MapControl/MapImage.WPF.cs +++ b/MapControl/MapImage.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) namespace MapControl diff --git a/MapControl/MapImage.cs b/MapControl/MapImage.cs index 18e493f8..74e9fd6c 100644 --- a/MapControl/MapImage.cs +++ b/MapControl/MapImage.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/MapImageLayer.cs b/MapControl/MapImageLayer.cs index f66aefeb..6ea06117 100644 --- a/MapControl/MapImageLayer.cs +++ b/MapControl/MapImageLayer.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; @@ -127,6 +127,7 @@ namespace MapControl using (var memoryStream = new MemoryStream()) { responseStream.CopyTo(memoryStream); + memoryStream.Position = 0; image = BitmapFrame.Create(memoryStream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad); } } diff --git a/MapControl/MapItem.Silverlight.WinRT.cs b/MapControl/MapItem.Silverlight.WinRT.cs index 38715db7..c4edc04f 100644 --- a/MapControl/MapItem.Silverlight.WinRT.cs +++ b/MapControl/MapItem.Silverlight.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/MapItem.WPF.cs b/MapControl/MapItem.WPF.cs index 56f9a237..9fcac044 100644 --- a/MapControl/MapItem.WPF.cs +++ b/MapControl/MapItem.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Windows; diff --git a/MapControl/MapItemsControl.Silverlight.WinRT.cs b/MapControl/MapItemsControl.Silverlight.WinRT.cs index ba329316..3ac9704f 100644 --- a/MapControl/MapItemsControl.Silverlight.WinRT.cs +++ b/MapControl/MapItemsControl.Silverlight.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/MapItemsControl.WPF.cs b/MapControl/MapItemsControl.WPF.cs index 48cd5d42..20d8f10e 100644 --- a/MapControl/MapItemsControl.WPF.cs +++ b/MapControl/MapItemsControl.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/MapOverlay.cs b/MapControl/MapOverlay.cs index c832c887..88f1ad29 100644 --- a/MapControl/MapOverlay.cs +++ b/MapControl/MapOverlay.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/MapPanel.Silverlight.WinRT.cs b/MapControl/MapPanel.Silverlight.WinRT.cs index 1f9c3c8d..eb1921e6 100644 --- a/MapControl/MapPanel.Silverlight.WinRT.cs +++ b/MapControl/MapPanel.Silverlight.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/MapPanel.WPF.cs b/MapControl/MapPanel.WPF.cs index 1a6fbeaf..7259136f 100644 --- a/MapControl/MapPanel.WPF.cs +++ b/MapControl/MapPanel.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Windows; diff --git a/MapControl/MapPanel.cs b/MapControl/MapPanel.cs index 2c06e7a0..f5e7aba6 100644 --- a/MapControl/MapPanel.cs +++ b/MapControl/MapPanel.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/MapPath.Silverlight.WinRT.cs b/MapControl/MapPath.Silverlight.WinRT.cs index 118947d6..839bd653 100644 --- a/MapControl/MapPath.Silverlight.WinRT.cs +++ b/MapControl/MapPath.Silverlight.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/MapPath.WPF.cs b/MapControl/MapPath.WPF.cs index f761fc41..4160b8c7 100644 --- a/MapControl/MapPath.WPF.cs +++ b/MapControl/MapPath.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Windows; diff --git a/MapControl/MapPath.cs b/MapControl/MapPath.cs index 0f263379..587591fb 100644 --- a/MapControl/MapPath.cs +++ b/MapControl/MapPath.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/MapPolyline.Silverlight.WinRT.cs b/MapControl/MapPolyline.Silverlight.WinRT.cs index c4143591..f6136200 100644 --- a/MapControl/MapPolyline.Silverlight.WinRT.cs +++ b/MapControl/MapPolyline.Silverlight.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Linq; diff --git a/MapControl/MapPolyline.WPF.cs b/MapControl/MapPolyline.WPF.cs index cb3a13e2..31a37b3b 100644 --- a/MapControl/MapPolyline.WPF.cs +++ b/MapControl/MapPolyline.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Linq; diff --git a/MapControl/MapPolyline.cs b/MapControl/MapPolyline.cs index a343e0e3..4fd940b7 100644 --- a/MapControl/MapPolyline.cs +++ b/MapControl/MapPolyline.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/MapRectangle.WPF.cs b/MapControl/MapRectangle.WPF.cs index 76e47e55..73f2b630 100644 --- a/MapControl/MapRectangle.WPF.cs +++ b/MapControl/MapRectangle.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) namespace MapControl diff --git a/MapControl/MapRectangle.cs b/MapControl/MapRectangle.cs index 10197546..2440d594 100644 --- a/MapControl/MapRectangle.cs +++ b/MapControl/MapRectangle.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/MapScale.cs b/MapControl/MapScale.cs index e15575b4..d94f8dca 100644 --- a/MapControl/MapScale.cs +++ b/MapControl/MapScale.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/MapTransform.cs b/MapControl/MapTransform.cs index cef59a3f..93077598 100644 --- a/MapControl/MapTransform.cs +++ b/MapControl/MapTransform.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/MatrixEx.cs b/MapControl/MatrixEx.cs index 5eb6c872..6a3ac5a3 100644 --- a/MapControl/MatrixEx.cs +++ b/MapControl/MatrixEx.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/MercatorTransform.cs b/MapControl/MercatorTransform.cs index ea98646e..db2202e5 100644 --- a/MapControl/MercatorTransform.cs +++ b/MapControl/MercatorTransform.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/Properties/AssemblyInfo.cs b/MapControl/Properties/AssemblyInfo.cs index cc094846..bcba0afb 100644 --- a/MapControl/Properties/AssemblyInfo.cs +++ b/MapControl/Properties/AssemblyInfo.cs @@ -13,10 +13,10 @@ using System.Windows; [assembly: AssemblyProduct("XAML Map Control")] [assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")] +[assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("1.11.1")] -[assembly: AssemblyFileVersion("1.11.1")] +[assembly: AssemblyVersion("1.11.2")] +[assembly: AssemblyFileVersion("1.11.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/Pushpin.Silverlight.WinRT.cs b/MapControl/Pushpin.Silverlight.WinRT.cs index 06cf1aa3..1325d99c 100644 --- a/MapControl/Pushpin.Silverlight.WinRT.cs +++ b/MapControl/Pushpin.Silverlight.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/Pushpin.WPF.cs b/MapControl/Pushpin.WPF.cs index c0f3378f..2bef1f8a 100644 --- a/MapControl/Pushpin.WPF.cs +++ b/MapControl/Pushpin.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Windows; diff --git a/MapControl/Tile.Silverlight.WinRT.cs b/MapControl/Tile.Silverlight.WinRT.cs index a0f35d37..1b10c377 100644 --- a/MapControl/Tile.Silverlight.WinRT.cs +++ b/MapControl/Tile.Silverlight.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/Tile.WPF.cs b/MapControl/Tile.WPF.cs index 8dc1ac2a..2a847361 100644 --- a/MapControl/Tile.WPF.cs +++ b/MapControl/Tile.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/Tile.cs b/MapControl/Tile.cs index 6e16e728..02042f97 100644 --- a/MapControl/Tile.cs +++ b/MapControl/Tile.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/TileContainer.Silverlight.WinRT.cs b/MapControl/TileContainer.Silverlight.WinRT.cs index 22da03c5..be95fd74 100644 --- a/MapControl/TileContainer.Silverlight.WinRT.cs +++ b/MapControl/TileContainer.Silverlight.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/TileContainer.WPF.cs b/MapControl/TileContainer.WPF.cs index dc9a415b..64eaba80 100644 --- a/MapControl/TileContainer.WPF.cs +++ b/MapControl/TileContainer.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/TileContainer.cs b/MapControl/TileContainer.cs index 216ed947..1c61865e 100644 --- a/MapControl/TileContainer.cs +++ b/MapControl/TileContainer.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/TileImageLoader.Silverlight.WinRT.cs b/MapControl/TileImageLoader.Silverlight.WinRT.cs index eaf50579..b05b8364 100644 --- a/MapControl/TileImageLoader.Silverlight.WinRT.cs +++ b/MapControl/TileImageLoader.Silverlight.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/TileImageLoader.WPF.cs b/MapControl/TileImageLoader.WPF.cs index 8a53f789..9fa120df 100644 --- a/MapControl/TileImageLoader.WPF.cs +++ b/MapControl/TileImageLoader.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; @@ -241,7 +241,12 @@ namespace MapControl try { - image = BitmapFrame.Create(tileSource.GetUri(tile.XIndex, tile.Y, tile.ZoomLevel)); + var uri = tileSource.GetUri(tile.XIndex, tile.Y, tile.ZoomLevel); + + if (uri != null) + { + image = BitmapFrame.Create(uri); + } } catch (Exception ex) { diff --git a/MapControl/TileLayer.Silverlight.WinRT.cs b/MapControl/TileLayer.Silverlight.WinRT.cs index 27bd6134..f0e33c49 100644 --- a/MapControl/TileLayer.Silverlight.WinRT.cs +++ b/MapControl/TileLayer.Silverlight.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/TileLayer.WPF.cs b/MapControl/TileLayer.WPF.cs index 24fd85f0..6426e19f 100644 --- a/MapControl/TileLayer.WPF.cs +++ b/MapControl/TileLayer.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Windows; diff --git a/MapControl/TileLayer.cs b/MapControl/TileLayer.cs index e68f0649..fe59f271 100644 --- a/MapControl/TileLayer.cs +++ b/MapControl/TileLayer.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/TileLayerCollection.cs b/MapControl/TileLayerCollection.cs index 33afbc48..635f3a1a 100644 --- a/MapControl/TileLayerCollection.cs +++ b/MapControl/TileLayerCollection.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Collections.ObjectModel; diff --git a/MapControl/TileSource.cs b/MapControl/TileSource.cs index 948f3dc3..8a790b41 100644 --- a/MapControl/TileSource.cs +++ b/MapControl/TileSource.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/TileSourceConverter.cs b/MapControl/TileSourceConverter.cs index 93ba07db..60070fa0 100644 --- a/MapControl/TileSourceConverter.cs +++ b/MapControl/TileSourceConverter.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/TransformEx.WinRT.cs b/MapControl/TransformEx.WinRT.cs index c97ba6ec..63e7ff49 100644 --- a/MapControl/TransformEx.WinRT.cs +++ b/MapControl/TransformEx.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 +// Copyright © 2014 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using Windows.Foundation; diff --git a/MapControl/WinRT/Properties/AssemblyInfo.cs b/MapControl/WinRT/Properties/AssemblyInfo.cs index 53f42f57..f76f719c 100644 --- a/MapControl/WinRT/Properties/AssemblyInfo.cs +++ b/MapControl/WinRT/Properties/AssemblyInfo.cs @@ -6,10 +6,10 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("XAML Map Control")] [assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")] +[assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("1.11.1")] -[assembly: AssemblyFileVersion("1.11.1")] +[assembly: AssemblyVersion("1.11.2")] +[assembly: AssemblyFileVersion("1.11.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs index a092b99f..7dfa461c 100644 --- a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs +++ b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs @@ -6,10 +6,10 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("XAML Map Control")] [assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")] +[assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("1.11.1")] -[assembly: AssemblyFileVersion("1.11.1")] +[assembly: AssemblyVersion("1.11.2")] +[assembly: AssemblyFileVersion("1.11.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs index e0220d38..8efda1a1 100644 --- a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs @@ -6,10 +6,10 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("XAML Map Control")] [assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")] +[assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("1.11.1")] -[assembly: AssemblyFileVersion("1.11.1")] +[assembly: AssemblyVersion("1.11.2")] +[assembly: AssemblyFileVersion("1.11.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs index 1a324ca0..fc8641de 100644 --- a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs @@ -6,10 +6,10 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("XAML Map Control")] [assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")] +[assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("1.11.1")] -[assembly: AssemblyFileVersion("1.11.1")] +[assembly: AssemblyVersion("1.11.2")] +[assembly: AssemblyFileVersion("1.11.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs b/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs index 77f314e8..0698c87c 100644 --- a/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs @@ -6,10 +6,10 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("XAML Map Control")] [assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")] +[assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("1.11.1")] -[assembly: AssemblyFileVersion("1.11.1")] +[assembly: AssemblyVersion("1.11.2")] +[assembly: AssemblyFileVersion("1.11.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/WpfApplication/MainWindow.xaml b/SampleApps/WpfApplication/MainWindow.xaml index 0014ef25..c6a105a2 100644 --- a/SampleApps/WpfApplication/MainWindow.xaml +++ b/SampleApps/WpfApplication/MainWindow.xaml @@ -31,13 +31,13 @@ + TileSource="http://ecn.t{i}.tiles.virtualearth.net/tiles/h{q}.jpeg?g=0&stl=h" MinZoomLevel="1" MaxZoomLevel="19"/>-->