From fab85307701f5d1a6d1203719bed5844875cc38e Mon Sep 17 00:00:00 2001 From: ClemensF Date: Thu, 17 Jan 2013 18:48:38 +0100 Subject: [PATCH] Version 1.1.5: Added support for file:// URIs to access map tile sets in local files. --- Caching/FileDbCache/FileDbCache.cs | 2 +- .../FileDbCache/Properties/AssemblyInfo.cs | 6 +- Caching/ImageFileCache/ImageFileCache.cs | 2 +- .../ImageFileCache/Properties/AssemblyInfo.cs | 6 +- MapControl/AnimationEx.Silverlight.cs | 2 +- MapControl/AnimationEx.WinRT.cs | 2 +- MapControl/GlyphRunText.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.WPF.cs | 2 +- MapControl/Map.WinRT.cs | 2 +- MapControl/Map.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/MapItem.Silverlight.WinRT.cs | 2 +- MapControl/MapItem.WPF.cs | 2 +- .../MapItemsControl.Silverlight.WinRT.cs | 2 +- MapControl/MapItemsControl.WPF.cs | 2 +- MapControl/MapItemsControl.cs | 2 +- MapControl/MapOverlay.Silverlight.WinRT.cs | 2 +- MapControl/MapOverlay.WPF.cs | 2 +- MapControl/MapOverlay.cs | 2 +- MapControl/MapPanel.Silverlight.WinRT.cs | 9 +- MapControl/MapPanel.WPF.cs | 2 +- MapControl/MapPanel.cs | 8 +- MapControl/MapPolyline.Silverlight.cs | 2 +- MapControl/MapPolyline.WPF.cs | 2 +- MapControl/MapPolyline.WinRT.cs | 2 +- MapControl/MapPolyline.cs | 2 +- MapControl/MapScale.cs | 2 +- MapControl/MapTransform.cs | 2 +- MapControl/MatrixEx.cs | 2 +- MapControl/MercatorTransform.cs | 4 +- MapControl/Properties/AssemblyInfo.cs | 6 +- MapControl/Pushpin.Silverlight.WinRT.cs | 2 +- MapControl/Pushpin.WPF.cs | 2 +- MapControl/Tile.Silverlight.WinRT.cs | 5 +- MapControl/Tile.WPF.cs | 5 +- MapControl/Tile.cs | 4 +- MapControl/TileContainer.Silverlight.WinRT.cs | 2 +- MapControl/TileContainer.WPF.cs | 2 +- MapControl/TileContainer.cs | 2 +- .../TileImageLoader.Silverlight.WinRT.cs | 9 +- MapControl/TileImageLoader.WPF.cs | 188 +++++++++++------- MapControl/TileLayer.Silverlight.WinRT.cs | 2 +- MapControl/TileLayer.WPF.cs | 2 +- MapControl/TileLayer.cs | 2 +- MapControl/TileLayerCollection.cs | 2 +- MapControl/TileSource.cs | 47 +++-- MapControl/TileSourceConverter.cs | 2 +- MapControl/TransformEx.WinRT.cs | 2 +- MapControl/WinRT/Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- SampleApps/WpfApplication/MainWindow.xaml | 5 +- .../WpfApplication/Properties/AssemblyInfo.cs | 6 +- 66 files changed, 245 insertions(+), 187 deletions(-) diff --git a/Caching/FileDbCache/FileDbCache.cs b/Caching/FileDbCache/FileDbCache.cs index a4e82fba..f99adbbf 100644 --- a/Caching/FileDbCache/FileDbCache.cs +++ b/Caching/FileDbCache/FileDbCache.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 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 f65192fc..b86c2c49 100644 --- a/Caching/FileDbCache/Properties/AssemblyInfo.cs +++ b/Caching/FileDbCache/Properties/AssemblyInfo.cs @@ -6,9 +6,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyProduct("XAML Map Control")] -[assembly: AssemblyCopyright("Copyright © 2012 Clemens Fischer")] +[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("1.1.4")] -[assembly: AssemblyFileVersion("1.1.4")] +[assembly: AssemblyVersion("1.1.5")] +[assembly: AssemblyFileVersion("1.1.5")] [assembly: ComVisible(false)] diff --git a/Caching/ImageFileCache/ImageFileCache.cs b/Caching/ImageFileCache/ImageFileCache.cs index f6f422d5..a9cd62ff 100644 --- a/Caching/ImageFileCache/ImageFileCache.cs +++ b/Caching/ImageFileCache/ImageFileCache.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 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 672be51b..8517c59e 100644 --- a/Caching/ImageFileCache/Properties/AssemblyInfo.cs +++ b/Caching/ImageFileCache/Properties/AssemblyInfo.cs @@ -6,9 +6,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyProduct("XAML Map Control")] -[assembly: AssemblyCopyright("Copyright © 2012 Clemens Fischer")] +[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("1.1.4")] -[assembly: AssemblyFileVersion("1.1.4")] +[assembly: AssemblyVersion("1.1.5")] +[assembly: AssemblyFileVersion("1.1.5")] [assembly: ComVisible(false)] diff --git a/MapControl/AnimationEx.Silverlight.cs b/MapControl/AnimationEx.Silverlight.cs index 98e5ea5c..521a4612 100644 --- a/MapControl/AnimationEx.Silverlight.cs +++ b/MapControl/AnimationEx.Silverlight.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 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 0b8bf532..9238d27b 100644 --- a/MapControl/AnimationEx.WinRT.cs +++ b/MapControl/AnimationEx.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 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 9d670bb7..a6c222b3 100644 --- a/MapControl/GlyphRunText.cs +++ b/MapControl/GlyphRunText.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/ImageTileSource.cs b/MapControl/ImageTileSource.cs index 82a575f9..57a35b02 100644 --- a/MapControl/ImageTileSource.cs +++ b/MapControl/ImageTileSource.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Windows.Media; diff --git a/MapControl/Int32Rect.cs b/MapControl/Int32Rect.cs index 370085a3..fcceee72 100644 --- a/MapControl/Int32Rect.cs +++ b/MapControl/Int32Rect.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) namespace MapControl diff --git a/MapControl/Location.cs b/MapControl/Location.cs index f5f45d74..dee52207 100644 --- a/MapControl/Location.cs +++ b/MapControl/Location.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/LocationCollection.cs b/MapControl/LocationCollection.cs index 3fc513bf..fb86fce9 100644 --- a/MapControl/LocationCollection.cs +++ b/MapControl/LocationCollection.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/LocationCollectionConverter.cs b/MapControl/LocationCollectionConverter.cs index 0ef4783e..9e815b5e 100644 --- a/MapControl/LocationCollectionConverter.cs +++ b/MapControl/LocationCollectionConverter.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/LocationConverter.cs b/MapControl/LocationConverter.cs index 3528f692..387782dd 100644 --- a/MapControl/LocationConverter.cs +++ b/MapControl/LocationConverter.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/Map.Silverlight.WPF.cs b/MapControl/Map.Silverlight.WPF.cs index 5903a450..d83aa13c 100644 --- a/MapControl/Map.Silverlight.WPF.cs +++ b/MapControl/Map.Silverlight.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/Map.WinRT.cs b/MapControl/Map.WinRT.cs index ff913837..7c449e70 100644 --- a/MapControl/Map.WinRT.cs +++ b/MapControl/Map.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/Map.cs b/MapControl/Map.cs index fa11a35f..97669884 100644 --- a/MapControl/Map.cs +++ b/MapControl/Map.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) namespace MapControl diff --git a/MapControl/MapBase.Silverlight.WinRT.cs b/MapControl/MapBase.Silverlight.WinRT.cs index fded910b..23f0259e 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 © 2012 Clemens Fischer +// Copyright © 2013 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 4578b1dd..f786c9a7 100644 --- a/MapControl/MapBase.WPF.cs +++ b/MapControl/MapBase.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Windows; diff --git a/MapControl/MapBase.cs b/MapControl/MapBase.cs index 53d48465..b84147ac 100644 --- a/MapControl/MapBase.cs +++ b/MapControl/MapBase.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 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 beced997..2f28b00b 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 © 2012 Clemens Fischer +// Copyright © 2013 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 fa0d6556..0da78ecd 100644 --- a/MapControl/MapGraticule.WPF.cs +++ b/MapControl/MapGraticule.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/MapGraticule.cs b/MapControl/MapGraticule.cs index 8e2a98fe..aa2a7c66 100644 --- a/MapControl/MapGraticule.cs +++ b/MapControl/MapGraticule.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/MapItem.Silverlight.WinRT.cs b/MapControl/MapItem.Silverlight.WinRT.cs index 4c18bd8f..c239a87d 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 © 2012 Clemens Fischer +// Copyright © 2013 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 d58739c1..c6037d2b 100644 --- a/MapControl/MapItem.WPF.cs +++ b/MapControl/MapItem.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 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 de7b51fb..31e1dc89 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 © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) namespace MapControl diff --git a/MapControl/MapItemsControl.WPF.cs b/MapControl/MapItemsControl.WPF.cs index 4b8daece..a935c154 100644 --- a/MapControl/MapItemsControl.WPF.cs +++ b/MapControl/MapItemsControl.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/MapItemsControl.cs b/MapControl/MapItemsControl.cs index 1a66fbde..dc64a492 100644 --- a/MapControl/MapItemsControl.cs +++ b/MapControl/MapItemsControl.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/MapOverlay.Silverlight.WinRT.cs b/MapControl/MapOverlay.Silverlight.WinRT.cs index 828bed71..c0f47747 100644 --- a/MapControl/MapOverlay.Silverlight.WinRT.cs +++ b/MapControl/MapOverlay.Silverlight.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/MapOverlay.WPF.cs b/MapControl/MapOverlay.WPF.cs index 3bd933fd..4ff41f9f 100644 --- a/MapControl/MapOverlay.WPF.cs +++ b/MapControl/MapOverlay.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/MapOverlay.cs b/MapControl/MapOverlay.cs index f188e4d2..e236d4e8 100644 --- a/MapControl/MapOverlay.cs +++ b/MapControl/MapOverlay.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/MapPanel.Silverlight.WinRT.cs b/MapControl/MapPanel.Silverlight.WinRT.cs index 935f164e..9870243b 100644 --- a/MapControl/MapPanel.Silverlight.WinRT.cs +++ b/MapControl/MapPanel.Silverlight.WinRT.cs @@ -1,12 +1,14 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media; #else using System.Windows; +using System.Windows.Controls; using System.Windows.Media; #endif @@ -25,6 +27,11 @@ namespace MapControl } } + private UIElementCollection InternalChildren + { + get { return Children; } + } + /// /// Helper method to work around missing property value inheritance in Silverlight and WinRT. /// Adds Loaded and Unloaded handlers to the specified FrameworkElement, which set and clear diff --git a/MapControl/MapPanel.WPF.cs b/MapControl/MapPanel.WPF.cs index 0f135839..2fa6bc0d 100644 --- a/MapControl/MapPanel.WPF.cs +++ b/MapControl/MapPanel.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Windows; diff --git a/MapControl/MapPanel.cs b/MapControl/MapPanel.cs index 1d6ea6a4..ddec9b19 100644 --- a/MapControl/MapPanel.cs +++ b/MapControl/MapPanel.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; @@ -51,7 +51,7 @@ namespace MapControl protected override Size MeasureOverride(Size availableSize) { - foreach (UIElement element in Children) + foreach (UIElement element in InternalChildren) { element.Measure(availableSize); } @@ -63,7 +63,7 @@ namespace MapControl { var parentMap = GetParentMap(this); - foreach (UIElement element in Children) + foreach (UIElement element in InternalChildren) { var rect = new Rect(0d, 0d, element.DesiredSize.Width, element.DesiredSize.Height); var location = GetLocation(element); @@ -96,7 +96,7 @@ namespace MapControl { var parentMap = GetParentMap(this); - foreach (UIElement element in Children) + foreach (UIElement element in InternalChildren) { var location = GetLocation(element); diff --git a/MapControl/MapPolyline.Silverlight.cs b/MapControl/MapPolyline.Silverlight.cs index 08b7e5ee..ee3c1682 100644 --- a/MapControl/MapPolyline.Silverlight.cs +++ b/MapControl/MapPolyline.Silverlight.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Collections.Generic; diff --git a/MapControl/MapPolyline.WPF.cs b/MapControl/MapPolyline.WPF.cs index 7c8a072e..acde6383 100644 --- a/MapControl/MapPolyline.WPF.cs +++ b/MapControl/MapPolyline.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Collections.Generic; diff --git a/MapControl/MapPolyline.WinRT.cs b/MapControl/MapPolyline.WinRT.cs index 7b291237..0e68444d 100644 --- a/MapControl/MapPolyline.WinRT.cs +++ b/MapControl/MapPolyline.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using Windows.UI.Xaml; diff --git a/MapControl/MapPolyline.cs b/MapControl/MapPolyline.cs index 49831f16..9eb3f986 100644 --- a/MapControl/MapPolyline.cs +++ b/MapControl/MapPolyline.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/MapScale.cs b/MapControl/MapScale.cs index 31ecfb11..b952dc8e 100644 --- a/MapControl/MapScale.cs +++ b/MapControl/MapScale.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/MapTransform.cs b/MapControl/MapTransform.cs index 31dd07e9..fd1eb2d7 100644 --- a/MapControl/MapTransform.cs +++ b/MapControl/MapTransform.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/MatrixEx.cs b/MapControl/MatrixEx.cs index 5c1452ea..44de2069 100644 --- a/MapControl/MatrixEx.cs +++ b/MapControl/MatrixEx.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/MercatorTransform.cs b/MapControl/MercatorTransform.cs index c798d663..c33b7f12 100644 --- a/MapControl/MercatorTransform.cs +++ b/MapControl/MercatorTransform.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; @@ -19,7 +19,7 @@ namespace MapControl { public override double MaxLatitude { - get { return 85.0511; } + get { return 85.0511287798066; } } public override double RelativeScale(Location location) diff --git a/MapControl/Properties/AssemblyInfo.cs b/MapControl/Properties/AssemblyInfo.cs index adbef922..0a1d1f40 100644 --- a/MapControl/Properties/AssemblyInfo.cs +++ b/MapControl/Properties/AssemblyInfo.cs @@ -13,9 +13,9 @@ using System.Windows; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyProduct("XAML Map Control")] -[assembly: AssemblyCopyright("Copyright © 2012 Clemens Fischer")] +[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("1.1.4")] -[assembly: AssemblyFileVersion("1.1.4")] +[assembly: AssemblyVersion("1.1.5")] +[assembly: AssemblyFileVersion("1.1.5")] [assembly: ComVisible(false)] diff --git a/MapControl/Pushpin.Silverlight.WinRT.cs b/MapControl/Pushpin.Silverlight.WinRT.cs index cba885f0..b6340378 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 © 2012 Clemens Fischer +// Copyright © 2013 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 d15967f2..0edfb4f0 100644 --- a/MapControl/Pushpin.WPF.cs +++ b/MapControl/Pushpin.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 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 6bd8d4ec..2ceabe55 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 © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) @@ -28,7 +28,7 @@ namespace MapControl public void SetImageSource(ImageSource image, bool animateOpacity) { - if (Image.Source == null) + if (image != null && Image.Source == null) { if (animateOpacity) { @@ -51,6 +51,7 @@ namespace MapControl } Image.Source = image; + HasImage = true; } private void BitmapImageOpened(object sender, RoutedEventArgs e) diff --git a/MapControl/Tile.WPF.cs b/MapControl/Tile.WPF.cs index 757d2da3..6dc9f092 100644 --- a/MapControl/Tile.WPF.cs +++ b/MapControl/Tile.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; @@ -20,7 +20,7 @@ namespace MapControl public void SetImageSource(ImageSource image, bool animateOpacity) { - if (Brush.ImageSource == null) + if (image != null && Brush.ImageSource == null) { if (animateOpacity) { @@ -43,6 +43,7 @@ namespace MapControl } Brush.ImageSource = image; + HasImage = true; } private void BitmapDownloadCompleted(object sender, EventArgs e) diff --git a/MapControl/Tile.cs b/MapControl/Tile.cs index 2e50d7a5..085756e3 100644 --- a/MapControl/Tile.cs +++ b/MapControl/Tile.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; @@ -24,7 +24,7 @@ namespace MapControl Y = y; } - public Uri Uri { get; set; } + public bool HasImage { get; private set; } public int XIndex { diff --git a/MapControl/TileContainer.Silverlight.WinRT.cs b/MapControl/TileContainer.Silverlight.WinRT.cs index 3e1cf6c9..b322ab69 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 © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE diff --git a/MapControl/TileContainer.WPF.cs b/MapControl/TileContainer.WPF.cs index 31fb5737..83c273eb 100644 --- a/MapControl/TileContainer.WPF.cs +++ b/MapControl/TileContainer.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Windows.Media; diff --git a/MapControl/TileContainer.cs b/MapControl/TileContainer.cs index 81dd3084..10f71863 100644 --- a/MapControl/TileContainer.cs +++ b/MapControl/TileContainer.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 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 753532e7..61d853d0 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 © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Collections.Generic; @@ -26,10 +26,11 @@ namespace MapControl internal void BeginGetTiles(IEnumerable tiles) { - foreach (var tile in tiles.Where(t => t.ImageSource == null && t.Uri == null)) + foreach (var tile in tiles.Where(t => !t.HasImage)) { - tile.Uri = tileLayer.TileSource.GetUri(tile.XIndex, tile.Y, tile.ZoomLevel); - tile.SetImageSource(new BitmapImage(tile.Uri), true); + var uri = tileLayer.TileSource.GetUri(tile.XIndex, tile.Y, tile.ZoomLevel); + + tile.SetImageSource(new BitmapImage(uri), true); } } diff --git a/MapControl/TileImageLoader.WPF.cs b/MapControl/TileImageLoader.WPF.cs index 67aee2d9..eb4f6b87 100644 --- a/MapControl/TileImageLoader.WPF.cs +++ b/MapControl/TileImageLoader.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; @@ -73,7 +73,7 @@ namespace MapControl internal void BeginGetTiles(IEnumerable tiles) { - ThreadPool.QueueUserWorkItem(BeginGetTilesAsync, new List(tiles.Where(t => t.ImageSource == null && t.Uri == null))); + ThreadPool.QueueUserWorkItem(BeginGetTilesAsync, new List(tiles.Where(t => !t.HasImage))); } internal void CancelGetTiles() @@ -82,131 +82,174 @@ namespace MapControl while (pendingTiles.TryDequeue(out tile)) ; // no Clear method } + private string GetCacheKey(Tile tile) + { + return string.Format("{0}/{1}/{2}/{3}", tileLayer.SourceName, tile.ZoomLevel, tile.XIndex, tile.Y); + } + private void BeginGetTilesAsync(object newTilesList) { var newTiles = (List)newTilesList; var imageTileSource = tileLayer.TileSource as ImageTileSource; - if (imageTileSource != null) + if (imageTileSource != null && !imageTileSource.CanLoadAsync) { - if (imageTileSource.CanLoadAsync) + foreach (var tile in newTiles) { - foreach (var tile in newTiles) - { - tileLayer.Dispatcher.BeginInvoke( - (Action)((t, i) => t.SetImageSource(i, true)), - DispatcherPriority.Background, tile, - imageTileSource.LoadImage(tile.XIndex, tile.Y, tile.ZoomLevel)); - } - } - else - { - foreach (var tile in newTiles) - { - tileLayer.Dispatcher.BeginInvoke( - (Action)((t, i) => t.SetImageSource(i.LoadImage(t.XIndex, t.Y, t.ZoomLevel), true)), - DispatcherPriority.Background, tile, imageTileSource); - } + tileLayer.Dispatcher.BeginInvoke( + (Action)((t, ts) => t.SetImageSource(ts.LoadImage(t.XIndex, t.Y, t.ZoomLevel), true)), + DispatcherPriority.Background, tile, imageTileSource); } } else { - if (Cache != null && !string.IsNullOrWhiteSpace(tileLayer.SourceName)) + if (imageTileSource == null && Cache != null && + !tileLayer.TileSource.UriFormat.StartsWith("file://") && + !string.IsNullOrWhiteSpace(tileLayer.SourceName)) { var outdatedTiles = new List(newTiles.Count); foreach (var tile in newTiles) { - var key = CacheKey(tile); + var key = GetCacheKey(tile); var buffer = Cache.Get(key) as byte[]; + var image = CreateImage(buffer); - if (buffer == null) + if (image != null) + { + tileLayer.Dispatcher.BeginInvoke( + (Action)((t, i) => t.SetImageSource(i, true)), + DispatcherPriority.Background, tile, image); + + var creationTime = BitConverter.ToInt64(buffer, 0); + + if (DateTime.FromBinary(creationTime) + CacheUpdateAge < DateTime.UtcNow) + { + // update outdated cache + outdatedTiles.Add(tile); + } + } + else { pendingTiles.Enqueue(tile); } - else if (!CreateTileImage(tile, buffer)) - { - // got corrupted buffer from cache - Cache.Remove(key); - pendingTiles.Enqueue(tile); - } - else if (IsCacheOutdated(buffer)) - { - // update cached image - outdatedTiles.Add(tile); - } } - foreach (var tile in outdatedTiles) - { - pendingTiles.Enqueue(tile); - } + newTiles = outdatedTiles; // enqueue outdated tiles at last } - else + + foreach (var tile in newTiles) { - foreach (var tile in newTiles) - { - pendingTiles.Enqueue(tile); - } + pendingTiles.Enqueue(tile); } while (downloadThreadCount < Math.Min(pendingTiles.Count, tileLayer.MaxParallelDownloads)) { Interlocked.Increment(ref downloadThreadCount); - ThreadPool.QueueUserWorkItem(DownloadTiles); + ThreadPool.QueueUserWorkItem(LoadTiles); } } } - private void DownloadTiles(object o) + private void LoadTiles(object o) { Tile tile; while (pendingTiles.TryDequeue(out tile)) { - tile.Uri = tileLayer.TileSource.GetUri(tile.XIndex, tile.Y, tile.ZoomLevel); - var buffer = DownloadImage(tile.Uri); + byte[] buffer = null; + ImageSource image = null; + var imageTileSource = tileLayer.TileSource as ImageTileSource; - if (buffer != null && CreateTileImage(tile, buffer) && Cache != null) + if (imageTileSource != null) { - Cache.Set(CacheKey(tile), buffer, new CacheItemPolicy { SlidingExpiration = CacheExpiration }); + try + { + image = imageTileSource.LoadImage(tile.XIndex, tile.Y, tile.ZoomLevel); + } + catch (Exception ex) + { + Trace.TraceWarning("Loading tile image failed: {0}", ex.Message); + } + } + else + { + var uri = tileLayer.TileSource.GetUri(tile.XIndex, tile.Y, tile.ZoomLevel); + + if (uri.Scheme != "http") + { + image = CreateImage(uri); + } + else + { + buffer = DownloadImage(uri); + image = CreateImage(buffer); + } + } + + if (image != null) + { + tileLayer.Dispatcher.BeginInvoke( + (Action)((t, i) => t.SetImageSource(i, true)), + DispatcherPriority.Background, tile, image); + + if (buffer != null && Cache != null) + { + Cache.Set(GetCacheKey(tile), buffer, new CacheItemPolicy { SlidingExpiration = CacheExpiration }); + } } } Interlocked.Decrement(ref downloadThreadCount); } - private string CacheKey(Tile tile) - { - return string.Format("{0}/{1}/{2}/{3}", tileLayer.SourceName, tile.ZoomLevel, tile.XIndex, tile.Y); - } - - private bool CreateTileImage(Tile tile, byte[] buffer) + private ImageSource CreateImage(Uri uri) { var image = new BitmapImage(); try { - using (var stream = new MemoryStream(buffer, 8, buffer.Length - 8, false)) - { - image.BeginInit(); - image.CacheOption = BitmapCacheOption.OnLoad; - image.StreamSource = stream; - image.EndInit(); - image.Freeze(); - } + image.BeginInit(); + image.CacheOption = BitmapCacheOption.OnLoad; + image.UriSource = uri; + image.EndInit(); + image.Freeze(); } catch (Exception ex) { Trace.TraceWarning("Creating tile image failed: {0}", ex.Message); - return false; + image = null; } - tileLayer.Dispatcher.BeginInvoke( - (Action)((t, i) => t.SetImageSource(i, true)), - DispatcherPriority.Background, tile, image); + return image; + } - return true; + private ImageSource CreateImage(byte[] buffer) + { + BitmapImage image = null; + + if (buffer != null && buffer.Length > 8) + { + try + { + using (var stream = new MemoryStream(buffer, 8, buffer.Length - 8, false)) + { + image = new BitmapImage(); + image.BeginInit(); + image.CacheOption = BitmapCacheOption.OnLoad; + image.StreamSource = stream; + image.EndInit(); + image.Freeze(); + } + } + catch (Exception ex) + { + Trace.TraceWarning("Creating tile image failed: {0}", ex.Message); + image = null; + } + } + + return image; } private static byte[] DownloadImage(Uri uri) @@ -216,7 +259,7 @@ namespace MapControl try { var request = (HttpWebRequest)WebRequest.Create(uri); - request.UserAgent = typeof(TileImageLoader).ToString(); + request.UserAgent = "XAML Map Control"; using (var response = (HttpWebResponse)request.GetResponse()) using (var responseStream = response.GetResponseStream()) @@ -257,12 +300,5 @@ namespace MapControl return buffer; } - - private static bool IsCacheOutdated(byte[] buffer) - { - var creationTime = BitConverter.ToInt64(buffer, 0); - - return DateTime.FromBinary(creationTime) + CacheUpdateAge < DateTime.UtcNow; - } } } diff --git a/MapControl/TileLayer.Silverlight.WinRT.cs b/MapControl/TileLayer.Silverlight.WinRT.cs index 17db56a7..d67f4467 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 © 2012 Clemens Fischer +// Copyright © 2013 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 6942c660..4f1faaf8 100644 --- a/MapControl/TileLayer.WPF.cs +++ b/MapControl/TileLayer.WPF.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System.Windows; diff --git a/MapControl/TileLayer.cs b/MapControl/TileLayer.cs index 2f2e9fa4..0d563009 100644 --- a/MapControl/TileLayer.cs +++ b/MapControl/TileLayer.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; diff --git a/MapControl/TileLayerCollection.cs b/MapControl/TileLayerCollection.cs index 254604f5..983b4dc0 100644 --- a/MapControl/TileLayerCollection.cs +++ b/MapControl/TileLayerCollection.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 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 32723d6d..52f39d1f 100644 --- a/MapControl/TileSource.cs +++ b/MapControl/TileSource.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) using System; @@ -92,35 +92,44 @@ namespace MapControl private Uri GetOpenStreetMapUri(int x, int y, int zoomLevel) { - hostIndex = (hostIndex + 1) % 3; + lock (getUri) // protect hostIndex + { + hostIndex = (hostIndex + 1) % 3; - return new Uri(UriFormat. - Replace("{c}", "abc".Substring(hostIndex, 1)). - Replace("{x}", x.ToString()). - Replace("{y}", y.ToString()). - Replace("{z}", zoomLevel.ToString())); + return new Uri(UriFormat. + Replace("{c}", "abc".Substring(hostIndex, 1)). + Replace("{x}", x.ToString()). + Replace("{y}", y.ToString()). + Replace("{z}", zoomLevel.ToString())); + } } private Uri GetGoogleMapsUri(int x, int y, int zoomLevel) { - hostIndex = (hostIndex + 1) % 4; + lock (getUri) // protect hostIndex + { + hostIndex = (hostIndex + 1) % 4; - return new Uri(UriFormat. - Replace("{i}", hostIndex.ToString()). - Replace("{x}", x.ToString()). - Replace("{y}", y.ToString()). - Replace("{z}", zoomLevel.ToString())); + return new Uri(UriFormat. + Replace("{i}", hostIndex.ToString()). + Replace("{x}", x.ToString()). + Replace("{y}", y.ToString()). + Replace("{z}", zoomLevel.ToString())); + } } private Uri GetMapQuestUri(int x, int y, int zoomLevel) { - hostIndex = (hostIndex % 4) + 1; + lock (getUri) // protect hostIndex + { + hostIndex = (hostIndex % 4) + 1; - return new Uri(UriFormat. - Replace("{n}", hostIndex.ToString()). - Replace("{x}", x.ToString()). - Replace("{y}", y.ToString()). - Replace("{z}", zoomLevel.ToString())); + return new Uri(UriFormat. + Replace("{n}", hostIndex.ToString()). + Replace("{x}", x.ToString()). + Replace("{y}", y.ToString()). + Replace("{z}", zoomLevel.ToString())); + } } private Uri GetQuadKeyUri(int x, int y, int zoomLevel) diff --git a/MapControl/TileSourceConverter.cs b/MapControl/TileSourceConverter.cs index e3c888a9..7cfabc10 100644 --- a/MapControl/TileSourceConverter.cs +++ b/MapControl/TileSourceConverter.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 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 38063909..92961a85 100644 --- a/MapControl/TransformEx.WinRT.cs +++ b/MapControl/TransformEx.WinRT.cs @@ -1,5 +1,5 @@ // XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © 2012 Clemens Fischer +// Copyright © 2013 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 7b6cb9d4..dc0832d5 100644 --- a/MapControl/WinRT/Properties/AssemblyInfo.cs +++ b/MapControl/WinRT/Properties/AssemblyInfo.cs @@ -6,9 +6,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyProduct("XAML Map Control")] -[assembly: AssemblyCopyright("Copyright © 2012 Clemens Fischer")] +[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("1.1.4")] -[assembly: AssemblyFileVersion("1.1.4")] +[assembly: AssemblyVersion("1.1.5")] +[assembly: AssemblyFileVersion("1.1.5")] [assembly: ComVisible(false)] diff --git a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs index bf0ac9a4..05cd478e 100644 --- a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs +++ b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs @@ -6,9 +6,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyProduct("XAML Map Control")] -[assembly: AssemblyCopyright("Copyright © 2012 Clemens Fischer")] +[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("1.1.4")] -[assembly: AssemblyFileVersion("1.1.4")] +[assembly: AssemblyVersion("1.1.5")] +[assembly: AssemblyFileVersion("1.1.5")] [assembly: ComVisible(false)] diff --git a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs index e1938105..8cb1afeb 100644 --- a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs @@ -6,9 +6,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyProduct("XAML Map Control")] -[assembly: AssemblyCopyright("Copyright © 2012 Clemens Fischer")] +[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("1.1.4")] -[assembly: AssemblyFileVersion("1.1.4")] +[assembly: AssemblyVersion("1.1.5")] +[assembly: AssemblyFileVersion("1.1.5")] [assembly: ComVisible(false)] diff --git a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs index eee28623..176f4fd8 100644 --- a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs @@ -6,9 +6,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyProduct("XAML Map Control")] -[assembly: AssemblyCopyright("Copyright © 2012 Clemens Fischer")] +[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("1.1.4")] -[assembly: AssemblyFileVersion("1.1.4")] +[assembly: AssemblyVersion("1.1.5")] +[assembly: AssemblyFileVersion("1.1.5")] [assembly: ComVisible(false)] diff --git a/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs b/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs index 1448e532..77b389fe 100644 --- a/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs @@ -7,10 +7,10 @@ using System.Windows; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyProduct("XAML Map Control")] -[assembly: AssemblyCopyright("Copyright © 2012 Clemens Fischer")] +[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("1.1.4")] -[assembly: AssemblyFileVersion("1.1.4")] +[assembly: AssemblyVersion("1.1.5")] +[assembly: AssemblyFileVersion("1.1.5")] [assembly: ComVisible(false)] [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)] diff --git a/SampleApps/WpfApplication/MainWindow.xaml b/SampleApps/WpfApplication/MainWindow.xaml index 3f503f27..02887449 100644 --- a/SampleApps/WpfApplication/MainWindow.xaml +++ b/SampleApps/WpfApplication/MainWindow.xaml @@ -33,10 +33,13 @@ TileSource="http://ecn.t{i}.tiles.virtualearth.net/tiles/h{q}.jpeg?g=0&stl=h" MaxZoomLevel="20" HasDarkBackground="True"/>--> - + + + diff --git a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs index 9cfbde58..a8c9721f 100644 --- a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs @@ -7,10 +7,10 @@ using System.Windows; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyProduct("XAML Map Control")] -[assembly: AssemblyCopyright("Copyright © 2012 Clemens Fischer")] +[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("1.1.4")] -[assembly: AssemblyFileVersion("1.1.4")] +[assembly: AssemblyVersion("1.1.5")] +[assembly: AssemblyFileVersion("1.1.5")] [assembly: ComVisible(false)] [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]