1 files changed, 48 insertions, 382 deletions

diff --git a/library.py b/library.py
index 0d490a1..5c17e96 100644
--- a/library.py
+++ b/library.py
@@ -2,59 +2,68 @@
 import datetime, requests, json, pytz, sys
 from geopy.geocoders import Nominatim, GeoNames
 
+weather_codes = {0:"Clear Sky", 1:"Mainly Clear",2:"Partly Cloudy",3:"Overcast",45:"Fog",48:"Fog",51:"Light Drizzle",\
+                 53:"Moderate Drizzle",55:"Dense Drizzle",56:"Light Freezing Drizzle",57:"Freezing Drizzle",\
+                 61:"Light Rain",63:"Moderate Rain",65:"Heavy Rain",66:"Light Freezing Rain",67:"Freezing Rain",\
+                 71:"Light Snowfall",73:"Moderate Snowfall",75:"Heavy Snowfall",77:"Snow Grains",80:"Slight Rain Showers",\
+                 81:"Moderate Rain Showers",82:"Heavy Rain Showers",85:"Slight Snow Showers",86:"Heavy Snow Showers",\
+                 95:"Thunderstorm",96:"Strong Thunderstrom",99:"Heavy Thunderstrom"}
+
+weather_icons = {0:('wi-day-sunny','wi-night-clear'), 1:('wi-day-sunny','wi-night-clear'), 2:('wi-cloudy','wi-night-partly-cloudy'),\
+                 3:('wi-day-sunny-overcast','wi-night-cloudy'), 45:('wi-day-fog','wi-night-fog'), 48:('wi-day-fog','wi-night-fog'), \
+                 51:('wi-day-rain','wi-night-rain'),53:('wi-day-rain','wi-night-rain'),55:('wi-day-rain','wi-night-rain'),\
+                 56:('wi-day-rain','wi-night-rain'),57:('wi-day-rain','wi-night-rain'),61:('wi-day-rain','wi-night-rain'),\
+                 63:('wi-day-rain','wi-night-rain'),65:('wi-day-rain','wi-night-rain'),66:('wi-day-rain','wi-night-rain'),\
+                 67:('wi-day-rain','wi-night-rain'),71:('wi-day-snow','wi-night-snow'),73:('wi-day-snow','wi-night-snow'),\
+                 71:('wi-day-snow','wi-night-snow'),75:('wi-day-snow','wi-night-snow'),77:('wi-day-snow','wi-night-snow'),\
+                 80:('wi-day-showers','wi-night-showers'),81:('wi-day-showers','wi-night-showers'),82:('wi-day-showers','wi-night-showers'),\
+                 85:('wi-day-snow','wi-night-snow'),86:('wi-day-snow','wi-night-snow'),95:('wi-day-storm-showers','wi-night-storm-showers'),\
+                 96:('wi-day-storm-showers','wi-night-storm-showers'),99:('wi-day-storm-showers','wi-night-storm-showers')}
+
 def get_lat_long(location):
     # Converts a location into latitude and longitude
-    geolocator = Nominatim(user_agent="pywttr")
-    location = geolocator.geocode(location)
-    return location.latitude, location.longitude
+    url = f"https://geocoding-api.open-meteo.com/v1/search?name={location}&count=1&language=en&format=json"
+    headers = {"User-Agent": "pywttr 0.1"}
+    data = requests.get(url, headers=headers).json()
+    latitude = data["results"][0]["latitude"]
+    longitude = data["results"][0]["longitude"]
+    return latitude, longitude
 
-def get_time_zone(latitude, longitude):
-    #TODO
-    pass
 
+def get_data(latitude, longitude):
+    headers = {"User-Agent": "pywttr 0.1"}
+    now = datetime.datetime.now()
+    now_str = now.strftime("%Y-%m-%d")
+    end_str = (now + datetime.timedelta(days=7)).strftime("%Y-%m-%d")
 
