Merge c96c925 into 9cca493

marcokreeft87 · Jan 1, 2023 · ff48485 · ff48485
2 parents 9cca493 + c96c925
commit ff48485
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/formulaone-card.js b/formulaone-card.js
diff --git a/formulaone-card.js.gz b/formulaone-card.js.gz
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "formulaone-card",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Frontend card for hass-formulaoneapi",
   "main": "index.js",
   "scripts": {

diff --git a/src/utils.ts b/src/utils.ts
@@ -22,6 +22,14 @@ export const getCountryFlagByNationality = (nationality: string) => {
 }
 
 export const getCountryFlagByName = (countryName: string) => {
+    const exceptions = [{ countryCode: 'USA', corrected: 'United States of America'}, { countryCode: 'UAE', corrected: 'United Arab Emirates'}];
+
+    const exception = exceptions.filter(exception => exception.countryCode == countryName);
+    if(exception.length > 0)
+    {
+        countryName = exception[0].corrected;
+    }
+
     const country = countries.filter(x => x.Country === countryName)[0];
 
     return getCountryFlagUrl(country.Code);

diff --git a/tests/utils/getCountryFlagUrl.test.ts b/tests/utils/getCountryFlagUrl.test.ts
@@ -12,6 +12,12 @@ describe('Testing util file function getCountryFlagUrl', () => {
     test('Passing UAE should return expected flag url', () => {         
         expect(getCountryFlagUrl('UAE')).toBe('https://flagcdn.com/w40/ae.png')
     }),
+    test('Passing USA should return expected flag url', () => {         
+        expect(getCountryFlagByName('USA')).toBe('https://flagcdn.com/w40/us.png')
+    }),
+    test('Passing UAE should return expected flag url', () => {         
+        expect(getCountryFlagByName('UAE')).toBe('https://flagcdn.com/w40/ae.png')
+    }),
     test('Passing Saudi Arabia should return expected flag url', () => {         
         expect(getCountryFlagUrl('Saudi-Arabia')).toBe('https://flagcdn.com/w40/saudi-arabia.png')
     })