Version 2.5.0:

- moved tile rect calculation from MapBase to TileLayer - added TileLayer.ZoomLevelOffset property - Windows Universal sample application in solution MapControl VS2015
2026-04-05 14:37:01 +00:00 · 2015-08-09 20:04:44 +02:00 · 2015-08-09 20:04:44 +02:00 · 98cdc95c5d
commit 98cdc95c5d
parent 36a8600faf
80 changed files with 16033 additions and 456 deletions
--- a/SampleApps/Common/ViewModel.cs
+++ b/SampleApps/Common/ViewModel.cs
@ -2,7 +2,7 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
-#if WINDOWS_RUNTIME
+#if NETFX_CORE
 using Windows.UI.Xaml;
 #else
 using System.Windows.Threading;
--- a/SampleApps/PhoneApplication/Package.appxmanifest
+++ b/SampleApps/PhoneApplication/Package.appxmanifest
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest" xmlns:m3="http://schemas.microsoft.com/appx/2014/manifest" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest">
-  <Identity Name="XamlMapControl.PhoneApp" Publisher="CN=Clemens" Version="2.4.0.0" />
+  <Identity Name="XamlMapControl.PhoneApp" Publisher="CN=Clemens" Version="2.5.0.0" />
  <mp:PhoneIdentity PhoneProductId="a28a99bb-a24b-4713-a6ea-3015d8aa2d72" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
  <Properties>
    <DisplayName>XAML Map Control Phone Application</DisplayName>
--- a/SampleApps/PhoneApplication/PhoneApplication.csproj
+++ b/SampleApps/PhoneApplication/PhoneApplication.csproj
@ -14,7 +14,7 @@
    <MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{76F1466A-8B6D-4E39-A767-685A06062A39};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Never</AppxBundle>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@ -28,7 +28,7 @@
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_PHONE_APP</DefineConstants>
--- a/SampleApps/PhoneApplication/PhoneApplication.csproj.user
+++ b/SampleApps/PhoneApplication/PhoneApplication.csproj.user
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DeviceId>30F105C9-681E-420b-A277-7C086EAD8A4E</DeviceId>
+    <DeviceId>20DCA81D-A315-40BC-9B83-B6A01D31DBC6</DeviceId>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
    <DeviceId>30F105C9-681E-420b-A277-7C086EAD8A4E</DeviceId>
