phares3757/view-by-distance-mklink-console
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ignoreXMatches

Browse Source
This commit is contained in:
Mike Phares 2023-08-06 17:36:54 -07:00
parent d4cbea3835
commit 5130c76413
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Map/Models/MapLogic.cs
View File

@ -1371,17 +1371,16 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
public bool IsUsed(bool ignoreXMatches, int id, MappingFromLocation mappingFromLocation) public bool IsUsed(bool ignoreXMatches, int id, MappingFromLocation mappingFromLocation)
{ {
bool result; bool result;
ReadOnlyCollection<PersonContainer>? personContainers;
List<int>? wholePercentagesCollection; List<int>? wholePercentagesCollection;
ReadOnlyCollection<PersonContainer>? personContainers;
ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers; ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers;
result = _SkipCollection.TryGetValue(id, out wholePercentagesCollection) && wholePercentagesCollection.Contains(mappingFromLocation.WholePercentages); result = _SkipCollection.TryGetValue(id, out wholePercentagesCollection) && wholePercentagesCollection.Contains(mappingFromLocation.WholePercentages);
if (!result && _IdThenWholePercentagesToPersonContainers.TryGetValue(id, out wholePercentagesToPersonContainers)) if (!result && _IdThenWholePercentagesToPersonContainers.TryGetValue(id, out wholePercentagesToPersonContainers))
{ {
if (wholePercentagesToPersonContainers.TryGetValue(mappingFromLocation.WholePercentages, out personContainers)) if (wholePercentagesToPersonContainers.TryGetValue(mappingFromLocation.WholePercentages, out personContainers))
{ {
result = true; if (!ignoreXMatches || personContainers.All(l => l.ApproximateYears is null && l.DisplayDirectoryName.First() != 'X'))
// if (!ignoreXMatches || personContainers.All(l => l.ApproximateYears is null && l.DisplayDirectoryName.First() != 'X')) result = true;
// result = true;
} }
} }
return result; return result;

2
Shared/Models/Properties/IMapping.cs
View File

@ -1,5 +1,3 @@
using System.Collections.ObjectModel;
namespace View_by_Distance.Shared.Models.Properties; namespace View_by_Distance.Shared.Models.Properties;
public interface IMapping public interface IMapping