diff --git a/__pycache__/iconSelector.cpython-311.pyc b/__pycache__/iconSelector.cpython-311.pyc index a00097b..59bf320 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 d13231f..5e91216 100644 --- a/iconSelector.py +++ b/iconSelector.py @@ -1,9 +1,7 @@ -from pathlib import Path, PurePosixPath import os -# currentDirectory = os.getcwd() -# currentDirectory = "/home/nclanceman/tools/weather" -currentDirectory = PurePosixPath(Path.cwd()) +currentDirectory = os.getcwd() + adjectives = ["severe", "scattered", "partly", "mostly", "light", "heavy"] clearWords = ["clear", "sunny"] diff --git a/weather.py b/weather.py index 526e7e2..3526756 100644 --- a/weather.py +++ b/weather.py @@ -59,7 +59,7 @@ def tooltipPrinter(r_dict): # Print station name, temp, humidity, wind speed, wind direction stationName = f"Station Name: {info['stationName']}" condition = f"Current Condition: {info['textDescription']}" - temp = f"Temp: {rounding(convertToF(info['temperature']['value']))} F" + temp = f"Temp: {rounding(convertToF(info['temperature']['value']))}\u00b0F" humidity = f"Humidity: {rounding(info['relativeHumidity']['value'])}%" # If no windSpeed, NWS returns "None". if (not info['windSpeed']['value']): @@ -69,17 +69,13 @@ def tooltipPrinter(r_dict): windSpeed = rounding(convertToMPH(info['windSpeed']['value'])) windDirection = info['windDirection']['value'] - windData = f"Wind: {windSpeed} MPH, {convertCompass(windDirection)}, {windDirection} degrees" + windData = f"Wind: {windSpeed} MPH, {convertCompass(windDirection)}, {windDirection}\u00b0" precipitation = f"Precipitation (3 Hrs.): {info['precipitationLast3Hours']['value']}" - result = f"{stationName}\n{condition} \n{temp} \n{windData} \n{humidity} \n{precipitation}" + result = f"{stationName}\n{condition}\n{temp}\ + \n{windData}\n{humidity}\n{precipitation}" return result -# Results at Hector Field - Fargo Int'l Airport -# request_addr = "https://api.weather.gov/stations/KFAR/observations/latest" -# Results at Dothan Regional Airport -# request_addr = "https://api.weather.gov/stations/KDHN/observations/latest" - request_addr = f"https://api.weather.gov/stations/{stationName}/observations/latest" @@ -105,5 +101,5 @@ else: weatherIcon = iconSelect.imageSelector(parsedCondition, timeOfDay) # print(f" \u2601 {condition}, {roundedTemp} F") print( - f"{weatherIcon} {roundedTemp}F") + f"{weatherIcon}{roundedTemp}\u00b0F") print(tooltipPrinter(request_json))