Fixed track layout image of Miami (#232)

package.json

@@ -1,6 +1,6 @@
 {
  "name": "formulaone-card",
- "version": "1.5.0",
+ "version": "1.5.1",
  "description": "Frontend card for Home Assistant to display Formula One data",
  "main": "index.js",
  "scripts": {

src/utils.ts

@@ -1,6 +1,6 @@
 import { html, HTMLTemplateResult, LitElement, PropertyValues } from "lit";
 import { FormulaOneCardConfig, FormulaOneCardType, LocalStorageItem, WeatherUnit } from "./types/formulaone-card-types";
-import { Constructor, Driver, Race, Root } from "./api/f1-models";
+import { Constructor, Driver, Race, Root, Location } from "./api/f1-models";
 import FormulaOneCard from ".";
 import { BaseCard } from "./cards/base-card";
 import { formatDateTimeRaceInfo } from "./lib/format_date_time";
@@ -75,7 +75,9 @@ export const getTeamImage = (card: BaseCard, teamName: string) => {
  return card.imageClient.GetImage(`${ImageConstants.TeamLogoCDN}/2023/${teamName.toLowerCase()}-logo.png.transform/2col-retina/image.png`);
 }
 
-export const getCircuitName = (circuitName: string) => {
+export const getCircuitName = (location: Location) => {
+
+ let circuitName = location.country.replace(" ","-")
  const exceptions = [{ countryDashed: 'UAE', name: 'Abu_Dhabi'}, { countryDashed: 'UK', name: 'Great_Britain'}, 
  { countryDashed: 'Monaco', name: 'Monoco'}, { countryDashed: 'Azerbaijan', name: 'Baku'}, { countryDashed: 'Saudi-Arabia', name: 'Saudi_Arabia'}];
 
@@ -85,6 +87,11 @@ export const getCircuitName = (circuitName: string) => {
  circuitName = exception[0].name; 
  }
 
+ if(location.country == 'USA' && location.locality != 'Austin')
+ {
+ circuitName = location.locality;
+ }
+
  return circuitName;
 }
 
@@ -111,8 +118,7 @@ export const clickHandler = (node: LitElement, config: FormulaOneCardConfig, has
 
 export const renderHeader = (card: BaseCard, race: Race, preventClick = false): HTMLTemplateResult => {
 
- const countryDashed = race.Circuit.Location.country.replace(" ","-")
- const circuitName = getCircuitName(countryDashed);
+ const circuitName = getCircuitName(race.Circuit.Location);
 
  const _handleAction = (ev: ActionHandlerEvent): void => {
  if (card.hass && card.config.actions && ev.detail.action && !preventClick) {

tests/utils/getCircuitName.test.ts

@@ -2,10 +2,20 @@ import { getCircuitName } from '../../src/utils';
 
 describe('Testing util file function getCircuitName', () => {
  test('Passing Japan should return expected circuit name', () => { 
- expect(getCircuitName('Japan')).toBe('Japan')
+ expect(getCircuitName({
+ country: 'Japan',
+ lat: '',
+ long: '',
+ locality: ''
+ })).toBe('Japan')
  }),
  test('Passing UAE should return expected circuit name', () => { 
- expect(getCircuitName('UAE')).toBe('Abu_Dhabi')
+ expect(getCircuitName({
+ country: 'UAE',
+ lat: '',
+ long: '',
+ locality: ''
+ })).toBe('Abu_Dhabi')
  })
 })
 

tests/utils/renderHeader.test.ts

@@ -130,5 +130,16 @@ describe('Testing util file function renderHeader', () => {
  const htmlResult = getRenderString(result);
 
  expect(htmlResult).toMatch(`<h2 class="formulaone-font"><img height="25" src="">&nbsp; 17 : Singapore Grand Prix</h2>`);
+ }),
+ test('Calling renderHeader with Miami with image not clickable', async () => { 
+ card.config.image_clickable = undefined;
+ card.config.hide_tracklayout = false;
+ lastRace.Circuit.Location.country = "USA";
+ lastRace.Circuit.Location.locality = "Miami";
+
+ const result = renderHeader(card, lastRace);
+ const htmlResult = getRenderString(result);
+
+ expect(htmlResult).toMatch(`<h2 class="formulaone-font"><img height="25" src="">&nbsp; 17 : Singapore Grand Prix</h2> <img width="100%" src="" @action=_handleAction .actionHandler= class=" clickable" /><br>`);
  })
 });