Added a minimum IV filter

PogoLocationFeeder.GUI/MainWindow.xaml

@@ -10,7 +10,7 @@
                       BorderBrush="{DynamicResource AccentColorBrush}"
                       BorderThickness="1"
                       WindowStartupLocation="CenterScreen"
-                      Title="Location Feeder" MinHeight="500" MinWidth="800" Height="650" Width="850"
+                      Title="Location Feeder" MinHeight="700" MinWidth="800" Height="700" Width="850"
                       xmlns:views1="clr-namespace:PogoLocationFeeder.GUI.Views"
                       TitleCaps="False"
                       NonActiveWindowTitleBrush="{DynamicResource HighlightBrush}"

PogoLocationFeeder.GUI/ViewModels/MainWindowViewModel.cs

@@ -135,7 +135,7 @@ public MainWindowViewModel()
         public bool UseGeoLocationBoundsFilter { get; set; }
         public LatLngBounds GeoLocationBounds { get; set; }
         public LatLngBounds LocationBoundsSettingToSave { get; set; }
-
+        public double MinimumIV { get; set; } = 0.0;
         public PokemonFilterModel SelectedPokemonFilter { get; set; }
         public PokemonFilterModel SelectedPokemonFiltered { get; set; }
         public int IndexPokemonToFilter { get; set; }
@@ -213,6 +213,7 @@ public void ShowSettings()
             VerifiedOnly = GlobalSettings.VerifiedOnly;
             RemoveMinutes = GlobalSettings.RemoveAfter.ToString();
             UseFilter = GlobalSettings.UseFilter;
+            MinimumIV = GlobalSettings.MinimumIV;
             UseGeoLocationBoundsFilter = GlobalSettings.UseGeoLocationBoundsFilter;
             GeoLocationBounds = GlobalSettings.GeoLocationBounds;
             AppThemeText = GlobalSettings.AppTheme;
@@ -239,6 +240,7 @@ public void SaveClick()
             GlobalSettings.VerifyOnSkiplagged = UseSkiplagged;
             GlobalSettings.VerifiedOnly = VerifiedOnly;
             GlobalSettings.UseFilter = UseFilter;
+            GlobalSettings.MinimumIV = MinimumIV;
             GlobalSettings.UseGeoLocationBoundsFilter = UseGeoLocationBoundsFilter;
             GlobalSettings.GeoLocationBounds = GeoLocationBounds;
             GlobalSettings.AppTheme = AppThemeText;

PogoLocationFeeder.GUI/Views/SettingsView.xaml

@@ -27,6 +27,8 @@
             <RowDefinition Height="10" />
             <RowDefinition Height="30" />
             <RowDefinition Height="10" />
+            <RowDefinition Height="30" />
+            <RowDefinition Height="10" />
             <RowDefinition Height="33" />
             <RowDefinition Height="10" />
             <RowDefinition Height="33"/>
@@ -123,8 +125,10 @@
             <TextBox VerticalAlignment="Center" Text="{Binding NorthEast.Longitude, Mode=TwoWay}" Margin="10, 0"
                  PreviewTextInput="DoubleValidationTextBox" Width="100" HorizontalAlignment="Left" />
         </StackPanel>
+        <TextBlock Grid.Row="25" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center">Minimum IV</TextBlock>
+        <TextBox  Grid.Row="25" Grid.Column="3" HorizontalAlignment="Left" Text="{Binding MinimumIV, Mode=TwoWay}" Width="100" PreviewTextInput="NumberValidationTextBox" />
 
-        <Button Grid.Row="25" Grid.Column="3"  Command="{Binding SaveCommand}">Save Settings</Button>
+        <Button Grid.Row="27" Grid.Column="3"  Command="{Binding SaveCommand}">Save Settings</Button>
 
     </Grid>
 </UserControl>

PogoLocationFeeder/Client/Filter.cs

@@ -27,6 +27,7 @@ public class Filter
         public bool VerifiedOnly { get; set; }
         public string Version { get; set; }
         public LatLngBounds AreaBounds;
