From 782a39282500a8b62f2c06346631e33afb13fc76 Mon Sep 17 00:00:00 2001 From: KatKatKateryna Date: Wed, 4 Sep 2024 03:37:22 +0100 Subject: [PATCH] error screen; better meshes --- pygeoapi/flask_app.py | 18 ++++++++++++++++-- .../templates/collections/items/index.html | 6 +++++- pygeoapi/templates/error_screen.html | 15 +++++++++++++++ 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 pygeoapi/templates/error_screen.html diff --git a/pygeoapi/flask_app.py b/pygeoapi/flask_app.py index b6d80c1..72c1f80 100644 --- a/pygeoapi/flask_app.py +++ b/pygeoapi/flask_app.py @@ -199,15 +199,29 @@ def landing_page(): def generate(): yield loading_screen().data - browser_response = execute_from_flask(itemtypes_api.get_collection_items, + try: + browser_response = execute_from_flask(itemtypes_api.get_collection_items, request, collection_id, skip_valid_check=True) + yield browser_response.data + + except Exception as ex: + yield error_screen(ex).data - yield browser_response.data return Response(stream_with_context(generate())) return get_response(api_.landing_page(request)) +def error_screen(ex: Exception): + """ + Loading empty page + + :returns: HTTP response + """ + content = render_j2_template(api_.tpl_config, 'error_screen.html',{"exception": ex}) + + return get_response((request.headers, HTTPStatus.OK, content)) + def loading_screen(): """ Loading empty page diff --git a/pygeoapi/templates/collections/items/index.html b/pygeoapi/templates/collections/items/index.html index 5598465..ea4f273 100644 --- a/pygeoapi/templates/collections/items/index.html +++ b/pygeoapi/templates/collections/items/index.html @@ -335,7 +335,7 @@ {% block extrafoot %} + +