From 5594250d59fdcc37e32364ca00d4b191737ce462 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Tue, 22 Nov 2022 14:49:51 +0100 Subject: [PATCH] #243 Feature without geometry * fixes GDALException in case of provided feature (import) without geometry content * modifies 500.html template to inform the user about the admins being informed automatically --- konova/forms/geometry_form.py | 7 ++++++- locale/de/LC_MESSAGES/django.mo | Bin 45638 -> 45704 bytes locale/de/LC_MESSAGES/django.po | 4 ++-- templates/500.html | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/konova/forms/geometry_form.py b/konova/forms/geometry_form.py index f76b907..b9658b4 100644 --- a/konova/forms/geometry_form.py +++ b/konova/forms/geometry_form.py @@ -82,7 +82,12 @@ class SimpleGeomForm(BaseForm): "MultiPolygon25D", ] for feature in features_json: - feature_geom = json.dumps(feature.get("geometry", feature)) + feature_geom = feature.get("geometry", feature) + if feature_geom is None: + # Fallback for rare cases where a feature does not contain any geometry + continue + + feature_geom = json.dumps(feature_geom) g = gdal.OGRGeometry(feature_geom, srs=DEFAULT_SRID_RLP) flatten_geometry = g.coord_dim > 2 diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 422ac7b6279015669d8aad1186b2f3fbf9e85d4e..b87493bc78dc6505adb6b03dd72ed2545d8d3e0b 100644 GIT binary patch delta 5865 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 diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 96bfa07..fb26103 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -2307,8 +2307,8 @@ msgid "Server Error" msgstr "" #: templates/500.html:10 -msgid "Something happened. We are working on it!" -msgstr "Irgendetwas ist passiert. Wir arbeiten daran!" +msgid "Something happened. Admins have been informed. We are working on it!" +msgstr "Irgendetwas ist passiert. Die Administratoren wurden informiert. Wir arbeiten daran!" #: templates/email/api/verify_token.html:7 msgid "Hello support" diff --git a/templates/500.html b/templates/500.html index 5299a69..f383971 100644 --- a/templates/500.html +++ b/templates/500.html @@ -7,7 +7,7 @@

{% trans 'Server Error' %}


- {% trans 'Something happened. We are working on it!' %} + {% trans 'Something happened. Admins have been informed. We are working on it!' %}

{% endblock %} \ No newline at end of file