Country bug fix relating to additional keywords

RandomHashTags · Nov 4, 2022 · 2c89f5b · 2c89f5b
1 parent 001bab4
commit 2c89f5b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/Sources/SwiftSovereignStates/Country.swift b/Sources/SwiftSovereignStates/Country.swift
@@ -318,11 +318,11 @@ public enum Country : String, CaseIterable, SovereignState {
     }
 
     public func getAdditionalKeywords() -> [String]? {
-        var keywords:[String] = [String]()
+        var keywords:[String] = getSovereignStateAdditionalKeywords() ?? [String]()
         if let parentISOAlpha2:String = getISOAlpha2ParentGroup() {
             keywords.append(parentISOAlpha2)
         }
-        return keywords
+        return keywords.isEmpty ? nil : keywords
     }
 
     public func getWikipediaURL() -> String {

diff --git a/Sources/SwiftSovereignStates/SovereignState.swift b/Sources/SwiftSovereignStates/SovereignState.swift
@@ -14,14 +14,17 @@ public protocol SovereignState : SovereignRegion {
     func getISOAlpha3() -> String?
 }
 public extension SovereignState {
-    func getAdditionalKeywords() -> [String]? {
+    func getSovereignStateAdditionalKeywords() -> [String]? {
         var keywords:[String] = [String]()
         if let isoAlpha2:String = getISOAlpha2() {
             keywords.append(isoAlpha2)
         }
         if let isoAlpha3:String = getISOAlpha3() {
             keywords.append(isoAlpha3)
         }
-        return keywords
+        return keywords.isEmpty ? nil : keywords
+    }
+    func getAdditionalKeywords() -> [String]? {
+        return getSovereignStateAdditionalKeywords()
     }
 }
diff --git a/Tests/SwiftSovereignStatesTests/SwiftSovereignStates.swift b/Tests/SwiftSovereignStatesTests/SwiftSovereignStates.swift
@@ -247,6 +247,8 @@ final class SwiftSovereignStatesTests: XCTestCase {
             print("SwiftSovereignStatesTests;testCountryMentions;shouldn't be=[" + notMentioned.map({ $0.getIdentifier() }).joined(separator: ",") + "]")
         }
         XCTAssert(mentioned.count == targetCountries.count)
+
+        XCTAssert(Country.valueOf("USA") != nil)
     }
     private func testSubdivisionMentions() {
         let targetSubdivisions:[any SovereignStateSubdivision] = [SubdivisionsMexico.baja_california, SubdivisionsUnitedStates.california]