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
2026-04-05 22:46:58 +00:00 · 2013-11-17 16:52:03 +01:00 · 2013-11-17 16:52:03 +01:00 · 5eafa751f8
commit 5eafa751f8
parent 9f4ab0f3e3
37 changed files with 391 additions and 571 deletions
--- a/SampleApps/WpfApplication/10_535_330.jpg
+++ b/SampleApps/WpfApplication/10_535_330.jpg
--- 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>
--- 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"/>

--- 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"];
--- 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)]
--- 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"]));
--- 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>
--- a/SampleApps/WpfApplication/SampleItems.cs
+++ b/SampleApps/WpfApplication/SampleItems.cs
@ -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>
-    {
-    }
-}
--- 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.