diff --git a/server/webserver.py b/server/webserver.py index cfc6884..9fca296 100644 --- a/server/webserver.py +++ b/server/webserver.py @@ -38,6 +38,7 @@ class WebServer: bottle.post("/api/v1/spot")(lambda: self.accept_spot()) # Routes for templated pages bottle.get("/")(lambda: self.serve_template('webpage_spots')) + bottle.get("/map")(lambda: self.serve_template('webpage_map')) bottle.get("/alerts")(lambda: self.serve_template('webpage_alerts')) bottle.get("/status")(lambda: self.serve_template('webpage_status')) bottle.get("/about")(lambda: self.serve_template('webpage_about')) @@ -148,14 +149,14 @@ class WebServer: for k in query.keys(): match k: case "since": - since = datetime.fromtimestamp(int(query.get(k)), pytz.UTC) + since = datetime.fromtimestamp(int(query.get(k)), pytz.UTC).timestamp() spots = [s for s in spots if s.time and s.time > since] case "max_age": max_age = int(query.get(k)) - since = datetime.now(pytz.UTC) - timedelta(seconds=max_age) + since = (datetime.now(pytz.UTC) - timedelta(seconds=max_age)).timestamp() spots = [s for s in spots if s.time and s.time > since] case "received_since": - since = datetime.fromtimestamp(int(query.get(k)), pytz.UTC) + since = datetime.fromtimestamp(int(query.get(k)), pytz.UTC).timestamp() spots = [s for s in spots if s.received_time and s.received_time > since] case "source": sources = query.get(k).split(",") diff --git a/views/webpage_base.tpl b/views/webpage_base.tpl index fe438e6..521baa6 100644 --- a/views/webpage_base.tpl +++ b/views/webpage_base.tpl @@ -58,6 +58,7 @@