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

Use XDocument instead of XmlDocument

Browse source
This commit is contained in:
ClemensF 2019-11-07 22:34:25 +01:00
parent 2c8bca205e
commit d2638c4a6c
5 changed files with 45 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

38
MapControl/Shared/WmsImageLayer.cs
View file

@ -8,13 +8,12 @@ using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
using System.Globalization;
using System.Xml.Linq;
#if WINDOWS_UWP
using Windows.Data.Xml.Dom;
using Windows.Foundation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
#else
using System.Xml;
using System.Windows;
using System.Windows.Media;
#endif
@ -23,6 +22,8 @@ namespace MapControl
{
public partial class WmsImageLayer : MapImageLayer
{
private static readonly XNamespace wmsNamespace = "http://www.opengis.net/wms";
public static readonly DependencyProperty ServiceUriProperty = DependencyProperty.Register(
nameof(ServiceUri), typeof(Uri), typeof(WmsImageLayer),
new PropertyMetadata(null, async (o, e) => await ((WmsImageLayer)o).UpdateImageAsync()));
@ -72,29 +73,17 @@ namespace MapControl
if (ServiceUri != null)
{
var uri = GetRequestUri("GetCapabilities");
var uri = GetRequestUri("GetCapabilities").Replace(" ", "%20");
try
{
var document = await XmlDocument.LoadFromUriAsync(new Uri(uri.Replace(" ", "%20")));
layerNames = new List<string>();
var capability = ChildElements(document.DocumentElement, "Capability").FirstOrDefault();
if (capability != null)
{
var rootLayer = ChildElements(capability, "Layer").FirstOrDefault();
if (rootLayer != null)
{
foreach (var layer in ChildElements(rootLayer, "Layer"))
{
var name = ChildElements(layer, "Name").FirstOrDefault();
if (name != null)
{
layerNames.Add(name.InnerText);
}
}
}
}
layerNames = await Task.Run(() =>
XDocument.Load(uri)
.Descendants(wmsNamespace + "Layer")
.Where(e => e.Attribute("queryable")?.Value == "1")
.Select(e => e.Element(wmsNamespace + "Name")?.Value)
.Where(n => !string.IsNullOrEmpty(n))
.ToList());
}
catch (Exception ex)
{
@ -200,10 +189,5 @@ namespace MapControl
return uri + "REQUEST=" + request;
}
private static IEnumerable<XmlElement> ChildElements(XmlElement element, string name)
{
return element.ChildNodes.OfType<XmlElement>().Where(e => (string)e.LocalName == name);
}
}
}