#1188 Add support for P25 fully qualified radio and talkgroup identifiers to aliases and alias lists. Resolve issue with ESN alias lookups.

src/main/java/io/github/dsheirer/alias/id/AliasID.java

@@ -35,11 +35,13 @@ import io.github.dsheirer.alias.id.legacy.talkgroup.LegacyTalkgroupID;
 import io.github.dsheirer.alias.id.legacy.uniqueID.UniqueID;
 import io.github.dsheirer.alias.id.lojack.LoJackFunctionAndID;
 import io.github.dsheirer.alias.id.priority.Priority;
+import io.github.dsheirer.alias.id.radio.P25FullyQualifiedRadio;
 import io.github.dsheirer.alias.id.radio.Radio;
 import io.github.dsheirer.alias.id.radio.RadioRange;
 import io.github.dsheirer.alias.id.record.Record;
 import io.github.dsheirer.alias.id.status.UnitStatusID;
 import io.github.dsheirer.alias.id.status.UserStatusID;
+import io.github.dsheirer.alias.id.talkgroup.P25FullyQualifiedTalkgroup;
 import io.github.dsheirer.alias.id.talkgroup.Talkgroup;
 import io.github.dsheirer.alias.id.talkgroup.TalkgroupRange;
 import io.github.dsheirer.alias.id.tone.TonesID;
@@ -61,6 +63,8 @@ import javafx.util.Callback;
     @JsonSubTypes.Type(value = Min.class, name = "min"),
     @JsonSubTypes.Type(value = MPT1327ID.class, name = "mpt1327ID"),
     @JsonSubTypes.Type(value = NonRecordable.class, name = "nonRecordable"),
+    @JsonSubTypes.Type(value = P25FullyQualifiedRadio.class, name = "p25FullyQualifiedRadio"),
+    @JsonSubTypes.Type(value = P25FullyQualifiedTalkgroup.class, name = "p25FullyQualifiedTalkgroup"),
     @JsonSubTypes.Type(value = Priority.class, name = "priority"),
     @JsonSubTypes.Type(value = Radio.class, name = "radio"),
     @JsonSubTypes.Type(value = RadioRange.class, name = "radioRange"),

src/main/java/io/github/dsheirer/alias/id/AliasIDType.java

@@ -29,6 +29,8 @@ public enum AliasIDType
     LOJACK("LoJack"),
     LTR_NET_UID("LTR-Net UID"),
     MIN("Passport MIN"),
+    P25_FULLY_QUALIFIED_RADIO_ID("P25 Fully Qualified Radio ID"),
+    P25_FULLY_QUALIFIED_TALKGROUP("P25 Fully Qualified Talkgroup"),
     PRIORITY("Audio Priority"),
     RADIO_ID("Radio ID"),
     RADIO_ID_RANGE("Radio ID Range"),
