GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 01:27:34 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#1983 Reverts aliasing of fully qualified identifiers against locally assign ID or address values - must be an exact match to the fully qualified identifier. (#1984)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2024-09-18 03:51:47 -04:00
committed by GitHub
parent 6f05db723f
commit 9474d53a93
2 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/io/github/dsheirer/alias/AliasList.java
View File

@@ -663,18 +663,13 @@ public class AliasList
public Alias getAlias(TalkgroupIdentifier identifier) public Alias getAlias(TalkgroupIdentifier identifier)
{ {
//Attempt to do a fully qualified identifier match first. //Attempt to do a fully qualified identifier match only
if(identifier instanceof FullyQualifiedTalkgroupIdentifier fqti) if(identifier instanceof FullyQualifiedTalkgroupIdentifier fqti)
{ {
Alias fullyQualifiedAlias = mFullyQualifiedTalkgroupAliasMap.get(fqti.getFullyQualifiedTalkgroupAddress()); return mFullyQualifiedTalkgroupAliasMap.get(fqti.getFullyQualifiedTalkgroupAddress());
if(fullyQualifiedAlias != null)
{
return fullyQualifiedAlias;
}
} }
//Next, attempt to match against the locally assigned (temporary) address //Attempt to match the talkgroup value
int value = identifier.getValue(); int value = identifier.getValue();
Alias mapValue = mTalkgroupAliasMap.get(value); Alias mapValue = mTalkgroupAliasMap.get(value);
@@ -683,7 +678,7 @@ public class AliasList
return mapValue; return mapValue;
} }
//Finally, match the locally assigned address against any talkgroup ranges //Alternatively, match the talkgroup to any talkgroup ranges
for(Map.Entry<TalkgroupRange, Alias> entry : mTalkgroupRangeAliasMap.entrySet()) for(Map.Entry<TalkgroupRange, Alias> entry : mTalkgroupRangeAliasMap.entrySet())
{ {
if(entry.getKey().contains(value)) if(entry.getKey().contains(value))
@@ -788,18 +783,13 @@ public class AliasList
public Alias getAlias(RadioIdentifier identifier) public Alias getAlias(RadioIdentifier identifier)
{ {
//Attempt to do a fully qualified identifier match first. //Match fully qualified identifier only.
if(identifier instanceof FullyQualifiedRadioIdentifier fqri) if(identifier instanceof FullyQualifiedRadioIdentifier fqri)
{ {
Alias fullyQualifiedRadioAlias = mFullyQualifiedRadioAliasMap.get(fqri.getFullyQualifiedRadioAddress()); return mFullyQualifiedRadioAliasMap.get(fqri.getFullyQualifiedRadioAddress());
if(fullyQualifiedRadioAlias != null)
{
return fullyQualifiedRadioAlias;
}
} }
//Next, attempt to match against the locally assigned (temporary) address //Attempt to match against the radio identifier
int value = identifier.getValue(); int value = identifier.getValue();
Alias mapValue = mRadioAliasMap.get(value); Alias mapValue = mRadioAliasMap.get(value);
@@ -808,7 +798,7 @@ public class AliasList
return mapValue; return mapValue;
} }
//Finally, attempt to match the locally assigned (temporary) address against any radio ranges. //Alternatively, attempt to match the radio address against any radio ranges.
for(Map.Entry<RadioRange, Alias> entry : mRadioRangeAliasMap.entrySet()) for(Map.Entry<RadioRange, Alias> entry : mRadioRangeAliasMap.entrySet())
{ {
if(entry.getKey().contains(value)) if(entry.getKey().contains(value))

12
src/test/java/io/github/dsheirer/alias/P25AliasTest.java
View File

@@ -120,8 +120,7 @@ public class P25AliasTest
APCO25FullyQualifiedTalkgroupIdentifier p25FQTG1 = APCO25FullyQualifiedTalkgroupIdentifier.createTo(aliasGroup, wacn, system, originalGroup); APCO25FullyQualifiedTalkgroupIdentifier p25FQTG1 = APCO25FullyQualifiedTalkgroupIdentifier.createTo(aliasGroup, wacn, system, originalGroup);
List<Alias> aliases = aliasList.getAliases(p25FQTG1); List<Alias> aliases = aliasList.getAliases(p25FQTG1);
assertEquals(1, aliases.size(), "Expected 1 matching alias"); assertEquals(0, aliases.size(), "Expected 0 matching alias");
assertEquals(correctAliasName, aliases.getFirst().getName(), "Unexpected alias name");
} }
/** /**
@@ -148,8 +147,7 @@ public class P25AliasTest
APCO25FullyQualifiedTalkgroupIdentifier p25FQTG1 = APCO25FullyQualifiedTalkgroupIdentifier.createTo(aliasGroup, wacn, system, originalGroup); APCO25FullyQualifiedTalkgroupIdentifier p25FQTG1 = APCO25FullyQualifiedTalkgroupIdentifier.createTo(aliasGroup, wacn, system, originalGroup);
List<Alias> aliases = aliasList.getAliases(p25FQTG1); List<Alias> aliases = aliasList.getAliases(p25FQTG1);
assertEquals(1, aliases.size(), "Expected 1 matching alias"); assertEquals(0, aliases.size(), "Expected 0 matching aliases");
assertEquals(correctAliasName, aliases.getFirst().getName(), "Unexpected alias name");
} }
@Test @Test
@@ -233,8 +231,7 @@ public class P25AliasTest
APCO25FullyQualifiedRadioIdentifier p25FQTG1 = APCO25FullyQualifiedRadioIdentifier.createFrom(aliasRadio, wacn, system, originalRadio); APCO25FullyQualifiedRadioIdentifier p25FQTG1 = APCO25FullyQualifiedRadioIdentifier.createFrom(aliasRadio, wacn, system, originalRadio);
List<Alias> aliases = aliasList.getAliases(p25FQTG1); List<Alias> aliases = aliasList.getAliases(p25FQTG1);
assertEquals(1, aliases.size(), "Expected 1 matching alias"); assertEquals(0, aliases.size(), "Expected 0 matching aliases");
assertEquals(correctAliasName, aliases.getFirst().getName(), "Unexpected alias name");
} }
/** /**
@@ -261,7 +258,6 @@ public class P25AliasTest
APCO25FullyQualifiedRadioIdentifier p25FQTG1 = APCO25FullyQualifiedRadioIdentifier.createFrom(aliasRadio, wacn, system, originalRadio); APCO25FullyQualifiedRadioIdentifier p25FQTG1 = APCO25FullyQualifiedRadioIdentifier.createFrom(aliasRadio, wacn, system, originalRadio);
List<Alias> aliases = aliasList.getAliases(p25FQTG1); List<Alias> aliases = aliasList.getAliases(p25FQTG1);
assertEquals(1, aliases.size(), "Expected 1 matching alias"); assertEquals(0, aliases.size(), "Expected 0 matching aliases");
assertEquals(correctAliasName, aliases.getFirst().getName(), "Unexpected alias name");
} }
} }