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 3.4.1. Fixed WMS URL composition.

Browse source
This commit is contained in:
ClemensF 2017-08-02 20:45:41 +02:00
parent 31f16d3cb7
commit 2aafe32e00
12 changed files with 38 additions and 26 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("© 2017 Clemens Fischer")] [assembly: AssemblyCopyright("© 2017 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("3.4.0")] [assembly: AssemblyVersion("3.4.1")]
[assembly: AssemblyFileVersion("3.4.0")] [assembly: AssemblyFileVersion("3.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("© 2017 Clemens Fischer")] [assembly: AssemblyCopyright("© 2017 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("3.4.0")] [assembly: AssemblyVersion("3.4.1")]
[assembly: AssemblyFileVersion("3.4.0")] [assembly: AssemblyFileVersion("3.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("© 2017 Clemens Fischer")] [assembly: AssemblyCopyright("© 2017 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("3.4.0")] [assembly: AssemblyVersion("3.4.1")]
[assembly: AssemblyFileVersion("3.4.0")] [assembly: AssemblyFileVersion("3.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("© 2017 Clemens Fischer")] [assembly: AssemblyCopyright("© 2017 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("3.4.0")] [assembly: AssemblyVersion("3.4.1")]
[assembly: AssemblyFileVersion("3.4.0")] [assembly: AssemblyFileVersion("3.4.1")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

4
MapControl/Properties/AssemblyInfo.cs
View file

@ -14,8 +14,8 @@ using System.Windows;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("© 2017 Clemens Fischer")] [assembly: AssemblyCopyright("© 2017 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("3.4.0")] [assembly: AssemblyVersion("3.4.1")]
[assembly: AssemblyFileVersion("3.4.0")] [assembly: AssemblyFileVersion("3.4.1")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

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("© 2017 Clemens Fischer")] [assembly: AssemblyCopyright("© 2017 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("3.4.0")] [assembly: AssemblyVersion("3.4.1")]
[assembly: AssemblyFileVersion("3.4.0")] [assembly: AssemblyFileVersion("3.4.1")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

15
MapControl/WmsImageLayer.cs
View file

@ -100,7 +100,14 @@ namespace MapControl
return false; return false;
} }
var query = "?SERVICE=WMS" var uri = ServerUri.ToString();
if (!uri.EndsWith("?") && !uri.EndsWith("&"))
{
uri += "?";
}
uri += "SERVICE=WMS"
+ "&VERSION=" + version + "&VERSION=" + version
+ "&REQUEST=GetMap" + "&REQUEST=GetMap"
+ "&LAYERS=" + (Layers ?? string.Empty) + "&LAYERS=" + (Layers ?? string.Empty)
@ -111,12 +118,10 @@ namespace MapControl
if (!string.IsNullOrEmpty(Parameters)) if (!string.IsNullOrEmpty(Parameters))
{ {
query += "&" + Parameters; uri += "&" + Parameters;
} }
var uri = new Uri(ServerUri, query.Replace(" ", "%20")); UpdateImage(new Uri(uri.Replace(" ", "%20")));
UpdateImage(uri);
return true; return true;
} }
} }

9
MapControl/WmsLayers.WPF.WinRT.cs
View file

@ -25,7 +25,14 @@ namespace MapControl
{ {
try try
{ {
var document = await LoadDocument(new Uri(serverUri, "?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities")); var uri = serverUri.ToString();
if (!uri.EndsWith("?") && !uri.EndsWith("&"))
{
uri += "?";
}
var document = await LoadDocument(new Uri(uri + "SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities"));
var capability = FirstChild(document.DocumentElement, "Capability"); var capability = FirstChild(document.DocumentElement, "Capability");
if (capability != null) if (capability != null)

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("© 2017 Clemens Fischer")] [assembly: AssemblyCopyright("© 2017 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("3.4.0")] [assembly: AssemblyVersion("3.4.1")]
[assembly: AssemblyFileVersion("3.4.0")] [assembly: AssemblyFileVersion("3.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("© 2017 Clemens Fischer")] [assembly: AssemblyCopyright("© 2017 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("3.4.0")] [assembly: AssemblyVersion("3.4.1")]
[assembly: AssemblyFileVersion("3.4.0")] [assembly: AssemblyFileVersion("3.4.1")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

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

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