@@ -56,7 +58,7 @@ public enum AliasIDType
 
     //Values used by the View-By alias editor
     public static EnumSet<AliasIDType> VIEW_BY_VALUES = EnumSet.of(TALKGROUP, TALKGROUP_RANGE, RADIO_ID, RADIO_ID_RANGE,
-        UNIT_STATUS, STATUS, TONES);
+        P25_FULLY_QUALIFIED_RADIO_ID, P25_FULLY_QUALIFIED_TALKGROUP, UNIT_STATUS, STATUS, TONES);
 
     public String toString()
     {

src/main/java/io/github/dsheirer/alias/id/radio/P25FullyQualifiedRadio.java

@@ -0,0 +1,127 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.alias.id.radio;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import io.github.dsheirer.alias.id.AliasIDType;
+import io.github.dsheirer.protocol.Protocol;
+
+/**
+ * Fully qualified radio.  Note: this is only for P25.
+ */
+public class P25FullyQualifiedRadio extends Radio
+{
+    private int mWacn;
+    private int mSystem;
+
+    public P25FullyQualifiedRadio()
+    {
+        //No-arg JAXB constructor
+    }
+
+    /**
+     * Constructs an instance
+     * @param wacn for the radio
+     * @param system for the radio
+     * @param id for the radio
+     */
+    public P25FullyQualifiedRadio(int wacn, int system, int id)
+    {
+        super(Protocol.APCO25, id);
+        mWacn = wacn;
+        mSystem = system;
+    }
+
+    @Override
+    public AliasIDType getType()
+    {
+        return AliasIDType.P25_FULLY_QUALIFIED_RADIO_ID;
+    }
+
+    /**
+     * WACN for this radio
+     * @return wacn
+     */
+    @JacksonXmlProperty(isAttribute = true, localName = "wacn")
+    public int getWacn()
+    {
+        return mWacn;
+    }
+
+    /**
+     * Sets the WACN for this radio
+     * @param wacn for this radio
+     */
+    public void setWacn(int wacn)
+    {
+        mWacn = wacn;
+    }
+
+    /**
+     * System for this radio
+     * @return system
+     */
+    @JacksonXmlProperty(isAttribute = true, localName = "system")
+    public int getSystem()
+    {
+        return mSystem;
+    }
+
+    /**
+     * Sets the system for this radio
+     * @param system for this radio
+     */
+    public void setSystem(int system)
+    {
+        mSystem = system;
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("Fully Qualified Radio ID:").append(getWacn());
+        sb.append(".").append(getSystem());
+        sb.append(".").append(getValue());
+        sb.append(" Protocol:").append((getProtocol()));
+
+        if(!isValid())
+        {
+            sb.append(" **NOT VALID**");
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * Hashable string key for use in a lookup map
+     */
+    @JsonIgnore
+    public String getHashKey()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getWacn());
+        sb.append(".").append(getSystem());
+        sb.append(".").append(getValue());
+        return sb.toString();
+    }
+}

src/main/java/io/github/dsheirer/alias/id/talkgroup/P25FullyQualifiedTalkgroup.java

@@ -0,0 +1,128 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.alias.id.talkgroup;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import io.github.dsheirer.alias.id.AliasIDType;
+import io.github.dsheirer.protocol.Protocol;
+
+/**
+ * Fully qualified talkgroup.  Note: this is only for P25.
+ */
+public class P25FullyQualifiedTalkgroup extends Talkgroup
+{
+    private int mWacn;
+    private int mSystem;
+
+    public P25FullyQualifiedTalkgroup()
+    {
+        //No-arg JAXB constructor
+    }
+
+    /**
+     * Constructs an instance
+     * @param wacn for the radio
+     * @param system for the radio
+     * @param talkgroup value
+     */
+    public P25FullyQualifiedTalkgroup(int wacn, int system, int talkgroup)
+    {
+        super(Protocol.APCO25, talkgroup);
+        mWacn = wacn;
+        mSystem = system;
+    }
+
+    @Override
+    public AliasIDType getType()
+    {
+        return AliasIDType.P25_FULLY_QUALIFIED_TALKGROUP;
+    }
+
+    /**
+     * WACN for this radio
+     * @return wacn
+     */
+    @JacksonXmlProperty(isAttribute = true, localName = "wacn")
+    public int getWacn()
+    {
+        return mWacn;
+    }
+
+    /**
+     * Sets the WACN for this radio
+     * @param wacn for this radio
+     */
+    public void setWacn(int wacn)
+    {
+        mWacn = wacn;
+    }
+
+    /**
+     * System for this radio
+     * @return system
+     */
+    @JacksonXmlProperty(isAttribute = true, localName = "system")
+    public int getSystem()
+    {
+        return mSystem;
+    }
+
+    /**
+     * Sets the system for this radio
+     * @param system for this radio
+     */
+    public void setSystem(int system)
+    {
+        mSystem = system;
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("Fully Qualified Radio ID:").append(getWacn());
+        sb.append(".").append(getSystem());
+        sb.append(".").append(getValue());
+        sb.append(" Protocol:").append((getProtocol()));
+
+        if(!isValid())
+        {
+            sb.append(" **NOT VALID**");
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * Hashable string key for use in a lookup map
+     * @return
+     */
+    @JsonIgnore
+    public String getHashKey()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getWacn());
+        sb.append(".").append(getSystem());
+        sb.append(".").append(getValue());
+        return sb.toString();
+    }
+}