diff --git a/__pycache__/iconSelector.cpython-311.pyc b/__pycache__/iconSelector.cpython-311.pyc index 2492939..e4fdbc7 100644 Binary files a/__pycache__/iconSelector.cpython-311.pyc and b/__pycache__/iconSelector.cpython-311.pyc differ diff --git a/iconSelector.py b/iconSelector.py index afe5311..2ae753e 100644 --- a/iconSelector.py +++ b/iconSelector.py @@ -1,4 +1,4 @@ -adjectives = ["severe", "scattered", "partly", "mostly"] +adjectives = ["severe", "scattered", "partly", "mostly", "light", "heavy"] clearWords = ["clear", "sunny"] rainWords = ["rain", "showers"] fogWords = ["fog", "mist", "smoke"] diff --git a/weather.py b/weather.py index 97a0a8a..adbbac1 100644 --- a/weather.py +++ b/weather.py @@ -59,8 +59,14 @@ def tooltipPrinter(r_dict): condition = f"Current Condition: {info['textDescription']}" temp = f"Temp: {rounding(convertToF(info['temperature']['value']))} F" humidity = f"Humidity: {rounding(info['relativeHumidity']['value'])}%" - windSpeed = rounding(convertToMPH(info['windSpeed']['value'])) - windDirection = info['windDirection']['value'] + # If no windSpeed, NWS returns "None". + if (not info['windSpeed']['value']): + windSpeed = 0 + windDirection = 0 + else: + windSpeed = rounding(convertToMPH(info['windSpeed']['value'])) + windDirection = info['windDirection']['value'] + windData = f"Wind: {windSpeed} MPH, {convertCompass(windDirection)}, {windDirection} degrees" precipitation = f"Precipitation (3 Hrs.): {info['precipitationLast3Hours']['value']}" result = f"{stationName}\n{condition} \n{temp} \n{windData} \n{humidity} \n{precipitation}"