+        public double MinimumIV { get; set; } = 0.0;
     }
 
     public class Channel

PogoLocationFeeder/Client/FilterFactory.cs

@@ -77,6 +77,7 @@ public static Filter Create(List<DiscordChannels> discordChannels = null)
             filter.VerifiedOnly = GlobalSettings.VerifiedOnly;
             filter.Version = Assembly.GetExecutingAssembly().GetName().Version.ToString();
             filter.AreaBounds = GlobalSettings.UseGeoLocationBoundsFilter ? GlobalSettings.GeoLocationBounds : null;
+            filter.MinimumIV = GlobalSettings.MinimumIV;
             return filter;
         }
     }

PogoLocationFeeder/Config/Settings.cs

@@ -49,6 +49,7 @@ public class GlobalSettings
         public static bool UsePokeSnipe = true;
         public static bool UseFilter = true;
         public static bool UseGeoLocationBoundsFilter = false;
+        public static double MinimumIV = 0.0;
         public static LatLngBounds GeoLocationBounds = new LatLngBounds(new GeoCoordinates(40.71461026176555, -74.033173578125), new GeoCoordinates(40.750381950874413, -73.981846826416017));
         public static string AppTheme = "Dark";
         public static bool IsServer = false;
@@ -110,6 +111,7 @@ public static GlobalSettings Load()
                 ShareBotCaptures = set.ShareBotCaptures;
                 BotWebSocketPorts = set.BotWebSocketPorts;
                 VerifiedOnly = set.VerifiedOnly;
+                MinimumIV = set.MinimumIV;
             }
             else
             {
@@ -269,6 +271,9 @@ public class SettingsToSave
         [DefaultValue(true)]
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
         public bool VerifiedOnly = GlobalSettings.VerifiedOnly;
+        [DefaultValue(0.0)]
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        public double MinimumIV = GlobalSettings.MinimumIV;
 
     }
 }

PogoLocationFeeder/Helper/SniperInfoFilter.cs

@@ -16,12 +16,12 @@ internal static List<SniperInfo> FilterUnmanaged(List<SniperInfo> sniperInfos, F
             var pokemonIds = PokemonFilterParser.ParseBinary(filter.Pokemon);
             var channels = filter.Channels;
             var areaBounds = filter.AreaBounds;
-
+            var minimumIV = filter.MinimumIV;
             return sniperInfos.Where(
-                s => Matches(s, pokemonIds, verifiedOnly, channels, areaBounds)).ToList();
+                s => Matches(s, pokemonIds, verifiedOnly, channels, areaBounds, minimumIV)).ToList();
         }
 
