From e5f7a8d8c5fdc0ed6ced395d388009f7d21c25ea Mon Sep 17 00:00:00 2001 From: ClemensFischer Date: Sun, 14 Sep 2025 21:57:19 +0200 Subject: [PATCH] Compound assignments --- MBTiles/Shared/MBTileLayer.cs | 2 +- MBTiles/Shared/MBTileSource.cs | 2 +- MBTiles/WPF/MBTiles.WPF.csproj | 1 + MapControl/Shared/MapProjectionFactory.cs | 2 +- MapControl/Shared/MapTileLayerBase.cs | 2 +- MapControl/Shared/WmtsCapabilities.cs | 12 ++++++------ MapProjections/WPF/MapProjections.WPF.csproj | 1 + MapUiTools/WPF/MapUiTools.WPF.csproj | 1 + 8 files changed, 13 insertions(+), 10 deletions(-) diff --git a/MBTiles/Shared/MBTileLayer.cs b/MBTiles/Shared/MBTileLayer.cs index 02ce2a78..4353ff71 100644 --- a/MBTiles/Shared/MBTileLayer.cs +++ b/MBTiles/Shared/MBTileLayer.cs @@ -19,7 +19,7 @@ namespace MapControl.MBTiles public class MBTileLayer : MapTileLayer { private static ILogger logger; - private static ILogger Logger => logger ?? (logger = ImageLoader.LoggerFactory?.CreateLogger()); + private static ILogger Logger => logger ??= ImageLoader.LoggerFactory?.CreateLogger(); public static readonly DependencyProperty FileProperty = DependencyPropertyHelper.Register(nameof(File), null, diff --git a/MBTiles/Shared/MBTileSource.cs b/MBTiles/Shared/MBTileSource.cs index 23fd9bb2..3984208c 100644 --- a/MBTiles/Shared/MBTileSource.cs +++ b/MBTiles/Shared/MBTileSource.cs @@ -18,7 +18,7 @@ namespace MapControl.MBTiles public sealed class MBTileSource : TileSource, IDisposable { private static ILogger logger; - private static ILogger Logger => logger ?? (logger = ImageLoader.LoggerFactory?.CreateLogger()); + private static ILogger Logger => logger ??= ImageLoader.LoggerFactory?.CreateLogger(); private SQLiteConnection connection; diff --git a/MBTiles/WPF/MBTiles.WPF.csproj b/MBTiles/WPF/MBTiles.WPF.csproj index dfffe899..b0939266 100644 --- a/MBTiles/WPF/MBTiles.WPF.csproj +++ b/MBTiles/WPF/MBTiles.WPF.csproj @@ -1,6 +1,7 @@  net9.0-windows;net462 + 8.0 true WPF MapControl.MBTiles diff --git a/MapControl/Shared/MapProjectionFactory.cs b/MapControl/Shared/MapProjectionFactory.cs index 56ed99d4..8a70201c 100644 --- a/MapControl/Shared/MapProjectionFactory.cs +++ b/MapControl/Shared/MapProjectionFactory.cs @@ -8,7 +8,7 @@ namespace MapControl public static MapProjectionFactory Instance { - get => instance ?? (instance = new MapProjectionFactory()); + get => instance ??= new MapProjectionFactory(); set => instance = value; } diff --git a/MapControl/Shared/MapTileLayerBase.cs b/MapControl/Shared/MapTileLayerBase.cs index 1e92620e..1f975336 100644 --- a/MapControl/Shared/MapTileLayerBase.cs +++ b/MapControl/Shared/MapTileLayerBase.cs @@ -82,7 +82,7 @@ namespace MapControl public ITileImageLoader TileImageLoader { - get => tileImageLoader ?? (tileImageLoader = new TileImageLoader()); + get => tileImageLoader ??= new TileImageLoader(); set => tileImageLoader = value; } diff --git a/MapControl/Shared/WmtsCapabilities.cs b/MapControl/Shared/WmtsCapabilities.cs index 9a9f5598..2ee26f5c 100644 --- a/MapControl/Shared/WmtsCapabilities.cs +++ b/MapControl/Shared/WmtsCapabilities.cs @@ -45,8 +45,8 @@ namespace MapControl public static WmtsCapabilities ReadCapabilities(XElement capabilitiesElement, string layer, string capabilitiesUrl) { - var contentsElement = capabilitiesElement.Element(wmts + "Contents") - ?? throw new ArgumentException("Contents element not found."); + var contentsElement = capabilitiesElement.Element(wmts + "Contents") ?? + throw new ArgumentException("Contents element not found."); XElement layerElement; @@ -77,8 +77,8 @@ namespace MapControl var styleElement = layerElement .Elements(wmts + "Style") - .FirstOrDefault(s => s.Attribute("isDefault")?.Value == "true") - ?? layerElement + .FirstOrDefault(s => s.Attribute("isDefault")?.Value == "true") ?? + layerElement .Elements(wmts + "Style") .FirstOrDefault(); @@ -97,8 +97,8 @@ namespace MapControl { var tileMatrixSetElement = contentsElement .Elements(wmts + "TileMatrixSet") - .FirstOrDefault(s => s.Element(ows + "Identifier")?.Value == tileMatrixSetId) - ?? throw new ArgumentException($"Linked TileMatrixSet element not found in Layer \"{layer}\"."); + .FirstOrDefault(s => s.Element(ows + "Identifier")?.Value == tileMatrixSetId) ?? + throw new ArgumentException($"Linked TileMatrixSet element not found in Layer \"{layer}\"."); tileMatrixSets.Add(ReadTileMatrixSet(tileMatrixSetElement)); } diff --git a/MapProjections/WPF/MapProjections.WPF.csproj b/MapProjections/WPF/MapProjections.WPF.csproj index 65a3f88c..1f1dea3a 100644 --- a/MapProjections/WPF/MapProjections.WPF.csproj +++ b/MapProjections/WPF/MapProjections.WPF.csproj @@ -1,6 +1,7 @@  net9.0-windows;net462 + 8.0 true WPF MapControl.Projections diff --git a/MapUiTools/WPF/MapUiTools.WPF.csproj b/MapUiTools/WPF/MapUiTools.WPF.csproj index 372c61e1..b3ee134b 100644 --- a/MapUiTools/WPF/MapUiTools.WPF.csproj +++ b/MapUiTools/WPF/MapUiTools.WPF.csproj @@ -1,6 +1,7 @@  net9.0-windows;net462 + 8.0 true WPF MapControl.UiTools