mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-16 10:37:26 -05:00
Adds logging/warning when alias list contains talkgroups or talkgroup (#511)
range collisions or overlaps.
This commit is contained in:
@@ -505,11 +505,32 @@ public class AliasList implements Listener<AliasEvent>
|
|||||||
|
|
||||||
public void add(Talkgroup talkgroup, Alias alias)
|
public void add(Talkgroup talkgroup, Alias alias)
|
||||||
{
|
{
|
||||||
|
//Detect talkgroup collisions
|
||||||
|
if(mTalkgroupAliasMap.containsKey(talkgroup.getValue()))
|
||||||
|
{
|
||||||
|
Alias existing = mTalkgroupAliasMap.get(talkgroup.getValue());
|
||||||
|
|
||||||
|
mLog.warn("Alias [" + alias.getName() + "] talkgroup [" + talkgroup.getValue() +
|
||||||
|
"] has the same talkgroup value as alias [" + existing.getName() +
|
||||||
|
"] - alias [" + alias.getName() + "] will be used for alias list [" + getName() + "]");
|
||||||
|
}
|
||||||
|
|
||||||
mTalkgroupAliasMap.put(talkgroup.getValue(), alias);
|
mTalkgroupAliasMap.put(talkgroup.getValue(), alias);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void add(TalkgroupRange talkgroupRange, Alias alias)
|
public void add(TalkgroupRange talkgroupRange, Alias alias)
|
||||||
{
|
{
|
||||||
|
//Log warning if the new talkgroup range overlaps with any existing ranges
|
||||||
|
for(Map.Entry<TalkgroupRange,Alias> entry: mTalkgroupRangeAliasMap.entrySet())
|
||||||
|
{
|
||||||
|
if(talkgroupRange.overlaps(entry.getKey()))
|
||||||
|
{
|
||||||
|
mLog.warn("Alias [" + alias.getName() + "] with talkgroup range [" + talkgroupRange.toString() +
|
||||||
|
"] overlaps with alias [" + entry.getValue().getName() +
|
||||||
|
"] with talkgroup range [" + entry.getKey().toString() + "] for alias list [" + getName() + "]");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
mTalkgroupRangeAliasMap.put(talkgroupRange, alias);
|
mTalkgroupRangeAliasMap.put(talkgroupRange, alias);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -140,6 +140,21 @@ public class TalkgroupRange extends AliasID
|
|||||||
return getMinTalkgroup() <= talkgroupValue && talkgroupValue <= getMaxTalkgroup();
|
return getMinTalkgroup() <= talkgroupValue && talkgroupValue <= getMaxTalkgroup();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Indicates if this talkgroup range overlaps the talkgroup range argument.
|
||||||
|
* @param talkgroupRange to check for overlap
|
||||||
|
* @return true if the ranges overlap
|
||||||
|
*/
|
||||||
|
public boolean overlaps(TalkgroupRange talkgroupRange)
|
||||||
|
{
|
||||||
|
return contains(talkgroupRange.getMinTalkgroup()) ||
|
||||||
|
contains(talkgroupRange.getMaxTalkgroup()) ||
|
||||||
|
(getMinTalkgroup() < talkgroupRange.getMinTalkgroup() &&
|
||||||
|
talkgroupRange.getMaxTalkgroup() < getMaxTalkgroup()) ||
|
||||||
|
(talkgroupRange.getMinTalkgroup() < getMinTalkgroup() &&
|
||||||
|
getMaxTalkgroup() < talkgroupRange.getMaxTalkgroup());
|
||||||
|
}
|
||||||
|
|
||||||
@JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
|
@JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
|
||||||
@Override
|
@Override
|
||||||
public AliasIDType getType()
|
public AliasIDType getType()
|
||||||
|
|||||||
Reference in New Issue
Block a user