Don't apply talkgroup weight twice

Also tag ID fields

pkg/alerting/alerting.go

@@ -169,12 +169,9 @@ func (as *alerter) eval(ctx context.Context, now time.Time, testMode bool) ([]Al
 	for _, s := range as.scores {
 		origScore := s.Score
 		tgr, err := as.tgCache.TG(ctx, s.ID)
-		if err == nil {
-			if !tgr.Talkgroup.Alert {
+		if err == nil && !tgr.Talkgroup.Alert {
 			continue
 		}
-			s.Score *= float64(tgr.Talkgroup.Weight)
-		}
 
 		if s.Score > as.cfg.AlertThreshold || testMode {
 			if old, inCache := as.alertCache[s.ID]; !inCache || now.Sub(old.Timestamp) > as.renotify {

pkg/talkgroups/talkgroup.go

@@ -13,8 +13,8 @@ type Talkgroup struct {
 }
 
 type ID struct {
-	System    uint32
-	Talkgroup uint32
+	System    uint32 `json:"sys"`
+	Talkgroup uint32 `json:"tg"`
 }
 
 type IDs []ID