From 2aafe32e007858b59d1cae206a8cacd82f38b3fb Mon Sep 17 00:00:00 2001 From: ClemensF Date: Wed, 2 Aug 2017 20:45:41 +0200 Subject: [PATCH] Version 3.4.1. Fixed WMS URL composition. --- .../FileDbCache.WPF/Properties/AssemblyInfo.cs | 4 ++-- .../FileDbCache.WinRT/Properties/AssemblyInfo.cs | 4 ++-- .../ImageFileCache.WPF/Properties/AssemblyInfo.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- MapControl/Properties/AssemblyInfo.cs | 4 ++-- MapControl/WinRT/Properties/AssemblyInfo.cs | 4 ++-- MapControl/WmsImageLayer.cs | 15 ++++++++++----- MapControl/WmsLayers.WPF.WinRT.cs | 9 ++++++++- .../Properties/AssemblyInfo.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- .../UniversalApp/Properties/AssemblyInfo.cs | 4 ++-- .../WpfApplication/Properties/AssemblyInfo.cs | 4 ++-- 12 files changed, 38 insertions(+), 26 deletions(-) diff --git a/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs b/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs index a2995c7f..9436afa4 100644 --- a/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs +++ b/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2017 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("3.4.0")] -[assembly: AssemblyFileVersion("3.4.0")] +[assembly: AssemblyVersion("3.4.1")] +[assembly: AssemblyFileVersion("3.4.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs b/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs index 8f5ab96e..d0fde364 100644 --- a/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs +++ b/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2017 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("3.4.0")] -[assembly: AssemblyFileVersion("3.4.0")] +[assembly: AssemblyVersion("3.4.1")] +[assembly: AssemblyFileVersion("3.4.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs b/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs index 7a08c5cd..73ce5b1f 100644 --- a/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs +++ b/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2017 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("3.4.0")] -[assembly: AssemblyFileVersion("3.4.0")] +[assembly: AssemblyVersion("3.4.1")] +[assembly: AssemblyFileVersion("3.4.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs b/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs index 80cb7cb8..11cc5c93 100644 --- a/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs +++ b/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2017 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("3.4.0")] -[assembly: AssemblyFileVersion("3.4.0")] +[assembly: AssemblyVersion("3.4.1")] +[assembly: AssemblyFileVersion("3.4.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/Properties/AssemblyInfo.cs b/MapControl/Properties/AssemblyInfo.cs index 09dbf19e..c8fe9b83 100644 --- a/MapControl/Properties/AssemblyInfo.cs +++ b/MapControl/Properties/AssemblyInfo.cs @@ -14,8 +14,8 @@ using System.Windows; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2017 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("3.4.0")] -[assembly: AssemblyFileVersion("3.4.0")] +[assembly: AssemblyVersion("3.4.1")] +[assembly: AssemblyFileVersion("3.4.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/WinRT/Properties/AssemblyInfo.cs b/MapControl/WinRT/Properties/AssemblyInfo.cs index a4ff706a..a443f499 100644 --- a/MapControl/WinRT/Properties/AssemblyInfo.cs +++ b/MapControl/WinRT/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2017 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("3.4.0")] -[assembly: AssemblyFileVersion("3.4.0")] +[assembly: AssemblyVersion("3.4.1")] +[assembly: AssemblyFileVersion("3.4.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/WmsImageLayer.cs b/MapControl/WmsImageLayer.cs index 47a1266b..717d01cc 100644 --- a/MapControl/WmsImageLayer.cs +++ b/MapControl/WmsImageLayer.cs @@ -100,7 +100,14 @@ namespace MapControl return false; } - var query = "?SERVICE=WMS" + var uri = ServerUri.ToString(); + + if (!uri.EndsWith("?") && !uri.EndsWith("&")) + { + uri += "?"; + } + + uri += "SERVICE=WMS" + "&VERSION=" + version + "&REQUEST=GetMap" + "&LAYERS=" + (Layers ?? string.Empty) @@ -111,12 +118,10 @@ namespace MapControl if (!string.IsNullOrEmpty(Parameters)) { - query += "&" + Parameters; + uri += "&" + Parameters; } - var uri = new Uri(ServerUri, query.Replace(" ", "%20")); - - UpdateImage(uri); + UpdateImage(new Uri(uri.Replace(" ", "%20"))); return true; } } diff --git a/MapControl/WmsLayers.WPF.WinRT.cs b/MapControl/WmsLayers.WPF.WinRT.cs index d01f19b1..c710681d 100644 --- a/MapControl/WmsLayers.WPF.WinRT.cs +++ b/MapControl/WmsLayers.WPF.WinRT.cs @@ -25,7 +25,14 @@ namespace MapControl { 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"); if (capability != null) diff --git a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs index 236ce48e..db97fcca 100644 --- a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs +++ b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2017 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("3.4.0")] -[assembly: AssemblyFileVersion("3.4.0")] +[assembly: AssemblyVersion("3.4.1")] +[assembly: AssemblyFileVersion("3.4.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs index 1b342302..16ed4465 100644 --- a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2017 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("3.4.0")] -[assembly: AssemblyFileVersion("3.4.0")] +[assembly: AssemblyVersion("3.4.1")] +[assembly: AssemblyFileVersion("3.4.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs index 71785d8a..110b313c 100644 --- a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs +++ b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("© 2017 Clemens Fischer")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.4.0")] -[assembly: AssemblyFileVersion("3.4.0")] +[assembly: AssemblyVersion("3.4.1")] +[assembly: AssemblyFileVersion("3.4.1")] [assembly: AssemblyConfiguration("")] [assembly: ComVisible(false)] diff --git a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs index 3b80a77e..e85c3219 100644 --- a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2017 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("3.4.0")] -[assembly: AssemblyFileVersion("3.4.0")] +[assembly: AssemblyVersion("3.4.1")] +[assembly: AssemblyFileVersion("3.4.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)]