From 5eafa751f8f8287dec8e94fe07aea1fef112fb4c Mon Sep 17 00:00:00 2001
From: ClemensF <fischer.clemens@gmail.com>
Date: Sun, 17 Nov 2013 16:52:03 +0100
Subject: [PATCH] Version 1.9.0:

- added MapBase.ZoomToBounds method
- fixed coercing property values in MapBase
- improved Location property handling in MapPanel to keep viewport positions near map center
- use common view model in sample applications
---
 .../FileDbCache/Properties/AssemblyInfo.cs    |   4 +-
 .../ImageFileCache/Properties/AssemblyInfo.cs |   4 +-
 MapControl/MapBase.cs                         | 106 ++++++----
 MapControl/MapGraticule.Silverlight.WinRT.cs  |   7 +-
 MapControl/MapPanel.cs                        |  17 ++
 MapControl/Properties/AssemblyInfo.cs         |   4 +-
 MapControl/TileContainer.Silverlight.WinRT.cs |   4 +-
 MapControl/TileContainer.WPF.cs               |   4 +-
 MapControl/TileContainer.cs                   |   2 +-
 MapControl/TileImageLoader.WPF.cs             |   6 +-
 MapControl/TileLayer.cs                       |   2 +-
 MapControl/TileSource.cs                      |   5 +
 MapControl/WinRT/Properties/AssemblyInfo.cs   |   4 +-
 .../10_535_330.jpg                            | Bin
 SampleApps/Common/ViewModel.cs                | 191 ++++++++++++++++++
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../SilverlightApplication/MainPage.xaml      |  19 +-
 .../SilverlightApplication/MainPage.xaml.cs   | 103 +---------
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../SilverlightApplication/SampleItems.cs     |  51 -----
 .../SilverlightApplication.csproj             |   8 +-
 SampleApps/StoreApplication/10_535_330.jpg    | Bin 7174 -> 0 bytes
 SampleApps/StoreApplication/MainPage.xaml     |  20 +-
 SampleApps/StoreApplication/MainPage.xaml.cs  | 107 +---------
 .../Properties/AssemblyInfo.cs                |   4 +-
 SampleApps/StoreApplication/SampleItems.cs    |  51 -----
 .../StoreApplication/StoreApplication.csproj  |   8 +-
 .../Properties/AssemblyInfo.cs                |   4 +-
 SampleApps/WpfApplication/10_535_330.jpg      | Bin 7174 -> 0 bytes
 SampleApps/WpfApplication/App.config          |   2 +-
 SampleApps/WpfApplication/MainWindow.xaml     |  40 ++--
 SampleApps/WpfApplication/MainWindow.xaml.cs  | 107 +---------
 .../WpfApplication/Properties/AssemblyInfo.cs |   4 +-
 .../Properties/Settings.Designer.cs           |   4 +-
 .../Properties/Settings.settings              |   2 +-
 SampleApps/WpfApplication/SampleItems.cs      |  51 -----
 .../WpfApplication/WpfApplication.csproj      |   9 +-
 37 files changed, 391 insertions(+), 571 deletions(-)
 rename SampleApps/{SilverlightApplication => Common}/10_535_330.jpg (100%)
 create mode 100644 SampleApps/Common/ViewModel.cs
 delete mode 100644 SampleApps/SilverlightApplication/SampleItems.cs
 delete mode 100644 SampleApps/StoreApplication/10_535_330.jpg
 delete mode 100644 SampleApps/StoreApplication/SampleItems.cs
 delete mode 100644 SampleApps/WpfApplication/10_535_330.jpg
 delete mode 100644 SampleApps/WpfApplication/SampleItems.cs

