diff --git a/AirScout/MapDlg.cs b/AirScout/MapDlg.cs index 37bb784..65e9d98 100644 --- a/AirScout/MapDlg.cs +++ b/AirScout/MapDlg.cs @@ -947,9 +947,9 @@ namespace AirScout */ // check for last saved stations not in database and revert to at least DL2ALF and GB3MHZ if necessary // first check for saved stations - string mycall = GetPropertyDefaultValue(nameof(Properties.Settings.Default.MyCall)); - double mylat = GetPropertyDefaultValue(nameof(Properties.Settings.Default.MyLat)); - double mylon = GetPropertyDefaultValue(nameof(Properties.Settings.Default.MyLon)); + string mycall = Properties.Settings.Default.MyCall; + double mylat = Properties.Settings.Default.MyLat; + double mylon = Properties.Settings.Default.MyLon; string myloc = MaidenheadLocator.LocFromLatLon(mylat, mylon, Properties.Settings.Default.Locator_SmallLettersForSubsquares, 3); LocationDesignator ld = StationData.Database.LocationFind(mycall, myloc); if (ld == null) @@ -963,9 +963,9 @@ namespace AirScout Properties.Settings.Default.MyLat = mylat; Properties.Settings.Default.MyLon = mylon; } - string dxcall = GetPropertyDefaultValue(nameof(Properties.Settings.Default.DXCall)); - double dxlat = GetPropertyDefaultValue(nameof(Properties.Settings.Default.DXLat)); - double dxlon = GetPropertyDefaultValue(nameof(Properties.Settings.Default.DXLon)); + string dxcall = Properties.Settings.Default.DXCall; + double dxlat = Properties.Settings.Default.DXLat; + double dxlon = Properties.Settings.Default.DXLon; string dxloc = MaidenheadLocator.LocFromLatLon(dxlat, dxlon, Properties.Settings.Default.Locator_SmallLettersForSubsquares, 3); ld = StationData.Database.LocationFind(dxcall, dxloc); if (ld == null) diff --git a/AirScout/Properties/AssemblyInfo.cs b/AirScout/Properties/AssemblyInfo.cs index 19e3074..5913caf 100644 --- a/AirScout/Properties/AssemblyInfo.cs +++ b/AirScout/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.3.3")] -[assembly: AssemblyFileVersion("1.3.3.3")] +[assembly: AssemblyVersion("1.3.3.4")] +[assembly: AssemblyFileVersion("1.3.3.4")] diff --git a/AirScout/VersionHistory.txt b/AirScout/VersionHistory.txt index 5b3f540..3322cf8 100644 --- a/AirScout/VersionHistory.txt +++ b/AirScout/VersionHistory.txt @@ -1,4 +1,9 @@ -2020-xx-xx: V1.3.3.3 +2020-04-25: V1.3.3.4 +==================== + +- Bugfix: AirScout always reverts to default call signs (DL2ALF <> GB3MHZ) when area of interest is set outside Europe --> fixed (tnx VK3VG) + +2020-04-21: V1.3.3.3 ==================== - Feature: export current path to CSV, feature was removed during change to V1.3.x diff --git a/AirScout/WatchlistDlg.cs b/AirScout/WatchlistDlg.cs index e9dbc9e..b3ff5a5 100644 --- a/AirScout/WatchlistDlg.cs +++ b/AirScout/WatchlistDlg.cs @@ -48,6 +48,17 @@ namespace AirScout dgv_Watchlist_Callsigns.DataSource = null; foreach (LocationDesignator ld in AllLocations) { + if (Properties.Settings.Default.Location_RestrictToAreaOfInterest) + { + if (ld.Lat < Properties.Settings.Default.MinLat) + continue; + if (ld.Lat > Properties.Settings.Default.MaxLat) + continue; + if (ld.Lon < Properties.Settings.Default.MinLon) + continue; + if (ld.Lon > Properties.Settings.Default.MaxLon) + continue; + } DataRow row = AllCallsigns.NewRow(); row[0] = ld.Call; row[1] = ld.Loc; diff --git a/ScoutBase/ScoutBase.Stations/StationDatabaseUpdater.cs b/ScoutBase/ScoutBase.Stations/StationDatabaseUpdater.cs index ffd53b2..f8b8a92 100644 --- a/ScoutBase/ScoutBase.Stations/StationDatabaseUpdater.cs +++ b/ScoutBase/ScoutBase.Stations/StationDatabaseUpdater.cs @@ -386,37 +386,6 @@ namespace ScoutBase.Stations // set status to updating StationData.Database.SetDBStatus(DATABASESTATUS.UPDATING); this.ReportProgress(1, StationData.Database.GetDBStatus()); - if (StartOptions.RestrictToAreaOfInterest) - { - this.ReportProgress(0, "Removing callsigns otside are of interest..."); - if (HasDatabaseChanged()) - { - // database changed --> do full check - List locations = StationData.Database.LocationGetAll(this); - foreach (LocationDesignator ld in locations) - { - if ((ld.Lat < StartOptions.MinLat) || (ld.Lat > StartOptions.MaxLat) || (ld.Lon < StartOptions.MinLon) || (ld.Lon > StartOptions.MaxLon)) - { - // remove from location database & QRV database - StationData.Database.LocationDelete(ld); - StationData.Database.QRVDelete(ld.Call, ld.Loc, BAND.BALL); - } - if (this.CancellationPending) - return; - // reduce CPU load - Thread.Sleep(1); - } - // save status & timestamps - SaveDatabaseTimeStamp(); - SaveDatabaseStatus(); - } - else - { - // dabase not changed --> nothing to do - // restore database status - StationData.Database.SetDBStatus(GetDatabaseStatus()); - } - } // update location database this.ReportProgress(0, "Updating locations from web database..."); // get update from url