From fdfa8348eb5c88e95d4b347d516d1edd8e5a9a96 Mon Sep 17 00:00:00 2001
From: ClemensFischer <fischer.clemens@gmail.com>
Date: Fri, 24 Jan 2025 20:12:31 +0100
Subject: [PATCH] Updated ProjectionDemo

---
 SampleApps/ProjectionDemo/MainWindow.xaml    | 27 ++++++++------------
 SampleApps/ProjectionDemo/MainWindow.xaml.cs | 14 +++++++---
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/SampleApps/ProjectionDemo/MainWindow.xaml b/SampleApps/ProjectionDemo/MainWindow.xaml
index 67edff83..73619c58 100644
--- a/SampleApps/ProjectionDemo/MainWindow.xaml
+++ b/SampleApps/ProjectionDemo/MainWindow.xaml
@@ -4,8 +4,15 @@
         xmlns:map="clr-namespace:MapControl;assembly=MapControl.WPF"
         Title="XAML MapControl - Projection Demo" Height="600" Width="800"
         Loaded="Window_Loaded">
-    <DockPanel>
-        <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
+    <Grid>
+        <map:Map MaxZoomLevel="22" ZoomLevel="10" Center="50.1,8.25" MapLayer="{Binding CurrentLayer}"
+                 MapProjection="{Binding CurrentProjection}"
+                 MouseRightButtonUp="Map_MouseRightButtonUp">
+
+            <map:Pushpin map:MapPanel.Location="{Binding PushpinLocation}"
+                         Content="{Binding PushpinText}"/>
+        </map:Map>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="4">
             <ComboBox Margin="2"
                       ItemsSource="{Binding Projections}"
                       SelectedItem="{Binding CurrentProjection}"
@@ -16,19 +23,5 @@
                       SelectedValuePath="Value"
                       DisplayMemberPath="Key"/>
         </StackPanel>
-
-        <map:Map MaxZoomLevel="22" ZoomLevel="8" Center="50,8" MapLayer="{Binding CurrentLayer}"
-                 MouseRightButtonUp="Map_MouseRightButtonUp">
-            <map:MapBase.MapProjection>
-                <Binding Path="CurrentProjection">
-                    <Binding.FallbackValue>
-                        <map:WebMercatorProjection/>
-                    </Binding.FallbackValue>
-                </Binding>
-            </map:MapBase.MapProjection>
-
-            <map:Pushpin map:MapPanel.Location="{Binding PushpinLocation}"
-                         Content="{Binding PushpinText}"/>
-        </map:Map>
-    </DockPanel>
+    </Grid>
 </Window>
diff --git a/SampleApps/ProjectionDemo/MainWindow.xaml.cs b/SampleApps/ProjectionDemo/MainWindow.xaml.cs
index f70bf8d1..0e7907e1 100644
--- a/SampleApps/ProjectionDemo/MainWindow.xaml.cs
+++ b/SampleApps/ProjectionDemo/MainWindow.xaml.cs
@@ -39,12 +39,20 @@ namespace ProjectionDemo
                     WmsLayers = "web"
                 });
 
+            viewModel.Layers.Add(
+                "Basemap.de WMS",
+                new WmsImageLayer
+                {
+                    ServiceUri = new Uri("https://sgx.geodatenzentrum.de/wms_basemapde"),
+                    WmsLayers = "de_basemapde_web_raster_farbe"
+                });
+
             viewModel.Layers.Add(
                 "Orthophotos Wiesbaden",
                 new WmsImageLayer
                 {
                     ServiceUri = new Uri("https://geoportal.wiesbaden.de/cgi-bin/mapserv.fcgi?map=d:/openwimap/umn/map/orthophoto/orthophotos.map"),
-                    WmsLayers = "orthophoto2017"
+                    WmsLayers = "orthophoto2023"
                 });
 
             viewModel.CurrentProjection = viewModel.Projections[0];
@@ -70,9 +78,9 @@ namespace ProjectionDemo
 
         public event PropertyChangedEventHandler PropertyChanged;
 
-        public List<MapProjection> Projections { get; } = new List<MapProjection>();
+        public List<MapProjection> Projections { get; } = [];
 
-        public Dictionary<string, IMapLayer> Layers { get; } = new Dictionary<string, IMapLayer>();
+        public Dictionary<string, IMapLayer> Layers { get; } = [];
 
         public MapProjection CurrentProjection
         {