diff --git a/Caching/FileDbCache/Properties/AssemblyInfo.cs b/Caching/FileDbCache/Properties/AssemblyInfo.cs
index c22cc179..75a45f2a 100644
--- a/Caching/FileDbCache/Properties/AssemblyInfo.cs
+++ b/Caching/FileDbCache/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("1.8.0")]
-[assembly: AssemblyFileVersion("1.8.0")]
+[assembly: AssemblyVersion("1.9.0")]
+[assembly: AssemblyFileVersion("1.9.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/Caching/ImageFileCache/Properties/AssemblyInfo.cs b/Caching/ImageFileCache/Properties/AssemblyInfo.cs
index 244d27ac..f44ac956 100644
--- a/Caching/ImageFileCache/Properties/AssemblyInfo.cs
+++ b/Caching/ImageFileCache/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("1.8.0")]
-[assembly: AssemblyFileVersion("1.8.0")]
+[assembly: AssemblyVersion("1.9.0")]
+[assembly: AssemblyFileVersion("1.9.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/MapControl/MapBase.cs b/MapControl/MapBase.cs
index 391e3f9a..ad16a8fd 100644
--- a/MapControl/MapBase.cs
+++ b/MapControl/MapBase.cs
@@ -405,6 +405,27 @@ namespace MapControl
             }
         }
 
+        /// <summary>
+        /// Sets the TargetZoomLevel and TargetCenter properties such that the specified bounding box
+        /// fits into the current viewport. The TargetHeading property is set to zero.
+        /// </summary>
+        public void ZoomToBounds(Location southWest, Location northEast)
+        {
+            if (southWest.Latitude < northEast.Latitude && southWest.Longitude < northEast.Longitude)
+            {
+                var p1 = MapTransform.Transform(southWest);
+                var p2 = MapTransform.Transform(northEast);
+                var lonScale = ActualWidth / (p2.X - p1.X) * 360d / TileSource.TileSize;
+                var latScale = ActualHeight / (p2.Y - p1.Y) * 360d / TileSource.TileSize;
+                var lonZoom = Math.Log(lonScale, 2d);
+                var latZoom = Math.Log(latScale, 2d);
+
+                TargetZoomLevel = Math.Min(lonZoom, latZoom);
+                TargetCenter = MapTransform.Transform(new Point((p1.X + p2.X) / 2d, (p1.Y + p2.Y) / 2d));
+                TargetHeading = 0d;
+            }
+        }
+
         protected override void OnViewportChanged()
         {
             base.OnViewportChanged();
@@ -551,8 +572,14 @@ namespace MapControl
             internalPropertyChange = false;
         }
 
-        private bool CoerceLocation(Location location, double latitudeEpsilon = 0d)
+        private bool CoerceLocation(ref Location location, double latitudeEpsilon = 0d)
         {
+            if (location == null)
+            {
+                location = new Location();
+                return true;
+            }
+
             var maxLatitude = mapTransform.MaxLatitude + latitudeEpsilon;
             var latitude = Math.Min(Math.Max(location.Latitude, -maxLatitude), maxLatitude);
             var longitude = Location.NormalizeLongitude(location.Longitude);
@@ -567,9 +594,9 @@ namespace MapControl
             return false;
         }
 
-        private void CoerceCenterProperty(DependencyProperty property, Location center)
+        private void CoerceCenterProperty(DependencyProperty property, ref Location center)
         {
-            if (CoerceLocation(center))
+            if (CoerceLocation(ref center))
             {
                 InternalSetValue(property, center);
             }
@@ -579,7 +606,7 @@ namespace MapControl
         {
             if (!internalPropertyChange)
             {
-                CoerceCenterProperty(CenterProperty, center);
+                CoerceCenterProperty(CenterProperty, ref center);
                 ResetTransformOrigin();
                 UpdateTransform();
 
@@ -595,9 +622,9 @@ namespace MapControl
         {
             if (!internalPropertyChange)
             {
-                CoerceCenterProperty(TargetCenterProperty, targetCenter);
+                CoerceCenterProperty(TargetCenterProperty, ref targetCenter);
 
-                if (!targetCenter.Equals(Center))
+                if (targetCenter.Latitude != Center.Latitude || targetCenter.Longitude != Center.Longitude)
                 {
                     if (centerAnimation != null)
                     {
@@ -652,9 +679,11 @@ namespace MapControl
 
             if (coercedValue != minZoomLevel)
             {
-                InternalSetValue(MinZoomLevelProperty, coercedValue);
+                minZoomLevel = coercedValue;
+                InternalSetValue(MinZoomLevelProperty, minZoomLevel);
             }
-            else if (ZoomLevel < minZoomLevel)
+
+            if (ZoomLevel < minZoomLevel)
             {
                 ZoomLevel = minZoomLevel;
             }
@@ -666,32 +695,32 @@ namespace MapControl
 
             if (coercedValue != maxZoomLevel)
             {
-                InternalSetValue(MaxZoomLevelProperty, coercedValue);
+                maxZoomLevel = coercedValue;
+                InternalSetValue(MaxZoomLevelProperty, maxZoomLevel);
             }
-            else if (ZoomLevel > maxZoomLevel)
+
+            if (ZoomLevel > maxZoomLevel)
             {
                 ZoomLevel = maxZoomLevel;
             }
         }
 
-        private bool CoerceZoomLevelProperty(DependencyProperty property, ref double zoomLevel)
+        private void CoerceZoomLevelProperty(DependencyProperty property, ref double zoomLevel)
         {
             var coercedValue = Math.Min(Math.Max(zoomLevel, MinZoomLevel), MaxZoomLevel);
 
             if (coercedValue != zoomLevel)
             {
-                InternalSetValue(property, coercedValue);
-                return true;
+                zoomLevel = coercedValue;
+                InternalSetValue(property, zoomLevel);
             }
-
-            return false;
         }
 
         private void ZoomLevelPropertyChanged(double zoomLevel)
         {
-            if (!internalPropertyChange &&
-                !CoerceZoomLevelProperty(ZoomLevelProperty, ref zoomLevel))
+            if (!internalPropertyChange)
             {
+                CoerceZoomLevelProperty(ZoomLevelProperty, ref zoomLevel);
                 UpdateTransform();
 
                 if (zoomLevelAnimation == null)
@@ -703,25 +732,28 @@ namespace MapControl
 
         private void TargetZoomLevelPropertyChanged(double targetZoomLevel)
         {
-            if (!internalPropertyChange &&
-                !CoerceZoomLevelProperty(TargetZoomLevelProperty, ref targetZoomLevel) &&
-                targetZoomLevel != ZoomLevel)
+            if (!internalPropertyChange)
             {
-                if (zoomLevelAnimation != null)
+                CoerceZoomLevelProperty(TargetZoomLevelProperty, ref targetZoomLevel);
+
+                if (targetZoomLevel != ZoomLevel)
                 {
-                    zoomLevelAnimation.Completed -= ZoomLevelAnimationCompleted;
+                    if (zoomLevelAnimation != null)
+                    {
+                        zoomLevelAnimation.Completed -= ZoomLevelAnimationCompleted;
+                    }
+
+                    zoomLevelAnimation = new DoubleAnimation
+                    {
+                        To = targetZoomLevel,
+                        Duration = AnimationDuration,
+                        EasingFunction = AnimationEasingFunction,
+                        FillBehavior = FillBehavior.HoldEnd
+                    };
+
+                    zoomLevelAnimation.Completed += ZoomLevelAnimationCompleted;
+                    this.BeginAnimation(ZoomLevelProperty, zoomLevelAnimation);
                 }
-
-                zoomLevelAnimation = new DoubleAnimation
-                {
-                    To = targetZoomLevel,
-                    Duration = AnimationDuration,
-                    EasingFunction = AnimationEasingFunction,
-                    FillBehavior = FillBehavior.HoldEnd
-                };
-
-                zoomLevelAnimation.Completed += ZoomLevelAnimationCompleted;
-                this.BeginAnimation(ZoomLevelProperty, zoomLevelAnimation);
             }
         }
 
@@ -742,12 +774,12 @@ namespace MapControl
 
         private void CoerceHeadingProperty(DependencyProperty property, ref double heading)
         {
-            var coercedValue = (heading >= -180d && heading <= 360d) ?
-                heading : (((heading % 360d) + 360d) % 360d);
+            var coercedValue = (heading >= -180d && heading <= 360d) ? heading : (((heading % 360d) + 360d) % 360d);
 
             if (coercedValue != heading)
             {
-                InternalSetValue(property, coercedValue);
+                heading = coercedValue;
+                InternalSetValue(property, heading);
             }
         }
 
@@ -826,7 +858,7 @@ namespace MapControl
             {
                 center = ViewportPointToLocation(new Point(RenderSize.Width / 2d, RenderSize.Height / 2d));
 
-                var coerced = CoerceLocation(center, 1e-3);
+                var coerced = CoerceLocation(ref center, 1e-3);
 
                 InternalSetValue(CenterProperty, center);
 
diff --git a/MapControl/MapGraticule.Silverlight.WinRT.cs b/MapControl/MapGraticule.Silverlight.WinRT.cs
index 50e0b5b7..9d6599bc 100644
--- a/MapControl/MapGraticule.Silverlight.WinRT.cs
+++ b/MapControl/MapGraticule.Silverlight.WinRT.cs
@@ -226,7 +226,6 @@ namespace MapControl
                     {
                         for (var lon = labelsStart.Longitude; lon <= end.Longitude; lon += spacing)
                         {
-                            var location = new Location(lat, lon);
                             TextBlock label;
 
                             if (childIndex < Children.Count)
@@ -273,13 +272,17 @@ namespace MapControl
                             {
                                 transformGroup.Children.Add(new TranslateTransform());
                                 transformGroup.Children.Add(ParentMap.RotateTransform);
+                                transformGroup.Children.Add(new TranslateTransform());
                             }
 
                             var translateTransform = (TranslateTransform)transformGroup.Children[0];
                             translateTransform.X = StrokeThickness / 2d + 2d;
                             translateTransform.Y = -label.DesiredSize.Height / 2d;
 
-                            MapPanel.SetLocation(label, location);
+                            var viewportPosition = ParentMap.LocationToViewportPoint(new Location(lat, lon));
+                            translateTransform = (TranslateTransform)transformGroup.Children[2];
+                            translateTransform.X = viewportPosition.X;
+                            translateTransform.Y = viewportPosition.Y;
                         }
                     }
 
diff --git a/MapControl/MapPanel.cs b/MapControl/MapPanel.cs
index 234aa69c..b8f0eb4d 100644
--- a/MapControl/MapPanel.cs
+++ b/MapControl/MapPanel.cs
@@ -151,6 +151,23 @@ namespace MapControl
 
             if (parentMap != null && location != null)
             {
+                var longitude = Location.NormalizeLongitude(location.Longitude);
+                var centerDistance = longitude - parentMap.Center.Longitude;
+
+                if (centerDistance > 180d)
+                {
+                    longitude -= 360d;
+                }
+                else if (centerDistance < -180d)
+                {
+                    longitude += 360d;
+                }
+
+                if (location.Longitude != longitude) // keep viewport position near map center
+                {
+                    location = new Location(location.Latitude, longitude);
+                }
+
                 viewportPosition = parentMap.LocationToViewportPoint(location);
                 element.SetValue(ViewportPositionProperty, viewportPosition);
             }
diff --git a/MapControl/Properties/AssemblyInfo.cs b/MapControl/Properties/AssemblyInfo.cs
index 39d82727..095b20b5 100644
--- a/MapControl/Properties/AssemblyInfo.cs
+++ b/MapControl/Properties/AssemblyInfo.cs
@@ -15,8 +15,8 @@ using System.Windows;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("1.8.0")]
-[assembly: AssemblyFileVersion("1.8.0")]
+[assembly: AssemblyVersion("1.9.0")]
+[assembly: AssemblyFileVersion("1.9.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/MapControl/TileContainer.Silverlight.WinRT.cs b/MapControl/TileContainer.Silverlight.WinRT.cs
index 3be445ed..22da03c5 100644
--- a/MapControl/TileContainer.Silverlight.WinRT.cs
+++ b/MapControl/TileContainer.Silverlight.WinRT.cs
@@ -17,8 +17,10 @@ namespace MapControl
 {
     internal partial class TileContainer : Panel
     {
-        private Matrix GetViewportTransformMatrix(Matrix transform)
+        private Matrix GetViewportTransformMatrix(double scale, double offsetX, double offsetY)
         {
+            var transform = new Matrix(scale, 0d, 0d, -scale, offsetX, offsetY);
+
             return transform.RotateAt(rotation, viewportOrigin.X, viewportOrigin.Y);
         }
 
diff --git a/MapControl/TileContainer.WPF.cs b/MapControl/TileContainer.WPF.cs
index 9a87e1c4..dc9a415b 100644
--- a/MapControl/TileContainer.WPF.cs
+++ b/MapControl/TileContainer.WPF.cs
@@ -9,8 +9,10 @@ namespace MapControl
 {
     internal partial class TileContainer : ContainerVisual
     {
-        private Matrix GetViewportTransformMatrix(Matrix transform)
+        private Matrix GetViewportTransformMatrix(double scale, double offsetX, double offsetY)
         {
+            var transform = new Matrix(scale, 0d, 0d, -scale, offsetX, offsetY);
+
             transform.RotateAt(rotation, viewportOrigin.X, viewportOrigin.Y);
 
             return transform;
diff --git a/MapControl/TileContainer.cs b/MapControl/TileContainer.cs
index 667789bf..054bd91f 100644
--- a/MapControl/TileContainer.cs
+++ b/MapControl/TileContainer.cs
@@ -101,7 +101,7 @@ namespace MapControl
             tileLayerOffset.X = transformOffsetX - 180d * scale;
             tileLayerOffset.Y = transformOffsetY - 180d * scale;
 
-            ViewportTransform.Matrix = GetViewportTransformMatrix(new Matrix(scale, 0d, 0d, -scale, transformOffsetX, transformOffsetY));
+            ViewportTransform.Matrix = GetViewportTransformMatrix(scale, transformOffsetX, transformOffsetY);
 
             if (Math.Sign(mapOrigin.X) != Math.Sign(oldMapOriginX) && Math.Abs(mapOrigin.X) > 90d)
             {
diff --git a/MapControl/TileImageLoader.WPF.cs b/MapControl/TileImageLoader.WPF.cs
index cfac5dec..8ae081a3 100644
--- a/MapControl/TileImageLoader.WPF.cs
+++ b/MapControl/TileImageLoader.WPF.cs
@@ -104,7 +104,7 @@ namespace MapControl
                     return;
                 }
             }
-            else if (!tileSource.UriFormat.StartsWith("file:")) // always load local image files asynchronously
+            else if (!tileSource.UriFormat.StartsWith("file:")) // load local image files asynchronously, without caching
             {
                 if (Cache == null || string.IsNullOrWhiteSpace(sourceName))
                 {
@@ -183,7 +183,7 @@ namespace MapControl
 
                     if (uri != null)
                     {
-                        if (uri.Scheme == "file")
+                        if (uri.Scheme == "file") // create from FileStream as creating from URI leaves the file open
                         {
                             image = CreateImage(uri.AbsolutePath);
                         }
@@ -256,7 +256,7 @@ namespace MapControl
             {
                 try
                 {
-                    using (var stream = new FileStream(path, FileMode.Open))
+                    using (var stream = new FileStream(path, FileMode.Open, FileAccess.Read))
                     {
                         image = BitmapFrame.Create(stream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
                     }
diff --git a/MapControl/TileLayer.cs b/MapControl/TileLayer.cs
index 615c8bac..e68f0649 100644
--- a/MapControl/TileLayer.cs
+++ b/MapControl/TileLayer.cs
@@ -48,7 +48,7 @@ namespace MapControl
 
         public TileLayer()
         {
-            MinZoomLevel = 1;
+            MinZoomLevel = 0;
             MaxZoomLevel = 18;
             MaxParallelDownloads = 8;
             LoadLowerZoomLevels = true;
diff --git a/MapControl/TileSource.cs b/MapControl/TileSource.cs
index be2f4f21..948f3dc3 100644
--- a/MapControl/TileSource.cs
+++ b/MapControl/TileSource.cs
@@ -145,6 +145,11 @@ namespace MapControl
 
         private Uri GetQuadKeyUri(int x, int y, int zoomLevel)
         {
+            if (zoomLevel < 1)
+            {
+                return null;
+            }
+
             var key = new StringBuilder { Length = zoomLevel };
 
             for (var z = zoomLevel - 1; z >= 0; z--, x /= 2, y /= 2)
diff --git a/MapControl/WinRT/Properties/AssemblyInfo.cs b/MapControl/WinRT/Properties/AssemblyInfo.cs
index e3f48ad2..1cdf1020 100644
--- a/MapControl/WinRT/Properties/AssemblyInfo.cs
+++ b/MapControl/WinRT/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("1.8.0")]
-[assembly: AssemblyFileVersion("1.8.0")]
+[assembly: AssemblyVersion("1.9.0")]
+[assembly: AssemblyFileVersion("1.9.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/SilverlightApplication/10_535_330.jpg b/SampleApps/Common/10_535_330.jpg
similarity index 100%
rename from SampleApps/SilverlightApplication/10_535_330.jpg
rename to SampleApps/Common/10_535_330.jpg
diff --git a/SampleApps/Common/ViewModel.cs b/SampleApps/Common/ViewModel.cs
new file mode 100644
index 00000000..5b18d00d
--- /dev/null
+++ b/SampleApps/Common/ViewModel.cs
@@ -0,0 +1,191 @@
+using System;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+#if NETFX_CORE
+using Windows.UI.Xaml;
+#else
+using System.Windows.Threading;
+#endif
+using MapControl;
+
+namespace ViewModel
+{
+    public class VmBase : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected void OnPropertyChanged(string propertyName)
+        {
+            if (PropertyChanged != null)
+            {
+                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            }
+        }
+    }
+
+    public class VmPoint : VmBase
+    {
+        private string name;
+        public string Name
+        {
+            get { return name; }
+            set
+            {
+                name = value;
+                OnPropertyChanged("Name");
+            }
+        }
+
+        private Location location;
+        public Location Location
+        {
+            get { return location; }
+            set
+            {
+                location = value;
+                OnPropertyChanged("Location");
+            }
+        }
+    }
+
+    public class VmPolyline
+    {
+        public LocationCollection Locations { get; set; }
+    }
+
+    public class ViewModel : VmBase
+    {
+        public ObservableCollection<VmPoint> Points { get; set; }
+        public ObservableCollection<VmPoint> Pushpins { get; set; }
+        public ObservableCollection<VmPolyline> Polylines { get; set; }
+
+        private Location mapCenter;
+        public Location MapCenter
+        {
+            get { return mapCenter; }
+            set
+            {
+                mapCenter = value;
+                OnPropertyChanged("MapCenter");
+            }
+        }
+
+        public ViewModel()
+        {
+            MapCenter = new Location(53.5, 8.2);
+
+            Points = new ObservableCollection<VmPoint>();
+            Points.Add(
+                new VmPoint
+                {
+                    Name = "Steinbake Leitdamm",
+                    Location = new Location(53.51217, 8.16603)
+                });
+            Points.Add(
+                new VmPoint
+                {
+                    Name = "Buhne 2",
+                    Location = new Location(53.50926, 8.15815)
+                });
+            Points.Add(
+                new VmPoint
+                {
+                    Name = "Buhne 4",
+                    Location = new Location(53.50468, 8.15343)
+                });
+            Points.Add(
+                new VmPoint
+                {
+                    Name = "Buhne 6",
+                    Location = new Location(53.50092, 8.15267)
+                });
+            Points.Add(
+                new VmPoint
+                {
+                    Name = "Buhne 8",
+                    Location = new Location(53.49871, 8.15321)
+                });
+            Points.Add(
+                new VmPoint
+                {
+                    Name = "Buhne 10",
+                    Location = new Location(53.49350, 8.15563)
+                });
+            Points.Add(
+                new VmPoint
+                {
+                    Name = "Moving",
+                    Location = new Location(53.5, 8.25)
+                });
+
+            Pushpins = new ObservableCollection<VmPoint>();
+            Pushpins.Add(
+                new VmPoint
+                {
+                    Name = "WHV - Eckwarderhörne",
+                    Location = new Location(53.5495, 8.1877)
+                });
+            Pushpins.Add(
+                new VmPoint
+                {
+                    Name = "JadeWeserPort",
+                    Location = new Location(53.5914, 8.14)
+                });
+            Pushpins.Add(
+                new VmPoint
+                {
+                    Name = "Kurhaus Dangast",
+                    Location = new Location(53.447, 8.1114)
+                });
+            Pushpins.Add(
+                new VmPoint
+                {
+                    Name = "Eckwarderhörne",
+                    Location = new Location(53.5207, 8.2323)
+                });
+
+            //for (double lon = -720; lon <= 720; lon += 15)
+            //{
+            //    var lat = lon / 10;
+            //    Pushpins.Add(
+            //        new VmPoint
+            //        {
+            //            Name = string.Format("{0:00.0}°, {1:000}°", lat, lon),
+            //            Location = new Location(lat, lon)
+            //        });
+            //}
+
+            Polylines = new ObservableCollection<VmPolyline>();
+            Polylines.Add(
+                new VmPolyline
+                {
+                    Locations = LocationCollection.Parse("53.5140,8.1451 53.5123,8.1506 53.5156,8.1623 53.5276,8.1757 53.5491,8.1852 53.5495,8.1877 53.5426,8.1993 53.5184,8.2219 53.5182,8.2386 53.5195,8.2387")
+                });
+            Polylines.Add(
+                new VmPolyline
+                {
+                    Locations = LocationCollection.Parse("53.5978,8.1212 53.6018,8.1494 53.5859,8.1554 53.5852,8.1531 53.5841,8.1539 53.5802,8.1392 53.5826,8.1309 53.5867,8.1317 53.5978,8.1212")
+                });
+
+            var timer = new DispatcherTimer
+            {
+                Interval = TimeSpan.FromSeconds(0.1)
+            };
+
+            timer.Tick += (sender, e) =>
+            {
+                var p = Points.Last();
+                p.Location = new Location(p.Location.Latitude + 0.001, p.Location.Longitude + 0.002);
+
+                if (p.Location.Latitude > 54d)
+                {
+                    p.Name = "Stopped";
+                    ((DispatcherTimer)sender).Stop();
+                }
+            };
+
+            timer.Start();
+        }
+    }
+}
diff --git a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs
index 4d0e3823..35521462 100644
--- a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs
+++ b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("1.8.0")]
-[assembly: AssemblyFileVersion("1.8.0")]
+[assembly: AssemblyVersion("1.9.0")]
+[assembly: AssemblyFileVersion("1.9.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/SilverlightApplication/MainPage.xaml b/SampleApps/SilverlightApplication/MainPage.xaml
index 1901d701..734127a4 100644
--- a/SampleApps/SilverlightApplication/MainPage.xaml
+++ b/SampleApps/SilverlightApplication/MainPage.xaml
@@ -4,8 +4,9 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:map="clr-namespace:MapControl;assembly=MapControl.Silverlight"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
+    xmlns:map="clr-namespace:MapControl;assembly=MapControl.Silverlight"
+    xmlns:vm="clr-namespace:ViewModel"
     xmlns:local="clr-namespace:SilverlightApplication"
     mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="400">
     <UserControl.Resources>
@@ -93,32 +94,32 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        <local:SampleItemCollection x:Key="Polylines"/>
-        <local:SampleItemCollection x:Key="Points"/>
-        <local:SampleItemCollection x:Key="Pushpins"/>
     </UserControl.Resources>
+    <UserControl.DataContext>
+        <vm:ViewModel/>
+    </UserControl.DataContext>
     <Grid x:Name="LayoutRoot" Background="White">
         <Grid.RowDefinitions>
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <map:Map x:Name="map" Center="53.5,8.2" MinZoomLevel="2" MaxZoomLevel="18" ZoomLevel="11"
+        <map:Map x:Name="map" Center="{Binding MapCenter}" MinZoomLevel="2" MaxZoomLevel="18" ZoomLevel="11"
                  MouseMove="MapMouseMove" MouseLeave="MapMouseLeave">
             <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="{StaticResource Polylines}"
+            <map:MapItemsControl ItemsSource="{Binding Polylines}"
                                  ItemTemplate="{StaticResource PolylineItemTemplate}"/>
-            <!--<map:MapItemsControl ItemsSource="{StaticResource Polylines}"
+            <!--<map:MapItemsControl ItemsSource="{Binding Polylines}"
                                  ItemContainerStyle="{StaticResource PolylineItemStyle}"/>-->
 
-            <map:MapItemsControl ItemsSource="{StaticResource Points}"
+            <map:MapItemsControl ItemsSource="{Binding Points}"
                                  ItemContainerStyle="{StaticResource PointItemStyle}"
                                  SelectionMode="Extended"/>
 
-            <map:MapItemsControl ItemsSource="{StaticResource Pushpins}"
+            <map:MapItemsControl ItemsSource="{Binding Pushpins}"
                                  ItemContainerStyle="{StaticResource PushpinItemStyle}"/>
 
             <Path map:MapPanel.Location="53.5,8.2" Stroke="Blue" StrokeThickness="3" Fill="#1F007F00">
diff --git a/SampleApps/SilverlightApplication/MainPage.xaml.cs b/SampleApps/SilverlightApplication/MainPage.xaml.cs
index e8008c0a..5b09b9ce 100644
--- a/SampleApps/SilverlightApplication/MainPage.xaml.cs
+++ b/SampleApps/SilverlightApplication/MainPage.xaml.cs
@@ -1,118 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
+using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Threading;
 using MapControl;
 
 namespace SilverlightApplication
 {
     public partial class MainPage : UserControl
     {
-        private SamplePoint movingPoint = new SamplePoint
-        {
-            Name = "Moving",
-            Location = new Location(53.5, 8.25)
-        };
-
         public MainPage()
         {
             InitializeComponent();
             tileLayerComboBox.SelectedIndex = 0;
-
-            var polylines = (ICollection<object>)Resources["Polylines"];
-            polylines.Add(
-                new SamplePolyline
-                {
-                    Locations = LocationCollection.Parse("53.5140,8.1451 53.5123,8.1506 53.5156,8.1623 53.5276,8.1757 53.5491,8.1852 53.5495,8.1877 53.5426,8.1993 53.5184,8.2219 53.5182,8.2386 53.5195,8.2387")
-                });
-            polylines.Add(
-                new SamplePolyline
-                {
-                    Locations = LocationCollection.Parse("53.5978,8.1212 53.6018,8.1494 53.5859,8.1554 53.5852,8.1531 53.5841,8.1539 53.5802,8.1392 53.5826,8.1309 53.5867,8.1317 53.5978,8.1212")
-                });
-
-            var points = (ICollection<object>)Resources["Points"];
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Steinbake Leitdamm",
-                    Location = new Location(53.51217, 8.16603)
-                });
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Buhne 2",
-                    Location = new Location(53.50926, 8.15815)
-                });
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Buhne 4",
-                    Location = new Location(53.50468, 8.15343)
-                });
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Buhne 6",
-                    Location = new Location(53.50092, 8.15267)
-                });
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Buhne 8",
-                    Location = new Location(53.49871, 8.15321)
-                });
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Buhne 10",
-                    Location = new Location(53.49350, 8.15563)
-                });
-            points.Add(movingPoint);
-
-            var pushpins = (ICollection<object>)Resources["Pushpins"];
-            pushpins.Add(
-                new SamplePoint
-                {
-                    Name = "WHV - Eckwarderhörne",
-                    Location = new Location(53.5495, 8.1877)
-                });
-            pushpins.Add(
-                new SamplePoint
-                {
-                    Name = "JadeWeserPort",
-                    Location = new Location(53.5914, 8.14)
-                });
-            pushpins.Add(
-                new SamplePoint
-                {
-                    Name = "Kurhaus Dangast",
-                    Location = new Location(53.447, 8.1114)
-                });
-            pushpins.Add(
-                new SamplePoint
-                {
-                    Name = "Eckwarderhörne",
-                    Location = new Location(53.5207, 8.2323)
-                });
-
-            var timer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(0.1) };
-            timer.Tick += MovePoint;
-            timer.Start();
-        }
-
-        private void MovePoint(object sender, EventArgs e)
-        {
-            movingPoint.Location = new Location(movingPoint.Location.Latitude + 0.001, movingPoint.Location.Longitude + 0.002);
-
-            if (movingPoint.Location.Latitude > 54d)
-            {
-                movingPoint.Name = "Stopped";
-                ((DispatcherTimer)sender).Stop();
-            }
         }
 
         private void MapMouseLeave(object sender, MouseEventArgs e)
diff --git a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs
index 56c8f888..cd747fbf 100644
--- a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("1.8.0")]
-[assembly: AssemblyFileVersion("1.8.0")]
+[assembly: AssemblyVersion("1.9.0")]
+[assembly: AssemblyFileVersion("1.9.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/SilverlightApplication/SampleItems.cs b/SampleApps/SilverlightApplication/SampleItems.cs
deleted file mode 100644
index bbfe90dc..00000000
--- a/SampleApps/SilverlightApplication/SampleItems.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using MapControl;
-
-namespace SilverlightApplication
-{
-    public class SamplePoint : INotifyPropertyChanged
-    {
-        private string name;
-        private Location location;
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        public string Name
-        {
-            get { return name; }
-            set
-            {
-                name = value;
-                OnPropertyChanged("Name");
-            }
-        }
-
-        public Location Location
-        {
-            get { return location; }
-            set
-            {
-                location = value;
-                OnPropertyChanged("Location");
-            }
-        }
-
-        private void OnPropertyChanged(string propertyName)
-        {
-            if (PropertyChanged != null)
-            {
-                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-
-    public class SamplePolyline
-    {
-        public LocationCollection Locations { get; set; }
-    }
-
-    public class SampleItemCollection : ObservableCollection<object>
-    {
-    }
-}
diff --git a/SampleApps/SilverlightApplication/SilverlightApplication.csproj b/SampleApps/SilverlightApplication/SilverlightApplication.csproj
index c6af4cfe..95f33178 100644
--- a/SampleApps/SilverlightApplication/SilverlightApplication.csproj
+++ b/SampleApps/SilverlightApplication/SilverlightApplication.csproj
@@ -73,6 +73,9 @@
     <Reference Include="System.Windows.Browser" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\Common\ViewModel.cs">
+      <Link>ViewModel.cs</Link>
+    </Compile>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
@@ -80,7 +83,6 @@
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SampleItems.cs" />
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
@@ -108,7 +110,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="10_535_330.jpg" />
+    <Resource Include="..\Common\10_535_330.jpg">
+      <Link>10_535_330.jpg</Link>
+    </Resource>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/SampleApps/StoreApplication/10_535_330.jpg b/SampleApps/StoreApplication/10_535_330.jpg
deleted file mode 100644
index 7eb2f5a71746b01a70dbdae4509923f8674552af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7174
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
T^HZnF{UsxQxlhLL{CW2u7OK-2

diff --git a/SampleApps/StoreApplication/MainPage.xaml b/SampleApps/StoreApplication/MainPage.xaml
index 73beda53..2944ce00 100644
--- a/SampleApps/StoreApplication/MainPage.xaml
+++ b/SampleApps/StoreApplication/MainPage.xaml
@@ -5,6 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:map="using:MapControl"
+    xmlns:vm="using:ViewModel"
     xmlns:local="using:StoreApplication"
     mc:Ignorable="d">
     <Page.Resources>
@@ -114,34 +115,31 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        <local:SampleItemCollection x:Key="Polylines"/>
-        <local:SampleItemCollection x:Key="Points"/>
-        <local:SampleItemCollection x:Key="Pushpins"/>
     </Page.Resources>
+    <Page.DataContext>
+        <vm:ViewModel/>
+    </Page.DataContext>
     <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
         <Grid.RowDefinitions>
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <map:Map x:Name="map" MinZoomLevel="2"  MaxZoomLevel="18" ZoomLevel="11" Foreground="Black">
-            <map:MapBase.Center>
-                <map:Location Latitude="53.5" Longitude="8.2"/>
-            </map:MapBase.Center>
+        <map:Map x:Name="map" MinZoomLevel="2" Center="{Binding MapCenter}" MaxZoomLevel="18" ZoomLevel="11" Foreground="Black">
             <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="{StaticResource Polylines}"
+            <map:MapItemsControl ItemsSource="{Binding Polylines}"
                                  ItemTemplate="{StaticResource PolylineItemTemplate}"/>
-            <!--<map:MapItemsControl ItemsSource="{StaticResource Polylines}"
+            <!--<map:MapItemsControl ItemsSource="{Binding Polylines}"
                                  ItemContainerStyle="{StaticResource PolylineItemStyle}"/>-->
 
-            <map:MapItemsControl ItemsSource="{StaticResource Points}"
+            <map:MapItemsControl ItemsSource="{Binding Points}"
                                  ItemContainerStyle="{StaticResource PointItemStyle}"
                                  SelectionMode="Extended"/>
 
-            <map:MapItemsControl ItemsSource="{StaticResource Pushpins}"
+            <map:MapItemsControl ItemsSource="{Binding Pushpins}"
                                  ItemContainerStyle="{StaticResource PushpinItemStyle}"/>
 
             <Path Stroke="Blue" StrokeThickness="3">
diff --git a/SampleApps/StoreApplication/MainPage.xaml.cs b/SampleApps/StoreApplication/MainPage.xaml.cs
index 66aa9794..91f63616 100644
--- a/SampleApps/StoreApplication/MainPage.xaml.cs
+++ b/SampleApps/StoreApplication/MainPage.xaml.cs
@@ -1,121 +1,16 @@
-using System;
-using System.Collections.Generic;
-using MapControl;
+using MapControl;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
 
-// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
-
 namespace StoreApplication
 {
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
     public sealed partial class MainPage : Page
     {
-        private SamplePoint movingPoint = new SamplePoint
-        {
-            Name = "Moving",
-            Location = new Location(53.5, 8.25)
-        };
-
         public MainPage()
         {
             this.InitializeComponent();
             tileLayerComboBox.SelectedIndex = 0;
-
-            var polylines = (ICollection<object>)Resources["Polylines"];
-            polylines.Add(
-                new SamplePolyline
-                {
-                    Locations = LocationCollection.Parse("53.5140,8.1451 53.5123,8.1506 53.5156,8.1623 53.5276,8.1757 53.5491,8.1852 53.5495,8.1877 53.5426,8.1993 53.5184,8.2219 53.5182,8.2386 53.5195,8.2387")
-                });
-            polylines.Add(
-                new SamplePolyline
-                {
-                    Locations = LocationCollection.Parse("53.5978,8.1212 53.6018,8.1494 53.5859,8.1554 53.5852,8.1531 53.5841,8.1539 53.5802,8.1392 53.5826,8.1309 53.5867,8.1317 53.5978,8.1212")
-                });
-
-            var points = (ICollection<object>)Resources["Points"];
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Steinbake Leitdamm",
-                    Location = new Location(53.51217, 8.16603)
-                });
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Buhne 2",
-                    Location = new Location(53.50926, 8.15815)
-                });
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Buhne 4",
-                    Location = new Location(53.50468, 8.15343)
-                });
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Buhne 6",
-                    Location = new Location(53.50092, 8.15267)
-                });
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Buhne 8",
-                    Location = new Location(53.49871, 8.15321)
-                });
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Buhne 10",
-                    Location = new Location(53.49350, 8.15563)
-                });
-            points.Add(movingPoint);
-
-            var pushpins = (ICollection<object>)Resources["Pushpins"];
-            pushpins.Add(
-                new SamplePoint
-                {
-                    Name = "WHV - Eckwarderhörne",
-                    Location = new Location(53.5495, 8.1877)
-                });
-            pushpins.Add(
-                new SamplePoint
-                {
-                    Name = "JadeWeserPort",
-                    Location = new Location(53.5914, 8.14)
-                });
-            pushpins.Add(
-                new SamplePoint
-                {
-                    Name = "Kurhaus Dangast",
-                    Location = new Location(53.447, 8.1114)
-                });
-            pushpins.Add(
-                new SamplePoint
-                {
-                    Name = "Eckwarderhörne",
-                    Location = new Location(53.5207, 8.2323)
-                });
-
-            var timer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(0.1) };
-            timer.Tick += MovePoint;
-            timer.Start();
-        }
-
-        private void MovePoint(object sender, object e)
-        {
-            movingPoint.Location = new Location(movingPoint.Location.Latitude + 0.001, movingPoint.Location.Longitude + 0.002);
-
-            if (movingPoint.Location.Latitude > 54d)
-            {
-                movingPoint.Name = "Stopped";
-                ((DispatcherTimer)sender).Stop();
-            }
         }
 
         private void ImageOpacitySliderValueChanged(object sender, RangeBaseValueChangedEventArgs e)
diff --git a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs
index 9f0d38a2..39f46008 100644
--- a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("1.8.0")]
-[assembly: AssemblyFileVersion("1.8.0")]
+[assembly: AssemblyVersion("1.9.0")]
+[assembly: AssemblyFileVersion("1.9.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/StoreApplication/SampleItems.cs b/SampleApps/StoreApplication/SampleItems.cs
deleted file mode 100644
index 04769ee2..00000000
--- a/SampleApps/StoreApplication/SampleItems.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using MapControl;
-
-namespace StoreApplication
-{
-    public class SamplePoint : INotifyPropertyChanged
-    {
-        private string name;
-        private Location location;
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        public string Name
-        {
-            get { return name; }
-            set
-            {
-                name = value;
-                OnPropertyChanged("Name");
-            }
-        }
-
-        public Location Location
-        {
-            get { return location; }
-            set
-            {
-                location = value;
-                OnPropertyChanged("Location");
-            }
-        }
-
-        private void OnPropertyChanged(string propertyName)
-        {
-            if (PropertyChanged != null)
-            {
-                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-
-    public class SamplePolyline
-    {
-        public LocationCollection Locations { get; set; }
-    }
-
-    public class SampleItemCollection : ObservableCollection<object>
-    {
-    }
-}
diff --git a/SampleApps/StoreApplication/StoreApplication.csproj b/SampleApps/StoreApplication/StoreApplication.csproj
index 17bbd195..50fce977 100644
--- a/SampleApps/StoreApplication/StoreApplication.csproj
+++ b/SampleApps/StoreApplication/StoreApplication.csproj
@@ -37,6 +37,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="..\Common\ViewModel.cs">
+      <Link>ViewModel.cs</Link>
+    </Compile>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
@@ -45,7 +48,6 @@
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SampleItems.cs" />
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
@@ -53,7 +55,9 @@
     </AppxManifest>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="10_535_330.jpg" />
+    <Content Include="..\Common\10_535_330.jpg">
+      <Link>10_535_330.jpg</Link>
+    </Content>
     <Content Include="Assets\Logo.png" />
     <Content Include="Assets\SmallLogo.png" />
     <Content Include="Assets\SplashScreen.png" />
diff --git a/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs b/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs
index 96b900ec..c9a8dc51 100644
--- a/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("1.8.0")]
-[assembly: AssemblyFileVersion("1.8.0")]
+[assembly: AssemblyVersion("1.9.0")]
+[assembly: AssemblyFileVersion("1.9.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/WpfApplication/10_535_330.jpg b/SampleApps/WpfApplication/10_535_330.jpg
deleted file mode 100644
index 7eb2f5a71746b01a70dbdae4509923f8674552af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7174
zcmbW5cTiK&m&X%YfCP{#p-7iNqz9xIApt@Uy@*H$0qNC3FOlAa2uKMKN<xvYC?H*W
z6KT>rC@3~8i@&lvyMOKOd2{B@n|J5D@8{fe-n(=E%>P*hTtcICQ2-zi003TGfIo`>
zO#n3&6^M$G8UzB-&`{GtSm+>NFa*lP%)r9U!E=S1gNut-P+XXo|C#_77wo#oHAyK1
z0>LA!pdv4=EG~nP{u=~HLqh`rL)hu)*roZn_@w{O_NNQLNc~q6IglSf#t0;51pes-
z@LcGm1pdPS|1uyMIRzyZh?<5Ld@-T<5`YXyPEJNaPDx2YaWVV;#d81!BPA1`lm->E
z$!!q7AB%KUMhUgRjfQSk%;ZNw8AtzU8d|o?>`)G&tHLl5QG~4Ab$JCvO)Vr!TSpgd
zYG!U>X=QEW<m}?==I-Gc5Ev935*ijB6B`$wkeGzc%*xKmeVmt%D=ov9S5y+JsvDm*
zHMg|3wRiNq?(ORz7#td&nx2`RdprMbVQqb5b8CBNcW?jX^wa0FFJHfX|M8dWFXzAQ
zpJ4xki}8YsjDmuk0`!*)NEUM8<ct)Qd{R_Q8YZCIe$4#RQPeCqGD;e{X#`|2A6Xs!
zCu!LP5o<yxf6@Ly_P+y*{(q7EC)j^+EdU_oz>CErX9TDLdJzkL6>mHIDEZ2Z$wmMl
zG=pa&^Sf#+a*cv@c|=q7I4DV5fS6HFTTwwJX_h*hokG+XzENRkxAD6am_$bIMX2jI
z7)LmH;oY3T-+EP@M50#8X8y2HmV>z+P3dCjzp}dH=IV&GpA{RS13N>~Y!aG-`qAiJ
z{4o_4Rv|^l(qv3Vi;V~@^hFvV=|yTJ=ZkS(o?YuCL7f<Y>A8t1hhOR-=Uv}YtW7Z!
zmW~Brf+UNir4(ZUU^r|v)hSs_^vSR=Ja7iXVKS9`5v$=2)I&oc$~aOFpop7m(Nb4+
zQLU6s@xa#(c^@Xx7PjwFB0L^Xi;g+LneQ(zTZKp2z`T!$xcz;(Q1b>3V2lid(HHFi
z^SZmoce9~Sz%g;$fJ68jV&ZO!$VB6FYB6xXiEB!s5iNJfeZcshIiAwZIS{7JF2HIq
z?U@6QR!o<#^1i#R)}E`@j4~w4)PsHTDf@1LIKe!cbvN5X+2b>#__Gi8thKxy;iXRv
zPlbeT-3x`(GB{Z=M_%;`9A`b4#AS8t2lUCe<c&<~h#&)TRIolV_F{@Y_VPZKE)gj`
zBrh||UwSHcmgsC_vPtCMwEWG849Xo)iWP~xxQkQ|KvPN?C>uxmd#_w?nH?9NY84}{
zKF3K&4KI=;YnH-sJ4<XB%Dd|Lp0>e_R!#e0>3yBH<X5k3i5fZR#0@Hh`Q03|a5E1P
zpyrjAXExl>xm$|5vz7|;_*|X}kyG2@F*XtN$h|gJfqjKKp?-tqvIpKe%e{}uC<ll3
zjSg<o8bN%$Q!HuQEXcFYWb?gUD1i1_pL{?kOunkol|}li4Z!>Ga76h`(u^KPCU69*
z!{;~ZWFY(mF3HX<U-S67UV*UY9KlUk_F!$zyMt@eyJg-n3Q5+1X3NHysMC7DO7kdL
z^2_l+9S`>kGDj?|m>kiR-4v-miGvkiR7C|4$%47a2aJqGq0gX5w8^d9kRAz(;kKE(
zKD3p%_<_M@kR>i6CdPUeUlA8FvDaG_jpho+vdM1=rTYvBbJvh@p66wk-G2KX8#*II
zkuJB>9H6MGRVg&{HrFgoLB7w~emURP(^th4Dja5e?H%F3-Q+=J*?lWOM8VVqjFi|X
z<ZKn6ZGw~p>ggf@7ZqPj7Im>SbpNc{zZ&ru8jb(uj*+w?9x$?GgRUCUC3EU0<+i9%
zEvp4#szRItV$Fh2qZkJ$#yT>k&a{=W0BB*QQE@CLe_P<+uJbQwV<1jO#~n{Lsa_g+
zF)flU3t^&9jxa$29JPLl9(r5*wxT<kKUpDjC-2jHYM4)Un61tY<|?MnnCNT#m!5y?
z`aAy3<3H;P)<+ie?-%~($W?2QY!Pc@ZK8G&_^qIz`>4+Qa%<B*<D?(vO<r&Htszg9
zG1D5Av?c%Q*uU)m!!=PJ05=>B9)C5GCj;e?Uxonu5CL9%mol@bOfMwRiu|o|;N$f|
zi2G$p7`tw(_fM(cvYA<;QCT+`diC~>7Y#iM<d(m64V3$Z<p#gwcy>u9j&-X#RkS~;
zf|PO|k?jcZoJ?vX$<eGR0EZ54s${QQ<vbe=ynPU`+g-zf^%q$$L9Ln<zjc)1MzWax
zEuH`7#W)7E2O^RNe>J^XviUObymJqKJ`Fz6e~;d{3R=nLh*gnSxlHEZp+R_U+C7Ts
zRU?$KL>H>lq{7Pa7qn6u>yfgRQ^cSr-j8+L>O{Lv8Jaaf3D*K^I3KrKNF%(is|osH
zc2Dc+crazfME~NHN_qYlp}GdQstS=X^c$x>=eUe`s(@X%lWss$)i~?&KDgY2?Z{8%
zg|)D#Tynz~5)-%_x9{<hMW-)1HD;kYa|<`KAhTo3>DP*`uf&#t;{h=i88tJH+VbVg
zD`E_*FI}Xx3sw%!&|pUZvN2IbGNa-v1*c&Z<Q_ET0$XDdQ@|qNb~?2YOV5nk)v{oK
z??ZHM7qr3n@xiE^wm`E*81>a>*|kb+;EP0@&jzP&Am$$CMS6xsHVN(!b?QD?uMH~C
zB#B2%;Hj{!to)rA?NR+S8xf$FoJZFT?JP`IH!%xA>yB8{r#v!1RHRQ(%)JF-Q1NnU
z@=#&I87XtY4<XvSl?^be>kLRQ2_vI2cjYDP1;A00o6V1%lWT$fTgr?Fw-nGm($D8t
zh^nFA^HyZ1eLkp;%XY|=M%UJi(U4H5Jv(}*u^V@Eo=1P>u{rA;uC?Ud!EN5VRetl<
z&BY;aXb`w*qhT}{ecf(wyZk!den6$tE?0?$7#rR#XQ>!8CDg-mO`0kkJD-x^lyNiE
zqm@%Np0o_Ep84oW;hD{Gs2`0MDV~Z^XP|JRN-y{&0;?d80{TibJb*39t911taJLcE
zeh!zp&PFBMz)=NX*Ky;<x>qL*^n%$xi7(U%4Vpw6fn=Ws5GWl>37ymJ$|rU~QX)zM
zNH+J;z?y<9m9i+?vaF^v1p*+<N)#@o5;^MLz1C^5!zso^zT8F%GcSl;ve=Snx>T#H
z{9}r9Jin99D~)o0L|sZW4KpkJleeRai~7}vYP5gL`pzRM%DIS{BsCRJ1I^cpEk((v
zwlci?Z$8luT5}sx^QPG}n-hn1RZ<4Gzt)(%nQCw-C~6K?=&;msyRYj$r#)(zmSNp6
z+GmrBUXW&eR6HHEUaUP>r9m{k^pB1Of3Y~JD>#LPF=|32yLQeFjGT?3Huv-*yYs{U
z0J47W^ZEFY_j9_UbnT_a0(M1%T`09eUDbl}9tx?Ar1iY?@qrzMD_t%XDoOdM!F35G
zt;G1VdWe@~%NhR3IyWk3(;}mwetcvxQQ;5Z%t9hXR^-Sbdf~FD&`>b94tGsOoT2*<
zF7w+T_GZRURF<wQ_UeLbs2|^9JitZEb+Kl6wJ9YH$(C_`gtw$(KM;<bGm6uuDi|`%
zO!j-!SZAS>k2I>fW`I>|)ze_6?c{0l$&SKa<swlzFU;ljvXJ#GC&m@R@@S*Lff3FD
zt1D~YzvAs=lDZ-!6hd}1FA=^?G>0t`ruK)wD02U<kxsnrK>X<?2_Wsi?#6i+ww)U@
z4W;Ght-39Az)GwfXlSdC>|g_|kKu2m_=YG$9gWbZo};Fg&GX3NN?SgM=BYzlxjBN>
z!%IAK_=tBru?y{oqAboDP4$~W2RL$|2+)5qU=O>I6ZW!2)~qy%$+kk6q3h75s5Jzp
zD~^|-;4=5~-G6}Oxo-DKN8i(O)W4Q90K&z*P-6BJrK<BXJ~ljCe8udbRYmu_qV(0r
z-}xb6P)pj*MmS-7u9`wGN?`EKr|ZMOUBH3q{K%J)`oY!SrIdln@?Z>UIXk%$J-mC`
zY0+cAV}YCe)NH%u^iywsTHtYc$OENGgQLV(Q32P;cL4sDe*i@L0Pqf!^bNg0qf~=y
z(6e-WT<+XI>o437uaIVTZMtj0S|g{R!0IhXN*qMi2cYTH>-v;sZ5-?^=7)g`Itrk4
zBceR_fUw|?AjBXvQUOKx_F6cu<>XP^Xk+7Wn0o?W!_vdJdo_>33)60DwPxfx)B=_y
zE7`}C%y~Gh#QL+i7a)0t4_B|^L3gMq$f#9+T6FMxa(K=8J8fe?6Mq0vq-2?A?)|la
z27$^gG}4r|+SQL+GWS}iZ1t&O^FPvTG~`X}liggZa!7Yj-{q@vHLMwzBfFTfZH;6=
z5OzV9dESFVPe|tqK`>^n!jhOBRXXnpp1uD$Uc)F)YwH_9@G(_cSm=Qn$&EIl$WsWB
z)1SfJd!+mZ;_ytWi@d!K`LRFcSB}#s$hbIkys|l9g>E7_RaPl`|6w4*@3@;TzuuH~
zc0S{ggvbC3OJ58(i-k41gsE!j22>A#*-Lse>GA$-&mb?o=EeJ-2zBowwY}cET-8#t
z<xvpei(~NPd<Oj8{L-asm0{1`Yabo{td!BjhN<@8&Am#GRSDr0ob3@n_1$GxfAxM)
zr+~K5i-yEhTcvkx2M6e5t6Xubtjs8R^0z8*6*QB!+&7faW0JODw0xg#@Q@7Zwr}-o
zLFrYJ%6(7X>J9Skjh7EaZ{<Ap%G)IW>M`JJgaP-rSUd5%Zlt2X4{lb~g?`FPmy87j
zr;iS(hhv6sy*VAGN|)Q>l=)0>_KyMQrk}ov$x%6XZ2bhUs5s6Em+;0x(fKU?fK{Te
zs>p<;&P(PS35U~MQNQMn;Z-edI_0UC4j3(#M#_?Z@c1+nYpp9<i}kDGmtw01_~JrL
za&gB2<_YkQcSYum6wW|geQd}&L8IL|Cr#8>qlU9#<+<ZA$>DRbgun)?>-E~+d$WU2
zONaveBzO4q>sjOjk?uZEJjV4K(`zPtM!gq#;fn~zBKBkYw3yd$dMV?s!$xOTM^HfW
z1MYooGZd$~xp19bc&f@D0Q&ppQJE4+^(Yo^M`^r6yBfk9R3#?ipvT%9A;F)W&C9bQ
z!WHw~?3#{AOmab{|3f08k4ajgP)~B#iu+ZL8&rOHGw7Mb!S5@LCln_7tzgKS21Hws
zaRNKk_>ntW`$<hp#(8xz?H<$VSZEF-c9@`w0VxLy5LLqL?@Yy(2?bz%jDr<aZgtO@
z>^&RuXw!ex?jKMPOuDh4xfL0XJ%gVo9v<$r=XWJpmYmfIW7S6v<srS;HYGic9s{D@
zo)Eh6WR3vpKEQxBh=C#;^PSr#bLnpeY^r$#h<ttrMtQo-O$DY+qY7t*=DhX-xAGS!
z%!Th^kMA+N)_X_<n%&JGW4K2T=V<Jx#~+dcVUzO<)dX4=N;`T=SJbdjuFj%!j9|?v
zdw9%&>HD#hQMOC0_J(WSvVcs^$aP~!<;F|WsyUnMqV^WH{ClY355bZRsdPKr0+l7z
zCuO=a!_@4X1g>@bHNOc~0bHXH14j+A>9kbmH|BmCF`&XDA_HEwnrTVSK90^1#J(Lh
zNP;VF@TIbqoZf4X6s+S+U7J2Ix|ZlmD6#t3lXGZDz{<k(6jpytsd!>E`O~eWi$XV8
z)}c8X3m|)s2|-K97T$eM^;hD>&u2RIizuutxUoH=bkXd#F`;Xm@U=oiX?29e`VJj`
z>}lJ6><kA4-EmJ{T?}*34oBWyrjV++N{{kYd71M{`W@Q>zdAOmCq6y1bCKs(`0_--
zAAoDU_MqijMBN{N)to`|h6Xf=A7U6P!2guILkd&FL9!($e|pQ*#*{FV)mDBb$f@we
z5Q}?&e=AA8Ii}~t6Z9P0C4l{W(B}9yFi8w=+_)jS5*tz{fm>Oh+Sdy+t101)hEG)@
z<`O72U_(p(1?GhJQRcv(`({2lP1cts;4U8B{i1DNsZCU0iQ;C?fgj=CV$ZiR{tV?-
zLG%>2^MjLj*ayeIaS-pug@r^9n{F)_YK+^N?~3hMP!r1YeS3d)Rh`w*>zPhDRZ5~8
zwJAKYgj!1lW%~Z=dfF`%z0wA*O`H~>oMZCUka};55a)VhQ&OW#{$LT?Q~La>P6L}G
zGFv;6UDD@y0*Z&|L*6x@Y4_1Z-@#k(itY|o^XJ91Chbk8myRU!5HfU{PxDKT;9!LV
z<j~DP`S(2bqhIo_y=Hyn`sHHJG}PsfCsTC8eU@O`mENx(P-%1xeTnJ3PP_TEr=ylF
zO{o{4u50%Rdu%u|#$+M$=#!yk^?9ShzKD4zTx+z0E#?P@$Ad6gs!uqu>r=^E^oLX2
znHrt;v)3(2lUN_MG}+DCcN?;Y9ij|}i!MBYT4kSWw~t4v4>R;kr4d_~e8_VZ`qj|U
z;1(CDH;nExg`J6CK~uE|s#RTISLd5s?aD!21VKNzHdiV|@lO&bmt_XV#6MVZZb;Hn
z+nRgb@x|?gk24<tPmEI6<!A@dEgStZGv@r`%sEOp>2AZ7kcTOT=r>U6MJIM4zi!zq
z3y0Z+rjbdWj`=maGx!I?R<<{uj+vIOYSJxBl)}wYvlbK?hO51#>7RnZ<(QP_D0(ZG
zRBG@M`golq6~bx5=DI}x^ULRoC6?10InLUfk)d83IyXmB$+zVc%()`9{Y-1i*R0-|
zM8|vOY;MOMc1xF_jQ0VIg#P<T+DX*#sraf=glQ$<HT#P1z#V|E;#oywykqJ?6Ib!s
z7h-S-Qe_A-Da{P=Qs~LGe<+><MNwwgyNuIeGs^SYmU->31CzNJ^v(PVw_-Y~K=NY&
zpNRs9Rxw?%q186I)Bd#~<XXJ^4$-Lg+k-`06NGq`F9@QP7CxR|pdI^$u2%+_)>9rI
z=5RWE*_>TDglDJO1N}TX*|Xd1OrcY=r}c}dUBzc^>#%_}tLN-Y@Hzfj;=&~#Uuj=-
z74Lnd<hO^YnMb-@el5pffk4?^O-3jerV>_UMU47jNLSQ6zkh{1!`ZDdk45>&r?gT0
zo=BB#k29?Hawf|u+(mY&&_GX6C`M<bn&s*9%=yoM02~ee+-sl_nh7%21iKx<**k7w
zK8Z`Lc~0BVF77y6nr1DJ-*w-z+XP$diho$<2$L!aKL;ni`_|qzBdCRb)Wv6zGW0P_
zd}`8wP+13ki_ol*#Vf1qv496<8AgRS#`)tR)$>DkZtp29Fdm0`E<)7m(o)7$eyPo3
z4N4iekts7Ib_nE3d9_3R7=U^T{SMN#=C{vqYtSq+td7M)@X2k{42ZVl&TM^%)J_ct
zU!@7WGo|zqe{^cCHbvFor~zH(Fccb4RK}WBDH*+&C2#RF++zA>UcNn<EjWHjUM(&h
zu`|k95X4({HI4N|D1AEU{Efr&8!ycwt{`1%xGc3d+UGX<Lg=M3v7A?)hmoAQoXyMJ
zpZDT2Y_o9g_h?af(ILQJ)*8pih<l>B;n18=8i0!8i9HABj?ve+h`6J!EG?_Go3#^h
z-pdT=vAfG&NvKnuE~_cdn<rzV%$LTJ4OyRm^cer0&+Et}x${k%mjP`pwi1{Ma&Z%<
zTKh1Qf$52-aNkg`i!M(v{dRV7NHwlWtZ86v88~k!$doqp`=Fzj_m0+qUel?B(CZ?Z
z6xY2|L}?WiWFZtIt{6V0r*2cyFqS?Ltrj{EC!7|5H8T%m<&0a*NJA%=AWuhbN4@qL
z7xlOa^xcf}@|KsUFsU?VP0k&izt+yJ(C?{}OIAB|+>@4F2UXeUUj2!OOL%>XIWR0N
zs3so-HN*J?6R*%vz(q;BZ3;_3&_vW+(welOj1NTPwdv8v@*Yaz%;BYz&*frYB7@@~
zk}7KG$~*K6OhTmym!+89i1YOtLAJwcymZb`|KVo1Yb~m_7Mx@5a<T6)jslHH2K=}<
zj5>qYDEE0CmAOKdG<I6QZ<lLDAd}I_m3~W&5PwmPFM0fKO|jo2SL+9$HFDl;rB2Zf
zQ$|+|Igd9KSat1}y9MN7VhsVUArxoaKW2u)1f))vjp1yNGLLb?GNSAxE{rP{3CaP1
z3%*nVERssup_^%Fo0YxHNlz93<EzHbOwP^;#$68ts7MltVpyv7mQ3Z3Bd;WXWXv#(
zHJFfn;R?aKFiC0fS3&RQx34#+c!=ZWk)K5>4k9Akl%8Z>&U#8TYKP9=h!s%2V(5uC
z8MdQdHoL!EO$EAAflnQC_SN6_56F~h`bDik$Sxce*WZyUQgu-HfWeP7!qeF!<!{e0
z{BA~lXuZ?AqR_wcG@<-jbsCMRwK{+bWA$n3Ny-<xGi3Y6#@a+*(slB^GknNB0BaJc
zuq?Gw<zywVmJOD<rJnNSj-)X?!wn<5h?&*^5-T5uQD-YuFoO1x&@(W-?oVR!L<d1Y
zcx&L(=$$e+j5oSgp7g+sSw<k&ea7eJK=S#?IC{Q$iC?3sYO%1gIcRNj`k7Q6nB+5%
zb|8)D7+q`-dNBw6c}Gc2ij}x7&#~BhJrM=;f4v)4o4l10Ov}kIMg;@$r+>y%6?SE)
z%}Jd1bQWPy*|7nq5})h18skV3#j#}8%a%MT5!|QW6@A8vy^Z0DqzT6roslSeIgg&F
z*(XIewhN&F@XNs-?8kfwXq|VZ-Xz1hec<4p;byufq-f_=bC_7+b&#DDMZD^a)a|V{
z0A$1GSo@{O<kge(Z_xF;n9RkOPJ;;2^-X0-1*d`yu4$Bl2@hAnMyJS-h0|$V|HfM)
zUkFpI#Y)~<y;|XAX2+u&0)pvpy1VvO9yGmOa_+el+&XNas%6R|Hm2dSae&iGfpq7$
z-O7uKQqO#=uAU(ukhv5yPW42z%wW6!fdgn5#46%2?3+9Q?O)nhnhHA)0kBBz`x(Bq
z5Fy2YX)b->jEK}eEvF{;zDHNnuXK*_fmm}T$q#xj(<x~1or0;Lc0p7*Nt~>csjN4u
zyIR)Siyl-|v|n*qei4mI%xY4D{&0IWSC-1pDz2`}Cd6BbF>3qip0nB>Pf5Kylq32+
z5OOwNw_#R<%Wh#`)gVybZ#?p<H;uesMVtIAp$qDxmZPfmXiQx5l6<!UMffidjQ7wM
z3fs3RoLm5$iap~^+Fa8yO^wayhZRs7zZcgzR(whn-*d*^pe3YHCINMKzE5W&b@X(b
T^HZnF{UsxQxlhLL{CW2u7OK-2

diff --git a/SampleApps/WpfApplication/App.config b/SampleApps/WpfApplication/App.config
index 25b1eb77..aed15bcc 100644
--- a/SampleApps/WpfApplication/App.config
+++ b/SampleApps/WpfApplication/App.config
@@ -8,7 +8,7 @@
     <applicationSettings>
         <WpfApplication.Properties.Settings>
             <setting name="TileCache" serializeAs="String">
-                <value />
+                <value>ImageFileCache</value>
             </setting>
         </WpfApplication.Properties.Settings>
     </applicationSettings>
diff --git a/SampleApps/WpfApplication/MainWindow.xaml b/SampleApps/WpfApplication/MainWindow.xaml
index 64e4ba7f..7833c4dc 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml
+++ b/SampleApps/WpfApplication/MainWindow.xaml
@@ -1,11 +1,17 @@
-<Window x:Class="WpfApplication.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:map="clr-namespace:MapControl;assembly=MapControl.WPF"
-        xmlns:local="clr-namespace:WpfApplication"
-        Title="XAML MapControl - WPF Test Application" Height="600" Width="800">
+<Window
+    x:Class="WpfApplication.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:map="clr-namespace:MapControl;assembly=MapControl.WPF"
+    xmlns:vm="clr-namespace:ViewModel"
+    xmlns:local="clr-namespace:WpfApplication"
+    Title="XAML MapControl - WPF Test Application" Height="600" Width="800"
+    Stylus.IsPressAndHoldEnabled="False">
     <Window.Resources>
         <map:TileLayerCollection x:Key="TileLayers">
+            <!--<map:TileLayer SourceName="OSM Local" Description="© {y} OpenStreetMap Contributors, CC-BY-SA">
+                <local:ImageTileSource UriFormat="file:///C:/ProgramData/MapControl/TileCache/OpenStreetMap/{z}/{x}/{y}.png"/>
+            </map:TileLayer>-->
             <map:TileLayer SourceName="OpenStreetMap" Description="© {y} OpenStreetMap Contributors, CC-BY-SA"
                            TileSource="http://{c}.tile.openstreetmap.org/{z}/{x}/{y}.png"/>
             <map:TileLayer SourceName="OpenCycleMap" Description="OpenCycleMap - © {y} Andy Allen &amp; OpenStreetMap Contributors, CC-BY-SA"
@@ -25,7 +31,7 @@
                  map content without using their APIs (i.e. Google Maps API or Bing Maps API).
                  Hence the declarations shown below are for demonstration purpose only. -->
 
-            <!--<map:TileLayer SourceName="Google Maps" Description="Google Maps - © {y} Google"
+            <map:TileLayer SourceName="Google Maps" Description="Google Maps - © {y} Google"
                            TileSource="http://mt{i}.google.com/vt/x={x}&amp;y={y}&amp;z={z}" MaxZoomLevel="20"/>
             <map:TileLayer SourceName="Google Images" Description="Google Maps - © {y} Google" Background="#FF3F3F3F" Foreground="White"
                            TileSource="http://khm{i}.google.com/kh/v=135&amp;x={x}&amp;y={y}&amp;z={z}" MaxZoomLevel="20"/>
@@ -34,7 +40,7 @@
             <map:TileLayer SourceName="Bing Images" Description="Bing Maps - © {y} Microsoft Corporation" Background="#FF3F3F3F" Foreground="White"
                            TileSource="http://ecn.t{i}.tiles.virtualearth.net/tiles/a{q}.jpeg?g=0" MaxZoomLevel="20"/>
             <map:TileLayer SourceName="Bing Hybrid" Description="Bing Maps - © {y} Microsoft Corporation" Background="#FF3F3F3F" Foreground="White"
-                           TileSource="http://ecn.t{i}.tiles.virtualearth.net/tiles/h{q}.jpeg?g=0&amp;stl=h" MaxZoomLevel="20"/>-->
+                           TileSource="http://ecn.t{i}.tiles.virtualearth.net/tiles/h{q}.jpeg?g=0&amp;stl=h" MaxZoomLevel="20"/>
 
             <!-- The following TileLayer uses an ImageTileSource, which bypasses caching of map tile images -->
             <!--<map:TileLayer SourceName="OSM Uncached" Description="© {y} OpenStreetMap Contributors, CC-BY-SA">
@@ -109,6 +115,7 @@
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
+            <EventSetter Event="TouchDown" Handler="MapItemTouchDown"/>
         </Style>
         <Style x:Key="PushpinItemStyle" TargetType="map:MapItem">
             <Setter Property="map:MapPanel.Location" Value="{Binding Location}"/>
@@ -129,22 +136,23 @@
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
+            <EventSetter Event="TouchDown" Handler="MapItemTouchDown"/>
             <Style.Triggers>
                 <Trigger Property="IsSelected" Value="True">
                     <Setter Property="Foreground" Value="OrangeRed"/>
                 </Trigger>
             </Style.Triggers>
         </Style>
-        <local:SampleItemCollection x:Key="Polylines"/>
-        <local:SampleItemCollection x:Key="Points"/>
-        <local:SampleItemCollection x:Key="Pushpins"/>
     </Window.Resources>
+    <Window.DataContext>
+        <vm:ViewModel/>
+    </Window.DataContext>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <map:Map x:Name="map" Margin="2" Center="53.5,8.2" ZoomLevel="11" MaxZoomLevel="20"
+        <map:Map x:Name="map" Margin="2" Center="{Binding MapCenter}" ZoomLevel="11" MaxZoomLevel="20"
                  TileLayer="{Binding Source={StaticResource TileLayersViewSource}, Path=CurrentItem}"
                  MouseLeftButtonDown="MapMouseLeftButtonDown" MouseRightButtonDown="MapMouseRightButtonDown"
                  MouseMove="MapMouseMove" MouseLeave="MapMouseLeave"
@@ -163,17 +171,17 @@
             <map:MapScale Margin="4" Opacity="0.8"/>
 
             <!-- use ItemTemplate or ItemContainerStyle alternatively -->
-            <map:MapItemsControl ItemsSource="{StaticResource Polylines}"
+            <map:MapItemsControl ItemsSource="{Binding Polylines}"
                                  ItemTemplate="{StaticResource PolylineItemTemplate}"/>
-            <!--<map:MapItemsControl ItemsSource="{StaticResource Polylines}"
+            <!--<map:MapItemsControl ItemsSource="{Binding Polylines}"
                                  ItemContainerStyle="{StaticResource PolylineItemStyle}"/>-->
 
-            <map:MapItemsControl ItemsSource="{StaticResource Points}"
+            <map:MapItemsControl ItemsSource="{Binding Points}"
                                  ItemContainerStyle="{StaticResource PointItemStyle}"
                                  IsSynchronizedWithCurrentItem="True"
                                  SelectionMode="Extended"/>
 
-            <map:MapItemsControl ItemsSource="{StaticResource Pushpins}"
+            <map:MapItemsControl ItemsSource="{Binding Pushpins}"
                                  ItemContainerStyle="{StaticResource PushpinItemStyle}"
                                  IsSynchronizedWithCurrentItem="True"/>
 
diff --git a/SampleApps/WpfApplication/MainWindow.xaml.cs b/SampleApps/WpfApplication/MainWindow.xaml.cs
index 8d0fb6da..f36414d7 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml.cs
+++ b/SampleApps/WpfApplication/MainWindow.xaml.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Runtime.Caching;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Threading;
 using Caching;
 using MapControl;
 
@@ -13,12 +11,6 @@ namespace WpfApplication
 {
     public partial class MainWindow : Window
     {
-        private SamplePoint movingPoint = new SamplePoint
-        {
-            Name = "Moving",
-            Location = new Location(53.5, 8.25)
-        };
-
         public MainWindow()
         {
             switch (Properties.Settings.Default.TileCache)
@@ -37,98 +29,6 @@ namespace WpfApplication
             }
 
             InitializeComponent();
-
-            var polylines = (ICollection<object>)Resources["Polylines"];
-            polylines.Add(
-                new SamplePolyline
-                {
-                    Locations = LocationCollection.Parse("53.5140,8.1451 53.5123,8.1506 53.5156,8.1623 53.5276,8.1757 53.5491,8.1852 53.5495,8.1877 53.5426,8.1993 53.5184,8.2219 53.5182,8.2386 53.5195,8.2387")
-                });
-            polylines.Add(
-                new SamplePolyline
-                {
-                    Locations = LocationCollection.Parse("53.5978,8.1212 53.6018,8.1494 53.5859,8.1554 53.5852,8.1531 53.5841,8.1539 53.5802,8.1392 53.5826,8.1309 53.5867,8.1317 53.5978,8.1212")
-                });
-
-            var points = (ICollection<object>)Resources["Points"];
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Steinbake Leitdamm",
-                    Location = new Location(53.51217, 8.16603)
-                });
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Buhne 2",
-                    Location = new Location(53.50926, 8.15815)
-                });
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Buhne 4",
-                    Location = new Location(53.50468, 8.15343)
-                });
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Buhne 6",
-                    Location = new Location(53.50092, 8.15267)
-                });
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Buhne 8",
-                    Location = new Location(53.49871, 8.15321)
-                });
-            points.Add(
-                new SamplePoint
-                {
-                    Name = "Buhne 10",
-                    Location = new Location(53.49350, 8.15563)
-                });
-            points.Add(movingPoint);
-
-            var pushpins = (ICollection<object>)Resources["Pushpins"];
-            pushpins.Add(
-                new SamplePoint
-                {
-                    Name = "WHV - Eckwarderhörne",
-                    Location = new Location(53.5495, 8.1877)
-                });
-            pushpins.Add(
-                new SamplePoint
-                {
-                    Name = "JadeWeserPort",
-                    Location = new Location(53.5914, 8.14)
-                });
-            pushpins.Add(
-                new SamplePoint
-                {
-                    Name = "Kurhaus Dangast",
-                    Location = new Location(53.447, 8.1114)
-                });
-            pushpins.Add(
-                new SamplePoint
-                {
-                    Name = "Eckwarderhörne",
-                    Location = new Location(53.5207, 8.2323)
-                });
-
-            var timer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(0.1) };
-            timer.Tick += MovePoint;
-            timer.Start();
-        }
-
-        private void MovePoint(object sender, EventArgs e)
-        {
-            movingPoint.Location = new Location(movingPoint.Location.Latitude + 0.001, movingPoint.Location.Longitude + 0.002);
-
-            if (movingPoint.Location.Latitude > 54d)
-            {
-                movingPoint.Name = "Stopped";
-                ((DispatcherTimer)sender).Stop();
-            }
         }
 
         private void MapMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
@@ -171,6 +71,13 @@ namespace WpfApplication
             e.TranslationBehavior.DesiredDeceleration = 0.001;
         }
 
+        private void MapItemTouchDown(object sender, TouchEventArgs e)
+        {
+            var mapItem = (MapItem)sender;
+            mapItem.IsSelected = !mapItem.IsSelected;
+            e.Handled = true;
+        }
+
         private void SeamarksClick(object sender, RoutedEventArgs e)
         {
             var seamarks = (TileLayer)Resources["SeamarksTileLayer"];
diff --git a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs
index 216b6127..e3cf2aba 100644
--- a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("1.8.0")]
-[assembly: AssemblyFileVersion("1.8.0")]
+[assembly: AssemblyVersion("1.9.0")]
+[assembly: AssemblyFileVersion("1.9.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/WpfApplication/Properties/Settings.Designer.cs b/SampleApps/WpfApplication/Properties/Settings.Designer.cs
index 5fcde2a0..c601f6e5 100644
--- a/SampleApps/WpfApplication/Properties/Settings.Designer.cs
+++ b/SampleApps/WpfApplication/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34003
+//     Runtime Version:4.0.30319.18408
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -25,7 +25,7 @@ namespace WpfApplication.Properties {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        [global::System.Configuration.DefaultSettingValueAttribute("ImageFileCache")]
         public string TileCache {
             get {
                 return ((string)(this["TileCache"]));
diff --git a/SampleApps/WpfApplication/Properties/Settings.settings b/SampleApps/WpfApplication/Properties/Settings.settings
index 0dab5ee7..d4515930 100644
--- a/SampleApps/WpfApplication/Properties/Settings.settings
+++ b/SampleApps/WpfApplication/Properties/Settings.settings
@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="TileCache" Type="System.String" Scope="Application">
-      <Value Profile="(Default)" />
+      <Value Profile="(Default)">ImageFileCache</Value>
     </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/SampleApps/WpfApplication/SampleItems.cs b/SampleApps/WpfApplication/SampleItems.cs
deleted file mode 100644
index a3bc5236..00000000
--- a/SampleApps/WpfApplication/SampleItems.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using MapControl;
-
-namespace WpfApplication
-{
-    public class SamplePoint : INotifyPropertyChanged
-    {
-        private string name;
-        private Location location;
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        public string Name
-        {
-            get { return name; }
-            set
-            {
-                name = value;
-                OnPropertyChanged("Name");
-            }
-        }
-
-        public Location Location
-        {
-            get { return location; }
-            set
-            {
-                location = value;
-                OnPropertyChanged("Location");
-            }
-        }
-
-        private void OnPropertyChanged(string propertyName)
-        {
-            if (PropertyChanged != null)
-            {
-                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-
-    public class SamplePolyline
-    {
-        public LocationCollection Locations { get; set; }
-    }
-
-    public class SampleItemCollection : ObservableCollection<object>
-    {
-    }
-}
diff --git a/SampleApps/WpfApplication/WpfApplication.csproj b/SampleApps/WpfApplication/WpfApplication.csproj
index 78ba97a8..b1d94675 100644
--- a/SampleApps/WpfApplication/WpfApplication.csproj
+++ b/SampleApps/WpfApplication/WpfApplication.csproj
@@ -49,7 +49,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="SampleItems.cs" />
+    <Compile Include="..\Common\ViewModel.cs">
+      <Link>ViewModel.cs</Link>
+    </Compile>
+    <Compile Include="ImageTileSource.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -97,7 +100,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="10_535_330.jpg" />
+    <Resource Include="..\Common\10_535_330.jpg">
+      <Link>10_535_330.jpg</Link>
+    </Resource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.