diff --git a/MapControl/Shared/BingMapsTileLayer.cs b/MapControl/Shared/BingMapsTileLayer.cs index a959fc09..e86c043f 100644 --- a/MapControl/Shared/BingMapsTileLayer.cs +++ b/MapControl/Shared/BingMapsTileLayer.cs @@ -50,24 +50,25 @@ namespace MapControl { Loaded -= OnLoaded; - if (string.IsNullOrEmpty(ApiKey)) + if (!string.IsNullOrEmpty(ApiKey)) { - Debug.WriteLine("BingMapsTileLayer requires a Bing Maps API Key"); - return; - } + var metadataUri = $"http://dev.virtualearth.net/REST/V1/Imagery/Metadata/{Mode}?output=xml&key={ApiKey}"; - var metadataUri = $"http://dev.virtualearth.net/REST/V1/Imagery/Metadata/{Mode}?output=xml&key={ApiKey}"; - - try - { - using (var stream = await ImageLoader.HttpClient.GetStreamAsync(metadataUri)) + try { - ReadImageryMetadata(XDocument.Load(stream).Root); + using (var stream = await ImageLoader.HttpClient.GetStreamAsync(metadataUri)) + { + ReadImageryMetadata(XDocument.Load(stream).Root); + } + } + catch (Exception ex) + { + Debug.WriteLine("BingMapsTileLayer: {0}: {1}", metadataUri, ex.Message); } } - catch (Exception ex) + else { - Debug.WriteLine("BingMapsTileLayer: {0}: {1}", metadataUri, ex.Message); + Debug.WriteLine("BingMapsTileLayer requires a Bing Maps API Key"); } } diff --git a/MapControl/Shared/MapTileLayerBase.cs b/MapControl/Shared/MapTileLayerBase.cs index 4302c47f..172ff119 100644 --- a/MapControl/Shared/MapTileLayerBase.cs +++ b/MapControl/Shared/MapTileLayerBase.cs @@ -52,12 +52,7 @@ namespace MapControl private MapBase parentMap; - public MapTileLayerBase() - : this(new TileImageLoader()) - { - } - - public MapTileLayerBase(ITileImageLoader tileImageLoader) + protected MapTileLayerBase(ITileImageLoader tileImageLoader) { IsHitTestVisible = false; RenderTransform = new MatrixTransform();