feat: New badges in cluster view for new Counties and new POTA

cmd/cntygen/main.go

@@ -25,8 +25,24 @@ func dxccForState(st string) int {
 	}
 }
 
-// territories we exclude — USA-CA is the 50 states (+ DC).
-var skipState = map[string]bool{"PR": true, "GU": true, "VI": true, "AS": true, "MP": true, "NA": true}
+// territories we exclude entirely — plus DC, which USA-CA does not count as a
+// county.
+var skipState = map[string]bool{"PR": true, "GU": true, "VI": true, "AS": true, "MP": true, "NA": true, "DC": true}
+
+// excludedUSACA reports county-equivalents that the CQ USA-CA award does NOT
+// count as counties: the independent cities of Virginia and Carson City (NV).
+// (Baltimore MD and St. Louis MO ARE counted, so they are kept.) A contact in
+// one of these counts toward a bordering county under the award rules.
+func excludedUSACA(state, name string) bool {
+	n := strings.ToLower(strings.TrimSpace(name))
+	switch state {
+	case "VA":
+		return strings.HasSuffix(n, " city")
+	case "NV":
+		return n == "carson city"
+	}
+	return false
+}
 
 func main() {
 	f, err := os.Open(os.Args[1])
@@ -51,6 +67,9 @@ func main() {
 		if skipState[st] || len(st) != 2 || strings.EqualFold(name, "UNITED STATES") {
 			continue
 		}
+		if excludedUSACA(st, name) {
+			continue
+		}
 		// State header rows have an all-caps state NAME and state code "NA"
 		// (already skipped). County rows have a 2-letter state code.
 		code := award.USCountyKey(st, name)