-        private static bool Matches(SniperInfo sniperInfo, List<PokemonId> pokemonIds,  bool verifiedOnly, List<Channel> channels, LatLngBounds areaBounds ) 
+        private static bool Matches(SniperInfo sniperInfo, List<PokemonId> pokemonIds,  bool verifiedOnly, List<Channel> channels, LatLngBounds areaBounds, double minimumIV ) 
         {
             if (!pokemonIds.Contains(sniperInfo.Id))
             {
@@ -43,6 +43,11 @@ private static bool Matches(SniperInfo sniperInfo, List<PokemonId> pokemonIds,
                 Log.Trace($"Skipped {sniperInfo} because the lat & long isn't the areabounds {areaBounds}");
                 return false;
             }
+            if (minimumIV > sniperInfo.IV)
+            {
+                Log.Trace($"Skipped {sniperInfo} because the IV was lower than {minimumIV}");
+                return false;
+            }
             return true;
         }
 

PogoLocationFeeder/Server/PogoServer.cs

@@ -36,8 +36,7 @@ public class PogoServer
         private WebSocketServer _webSocketServer;
         private readonly SniperInfoRepository _serverRepository;
         private readonly SniperInfoRepositoryManager _sniperInfoRepositoryManager;
-        private List<PokemonId> _pokemonIds;
-
+        private ServerUploadFilter _serverUploadFilter;
         public PogoServer()
         {
             _serverRepository = new SniperInfoRepository();
@@ -59,10 +58,13 @@ public void Start()
             _webSocketServer.NewMessageReceived += new SessionHandler<WebSocketSession, string>(socketServer_NewMessageReceived);
             _webSocketServer.NewSessionConnected += socketServer_NewSessionConnected;
             _webSocketServer.SessionClosed += socketServer_SessionClosed;
-            _pokemonIds = GlobalSettings.UseFilter
-                ? PokemonParser.ParsePokemons(new List<string>(GlobalSettings.PokekomsToFeedFilter))
-                : Enum.GetValues(typeof(PokemonId)).Cast<PokemonId>().ToList();
+
             UpdateTitle();
+            var pokemonIds = GlobalSettings.UseFilter
+? PokemonParser.ParsePokemons(new List<string>(GlobalSettings.PokekomsToFeedFilter))
+: Enum.GetValues(typeof(PokemonId)).Cast<PokemonId>().ToList();
+            _serverUploadFilter = ServerUploadFilterFactory.Create(pokemonIds);
+
         }
 
         private void UpdateTitle()
@@ -73,7 +75,7 @@ private void UpdateTitle()
 
         private void socketServer_NewSessionConnected(WebSocketSession session)
         {
-            var uploadFilter = JsonConvert.SerializeObject(ServerUploadFilterFactory.Create(_pokemonIds));
+            var uploadFilter = JsonConvert.SerializeObject(_serverUploadFilter);
             session.Send($"{GetEpoch()}:Hello Darkness my old friend.:{uploadFilter}");
             Log.Info($"[{_webSocketServer.SessionCount}:{session.SessionID}] Session started");
             UpdateTitle();
@@ -99,10 +101,14 @@ private void socketServer_NewMessageReceived(WebSocketSession session, string va
                     {
                         foreach (SniperInfo sniperInfo in sniperInfos)
                         {
-                            if (_pokemonIds == null || _pokemonIds.Contains(sniperInfo.Id))
+                            if (_serverUploadFilter.Matches(sniperInfo))
                             {
                                 OnReceivedViaClients(sniperInfo);
                             }
+                            else
+                            {
+                                Log.Trace($"Not allowing upload of {sniperInfo} but it doesn't match the upload filter");
+                            }
                         }
                     }
                 }

PogoLocationFeeder/Server/ServerUploadFilter.cs

@@ -30,15 +30,24 @@ public class ServerUploadFilter
     {
         public string Pokemon { get; set; }
         public LatLngBounds AreaBounds { get; set; }
+        public double MinimumIV { get; set; } = 0.0;
 
         public bool Matches(SniperInfo sniperInfo)
         {
             var pokemonIds = PokemonFilterParser.ParseBinary(Pokemon);
-            if (pokemonIds == null || pokemonIds.Contains(sniperInfo.Id))
+            if (pokemonIds != null && !pokemonIds.Contains(sniperInfo.Id))
             {
-                return AreaBounds == null || AreaBounds.Intersects(sniperInfo.Latitude, sniperInfo.Longitude);
+                return false;
             }
-            return false;
+            if (AreaBounds != null && !AreaBounds.Intersects(sniperInfo.Latitude, sniperInfo.Longitude))
+            {
+                return false;
+            }
+            if (MinimumIV > sniperInfo.IV)
+            {
+                return false;
+            }
+            return true;
         }
     }
 }

PogoLocationFeeder/Server/ServerUploadFilterFactory.cs

@@ -32,7 +32,7 @@ public static ServerUploadFilter Create(List<PokemonId> pokemon)
 
             serverUploadFilter.Pokemon = pokemonsBinary;
             serverUploadFilter.AreaBounds = GlobalSettings.UseGeoLocationBoundsFilter ? GlobalSettings.GeoLocationBounds : null;
-
+            serverUploadFilter.MinimumIV = GlobalSettings.MinimumIV;
             return serverUploadFilter;
         }
     }