1 files changed, 14 insertions, 28 deletions

diff --git a/app.py b/app.py
index e929032..72e74ca 100644
--- a/app.py
+++ b/app.py
@@ -10,36 +10,22 @@ def index():
     form = forms.WeatherForm()
     if form.validate_on_submit():
         location = form.location.data
-        days = form.days.data
-        forecast_type = form.forecast_type.data
-        print(location)
-        print(days)
-        print(forecast_type)
-        if forecast_type == 'hourly':
-            return flask.redirect(flask.url_for('hourly', location=location, days=days))
-        elif forecast_type == 'daily':
-            return flask.redirect(flask.url_for('daily', location=location, days=days))
-
+        return flask.redirect(flask.url_for('weather', location=location))
     return flask.render_template("index.html", form=form)
 
-@app.route('/hourly')
-def hourly():
-    location = flask.request.args.get('location', type=str)
-    days = flask.request.args.get('days', type=int)
-    latitude, longitude = library.get_lat_long(location)
-    grid_data = library.get_grid_data(latitude, longitude)
-    raw_data = library.get_raw_data(grid_data["grid_id"], grid_data["grid_x"], grid_data["grid_y"])
-    data = library.hourly_forecast(raw_data, days)
-    return flask.render_template("hourly.html", data=data)
-
 
-@app.route('/daily')
-def daily():
+@app.route('/weather', methods=('GET','POST'))
+def weather():
     location = flask.request.args.get('location', type=str)
-    days = flask.request.args.get('days', type=int)
     latitude, longitude = library.get_lat_long(location)
-    grid_data = library.get_grid_data(latitude, longitude)
-    raw_data = library.get_raw_data(grid_data["grid_id"], grid_data["grid_x"], grid_data["grid_y"])
-    raw_forecast = library.get_raw_forecast(grid_data["grid_id"], grid_data["grid_x"], grid_data["grid_y"])
-    data = library.daily_forecast(raw_data, raw_forecast, days)
-    return flask.render_template("daily.html", data=data)
+    data = library.get_data(latitude, longitude)
+    hour = library.get_current_rounded_time(data["timezone"]).hour
+    form = forms.WeatherForm()
+    if form.validate_on_submit():
+        location = form.location.data
+        return flask.redirect(flask.url_for('weather', location=location))
+    return flask.render_template("weather.html", data=data, form=form, weather_codes=library.weather_codes, 
+            weather_icons=library.weather_icons, hour=hour)
+
+if __name__ == "__main__":
+    app.run()