diff --git a/MapUiTools/Shared/MapProjectionsMenuButton.cs b/MapUiTools/Shared/MapProjectionsMenuButton.cs
index 87c37e1..4099997 100644
--- a/MapUiTools/Shared/MapProjectionsMenuButton.cs
+++ b/MapUiTools/Shared/MapProjectionsMenuButton.cs
@@ -36,7 +36,7 @@ public class MapProjectionItem
 #endif
     public class MapProjectionsMenuButton : MenuButton
     {
-        private string selectedProjection;
+        private string _selectedProjection;
 
         public MapProjectionsMenuButton()
             : base("\uE809")
@@ -86,10 +86,10 @@ private void MapProjectionClicked(object sender, RoutedEventArgs e)
 
         private void SetMapProjection(string projection)
         {
-            if (selectedProjection != projection)
+            if (_selectedProjection != projection)
             {
-                selectedProjection = projection;
-                Map.MapProjection = MapProjectionFactory.Instance.GetProjection(selectedProjection);
+                _selectedProjection = projection;
+                Map.MapProjection = MapProjection.Parse(_selectedProjection);
             }
 
             UpdateCheckedStates();
@@ -99,7 +99,7 @@ private void UpdateCheckedStates()
         {
             foreach (var item in GetMenuItems())
             {
-                item.IsChecked = selectedProjection == (string)item.Tag;
+                item.IsChecked = _selectedProjection == (string)item.Tag;
             }
         }
     }
diff --git a/MapUiTools/WPF/MapUiTools.WPF.csproj b/MapUiTools/WPF/MapUiTools.WPF.csproj
index b77ab69..713bc6a 100644
--- a/MapUiTools/WPF/MapUiTools.WPF.csproj
+++ b/MapUiTools/WPF/MapUiTools.WPF.csproj
@@ -18,6 +18,6 @@
     </ItemGroup>
 
     <ItemGroup>
-		<PackageReference Include="XAML.MapControl.WPF" Version="13.6.0" />
+		<PackageReference Include="XAML.MapControl.WPF" Version="17.1.0" />
     </ItemGroup>
 </Project>
diff --git a/PhotoLocator/MapDisplay/MapView.xaml.cs b/PhotoLocator/MapDisplay/MapView.xaml.cs
index 84bc468..43556a1 100644
--- a/PhotoLocator/MapDisplay/MapView.xaml.cs
+++ b/PhotoLocator/MapDisplay/MapView.xaml.cs
@@ -90,7 +90,7 @@ private void MapMouseMove(object sender, MouseEventArgs e)
 
                 if (start != null)
                 {
-                    measurementLine.Locations = LocationCollection.OrthodromeLocations(start, location);
+                    measurementLine.Locations = LocationCollection.GeodesicLocations(start, location);
                     mouseLocation.Text += GetDistanceText(location.GetDistance(start));
                 }
             }
diff --git a/PhotoLocator/PhotoLocator.csproj b/PhotoLocator/PhotoLocator.csproj
index 82eace3..994e092 100644
--- a/PhotoLocator/PhotoLocator.csproj
+++ b/PhotoLocator/PhotoLocator.csproj
@@ -35,7 +35,7 @@
     <PackageReference Include="Microsoft-WindowsAPICodePack-ShellExtensions" Version="1.1.5" />
     <PackageReference Include="OpenCvSharp4.Windows" Version="4.10.0.20240616" />
     <PackageReference Include="SunCalcNet" Version="1.2.3" />
-    <PackageReference Include="XAML.MapControl.WPF" Version="13.6.0" />
+    <PackageReference Include="XAML.MapControl.WPF" Version="17.1.0" />
   </ItemGroup>
 
   <ItemGroup>