-def get_grid_data(latitude, longitude):
-    # Returns id,x,y for a given latitude and longitude
-    grid_data = json.loads(requests.get(f"https://api.weather.gov/points/{latitude},{longitude}").text)
-    grid_id = grid_data["properties"]["gridId"]
-    grid_x = grid_data["properties"]["gridX"]
-    grid_y = grid_data["properties"]["gridY"]
-    return {"grid_id": grid_id, "grid_x": grid_x, "grid_y":grid_y}
+    url_base = f"https://api.open-meteo.com/v1/forecast?latitude={latitude}&longitude={longitude}"
+    url_weather_params = "&current_weather=true&hourly=temperature_2m&hourly=relativehumidity_2m&hourly=apparent_temperature&hourly=precipitation_probability&hourly=precipitation&hourly=weathercode&hourly=windspeed_10m&hourly=winddirection_10m&daily=weathercode&daily=temperature_2m_max&daily=temperature_2m_min&daily=sunrise&daily=sunset&daily=precipitation_sum&daily=precipitation_probability_max&temperature_unit=fahrenheit&windspeed_unit=mph&precipitation_unit=inch&timeformat=iso8601&past_days=0&forecast_days=7"
+    url_date_time = f"&start_date={now_str}&end_date={end_str}&timezone=auto"
+    url = url_base + url_weather_params + url_date_time
+    data = requests.get(url, headers=headers).json()
 
+    for i in range(len(data["hourly"]["time"])):
+        data["hourly"]["time"][i] = datetime.datetime.strptime(data["hourly"]["time"][i], '%Y-%m-%dT%H:%M').strftime('%a %x %I:%M %p')
+    for i in range(len(data["daily"]["time"])):
+        data["daily"]["time"][i] = datetime.datetime.strptime(data["daily"]["time"][i], '%Y-%m-%d').strftime('%a %x')
+    for i in range(len(data["daily"]["sunrise"])):
+        data["daily"]["sunrise"][i] = datetime.datetime.strptime(data["daily"]["sunrise"][i], '%Y-%m-%dT%H:%M').strftime('%I:%M %p')
+    for i in range(len(data["daily"]["sunset"])):
+        data["daily"]["sunset"][i] = datetime.datetime.strptime(data["daily"]["sunset"][i], '%Y-%m-%dT%H:%M').strftime('%I:%M %p')
 
-def get_raw_data(grid_id, grid_x, grid_y):
-    headers = {"User-Agent": "pywttr 0.1"}
-    raw_data = json.loads(requests.get(f"https://api.weather.gov/gridpoints/{grid_id}/{grid_x},{grid_y}", headers=headers).text)
-    return raw_data
+    data["current_weather"]["time"] = datetime.datetime.strptime(data["current_weather"]["time"], '%Y-%m-%dT%H:%M').strftime('%a %x %I:%M %p')
 
-
-def get_raw_forecast(grid_id, grid_x, grid_y):
-    headers = {"User-Agent": "pywttr 0.1"}
-    raw_data = json.loads(requests.get(f"https://api.weather.gov/gridpoints/{grid_id}/{grid_x},{grid_y}/forecast", headers=headers).text)
-    return raw_data
+    return data
 
 
-def get_current_rounded_time():
+def get_current_rounded_time(tz_str):
     # Gets current time rounded down to the hour
-
-    tz = pytz.timezone("America/New_York") #temp
+    tz = pytz.timezone(tz_str)
     cur_time = datetime.datetime.now(tz=tz)
     cur_time_rounded = cur_time.replace(second=0, microsecond=0, minute=0, hour=cur_time.hour)
     return cur_time_rounded
 
 
-def set_timezone(values):
-    # Takes a list of weather data values
-    # and converts all times to proper timezone
-    
-    ret = []
-    tz = pytz.timezone("America/New_York") #temp
-    for val in values:
-        val["time"] = val["time"].astimezone(tz)
-        ret.append(val)
-    return ret
-
-
 def make_current(values):
     # Takes a list of weather data values 
     # and removes items from before the current time
@@ -67,349 +76,6 @@ def make_current(values):
     return ret
 
 