--- a/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs
@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("2.4.12")]
-[assembly: AssemblyFileVersion("2.4.12")]
+[assembly: AssemblyVersion("2.5.0")]
+[assembly: AssemblyFileVersion("2.5.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
--- a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs
+++ b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs
@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("2.4.12")]
-[assembly: AssemblyFileVersion("2.4.12")]
+[assembly: AssemblyVersion("2.5.0")]
+[assembly: AssemblyFileVersion("2.5.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
--- a/SampleApps/SilverlightApplication/MainPage.xaml
+++ b/SampleApps/SilverlightApplication/MainPage.xaml
@ -11,7 +11,7 @@
    <UserControl.Resources>
        <map:TileLayerCollection x:Key="TileLayers">
            <!--
-            TileLayers with OpenStreetMap data.
+                TileLayers with OpenStreetMap data.
            -->
            <map:TileLayer SourceName="OpenStreetMap"
                           Description="Maps © [OpenStreetMap Contributors](http://www.openstreetmap.org/copyright)"
@ -42,10 +42,10 @@
                           MinZoomLevel="10" MaxZoomLevel="18"/>

            <!--
-            Bing Maps TileLayers with tile URLs retrieved from the Imagery Metadata Service
-            (see http://msdn.microsoft.com/en-us/library/ff701716.aspx).
-            A Bing Maps API Key (see http://msdn.microsoft.com/en-us/library/ff428642.aspx) is required
-            for using these layers and must be assigned to the static BingMapsTileLayer.ApiKey property.
+                Bing Maps TileLayers with tile URLs retrieved from the Imagery Metadata Service
+                (see http://msdn.microsoft.com/en-us/library/ff701716.aspx).
+                A Bing Maps API Key (see http://msdn.microsoft.com/en-us/library/ff428642.aspx) is required
+                for using these layers and must be assigned to the static BingMapsTileLayer.ApiKey property.
            -->
            <map:BingMapsTileLayer SourceName="Bing Maps Road"
                                   Description="© [Microsoft Corporation](http://www.bing.com/maps/)"
--- a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs
@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("2.4.12")]
-[assembly: AssemblyFileVersion("2.4.12")]
+[assembly: AssemblyVersion("2.5.0")]
+[assembly: AssemblyFileVersion("2.5.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
--- a/SampleApps/StoreApplication/MainPage.xaml
+++ b/SampleApps/StoreApplication/MainPage.xaml
@ -8,7 +8,7 @@
    <Page.Resources>
        <map:TileLayerCollection x:Key="TileLayers">
            <!--
-            TileLayers with OpenStreetMap data.
+                TileLayers with OpenStreetMap data.
            -->
            <map:TileLayer SourceName="OpenStreetMap"
                           Description="Maps © [OpenStreetMap Contributors](http://www.openstreetmap.org/copyright)"
@ -46,10 +46,10 @@
            </map:TileLayer>

            <!--
-            Bing Maps TileLayers with tile URLs retrieved from the Imagery Metadata Service
-            (see http://msdn.microsoft.com/en-us/library/ff701716.aspx).
-            A Bing Maps API Key (see http://msdn.microsoft.com/en-us/library/ff428642.aspx) is required
-            for using these layers and must be assigned to the static BingMapsTileLayer.ApiKey property.
+                Bing Maps TileLayers with tile URLs retrieved from the Imagery Metadata Service
+                (see http://msdn.microsoft.com/en-us/library/ff701716.aspx).
+                A Bing Maps API Key (see http://msdn.microsoft.com/en-us/library/ff428642.aspx) is required
+                for using these layers and must be assigned to the static BingMapsTileLayer.ApiKey property.
            -->
            <map:BingMapsTileLayer SourceName="Bing Maps Road"
                                   Description="Bing Maps - © Microsoft Corporation"
--- a/SampleApps/StoreApplication/Package.appxmanifest
+++ b/SampleApps/StoreApplication/Package.appxmanifest
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="XamlMapControl.StoreApp" Publisher="CN=Clemens" Version="2.4.0.0" />
+  <Identity Name="XamlMapControl.StoreApp" Publisher="CN=Clemens" Version="2.5.0.0" />
  <Properties>
    <DisplayName>XAML Map Control Store Application</DisplayName>
    <PublisherDisplayName>Clemens</PublisherDisplayName>
--- a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs
@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("2.4.12")]
-[assembly: AssemblyFileVersion("2.4.12")]
-[assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("2.5.0")]
+[assembly: AssemblyFileVersion("2.5.0")]
+[assembly: AssemblyConfiguration("")]
 [assembly: ComVisible(false)]
--- a/SampleApps/StoreApplication/StoreApplication.csproj
+++ b/SampleApps/StoreApplication/StoreApplication.csproj
@ -33,7 +33,7 @@
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;WINDOWS_RUNTIME</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
--- a/SampleApps/UniversalApp/App.xaml
+++ b/SampleApps/UniversalApp/App.xaml
@ -0,0 +1,8 @@
+<Application
+    x:Class="UniversalApp.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:UniversalApp"
+    RequestedTheme="Light">
+
+</Application>
--- a/SampleApps/UniversalApp/App.xaml.cs
+++ b/SampleApps/UniversalApp/App.xaml.cs
@ -0,0 +1,49 @@
+using System;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Activation;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+
+namespace UniversalApp
+{
+    sealed partial class App : Application
+    {
+        public App()
+        {
+            this.InitializeComponent();
+            this.Suspending += OnSuspending;
+        }
+
+        protected override void OnLaunched(LaunchActivatedEventArgs e)
+        {
+            Frame rootFrame = Window.Current.Content as Frame;
+
+            if (rootFrame == null)
+            {
+                rootFrame = new Frame();
+                rootFrame.NavigationFailed += OnNavigationFailed;
+
+                Window.Current.Content = rootFrame;
+            }
+
+            if (rootFrame.Content == null)
+            {
+                rootFrame.Navigate(typeof(MainPage), e.Arguments);
+            }
+
+            Window.Current.Activate();
+        }
+
+        private void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
+        {
+            throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
+        }
+
+        private void OnSuspending(object sender, SuspendingEventArgs e)
+        {
+            var deferral = e.SuspendingOperation.GetDeferral();
+            deferral.Complete();
+        }
+    }
+}
--- a/SampleApps/UniversalApp/Assets/LockScreenLogo.scale-200.png
+++ b/SampleApps/UniversalApp/Assets/LockScreenLogo.scale-200.png
--- a/SampleApps/UniversalApp/Assets/SplashScreen.scale-200.png
+++ b/SampleApps/UniversalApp/Assets/SplashScreen.scale-200.png
--- a/SampleApps/UniversalApp/Assets/Square150x150Logo.scale-200.png
+++ b/SampleApps/UniversalApp/Assets/Square150x150Logo.scale-200.png
--- a/SampleApps/UniversalApp/Assets/Square44x44Logo.scale-200.png
+++ b/SampleApps/UniversalApp/Assets/Square44x44Logo.scale-200.png
--- a/SampleApps/UniversalApp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
+++ b/SampleApps/UniversalApp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
--- a/SampleApps/UniversalApp/Assets/StoreLogo.png
+++ b/SampleApps/UniversalApp/Assets/StoreLogo.png
--- a/SampleApps/UniversalApp/Assets/Wide310x150Logo.scale-200.png
+++ b/SampleApps/UniversalApp/Assets/Wide310x150Logo.scale-200.png
--- a/SampleApps/UniversalApp/BindingHelper.cs
+++ b/SampleApps/UniversalApp/BindingHelper.cs
@ -0,0 +1,36 @@
+using MapControl;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Data;
+
+namespace UniversalApp
+{
+    public class BindingHelper
+    {
+        public static readonly DependencyProperty LocationPathProperty = DependencyProperty.RegisterAttached(
+            "LocationPath", typeof(string), typeof(BindingHelper),
+            new PropertyMetadata(null, LocationPathPropertyChanged));
+
+        public static string GetLocationPath(DependencyObject obj)
+        {
+            return (string)obj.GetValue(LocationPathProperty);
+        }
+
+        public static void SetLocationPath(DependencyObject obj, string value)
+        {
+            obj.SetValue(LocationPathProperty, value);
+        }
+
+        private static void LocationPathPropertyChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e)
+        {
+            var propertyPath = e.NewValue as string;
+
+            if (propertyPath != null)
+            {
+                BindingOperations.SetBinding(
+                    obj,
+                    MapPanel.LocationProperty,
+                    new Binding { Path = new PropertyPath(propertyPath) });
+            }
+        }
+    }
+}
--- a/SampleApps/UniversalApp/MainPage.xaml
+++ b/SampleApps/UniversalApp/MainPage.xaml
@ -0,0 +1,256 @@
+<Page
+    x:Class="UniversalApp.MainPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:map="using:MapControl"
+    xmlns:vm="using:ViewModel"
+    xmlns:local="using:UniversalApp">
+
+    <Page.Resources>
+        <map:TileLayerCollection x:Key="TileLayers">
+            <!--
+                TileLayers with OpenStreetMap data.
+            -->
+            <map:TileLayer SourceName="OpenStreetMap"
+                           Description="Maps © [OpenStreetMap Contributors](http://www.openstreetmap.org/copyright)"
+                           MaxZoomLevel="19">
+                <map:TileSource UriFormat="http://{c}.tile.openstreetmap.org/{z}/{x}/{y}.png"/>
+            </map:TileLayer>
+            <map:TileLayer SourceName="Thunderforest OpenCycleMap"
+                           Description="Maps © [Thunderforest](http://www.thunderforest.com/), Data © [OpenStreetMap Contributors](http://www.openstreetmap.org/copyright)">
+                <map:TileSource UriFormat="http://{c}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png"/>
+            </map:TileLayer>
+            <map:TileLayer SourceName="Thunderforest Landscape"
+                           Description="Maps © [Thunderforest](http://www.thunderforest.com/), Data © [OpenStreetMap Contributors](http://www.openstreetmap.org/copyright)">
+                <map:TileSource UriFormat="http://{c}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png"/>
+            </map:TileLayer>
+            <map:TileLayer SourceName="Thunderforest Outdoors"
+                           Description="Maps © [Thunderforest](http://www.thunderforest.com/), Data © [OpenStreetMap Contributors](http://www.openstreetmap.org/copyright)">
+                <map:TileSource UriFormat="http://{c}.tile.thunderforest.com/outdoors/{z}/{x}/{y}.png"/>
+            </map:TileLayer>
+            <map:TileLayer SourceName="Thunderforest Transport"
+                           Description="Maps © [Thunderforest](http://www.thunderforest.com/), Data © [OpenStreetMap Contributors](http://www.openstreetmap.org/copyright)">
+                <map:TileSource UriFormat="http://{c}.tile.thunderforest.com/transport/{z}/{x}/{y}.png"/>
+            </map:TileLayer>
+            <map:TileLayer SourceName="Thunderforest Transport Dark"
+                           Description="Maps © [Thunderforest](http://www.thunderforest.com/), Data © [OpenStreetMap Contributors](http://www.openstreetmap.org/copyright)"
+                           Foreground="White" Background="Black">
+                <map:TileSource UriFormat="http://{c}.tile.thunderforest.com/transport-dark/{z}/{x}/{y}.png"/>
+            </map:TileLayer>
+            <map:TileLayer SourceName="MapQuest OpenStreetMap"
+                           Description="Maps © [MapQuest](http://www.mapquest.com/), Data © [OpenStreetMap Contributors](http://www.openstreetmap.org/copyright)">
+                <map:TileSource UriFormat="http://otile{n}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png"/>
+            </map:TileLayer>
+            <map:TileLayer SourceName="Seamarks" Description="© OpenSeaMap Contributors"
+                           MinZoomLevel="10" MaxZoomLevel="18">
+                <map:TileSource UriFormat="http://tiles.openseamap.org/seamark/{z}/{x}/{y}.png"/>
+            </map:TileLayer>
+
+            <!--
+                Bing Maps TileLayers with tile URLs retrieved from the Imagery Metadata Service
+                (see http://msdn.microsoft.com/en-us/library/ff701716.aspx).
+                A Bing Maps API Key (see http://msdn.microsoft.com/en-us/library/ff428642.aspx) is required
+                for using these layers and must be assigned to the static BingMapsTileLayer.ApiKey property.
+            -->
+            <map:BingMapsTileLayer SourceName="Bing Maps Road"
+                                   Description="Bing Maps - © Microsoft Corporation"
+                                   Mode="Road" MaxZoomLevel="19"/>
+            <map:BingMapsTileLayer SourceName="Bing Maps Aerial"
+                                   Description="Bing Maps - © Microsoft Corporation"
+                                   Mode="Aerial" MaxZoomLevel="19" Foreground="White" Background="Black"/>
+            <map:BingMapsTileLayer SourceName="Bing Maps Hybrid"
+                                   Description="Bing Maps - © Microsoft Corporation"
+                                   Mode="AerialWithLabels" MaxZoomLevel="19" Foreground="White" Background="Black"/>
+        </map:TileLayerCollection>
+
+        <DataTemplate x:Key="PolylineItemTemplate">
+            <map:MapPolyline Locations="{Binding Locations}" Stroke="Red" StrokeThickness="3"/>
+        </DataTemplate>
+
+        <Style x:Key="PolylineItemStyle" TargetType="map:MapItem">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="map:MapItem">
+                        <map:MapPolyline Locations="{Binding Locations}" Stroke="Red" StrokeThickness="3"/>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="PointItemStyle" TargetType="map:MapItem">
+            <Setter Property="local:BindingHelper.LocationPath" Value="Location"/>
+            <Setter Property="Foreground" Value="Black"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="map:MapItem">
+                        <Canvas>
+                            <VisualStateManager.VisualStateGroups>
+                                <VisualStateGroup x:Name="CommonStates">
+                                    <VisualState x:Name="Normal"/>
+                                    <VisualState x:Name="Disabled"/>
+                                    <VisualState x:Name="PointerOver">
+                                        <Storyboard>
+                                            <DoubleAnimation Storyboard.TargetName="labelBackground" Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:0.1"/>
+                                        </Storyboard>
+                                    </VisualState>
+                                </VisualStateGroup>
+                                <VisualStateGroup x:Name="SelectionStates">
+                                    <VisualState x:Name="Unselected"/>
+                                    <VisualState x:Name="Selected">
+                                        <Storyboard>
+                                            <DoubleAnimation Storyboard.TargetName="selectedPath" Storyboard.TargetProperty="Opacity" To="0.7" Duration="0:0:0.1"/>
+                                        </Storyboard>
+                                    </VisualState>
+                                    <VisualState x:Name="SelectedUnfocus">
+                                        <Storyboard>
+                                            <DoubleAnimation Storyboard.TargetName="selectedPath" Storyboard.TargetProperty="Opacity" To="0.7" Duration="0:0:0.1"/>
+                                        </Storyboard>
+                                    </VisualState>
+                                    <VisualState x:Name="SelectedDisable">
+                                        <Storyboard>
+                                            <DoubleAnimation Storyboard.TargetName="selectedPath" Storyboard.TargetProperty="Opacity" To="0.7" Duration="0:0:0.1"/>
+                                        </Storyboard>
+                                    </VisualState>
+                                    <VisualState x:Name="SelectedPointer">
+                                        <Storyboard>
+                                            <DoubleAnimation Storyboard.TargetName="selectedPath" Storyboard.TargetProperty="Opacity" To="0.7" Duration="0:0:0.1"/>
+                                        </Storyboard>
+                                    </VisualState>
+                                    <VisualState x:Name="SelectedPressed">
+                                        <Storyboard>
+                                            <DoubleAnimation Storyboard.TargetName="selectedPath" Storyboard.TargetProperty="Opacity" To="0.7" Duration="0:0:0.1"/>
+                                        </Storyboard>
+                                    </VisualState>
+                                </VisualStateGroup>
+                            </VisualStateManager.VisualStateGroups>
+                            <Path x:Name="selectedPath" Fill="White" Opacity="0">
+                                <Path.Data>
+                                    <EllipseGeometry RadiusX="15" RadiusY="15"/>
+                                </Path.Data>
+                            </Path>
+                            <Path Fill="Transparent" Stroke="Gray" StrokeThickness="2">
+                                <Path.Data>
+                                    <EllipseGeometry RadiusX="8" RadiusY="8"/>
+                                </Path.Data>
+                            </Path>
+                            <Grid Canvas.Left="15" Canvas.Top="-8">
+                                <Rectangle x:Name="labelBackground" Fill="White" Opacity="0.7"/>
+                                <TextBlock Margin="2,0,2,0" Text="{Binding Name}"/>
+                            </Grid>
+                        </Canvas>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="PushpinItemStyle" TargetType="map:MapItem">
+            <Setter Property="local:BindingHelper.LocationPath" Value="Location"/>
+            <Setter Property="VerticalAlignment" Value="Bottom"/>
+            <Setter Property="Foreground" Value="Black"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="map:MapItem">
+                        <map:Pushpin Content="{Binding Name}"/>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Page.Resources>
+
+    <Page.DataContext>
+        <vm:ViewModel/>
+    </Page.DataContext>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <map:Map x:Name="map" TileLayer="{Binding [OpenStreetMap], Source={StaticResource TileLayers}}"
+                 Center="{Binding MapCenter}" MinZoomLevel="2" MaxZoomLevel="18" ZoomLevel="11" ManipulationMode="All">
+            <map:MapImage x:Name="mapImage" South="53.54031" North="53.74871" West="8.08594" East="8.43750"
+                          Source="10_535_330.jpg" Opacity="0.5"/>
+            <map:MapGraticule Opacity="0.6"/>
+
+            <!-- use ItemTemplate or ItemContainerStyle alternatively -->
+            <map:MapItemsControl ItemsSource="{Binding Polylines}"
+                                 ItemTemplate="{StaticResource PolylineItemTemplate}"/>
+            <!--<map:MapItemsControl ItemsSource="{Binding Polylines}"
+                                 ItemContainerStyle="{StaticResource PolylineItemStyle}"/>-->
+
+            <map:MapItemsControl ItemsSource="{Binding Points}"
+                                 ItemContainerStyle="{StaticResource PointItemStyle}"
+                                 SelectionMode="Extended"/>
+
+            <map:MapItemsControl ItemsSource="{Binding Pushpins}"
+                                 ItemContainerStyle="{StaticResource PushpinItemStyle}"/>
+
+            <Path Stroke="Blue" StrokeThickness="3">
+                <map:MapPanel.Location>
+                    <map:Location Latitude="53.5" Longitude="8.2"/>
+                </map:MapPanel.Location>
+                <Path.Data>
+                    <EllipseGeometry RadiusX="1852" RadiusY="1852" Transform="{Binding ScaleTransform, ElementName=map}"/>
+                </Path.Data>
+            </Path>
+
+            <map:MapPath Fill="Aqua" Opacity="0.5">
+                <map:MapPath.Data>
+                    <GeometryGroup FillRule="EvenOdd">
+                        <EllipseGeometry Center="8.2,63.5" RadiusX="0.025" RadiusY="0.025"/>
+                        <EllipseGeometry Center="8.2,63.51" RadiusX="0.015" RadiusY="0.015"/>
+                    </GeometryGroup>
+                </map:MapPath.Data>
+            </map:MapPath>
+
+            <map:Pushpin Background="Yellow" Foreground="Blue" Content="N 53° 30' E 8° 12'">
+                <map:MapPanel.Location>
+                    <map:Location Latitude="53.5" Longitude="8.2"/>
+                </map:MapPanel.Location>
+            </map:Pushpin>
+        </map:Map>
+        <Border HorizontalAlignment="Right" VerticalAlignment="Bottom" Background="#BFFFFFFF">
+            <TextBlock Margin="2" FontSize="10" Foreground="Black"
+                       map:HyperlinkText.InlinesSource="{Binding TileLayer.Description, ElementName=map}"/>
+        </Border>
+        <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
+                <StackPanel Margin="5">
+                    <TextBlock Text="Zoom Level" HorizontalAlignment="Center" Foreground="Gray" FontSize="14"/>
+                    <Slider Margin="10,-10,10,-10" Width="200" SmallChange="0.1"
+                            Minimum="{Binding MinZoomLevel, ElementName=map}"
+                            Maximum="{Binding MaxZoomLevel, ElementName=map}"
+                            Value="{Binding TargetZoomLevel, ElementName=map, Mode=TwoWay}"/>
+                </StackPanel>
+                <StackPanel Margin="5">
+                    <TextBlock Text="Heading" HorizontalAlignment="Center" Foreground="Gray" FontSize="14"/>
+                    <Slider Margin="10,-10,10,-10" Width="200" Minimum="0" Maximum="360" SmallChange="5" LargeChange="45"
+                            Value="{Binding Heading, ElementName=map, Mode=TwoWay}"/>
+                </StackPanel>
+                <StackPanel Margin="5">
+                    <TextBlock Text="Image Opacity" HorizontalAlignment="Center" Foreground="Gray" FontSize="14"/>
+                    <Slider Margin="10,-10,10,-10" Width="200" Value="50" ValueChanged="ImageOpacitySliderValueChanged"/>
+                </StackPanel>
+                <CheckBox Margin="10" VerticalAlignment="Center" Content="Seamarks"
+                          Checked="SeamarksChecked" Unchecked="SeamarksUnchecked"/>
+                <ComboBox Width="200" Margin="10" VerticalAlignment="Center"
+                          SelectedValuePath="Tag" SelectedValue="{Binding TileLayer, ElementName=map, Mode=TwoWay}">
+                    <ComboBoxItem Tag="{Binding [OpenStreetMap], Source={StaticResource TileLayers}}">OpenStreetMap</ComboBoxItem>
+                    <ComboBoxItem Tag="{Binding [Thunderforest OpenCycleMap], Source={StaticResource TileLayers}}">OpenCycleMap</ComboBoxItem>
+                    <ComboBoxItem Tag="{Binding [Thunderforest Landscape], Source={StaticResource TileLayers}}">Landscape</ComboBoxItem>
+                    <ComboBoxItem Tag="{Binding [Thunderforest Outdoors], Source={StaticResource TileLayers}}">Outdoors</ComboBoxItem>
+                    <ComboBoxItem Tag="{Binding [Thunderforest Transport], Source={StaticResource TileLayers}}">Transport</ComboBoxItem>
+                    <ComboBoxItem Tag="{Binding [Thunderforest Transport Dark], Source={StaticResource TileLayers}}">Transport Dark</ComboBoxItem>
+                    <ComboBoxItem Tag="{Binding [MapQuest OpenStreetMap], Source={StaticResource TileLayers}}">MapQuest Open</ComboBoxItem>
+                    <!--<ComboBoxItem Tag="{Binding [Bing Maps Road], Source={StaticResource TileLayers}}">Bing Maps Road</ComboBoxItem>
+                    <ComboBoxItem Tag="{Binding [Bing Maps Aerial], Source={StaticResource TileLayers}}">Bing Maps Aerial</ComboBoxItem>
+                    <ComboBoxItem Tag="{Binding [Bing Maps Hybrid], Source={StaticResource TileLayers}}">Bing Maps Hybrid</ComboBoxItem>-->
+                </ComboBox>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</Page>
--- a/SampleApps/UniversalApp/MainPage.xaml.cs
+++ b/SampleApps/UniversalApp/MainPage.xaml.cs
@ -0,0 +1,35 @@
+using MapControl;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+
+namespace UniversalApp
+{
+    public sealed partial class MainPage : Page
+    {
+        public MainPage()
+        {
+            //TileImageLoader.Cache = new MapControl.Caching.ImageFileCache();
+
+            this.InitializeComponent();
+        }
+
+        private void ImageOpacitySliderValueChanged(object sender, RangeBaseValueChangedEventArgs e)
+        {
+            if (mapImage != null)
+            {
+                mapImage.Opacity = e.NewValue / 100;
+            }
+        }
+
+        private void SeamarksChecked(object sender, RoutedEventArgs e)
+        {
+            map.TileLayers.Add(((TileLayerCollection)Resources["TileLayers"])["Seamarks"]);
+        }
+
+        private void SeamarksUnchecked(object sender, RoutedEventArgs e)
+        {
+            map.TileLayers.Remove(((TileLayerCollection)Resources["TileLayers"])["Seamarks"]);
+        }
+    }
+}
--- a/SampleApps/UniversalApp/Package.appxmanifest
+++ b/SampleApps/UniversalApp/Package.appxmanifest
@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
+  <Identity Name="XamlMapControl.UniversalApp" Publisher="CN=Clemens" Version="2.5.0.0" />
+  <mp:PhoneIdentity PhoneProductId="6781ec09-e195-49eb-9a20-b25a8dc39b2a" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
+  <Properties>
+    <DisplayName>UniversalApp</DisplayName>
+    <PublisherDisplayName>Clemens</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+  </Dependencies>
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="UniversalApp.App">
+      <uap:VisualElements DisplayName="XAML Map Control Test Application" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="UniversalApp" BackgroundColor="transparent">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
+        </uap:DefaultTile>
+        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <Capability Name="internetClient" />
+  </Capabilities>
+</Package>
--- a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs
+++ b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs
@ -0,0 +1,14 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Windows Universal Sample Application")]
+[assembly: AssemblyDescription("XAML Map Control Windows Universal Sample Application")]
+[assembly: AssemblyProduct("XAML Map Control")]
+[assembly: AssemblyCompany("Clemens Fischer")]
+[assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("2.5.0")]
+[assembly: AssemblyFileVersion("2.5.0")]
+[assembly: AssemblyConfiguration("")]
+[assembly: ComVisible(false)]
--- a/SampleApps/UniversalApp/Properties/Default.rd.xml
+++ b/SampleApps/UniversalApp/Properties/Default.rd.xml
@ -0,0 +1,31 @@
+<!--
+    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
+    developers. However, you can modify these parameters to modify the behavior of the .NET Native
+    optimizer.
+
+    Runtime Directives are documented at http://go.microsoft.com/fwlink/?LinkID=391919
+
+    To fully enable reflection for App1.MyClass and all of its public/private members
+    <Type Name="App1.MyClass" Dynamic="Required All"/>
+
+    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
+    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
+
+    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
+    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
+-->
+
+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
+  <Application>
+    <!--
+      An Assembly element with Name="*Application*" applies to all assemblies in
+      the application package. The asterisks are not wildcards.
+    -->
+    <Assembly Name="*Application*" Dynamic="Required All" />
+    
+    
+    <!-- Add your application specific runtime directives here. -->
+
+
+  </Application>
+</Directives>
--- a/SampleApps/UniversalApp/UniversalApp.csproj
+++ b/SampleApps/UniversalApp/UniversalApp.csproj
@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}</ProjectGuid>
+    <OutputType>AppContainerExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>UniversalApp</RootNamespace>
+    <AssemblyName>UniversalApp</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <PackageCertificateKeyFile>UniversalApp_TemporaryKey.pfx</PackageCertificateKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
+    <EnableGatekeeperAnalysis>false</EnableGatekeeperAnalysis>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
+    <OutputPath>bin\ARM\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>none</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+    <EnableGatekeeperAnalysis>false</EnableGatekeeperAnalysis>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
+    <EnableGatekeeperAnalysis>false</EnableGatekeeperAnalysis>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>none</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+    <EnableGatekeeperAnalysis>false</EnableGatekeeperAnalysis>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
+    <EnableGatekeeperAnalysis>false</EnableGatekeeperAnalysis>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>none</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+    <EnableGatekeeperAnalysis>false</EnableGatekeeperAnalysis>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
+    <None Include="project.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Common\ViewModel.cs">
+      <Link>ViewModel.cs</Link>
+    </Compile>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="BindingHelper.cs" />
+    <Compile Include="MainPage.xaml.cs">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+    <None Include="UniversalApp_TemporaryKey.pfx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\Common\10_535_330.jpg">
+      <Link>10_535_330.jpg</Link>
+    </Content>
+    <Content Include="Properties\Default.rd.xml" />
+    <Content Include="Assets\LockScreenLogo.scale-200.png" />
+    <Content Include="Assets\SplashScreen.scale-200.png" />
+    <Content Include="Assets\Square150x150Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Assets\StoreLogo.png" />
+    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="MainPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Caching\ImageFileCache.WinRT\ImageFileCache.WinRT.csproj">
+      <Project>{f789647e-96f7-43e3-a895-fa3fe8d01260}</Project>
+      <Name>ImageFileCache.WinRT</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MapControl\WinRT\MapControl.WinRT.csproj">
+      <Project>{63cefdf7-5170-43b6-86f8-5c4a383a1615}</Project>
+      <Name>MapControl.WinRT</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
--- a/SampleApps/UniversalApp/UniversalApp.csproj.user
+++ b/SampleApps/UniversalApp/UniversalApp.csproj.user
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
+    <DeviceId>30F105C9-681E-420b-A277-7C086EAD8A4E</DeviceId>
+    <UseEmulator>true</UseEmulator>
+  </PropertyGroup>
+</Project>
--- a/SampleApps/UniversalApp/UniversalApp_TemporaryKey.pfx
+++ b/SampleApps/UniversalApp/UniversalApp_TemporaryKey.pfx
--- a/SampleApps/UniversalApp/project.json
+++ b/SampleApps/UniversalApp/project.json
@ -0,0 +1,16 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
+  },
+  "frameworks": {
+    "uap10.0": {}
+  },
+  "runtimes": {
+    "win10-arm": {},
+    "win10-arm-aot": {},
+    "win10-x86": {},
+    "win10-x86-aot": {},
+    "win10-x64": {},
+    "win10-x64-aot": {}
+  }
+}
--- a/SampleApps/UniversalApp/project.lock.json
+++ b/SampleApps/UniversalApp/project.lock.json
--- a/SampleApps/WpfApplication/MainWindow.xaml
+++ b/SampleApps/WpfApplication/MainWindow.xaml
@ -9,7 +9,7 @@
    Stylus.IsPressAndHoldEnabled="False">
    <Window.Resources>
        <!--
-        TileLayers with OpenStreetMap data.
+            TileLayers with OpenStreetMap data.
        -->
        <map:TileLayer x:Key="OpenStreetMap" SourceName="OpenStreetMap"
                       Description="Maps © [OpenStreetMap Contributors](http://www.openstreetmap.org/copyright)"
@ -40,10 +40,18 @@
                       MinZoomLevel="9" MaxZoomLevel="18"/>

        <!--
-        Bing Maps TileLayers with tile URLs retrieved from the Imagery Metadata Service
-        (see http://msdn.microsoft.com/en-us/library/ff701716.aspx).
-        A Bing Maps API Key (see http://msdn.microsoft.com/en-us/library/ff428642.aspx) is required
-        for using these layers and must be assigned to the static BingMapsTileLayer.ApiKey property.
+            A TileLayer using World OSM WMS, a Web Map Service based on OpenStreetMap data.
+            Please contact the provider at http://www.osm-wms.de/ if you intend to use this in an application.
+        -->
+        <map:TileLayer x:Key="WorldOsm" SourceName="World OSM WMS"
+                       Description="[World OSM WMS](http://www.osm-wms.de/) © [OpenStreetMap Contributors](http://www.openstreetmap.org/copyright)"
+                       TileSource="http://129.206.228.72/cached/osm?SERVICE=WMS&amp;VERSION=1.1.1&amp;REQUEST=GetMap&amp;LAYERS=osm_auto:all&amp;STYLES=&amp;SRS=EPSG:900913&amp;BBOX={W},{S},{E},{N}&amp;WIDTH={X}&amp;HEIGHT={Y}&amp;FORMAT=image/png"/>
+
+        <!--
+            Bing Maps TileLayers with tile URLs retrieved from the Imagery Metadata Service
+            (see http://msdn.microsoft.com/en-us/library/ff701716.aspx).
+            A Bing Maps API Key (see http://msdn.microsoft.com/en-us/library/ff428642.aspx) is required
+            for using these layers and must be assigned to the static BingMapsTileLayer.ApiKey property.
        -->
        <map:BingMapsTileLayer x:Key="BingRoad" SourceName="Bing Maps Road"
                               Description="© [Microsoft Corporation](http://www.bing.com/maps/)"
@ -56,14 +64,7 @@
                               Mode="AerialWithLabels" MaxZoomLevel="19" Foreground="White" Background="Black"/>

        <!--
-        A TileLayer for World OSM WMS, a Web Map Service based on OpenStreetMap data.
-        -->
-        <!--<map:TileLayer x:Key="WorldOsm" SourceName="World OSM WMS"
-                       Description="[World OSM WMS](http://www.osm-wms.de/) © [OpenStreetMap Contributors](http://www.openstreetmap.org/copyright)"
-                       TileSource="http://129.206.228.72/cached/osm?SERVICE=WMS&amp;VERSION=1.1.1&amp;REQUEST=GetMap&amp;LAYERS=osm_auto:all&amp;STYLES=&amp;SRS=EPSG:900913&amp;BBOX={W},{S},{E},{N}&amp;WIDTH=256&amp;HEIGHT=256&amp;FORMAT=image/png"/>-->
-
-        <!--
-        A TileLayer that uses an ImageTileSource
+            A TileLayer that uses an ImageTileSource
        -->
        <!--<map:TileLayer x:Key="OsmImageTileSource"
                       Description="© [OpenStreetMap Contributors](http://www.openstreetmap.org/copyright)">
@ -71,7 +72,7 @@
        </map:TileLayer>-->

        <!--
-        A TileLayer that demonstrates how to access local tile image files (from ImageFileCache here)
+            A TileLayer that demonstrates how to access local tile image files (from ImageFileCache here)
        -->
        <!--<map:TileLayer x:Key="OsmLocalFiles"
                       Description="© [OpenStreetMap Contributors](http://www.openstreetmap.org/copyright)"
@ -283,6 +284,7 @@
                    <ComboBoxItem Tag="{StaticResource Transport}">Transport</ComboBoxItem>
                    <ComboBoxItem Tag="{StaticResource TransportDark}">Transport Dark</ComboBoxItem>
                    <ComboBoxItem Tag="{StaticResource MapQuest}">MapQuest Open</ComboBoxItem>
+                    <!--<ComboBoxItem Tag="{StaticResource WorldOsm}">World OSM WMS</ComboBoxItem>-->
                    <!--<ComboBoxItem Tag="{StaticResource BingRoad}">Bing Maps Road</ComboBoxItem>
                    <ComboBoxItem Tag="{StaticResource BingAerial}">Bing Maps Aerial</ComboBoxItem>
                    <ComboBoxItem Tag="{StaticResource BingHybrid}">Bing Maps Hybrid</ComboBoxItem>-->
--- a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs
@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("2.4.12")]
-[assembly: AssemblyFileVersion("2.4.12")]
+[assembly: AssemblyVersion("2.5.0")]
+[assembly: AssemblyFileVersion("2.5.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]