ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Version 2.4.12: Fixed issue with clearing the TileLayers collection, added support for relative paths of local tile images.

Browse source
This commit is contained in:
ClemensF 2015-06-09 20:09:57 +02:00
parent 575930dce8
commit 36a8600faf
15 changed files with 49 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.11")]
[assembly: AssemblyFileVersion("2.4.11")]
[assembly: AssemblyVersion("2.4.12")]
[assembly: AssemblyFileVersion("2.4.12")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

4
Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.11")]
[assembly: AssemblyFileVersion("2.4.11")]
[assembly: AssemblyVersion("2.4.12")]
[assembly: AssemblyFileVersion("2.4.12")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

4
Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.11")]
[assembly: AssemblyFileVersion("2.4.11")]
[assembly: AssemblyVersion("2.4.12")]
[assembly: AssemblyFileVersion("2.4.12")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

4
Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.11")]
[assembly: AssemblyFileVersion("2.4.11")]
[assembly: AssemblyVersion("2.4.12")]
[assembly: AssemblyFileVersion("2.4.12")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

2
MapControl/Map.WinRT.cs
View file

@ -79,7 +79,7 @@ namespace MapControl
private void OnManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e)
{
if (e.PointerDeviceType != PointerDeviceType.Mouse)
if (e.PointerDeviceType == PointerDeviceType.Touch)
{
TransformMap(e.Position, e.Delta.Translation, e.Delta.Rotation, e.Delta.Scale);
}

14
MapControl/MapBase.cs
View file

@ -455,7 +455,7 @@ namespace MapControl
}
TileLayer = null;
RemoveTileLayers(0, oldTileLayers.Count);
ClearTileLayers();
}
if (newTileLayers != null)
@ -491,10 +491,7 @@ namespace MapControl
break;
case NotifyCollectionChangedAction.Reset:
if (e.OldItems != null)
{
RemoveTileLayers(0, e.OldItems.Count);
}
ClearTileLayers();
if (e.NewItems != null)
{
AddTileLayers(0, e.NewItems.Cast<TileLayer>());
@ -548,6 +545,13 @@ namespace MapControl
}
}
private void ClearTileLayers()
{
tileLayerPanel.Children.Clear();
ClearValue(BackgroundProperty);
ClearValue(ForegroundProperty);
}
private void InternalSetValue(DependencyProperty property, object value)
{
internalPropertyChange = true;

4
MapControl/Properties/AssemblyInfo.cs
View file

@ -17,8 +17,8 @@ using System.Windows;
[assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.11")]
[assembly: AssemblyFileVersion("2.4.11")]
[assembly: AssemblyVersion("2.4.12")]
[assembly: AssemblyFileVersion("2.4.12")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

6
MapControl/TileImageLoader.WPF.cs
View file

@ -152,7 +152,11 @@ namespace MapControl
if (uri != null)
{
if (uri.Scheme == "file") // load from FileStream as loading from Uri leaves file open
if (!uri.IsAbsoluteUri)
{
image = LoadImage(uri.OriginalString);
}
else if (uri.Scheme == "file")
{
image = LoadImage(uri.LocalPath);
}

18
MapControl/TileSource.cs
View file

@ -87,7 +87,8 @@ namespace MapControl
return new Uri(uriFormat.
Replace("{x}", x.ToString()).
Replace("{y}", y.ToString()).
Replace("{z}", zoomLevel.ToString()));
Replace("{z}", zoomLevel.ToString()),
UriKind.RelativeOrAbsolute);
}
private Uri GetOpenStreetMapUri(int x, int y, int zoomLevel)
@ -98,7 +99,8 @@ namespace MapControl
Replace("{c}", "abc".Substring(hostIndex, 1)).
Replace("{x}", x.ToString()).
Replace("{y}", y.ToString()).
Replace("{z}", zoomLevel.ToString()));
Replace("{z}", zoomLevel.ToString()),
UriKind.RelativeOrAbsolute);
}
private Uri GetGoogleMapsUri(int x, int y, int zoomLevel)
@ -109,7 +111,8 @@ namespace MapControl
Replace("{i}", hostIndex.ToString()).
Replace("{x}", x.ToString()).
Replace("{y}", y.ToString()).
Replace("{z}", zoomLevel.ToString()));
Replace("{z}", zoomLevel.ToString()),
UriKind.RelativeOrAbsolute);
}
private Uri GetMapQuestUri(int x, int y, int zoomLevel)
@ -120,7 +123,8 @@ namespace MapControl
Replace("{n}", hostIndex.ToString()).
Replace("{x}", x.ToString()).
Replace("{y}", y.ToString()).
Replace("{z}", zoomLevel.ToString()));
Replace("{z}", zoomLevel.ToString()),
UriKind.RelativeOrAbsolute);
}
private Uri GetTmsUri(int x, int y, int zoomLevel)
@ -130,7 +134,8 @@ namespace MapControl
return new Uri(uriFormat.
Replace("{x}", x.ToString()).
Replace("{v}", y.ToString()).
Replace("{z}", zoomLevel.ToString()));
Replace("{z}", zoomLevel.ToString()),
UriKind.RelativeOrAbsolute);
}
private Uri GetQuadKeyUri(int x, int y, int zoomLevel)
@ -149,7 +154,8 @@ namespace MapControl
return new Uri(uriFormat.
Replace("{i}", new string(quadkey[zoomLevel - 1], 1)).
Replace("{q}", new string(quadkey)));
Replace("{q}", new string(quadkey)),
UriKind.RelativeOrAbsolute);
}
private Uri GetBoundingBoxUri(int x, int y, int zoomLevel)

4
MapControl/WinRT/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.11")]
[assembly: AssemblyFileVersion("2.4.11")]
[assembly: AssemblyVersion("2.4.12")]
[assembly: AssemblyFileVersion("2.4.12")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

4
SampleApps/PhoneApplication/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.11")]
[assembly: AssemblyFileVersion("2.4.11")]
[assembly: AssemblyVersion("2.4.12")]
[assembly: AssemblyFileVersion("2.4.12")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

4
SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.11")]
[assembly: AssemblyFileVersion("2.4.11")]
[assembly: AssemblyVersion("2.4.12")]
[assembly: AssemblyFileVersion("2.4.12")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

4
SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.11")]
[assembly: AssemblyFileVersion("2.4.11")]
[assembly: AssemblyVersion("2.4.12")]
[assembly: AssemblyFileVersion("2.4.12")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

4
SampleApps/StoreApplication/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.11")]
[assembly: AssemblyFileVersion("2.4.11")]
[assembly: AssemblyVersion("2.4.12")]
[assembly: AssemblyFileVersion("2.4.12")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

4
SampleApps/WpfApplication/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.11")]
[assembly: AssemblyFileVersion("2.4.11")]
[assembly: AssemblyVersion("2.4.12")]
[assembly: AssemblyFileVersion("2.4.12")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]