-def fill_gaps(values):
-    # Takes a list of weather data values 
-    # and fills gaps left by duration periods of longer
-    # than 1 hour
-    ret = []
-    for val in values:
-        ret.append(val)
-        duration_hours = int((val["duration"].seconds / 3600) + (val["duration"].days * 24))
-        if duration_hours > 1:
-            for i in range(1, duration_hours):
-                copy = val.copy()
-                copy["time"] = val["time"] + datetime.timedelta(hours=i)
-                copy["duration"] = datetime.timedelta(hours=1)
-                ret.append(copy)
-    return ret
-
-
-def normalize(values):
-    values = set_timezone(values)
-    values = make_current(values)
-    values = fill_gaps(values)
-    return values
-
-
-def celcius_to_fahrenheit(celcius):
-    fahrenheit = int(celcius * 9/5 + 32)
-    return fahrenheit
-
-    
-def parse_duration(duration_str):
-    #Parses time duration string and returns timedelta
-
-    duration_str = duration_str[1:] # strip off leading P
-    period_str, time_str = duration_str.split('T')
-    if len(period_str) > 0:
-        days = int(period_str[0])
-    else:
-        days = 0
-    hours = int(time_str[0:len(time_str)-1])
-    delta = datetime.timedelta(hours=hours, days=days)
-    return delta
-
-
-def get_daily_highs(raw_data):
-    daily_highs_raw = raw_data["properties"]["maxTemperature"]["values"]
-
-    daily_highs = []
-
-    for high in daily_highs_raw:
-        high_celc = high["value"]
-        high_fahr = celcius_to_fahrenheit(high_celc)
-
-        time_str, duration_str = high["validTime"].split('/')
-        time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
-        duration = parse_duration(duration_str)
-        daily_highs.append({"time":time,"duration":duration,"high_celc":high_celc,"high_fahr":high_fahr})
-
-    return daily_highs
-
-
-def get_daily_lows(raw_data):
-    daily_lows_raw = raw_data["properties"]["minTemperature"]["values"]
-
-    daily_lows = []
-
-    for low in daily_lows_raw:
-        low_celc = low["value"]
-        low_fahr = celcius_to_fahrenheit(low_celc)
-        time_str, duration_str = low["validTime"].split('/')
-        time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
-        duration = parse_duration(duration_str)
-        daily_lows.append({"time":time,"duration":duration,"low_celc":low_celc,"low_fahr":low_fahr})
-
-    return daily_lows
-
-
-def get_daily_forecast(raw_data):
-    daily_forecast_raw = raw_data["properties"]["periods"]
-
-    daily_forecast = []
-    for point in daily_forecast_raw:
-        time_str = point["startTime"]
-        time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
-        daily_forecast.append({"time":time, "short_forecast":point["shortForecast"], "detailed_forecast":point["detailedForecast"]})
-    return make_current(set_timezone(daily_forecast))
-    
-
-def get_temperature(raw_data):
-    raw_values = raw_data["properties"]["temperature"]["values"]
-    ret = []
-
-    for val in raw_values:
-        val_celc = round(val["value"])
-        val_fahr = round(celcius_to_fahrenheit(val_celc))
-        time_str, duration_str = val["validTime"].split('/')
-        time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
-        duration = parse_duration(duration_str)
-        ret.append({"time":time,"duration":duration,"value_celc":val_celc,"value_fahr":val_fahr})
-
-    return normalize(ret)
-
-
-def get_apparent_temperature(raw_data):
-    raw_values = raw_data["properties"]["apparentTemperature"]["values"]
-    ret = []
-    
-
-    for val in raw_values:
-        val_celc = round(val["value"])
-        val_fahr = round(celcius_to_fahrenheit(val_celc))
-        time_str, duration_str = val["validTime"].split('/')
-        time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
-        duration = parse_duration(duration_str)
-        ret.append({"time":time,"duration":duration,"value_celc":val_celc,"value_fahr":val_far})
-
-    return normalize(ret)
-
-
-def get_humidity(raw_data):
-    raw_values = raw_data["properties"]["relativeHumidity"]["values"]
-    ret = []
-
-    for val in raw_values:
-        time_str, duration_str = val["validTime"].split('/')
-        time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
-        duration = parse_duration(duration_str)
-        ret.append({"time":time,"duration":duration,"value":round(val["value"])})
-
-    return normalize(ret)
-
-
-def get_wind_chill(raw_data):
-    raw_values = raw_data["properties"]["windChill"]["values"]
-    ret = []
-
-    for val in raw_values:
-        val_celc = round(val["value"])
-        val_fahr = round(celcius_to_fahrenheit(val_celc))
-        time_str, duration_str = val["validTime"].split('/')
-        time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
-        duration = parse_duration(duration_str)
-        ret.append({"time":time,"duration":duration,"value_celc":val_celc,"value_fahr":val_fahr})
-
-    return normalize(ret)
-
-
-def get_wind_speed(raw_data):
-    raw_values = raw_data["properties"]["windSpeed"]["values"]
-    ret = []
-
-    for val in raw_values:
-        time_str, duration_str = val["validTime"].split('/')
-        time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
-        duration = parse_duration(duration_str)
-        ret.append({"time":time,"duration":duration,"value":round(val["value"])})
-
-    return normalize(ret)
-
-
-def get_wind_gust(raw_data):
-    raw_values = raw_data["properties"]["windGust"]["values"]
-    ret = []
-
-    for val in raw_values:
-        time_str, duration_str = val["validTime"].split('/')
-        time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
-        duration = parse_duration(duration_str)
-        ret.append({"time":time,"duration":duration,"value":round(val["value"])})
-
-    return normalize(ret)
-
-
-def get_precip_chance(raw_data):
-    raw_values = raw_data["properties"]["probabilityOfPrecipitation"]["values"]
-    ret = []
-
-    for val in raw_values:
-        time_str, duration_str = val["validTime"].split('/')
-        time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
-        duration = parse_duration(duration_str)
-        ret.append({"time":time,"duration":duration,"value":round(val["value"])})
-
-    return normalize(ret)
-
-
-def get_precip_amount(raw_data):
-    raw_values = raw_data["properties"]["quantitativePrecipitation"]["values"]
-    ret = []
-
-    for val in raw_values:
-        time_str, duration_str = val["validTime"].split('/')
-        time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
-        duration = parse_duration(duration_str)
-        ret.append({"time":time,"duration":duration,"value":round(val["value"])})
-
-    return normalize(ret)
-
-
-def get_snowfall_amount(raw_data):
-    raw_values = raw_data["properties"]["snowfallAmount"]["values"]
-    ret = []
-
-    for val in raw_values:
-        time_str, duration_str = val["validTime"].split('/')
-        time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
-        duration = parse_duration(duration_str)
-        ret.append({"time":time,"duration":duration,"value":round(val["value"])})
-
-    return normalize(ret)
-
-
-def get_snow_level(raw_data):
-    raw_values = raw_data["properties"]["snowLevel"]["values"]
-    ret = []
-
-    for val in raw_values:
-        time_str, duration_str = val["validTime"].split('/')
-        time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
-        duration = parse_duration(duration_str)
-        ret.append({"time":time,"duration":duration,"value":round(val["value"])})
-
-    return normalize(ret)
-
-
-def get_visibility(raw_data):
-    raw_values = raw_data["properties"]["visibility"]["values"]
-    ret = []
-
-    for val in raw_values:
-        time_str, duration_str = val["validTime"].split('/')
-        time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
-        duration = parse_duration(duration_str)
-        ret.append({"time":time,"duration":duration,"value":round(val["value"])})
-
-    return normalize(ret)
-
-
-def get_wind_direction(raw_data):
-    raw_values = raw_data["properties"]["windDirection"]["values"]
-    ret = []
-
-    for val in raw_values:
-        time_str, duration_str = val["validTime"].split('/')
-        time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
-        duration = parse_duration(duration_str)
-
-        def degrees_to_cardinal(d):
-            dirs = ['N', 'NNE', 'NE', 'ENE', 'E', 'ESE', 'SE', 'SSE', 'S', 'SSW', 'SW', 'WSW', 'W', 'WNW', 'NW', 'NNW']
-            ix = round(d / (360. / len(dirs)))
-            return dirs[ix % len(dirs)]
-
-        direction_str = degrees_to_cardinal(val["value"])
-
-        ret.append({"time":time,"duration":duration,"value":direction_str})
-
-    return normalize(ret)
-
-
-def get_dewpoint(raw_data):
-    raw_values = raw_data["properties"]["dewpoint"]["values"]
-    ret = []
-
-    for val in raw_values:
-        val_celc = round(val["value"])
-        val_fahr = round(celcius_to_fahrenheit(val_celc))
-        time_str, duration_str = val["validTime"].split('/')
-        time = datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S%z")
-        duration = parse_duration(duration_str)
-        ret.append({"time":time,"duration":duration,"value_celc":val_celc,"value_fahr":val_fahr})
-
-    return normalize(ret)
-
-
-def get_hourly_data(raw_data, end_time):
-    temps = get_temperature(raw_data)
-    humidity = get_humidity(raw_data)
-    precip_chance = get_precip_chance(raw_data)
-    precip_amount = get_precip_amount(raw_data)
-    wind_speed = get_wind_speed(raw_data)
-    wind_direction = get_wind_direction(raw_data)
-    ret_list = []
-    i = 0
-    while i < len(temps) and temps[i]["time"] < end_time:
-        if i >= len(temps):
-            temps.append({"value":"N/A"})
-        if i >= len(humidity):
-            humidity.append({"value":"N/A"})
-        if i >= len(precip_chance):
-            precip_chance.append({"value":"N/A"})
-        if i >= len(precip_amount):
-            precip_amount.append({"value":"N/A"})
-        if i >= len(wind_speed):
-            wind_speed.append({"value":"N/A"})
-        if i >= len(wind_direction):
-            wind_direction.append({"value":"N/A"})
-
-        val_dict = { "time": temps[i]["time"],
-                     "temp": temps[i]["value_fahr"],
-                     "humidity": humidity[i]["value"],
-                     "precip_chance": precip_chance[i]["value"],
-                     "precip_amount": precip_amount[i]["value"],
-                     "wind_speed": wind_speed[i]["value"],
-                     "wind_direction": wind_direction[i]["value"] }
-        ret_list.append(val_dict)
-        i+=1
-
-    return ret_list
-
-
-def get_daily_data(raw_data, raw_forecast, end_time):
-    daily_highs = get_daily_highs(raw_data)
-    daily_lows = get_daily_lows(raw_data)
-    daily_forecasts = get_daily_forecast(raw_forecast)
-    ret_list = []
-    i = 0
-    while i < len(daily_highs) and daily_highs[i]["time"] < end_time:
-        val_dict = { "time": daily_highs[i]["time"],
-                     "high": daily_highs[i]["high_fahr"],
-                     "low": daily_lows[i]["low_fahr"],
-                     "short_forecast_am": daily_forecasts[i]["short_forecast"],
-                     "detailed_forecast_am": daily_forecasts[i]["detailed_forecast"],
-                     "short_forecast_pm": daily_forecasts[i+1]["short_forecast"],
-                     "detailed_forecast_pm": daily_forecasts[i+1]["detailed_forecast"] }
-        ret_list.append(val_dict)
-        i+=1
-    return ret_list
-
-
-def hourly_forecast(raw_data, days):
-    init_time = get_current_rounded_time()
-    if days > 0:
-        delta = datetime.timedelta(days=days)
-    else:
-        delta = datetime.timedelta(hours=(24-init_time.hour))
-    end_time = init_time + delta
-    return get_hourly_data(raw_data, end_time)
-
+def translate_weather_code(weather_code:int):
+    return weather_codes[weather_code]
 
-def daily_forecast(raw_data, raw_forecast, days):
-    init_time = get_current_rounded_time()
-    if days > 0:
-        delta = datetime.timedelta(days=days)
-    else:
-        delta = datetime.timedelta(days=5)
-    end_time = init_time + delta
-    return get_daily_data(raw_data, raw_forecast, end_time)