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.1: Fixed TileLayer property update in MapBase.

Browse source
This commit is contained in:
ClemensF 2014-11-20 17:13:11 +01:00
parent 3b6545e738
commit 1583b10ff3
13 changed files with 43 additions and 28 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: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.0")] [assembly: AssemblyVersion("2.4.1")]
[assembly: AssemblyFileVersion("2.4.0")] [assembly: AssemblyFileVersion("2.4.1")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [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: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.0")] [assembly: AssemblyVersion("2.4.1")]
[assembly: AssemblyFileVersion("2.4.0")] [assembly: AssemblyFileVersion("2.4.1")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [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: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.0")] [assembly: AssemblyVersion("2.4.1")]
[assembly: AssemblyFileVersion("2.4.0")] [assembly: AssemblyFileVersion("2.4.1")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [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: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.0")] [assembly: AssemblyVersion("2.4.1")]
[assembly: AssemblyFileVersion("2.4.0")] [assembly: AssemblyFileVersion("2.4.1")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

18
MapControl/MapBase.cs
View file

@ -416,10 +416,9 @@ namespace MapControl
{ {
if (TileLayers == null) if (TileLayers == null)
{ {
TileLayers = new TileLayerCollection(); TileLayers = new TileLayerCollection(tileLayer);
} }
else if (TileLayers.Count == 0)
if (TileLayers.Count == 0)
{ {
TileLayers.Add(tileLayer); TileLayers.Add(tileLayer);
} }
@ -435,16 +434,18 @@ namespace MapControl
if (oldTileLayers != null) if (oldTileLayers != null)
{ {
oldTileLayers.CollectionChanged -= TileLayerCollectionChanged; oldTileLayers.CollectionChanged -= TileLayerCollectionChanged;
TileLayer = null;
RemoveTileLayers(0, oldTileLayers.Count); RemoveTileLayers(0, oldTileLayers.Count);
} }
if (newTileLayers != null) if (newTileLayers != null)
{ {
TileLayer = newTileLayers.FirstOrDefault();
AddTileLayers(0, newTileLayers); AddTileLayers(0, newTileLayers);
newTileLayers.CollectionChanged += TileLayerCollectionChanged; newTileLayers.CollectionChanged += TileLayerCollectionChanged;
} }
TileLayer = TileLayers.FirstOrDefault();
} }
private void TileLayerCollectionChanged(object sender, NotifyCollectionChangedEventArgs e) private void TileLayerCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
@ -481,7 +482,12 @@ namespace MapControl
break; break;
} }
TileLayer = TileLayers.FirstOrDefault(); var tileLayer = TileLayers.FirstOrDefault();
if (TileLayer != tileLayer)
{
TileLayer = tileLayer;
}
} }
private void AddTileLayers(int index, IEnumerable<TileLayer> tileLayers) private void AddTileLayers(int index, IEnumerable<TileLayer> tileLayers)

4
MapControl/Properties/AssemblyInfo.cs
View file

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

9
MapControl/TileLayerCollection.cs
View file

@ -9,6 +9,15 @@ namespace MapControl
{ {
public class TileLayerCollection : ObservableCollection<TileLayer> public class TileLayerCollection : ObservableCollection<TileLayer>
{ {
internal TileLayerCollection(TileLayer tileLayer)
{
Add(tileLayer);
}
public TileLayerCollection()
{
}
public TileLayer this[string sourceName] public TileLayer this[string sourceName]
{ {
get { return this.FirstOrDefault(t => t.SourceName == sourceName); } get { return this.FirstOrDefault(t => t.SourceName == sourceName); }

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

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

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

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.0")] [assembly: AssemblyVersion("2.4.1")]
[assembly: AssemblyFileVersion("2.4.0")] [assembly: AssemblyFileVersion("2.4.1")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [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: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2014 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.0")] [assembly: AssemblyVersion("2.4.1")]
[assembly: AssemblyFileVersion("2.4.0")] [assembly: AssemblyFileVersion("2.4.1")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

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

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

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

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

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

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