Verious minor code tidy-ups.

Tkael · Tkael · commit 561317ec9389 · 2025-01-13T01:45:10.000-08:00
diff --git a/DataDefinitions/NavBookmark.cs b/DataDefinitions/NavBookmark.cs
@@ -148,12 +148,7 @@ public long? arrivalRadiusMeters
 
         public bool nearby = false;
 
-        public bool useStraightPath
-        {
-            get => _useStraightPath;
-            set => _useStraightPath = value;
-        }
-        [JsonIgnore] private bool _useStraightPath;
+        public bool useStraightPath { get; set; }
 
         public SortedSet<DateTime> visitLog
         {
diff --git a/DataProviderService/DataProviderService.cs b/DataProviderService/DataProviderService.cs
@@ -61,7 +61,7 @@ public List<StarSystem> GetOrCreateStarSystems ( Dictionary<ulong, string> reque
             return results;
         }
 
-        public StarSystem GetOrFetchStarSystem ( ulong systemAddress, string systemName = null, bool fetchIfMissing = true, bool refreshIfOutdated = true, bool showMarketDetails = false )
+        public StarSystem GetOrFetchStarSystem ( ulong systemAddress, bool fetchIfMissing = true, bool refreshIfOutdated = true, bool showMarketDetails = false )
         {
             if ( systemAddress <= 0 ) { return null; }
 
diff --git a/EDDI/EDDI.cs b/EDDI/EDDI.cs
@@ -1517,7 +1517,7 @@ private bool eventCarrierJumpEngaged(CarrierJumpEngagedEvent @event)
                 Vehicle = Constants.VEHICLE_SHIP;
 
                 // Make sure we have at least basic information about the destination star system
-                NextStarSystem = DataProvider.GetOrFetchStarSystem( @event.systemAddress, @event.systemname ) ?? 
+                NextStarSystem = DataProvider.GetOrFetchStarSystem( @event.systemAddress ) ?? 
                                  new StarSystem()
                 {
                     systemname = @event.systemname,
@@ -1542,7 +1542,7 @@ private bool eventCarrierJumpEngaged(CarrierJumpEngagedEvent @event)
             else if (!string.IsNullOrEmpty(@event.originSystemName))
             {
                 // Remove the carrier from its prior location in the origin system so that we can re-save it with a new location
-                var starSystem = DataProvider.GetOrFetchStarSystem(@event.originSystemAddress, @event.originSystemName);
+                var starSystem = DataProvider.GetOrFetchStarSystem(@event.originSystemAddress);
                 var carrier = starSystem?.stations.FirstOrDefault(s => s.marketId == @event.carrierId);
                 starSystem?.stations.RemoveAll(s => s.marketId == @event.carrierId);
                 // Save the carrier to the updated star system
@@ -1557,7 +1557,7 @@ private bool eventCarrierJumpEngaged(CarrierJumpEngagedEvent @event)
                     }
                     else
                     {
-                        var updatedStarSystem = DataProvider.GetOrFetchStarSystem(@event.systemAddress, @event.systemname);
+                        var updatedStarSystem = DataProvider.GetOrFetchStarSystem(@event.systemAddress);
                         if (updatedStarSystem != null)
                         {
                             updatedStarSystem.stations.Add(carrier);
@@ -2453,7 +2453,7 @@ internal void updateCurrentSystem(string systemName, ulong systemAddress)
             }
             else
             {
-                CurrentStarSystem = DataProvider.GetOrFetchStarSystem( systemAddress, systemName ) ?? 
+                CurrentStarSystem = DataProvider.GetOrFetchStarSystem( systemAddress ) ?? 
                                     new StarSystem { systemname = systemName, systemAddress = systemAddress};
             }
 
@@ -2515,7 +2515,7 @@ private bool eventFSDEngaged(FSDEngagedEvent @event)
         private bool eventFSDTarget(FSDTargetEvent @event)
         {
             // Set and prepare data about the next star system
-            NextStarSystem = DataProvider.GetOrFetchStarSystem(@event.systemAddress, @event.system );
+            NextStarSystem = DataProvider.GetOrFetchStarSystem(@event.systemAddress );
             if (NextStarSystem != null && !NextStarSystem.bodies.Any(b => b.mainstar ?? false))
             {
                 // This system is unknown to us, might not be recorded, or we might not have connectivity.  Use a placeholder main star
@@ -3509,7 +3509,7 @@ public void updateDestinationSystem ( ulong? destinationSystemAddress, string de
             var configuration = ConfigService.Instance.eddiConfiguration;
             if ( destinationSystemAddress > 0 )
             {
-                var system = DataProvider.GetOrFetchStarSystem((ulong)destinationSystemAddress, destinationSystem );
+                var system = DataProvider.GetOrFetchStarSystem((ulong)destinationSystemAddress );
 
                 //Ignore null & empty systems
                 if (system != null)
@@ -3536,7 +3536,7 @@ public void setHomeSystem ( ulong? newSystemAddress, string newSystemName )
             StarSystem newSystem = null;
             if ( newSystemAddress != null )
             {
-                newSystem = DataProvider.GetOrFetchStarSystem( (ulong)newSystemAddress, newSystemName );
+                newSystem = DataProvider.GetOrFetchStarSystem( (ulong)newSystemAddress );
             }
             if ( newSystem is null && !string.IsNullOrEmpty( newSystemName ) )
             {
@@ -3591,7 +3591,7 @@ public void setSquadronSystem ( ulong? newSystemAddress, string newSystemName )
             StarSystem newSystem = null;
             if ( newSystemAddress != null )
             {
-                newSystem = DataProvider.GetOrFetchStarSystem( (ulong)newSystemAddress, newSystemName );
+                newSystem = DataProvider.GetOrFetchStarSystem( (ulong)newSystemAddress );
             }
             if ( newSystem is null && !string.IsNullOrEmpty(newSystemName) )
             {
diff --git a/EDDI/MainWindow.xaml.cs b/EDDI/MainWindow.xaml.cs
@@ -1208,7 +1208,7 @@ private async void createGithubIssueClicked(object sender, RoutedEventArgs e)
             }
             Logging.Info("Commander name: " + (EDDI.Instance.Cmdr != null ? EDDI.Instance.Cmdr.name : "null"));
             Logging.Info("Default UI culture: " + (CultureInfo.DefaultThreadCurrentUICulture?.IetfLanguageTag ?? "automatic"));
-            Logging.Info("Current UI culture: " + (CultureInfo.CurrentUICulture.IetfLanguageTag));
+            Logging.Info("Current UI culture: " + CultureInfo.CurrentUICulture.IetfLanguageTag);
 
             // Prepare a truncated log file for export if verbose logging is enabled
             if (eddiVerboseLogging.IsChecked ?? false)
diff --git a/EddiSpanshService/SpanshQuery.cs b/EddiSpanshService/SpanshQuery.cs
@@ -36,7 +36,7 @@ public JToken DistanceOrderedQuery ( QueryGroup queryGroup, decimal fromX, decim
         // TODO: Handle multi-page responses (see BgsService for example)
         private static IRestRequest GetRestRequest ( QueryGroup queryGroup, [NotNull] Dictionary<string, object> filter, int? maxResults, int? pageId )
         {
-            var request = new RestRequest($@"{queryGroup.ToString()}/search") { Method = Method.POST };
+            var request = new RestRequest($@"{queryGroup}/search") { Method = Method.POST };
             var jsonObject = new
             {
                 filters = filter,
@@ -49,7 +49,7 @@ private static IRestRequest GetRestRequest ( QueryGroup queryGroup, [NotNull] Di
 
         private static IRestRequest GetDistanceOrderedRestRequest ( QueryGroup queryGroup, decimal fromX, decimal fromY, decimal fromZ, [NotNull] Dictionary<string, object> filter )
         {
-            var request = new RestRequest($@"{queryGroup.ToString()}/search") { Method = Method.POST };
+            var request = new RestRequest($@"{queryGroup}/search") { Method = Method.POST };
             var jsonObject = new
             {
                 filters = filter,
diff --git a/Events/ModificationCraftedEvent.cs b/Events/ModificationCraftedEvent.cs
@@ -46,7 +46,7 @@ public class ModificationCraftedEvent : Event
 
         public Module Module { get; private set; }
 
-        public ModificationCraftedEvent(DateTime timestamp, string engineer, long engineerId, string blueprint, long blueprintId, int level, decimal? quality, string experimentalEffect, List<MaterialAmount> materials, List<CommodityAmount> commodities, string slot, Module module) : base(timestamp, NAME)
+        public ModificationCraftedEvent(DateTime timestamp, string engineer, long engineerId, string blueprint, long blueprintId, int level, decimal? quality, string experimentalEffect, List<MaterialAmount> materials, List<CommodityAmount> commodities, string slot, Module Module) : base(timestamp, NAME)
         {
             this.engineer = engineer;
             this.engineerId = -engineerId;
diff --git a/Events/ShipLoadoutEvent.cs b/Events/ShipLoadoutEvent.cs
@@ -65,7 +65,7 @@ [ PublicAPI( "The optimal mass value of the frame shift drive" ) ]
 
         public Ship shipDefinition => ShipDefinitions.FromEDModel(edModel);
 
-        private Module frameShiftDrive;
+        private Module frameShiftDrive { get; set; }
 
         public string edModel { get; private set; }
 
diff --git a/GalnetMonitor/GalnetMonitor.cs b/GalnetMonitor/GalnetMonitor.cs
@@ -37,9 +37,6 @@ public class GalnetMonitor : IEddiMonitor
         private bool running;
         private DateTime journalTimeStamp;
 
-        // This monitor currently requires game version 4.0 or later.
-        private static readonly System.Version minGameVersion = new System.Version(4, 0);
-
         public GalnetMonitor ()
         {
             configuration = ConfigService.Instance.galnetConfiguration;
diff --git a/JournalMonitor/JournalMonitor.cs b/JournalMonitor/JournalMonitor.cs
@@ -4434,7 +4434,7 @@ dest.y is decimal sy &&
                                     // There is a bug in the journal output where "Body" can be missing but "BodyID" can be present. Try to Work around that here.
                                     if (string.IsNullOrEmpty(bodyName) && systemAddress > 0)
                                     {
-                                        var starSystem = EDDI.Instance.DataProvider.GetOrFetchStarSystem(systemAddress, systemName, true, true);
+                                        var starSystem = EDDI.Instance.DataProvider.GetOrFetchStarSystem(systemAddress, true, true);
                                         bodyName = starSystem?.bodies?.FirstOrDefault(b => b?.bodyId == bodyId)?.bodyname;
                                     }
 
diff --git a/JournalMonitor/LogMonitor.cs b/JournalMonitor/LogMonitor.cs
@@ -13,9 +13,9 @@ namespace EddiJournalMonitor
     public class LogMonitor
     {
         // What we are monitoring and what to do with it
-        private string Directory;
-        private Regex Filter;
-        private Action<IEnumerable<string>, bool> Callback;
+        private readonly string Directory;
+        private readonly Regex Filter;
+        private readonly Action<IEnumerable<string>, bool> Callback;
         protected static string journalFileName;
 
         private const int pollingIntervalActiveMs = 100;
diff --git a/NavigationService/QueryResolvers/MissionQueryResolvers.cs b/NavigationService/QueryResolvers/MissionQueryResolvers.cs
@@ -116,7 +116,6 @@ private RouteDetailsEvent GetFarthestMissionRoute ( [ NotNull ] StarSystem start
             var startSystemWaypoint = new NavWaypoint( startSystem ) { visited = true };
             navRouteList.Waypoints.Add( startSystemWaypoint );
 
-
             var farthestList = new SortedList<decimal, NavWaypoint>();
             foreach ( var mission in missions.Where( m => m.statusDef == MissionStatus.Active ).ToList() )
             {
@@ -309,7 +308,7 @@ private RouteDetailsEvent GetRepetiveNearestNeighborMissionRoute ( [ NotNull ] S
             // Add origin systems for 'return to origin' missions to the 'systems' list
             foreach ( var mission in missions.Where ( m => m.statusDef != MissionStatus.Failed ) )
             {
-                if ( mission.originreturn && !systems.Contains ( mission.originsystem ) )
+                if ( mission.originreturn && !string.IsNullOrEmpty( mission.originsystem ) && !systems.Contains ( mission.originsystem ) )
                 {
                     systems.Add ( mission.originsystem );
                 }
diff --git a/SpeechService/Humanize.cs b/SpeechService/Humanize.cs
@@ -19,7 +19,7 @@ public static string Humanize(decimal? rawValue, bool? forceIntegerMantissa = nu
             if ( value == 0 )
             {
                 var result = Properties.Phrases.zero;
-                Logging.Debug( $"Converted raw value '{rawValue.ToString()}' to '{result}'" );
+                Logging.Debug( $"Converted raw value '{rawValue}' to '{result}'" );
                 return result;
             }
 
@@ -44,7 +44,7 @@ public static string Humanize(decimal? rawValue, bool? forceIntegerMantissa = nu
                 // Now round it to 2sf
                 var result = ( isNegative ? Properties.Phrases.minus + " " : "" ) +
                              ( Math.Round( value * 10 ) / (decimal)Math.Pow( 10, numzeros + 2 ) );
-                Logging.Debug($"Converted raw value '{rawValue.ToString()}' to '{result}'");
+                Logging.Debug($"Converted raw value '{rawValue}' to '{result}'");
                 return result;
             }
 
@@ -58,20 +58,20 @@ public static string Humanize(decimal? rawValue, bool? forceIntegerMantissa = nu
                 // Some languages render these differently than others. "1000" in English is "one thousand" but in Italian is simply "mille".
                 // Consequently, we leave the interpretation to the culture-specific voice.
                 var result = FormatVerbatim(number, isNegative, orderMultiplier);
-                Logging.Debug( $"Converted raw value '{rawValue.ToString()}' to '{result}'" );
+                Logging.Debug( $"Converted raw value '{rawValue}' to '{result}'" );
                 return result;
             }
 
             if (number < 100)
             {
                 var result = FormatWith2SignificantDigits(number, isNegative, orderMultiplier, nextDigit, value, wantIntegerMantissa);
-                Logging.Debug( $"Converted raw value '{rawValue.ToString()}' to '{result}'" );
+                Logging.Debug( $"Converted raw value '{rawValue}' to '{result}'" );
                 return result;
             }
             else // Describe (less precisely) values for numbers where the largest order number exceeds one hundred
             {
                 var result = FormatWith3SignificantDigits(number, isNegative, orderMultiplier, nextDigit, value);
-                Logging.Debug( $"Converted raw value '{rawValue.ToString()}' to '{result}'" );
+                Logging.Debug( $"Converted raw value '{rawValue}' to '{result}'" );
                 return result;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public List<StarSystem> GetOrCreateStarSystems ( Dictionary<ulong, string> reque`
`61`	`61`	`return results;`
`62`	`62`	`}`
`63`	`63`
`64`		`- public StarSystem GetOrFetchStarSystem ( ulong systemAddress, string systemName = null, bool fetchIfMissing = true, bool refreshIfOutdated = true, bool showMarketDetails = false )`
	`64`	`+ public StarSystem GetOrFetchStarSystem ( ulong systemAddress, bool fetchIfMissing = true, bool refreshIfOutdated = true, bool showMarketDetails = false )`
`65`	`65`	`{`
`66`	`66`	`if ( systemAddress <= 0 ) { return null; }`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -1517,7 +1517,7 @@ private bool eventCarrierJumpEngaged(CarrierJumpEngagedEvent @event)`
`1517`	`1517`	`Vehicle = Constants.VEHICLE_SHIP;`
`1518`	`1518`
`1519`	`1519`	`// Make sure we have at least basic information about the destination star system`
`1520`		`- NextStarSystem = DataProvider.GetOrFetchStarSystem( @event.systemAddress, @event.systemname ) ??`
	`1520`	`+ NextStarSystem = DataProvider.GetOrFetchStarSystem( @event.systemAddress ) ??`
`1521`	`1521`	`new StarSystem()`
`1522`	`1522`	`{`
`1523`	`1523`	`systemname = @event.systemname,`
`@@ -1542,7 +1542,7 @@ private bool eventCarrierJumpEngaged(CarrierJumpEngagedEvent @event)`
`1542`	`1542`	`else if (!string.IsNullOrEmpty(@event.originSystemName))`
`1543`	`1543`	`{`
`1544`	`1544`	`// Remove the carrier from its prior location in the origin system so that we can re-save it with a new location`
`1545`		`- var starSystem = DataProvider.GetOrFetchStarSystem(@event.originSystemAddress, @event.originSystemName);`
	`1545`	`+ var starSystem = DataProvider.GetOrFetchStarSystem(@event.originSystemAddress);`
`1546`	`1546`	`var carrier = starSystem?.stations.FirstOrDefault(s => s.marketId == @event.carrierId);`
`1547`	`1547`	`starSystem?.stations.RemoveAll(s => s.marketId == @event.carrierId);`
`1548`	`1548`	`// Save the carrier to the updated star system`
`@@ -1557,7 +1557,7 @@ private bool eventCarrierJumpEngaged(CarrierJumpEngagedEvent @event)`
`1557`	`1557`	`}`
`1558`	`1558`	`else`
`1559`	`1559`	`{`
`1560`		`- var updatedStarSystem = DataProvider.GetOrFetchStarSystem(@event.systemAddress, @event.systemname);`
	`1560`	`+ var updatedStarSystem = DataProvider.GetOrFetchStarSystem(@event.systemAddress);`
`1561`	`1561`	`if (updatedStarSystem != null)`
`1562`	`1562`	`{`
`1563`	`1563`	`updatedStarSystem.stations.Add(carrier);`
`@@ -2453,7 +2453,7 @@ internal void updateCurrentSystem(string systemName, ulong systemAddress)`
`2453`	`2453`	`}`
`2454`	`2454`	`else`
`2455`	`2455`	`{`
`2456`		`- CurrentStarSystem = DataProvider.GetOrFetchStarSystem( systemAddress, systemName ) ??`
	`2456`	`+ CurrentStarSystem = DataProvider.GetOrFetchStarSystem( systemAddress ) ??`
`2457`	`2457`	`new StarSystem { systemname = systemName, systemAddress = systemAddress};`
`2458`	`2458`	`}`
`2459`	`2459`
`@@ -2515,7 +2515,7 @@ private bool eventFSDEngaged(FSDEngagedEvent @event)`
`2515`	`2515`	`private bool eventFSDTarget(FSDTargetEvent @event)`
`2516`	`2516`	`{`
`2517`	`2517`	`// Set and prepare data about the next star system`
`2518`		`- NextStarSystem = DataProvider.GetOrFetchStarSystem(@event.systemAddress, @event.system );`
	`2518`	`+ NextStarSystem = DataProvider.GetOrFetchStarSystem(@event.systemAddress );`
`2519`	`2519`	`if (NextStarSystem != null && !NextStarSystem.bodies.Any(b => b.mainstar ?? false))`
`2520`	`2520`	`{`
`2521`	`2521`	`// This system is unknown to us, might not be recorded, or we might not have connectivity. Use a placeholder main star`
`@@ -3509,7 +3509,7 @@ public void updateDestinationSystem ( ulong? destinationSystemAddress, string de`
`3509`	`3509`	`var configuration = ConfigService.Instance.eddiConfiguration;`
`3510`	`3510`	`if ( destinationSystemAddress > 0 )`
`3511`	`3511`	`{`
`3512`		`- var system = DataProvider.GetOrFetchStarSystem((ulong)destinationSystemAddress, destinationSystem );`
	`3512`	`+ var system = DataProvider.GetOrFetchStarSystem((ulong)destinationSystemAddress );`
`3513`	`3513`
`3514`	`3514`	`//Ignore null & empty systems`
`3515`	`3515`	`if (system != null)`
`@@ -3536,7 +3536,7 @@ public void setHomeSystem ( ulong? newSystemAddress, string newSystemName )`
`3536`	`3536`	`StarSystem newSystem = null;`
`3537`	`3537`	`if ( newSystemAddress != null )`
`3538`	`3538`	`{`
`3539`		`- newSystem = DataProvider.GetOrFetchStarSystem( (ulong)newSystemAddress, newSystemName );`
	`3539`	`+ newSystem = DataProvider.GetOrFetchStarSystem( (ulong)newSystemAddress );`
`3540`	`3540`	`}`
`3541`	`3541`	`if ( newSystem is null && !string.IsNullOrEmpty( newSystemName ) )`
`3542`	`3542`	`{`
`@@ -3591,7 +3591,7 @@ public void setSquadronSystem ( ulong? newSystemAddress, string newSystemName )`
`3591`	`3591`	`StarSystem newSystem = null;`
`3592`	`3592`	`if ( newSystemAddress != null )`
`3593`	`3593`	`{`
`3594`		`- newSystem = DataProvider.GetOrFetchStarSystem( (ulong)newSystemAddress, newSystemName );`
	`3594`	`+ newSystem = DataProvider.GetOrFetchStarSystem( (ulong)newSystemAddress );`
`3595`	`3595`	`}`
`3596`	`3596`	`if ( newSystem is null && !string.IsNullOrEmpty(newSystemName) )`
`3597`	`3597`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1208,7 +1208,7 @@ private async void createGithubIssueClicked(object sender, RoutedEventArgs e)`
`1208`	`1208`	`}`
`1209`	`1209`	`Logging.Info("Commander name: " + (EDDI.Instance.Cmdr != null ? EDDI.Instance.Cmdr.name : "null"));`
`1210`	`1210`	`Logging.Info("Default UI culture: " + (CultureInfo.DefaultThreadCurrentUICulture?.IetfLanguageTag ?? "automatic"));`
`1211`		`- Logging.Info("Current UI culture: " + (CultureInfo.CurrentUICulture.IetfLanguageTag));`
	`1211`	`+ Logging.Info("Current UI culture: " + CultureInfo.CurrentUICulture.IetfLanguageTag);`
`1212`	`1212`
`1213`	`1213`	`// Prepare a truncated log file for export if verbose logging is enabled`
`1214`	`1214`	`if (eddiVerboseLogging.IsChecked ?? false)`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public JToken DistanceOrderedQuery ( QueryGroup queryGroup, decimal fromX, decim`
`36`	`36`	`// TODO: Handle multi-page responses (see BgsService for example)`
`37`	`37`	`private static IRestRequest GetRestRequest ( QueryGroup queryGroup, [NotNull] Dictionary<string, object> filter, int? maxResults, int? pageId )`
`38`	`38`	`{`
`39`		`- var request = new RestRequest($@"{queryGroup.ToString()}/search") { Method = Method.POST };`
	`39`	`+ var request = new RestRequest($@"{queryGroup}/search") { Method = Method.POST };`
`40`	`40`	`var jsonObject = new`
`41`	`41`	`{`
`42`	`42`	`filters = filter,`
`@@ -49,7 +49,7 @@ private static IRestRequest GetRestRequest ( QueryGroup queryGroup, [NotNull] Di`
`49`	`49`
`50`	`50`	`private static IRestRequest GetDistanceOrderedRestRequest ( QueryGroup queryGroup, decimal fromX, decimal fromY, decimal fromZ, [NotNull] Dictionary<string, object> filter )`
`51`	`51`	`{`
`52`		`- var request = new RestRequest($@"{queryGroup.ToString()}/search") { Method = Method.POST };`
	`52`	`+ var request = new RestRequest($@"{queryGroup}/search") { Method = Method.POST };`
`53`	`53`	`var jsonObject = new`
`54`	`54`	`{`
`55`	`55`	`filters = filter,`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public class ModificationCraftedEvent : Event`
`46`	`46`
`47`	`47`	`public Module Module { get; private set; }`
`48`	`48`
`49`		`- public ModificationCraftedEvent(DateTime timestamp, string engineer, long engineerId, string blueprint, long blueprintId, int level, decimal? quality, string experimentalEffect, List<MaterialAmount> materials, List<CommodityAmount> commodities, string slot, Module module) : base(timestamp, NAME)`
	`49`	`+ public ModificationCraftedEvent(DateTime timestamp, string engineer, long engineerId, string blueprint, long blueprintId, int level, decimal? quality, string experimentalEffect, List<MaterialAmount> materials, List<CommodityAmount> commodities, string slot, Module Module) : base(timestamp, NAME)`
`50`	`50`	`{`
`51`	`51`	`this.engineer = engineer;`
`52`	`52`	`this.engineerId = -engineerId;`
Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,6 @@ public class GalnetMonitor : IEddiMonitor`
`37`	`37`	`private bool running;`
`38`	`38`	`private DateTime journalTimeStamp;`
`39`	`39`
`40`		`- // This monitor currently requires game version 4.0 or later.`
`41`		`- private static readonly System.Version minGameVersion = new System.Version(4, 0);`
`42`		`-`
`43`	`40`	`public GalnetMonitor ()`
`44`	`41`	`{`
`45`	`42`	`configuration = ConfigService.Instance.galnetConfiguration;`
Original file line number	Diff line number	Diff line change
`@@ -4434,7 +4434,7 @@ dest.y is decimal sy &&`
`4434`	`4434`	`// There is a bug in the journal output where "Body" can be missing but "BodyID" can be present. Try to Work around that here.`
`4435`	`4435`	`if (string.IsNullOrEmpty(bodyName) && systemAddress > 0)`
`4436`	`4436`	`{`
`4437`		`- var starSystem = EDDI.Instance.DataProvider.GetOrFetchStarSystem(systemAddress, systemName, true, true);`
	`4437`	`+ var starSystem = EDDI.Instance.DataProvider.GetOrFetchStarSystem(systemAddress, true, true);`
`4438`	`4438`	`bodyName = starSystem?.bodies?.FirstOrDefault(b => b?.bodyId == bodyId)?.bodyname;`
`4439`	`4439`	`}`
`4440`	`4440`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,6 @@ private RouteDetailsEvent GetFarthestMissionRoute ( [ NotNull ] StarSystem start`
`116`	`116`	`var startSystemWaypoint = new NavWaypoint( startSystem ) { visited = true };`
`117`	`117`	`navRouteList.Waypoints.Add( startSystemWaypoint );`
`118`	`118`
`119`		`-`
`120`	`119`	`var farthestList = new SortedList<decimal, NavWaypoint>();`
`121`	`120`	`foreach ( var mission in missions.Where( m => m.statusDef == MissionStatus.Active ).ToList() )`
`122`	`121`	`{`
`@@ -309,7 +308,7 @@ private RouteDetailsEvent GetRepetiveNearestNeighborMissionRoute ( [ NotNull ] S`
`309`	`308`	`// Add origin systems for 'return to origin' missions to the 'systems' list`
`310`	`309`	`foreach ( var mission in missions.Where ( m => m.statusDef != MissionStatus.Failed ) )`
`311`	`310`	`{`
`312`		`- if ( mission.originreturn && !systems.Contains ( mission.originsystem ) )`
	`311`	`+ if ( mission.originreturn && !string.IsNullOrEmpty( mission.originsystem ) && !systems.Contains ( mission.originsystem ) )`
`313`	`312`	`{`
`314`	`313`	`systems.Add ( mission.originsystem );`
`315`	`314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public static string Humanize(decimal? rawValue, bool? forceIntegerMantissa = nu`
`19`	`19`	`if ( value == 0 )`
`20`	`20`	`{`
`21`	`21`	`var result = Properties.Phrases.zero;`
`22`		`- Logging.Debug( $"Converted raw value '{rawValue.ToString()}' to '{result}'" );`
	`22`	`+ Logging.Debug( $"Converted raw value '{rawValue}' to '{result}'" );`
`23`	`23`	`return result;`
`24`	`24`	`}`
`25`	`25`
`@@ -44,7 +44,7 @@ public static string Humanize(decimal? rawValue, bool? forceIntegerMantissa = nu`
`44`	`44`	`// Now round it to 2sf`
`45`	`45`	`var result = ( isNegative ? Properties.Phrases.minus + " " : "" ) +`
`46`	`46`	`( Math.Round( value * 10 ) / (decimal)Math.Pow( 10, numzeros + 2 ) );`
`47`		`- Logging.Debug($"Converted raw value '{rawValue.ToString()}' to '{result}'");`
	`47`	`+ Logging.Debug($"Converted raw value '{rawValue}' to '{result}'");`
`48`	`48`	`return result;`
`49`	`49`	`}`
`50`	`50`
`@@ -58,20 +58,20 @@ public static string Humanize(decimal? rawValue, bool? forceIntegerMantissa = nu`
`58`	`58`	`// Some languages render these differently than others. "1000" in English is "one thousand" but in Italian is simply "mille".`
`59`	`59`	`// Consequently, we leave the interpretation to the culture-specific voice.`
`60`	`60`	`var result = FormatVerbatim(number, isNegative, orderMultiplier);`
`61`		`- Logging.Debug( $"Converted raw value '{rawValue.ToString()}' to '{result}'" );`
	`61`	`+ Logging.Debug( $"Converted raw value '{rawValue}' to '{result}'" );`
`62`	`62`	`return result;`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`if (number < 100)`
`66`	`66`	`{`
`67`	`67`	`var result = FormatWith2SignificantDigits(number, isNegative, orderMultiplier, nextDigit, value, wantIntegerMantissa);`
`68`		`- Logging.Debug( $"Converted raw value '{rawValue.ToString()}' to '{result}'" );`
	`68`	`+ Logging.Debug( $"Converted raw value '{rawValue}' to '{result}'" );`
`69`	`69`	`return result;`
`70`	`70`	`}`
`71`	`71`	`else // Describe (less precisely) values for numbers where the largest order number exceeds one hundred`
`72`	`72`	`{`
`73`	`73`	`var result = FormatWith3SignificantDigits(number, isNegative, orderMultiplier, nextDigit, value);`
`74`		`- Logging.Debug( $"Converted raw value '{rawValue.ToString()}' to '{result}'" );`
	`74`	`+ Logging.Debug( $"Converted raw value '{rawValue}' to '{result}'" );`
`75`	`75`	`return result;`
`76`	`76`	`}`
`77`	`77`	`}`