Merge pull request '585 invalid 25832 coordinates' (#586) from 585_Invalid_25832_coordinates into master
Reviewed-on: #586
This commit was merged in pull request #586.
This commit is contained in:
@@ -12,7 +12,7 @@ from django.contrib.gis.geos.prototypes.io import WKTWriter
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from konova.settings import GEOM_MAX_VERTICES
|
||||
from konova.sub_settings.lanis_settings import DEFAULT_SRID_RLP
|
||||
from konova.sub_settings.lanis_settings import DEFAULT_SRID_RLP, DEFAULT_SRID
|
||||
|
||||
|
||||
class GeometryProcessor:
|
||||
@@ -50,7 +50,7 @@ class GeometryProcessor:
|
||||
return geometry.num_coords <= GEOM_MAX_VERTICES
|
||||
|
||||
@staticmethod
|
||||
def is_valid_4326(geometry):
|
||||
def is_valid_4326(geometry: MultiPolygon) -> bool:
|
||||
""" Checks whether a given geometry's coordinates are in a valid range to be of EPSG:4326
|
||||
|
||||
Args:
|
||||
@@ -59,13 +59,69 @@ class GeometryProcessor:
|
||||
Returns:
|
||||
ret_val (bool): Whether the geometry is valid EPSG:4326
|
||||
"""
|
||||
assert geometry.srid == DEFAULT_SRID
|
||||
return GeometryProcessor.is_valid_coord_range(
|
||||
geometry,
|
||||
-90.0,
|
||||
90.0,
|
||||
-180.0,
|
||||
180.0,
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def is_valid_25832(geometry: MultiPolygon) -> bool:
|
||||
""" Checks whether a given geometry's coordinates are in a valid range to be of EPSG:25832
|
||||
|
||||
Args:
|
||||
geometry: The geometry
|
||||
|
||||
Returns:
|
||||
ret_val (bool): Whether the geometry is valid EPSG:25832
|
||||
"""
|
||||
assert geometry.srid == DEFAULT_SRID_RLP
|
||||
return GeometryProcessor.is_valid_coord_range(
|
||||
geometry,
|
||||
166_000,
|
||||
834_000,
|
||||
0,
|
||||
9_329_000,
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def is_valid_coord_range(geometry: MultiPolygon,
|
||||
min_x:float|int,
|
||||
max_x:float|int,
|
||||
min_y:float|int,
|
||||
max_y: float|int) -> bool:
|
||||
""" Checks whether a given geometry's coordinates are in a valid range defined by input parameters
|
||||
|
||||
Args:
|
||||
geometry: The geometry
|
||||
min_x (float|int): The min x value
|
||||
max_x (float|int): The max x value
|
||||
min_y (float|int): The min y value
|
||||
max_y (float|int): The max y value
|
||||
|
||||
Returns:
|
||||
ret_val (bool): Whether the geometry's coordinates stays inside the defined range
|
||||
"""
|
||||
if not geometry.centroid.coords:
|
||||
# No coordinates at all found, therefore technically proper 4326
|
||||
return True
|
||||
|
||||
try:
|
||||
lat,lon = geometry.centroid.coords
|
||||
return (-90.0 <= lat <= 90.0) and (-180.0 <= lon <= 180.0)
|
||||
env_min_x = geometry.envelope.min_x
|
||||
env_max_x = geometry.envelope.max_x
|
||||
env_min_y = geometry.envelope.min_y
|
||||
env_max_y = geometry.envelope.max_x
|
||||
|
||||
valid = (
|
||||
min_x <= env_min_x and
|
||||
env_max_x <= max_x and
|
||||
min_y <= env_min_y and
|
||||
env_max_y <= max_y
|
||||
)
|
||||
return valid
|
||||
except IndexError:
|
||||
return False
|
||||
|
||||
@@ -251,6 +307,8 @@ class GeoJsonValidator:
|
||||
if g.empty:
|
||||
continue
|
||||
g = GeometryProcessor.cast_to_rlp_srid(g)
|
||||
if not GeometryProcessor.is_valid_25832(g):
|
||||
raise AssertionError(_("This feature does not hold valid EPSG:25832 coordinates:\n {}".format(g.geojson)))
|
||||
|
||||
geometry_has_unwanted_dimensions = g.coord_dim > 2
|
||||
if geometry_has_unwanted_dimensions:
|
||||
|
||||
@@ -9,6 +9,7 @@ import json
|
||||
from json import JSONDecodeError
|
||||
|
||||
import requests
|
||||
from django.contrib.gis import gdal
|
||||
|
||||
from konova.sub_settings import schneider_settings
|
||||
from konova.sub_settings.lanis_settings import DEFAULT_SRID
|
||||
@@ -35,7 +36,10 @@ class ParcelFetcher:
|
||||
if geom.area < buffer_threshold:
|
||||
# Fallback for malicious geometries which are way too small and would disappear on negative buffering
|
||||
geom = geometry.geom
|
||||
geom.transform(DEFAULT_SRID)
|
||||
try:
|
||||
geom.transform(DEFAULT_SRID)
|
||||
except gdal.GDALException as e:
|
||||
raise ValueError(f"{str(e)}\nCould not transform geometry (id: {geometry.id}) to {DEFAULT_SRID}:\n {geom.geojson}")
|
||||
self.geojson = geom.ewkt
|
||||
self.results = []
|
||||
|
||||
|
||||
Binary file not shown.
@@ -30,7 +30,7 @@
|
||||
#: konova/filters/mixins/office.py:57 konova/filters/mixins/record.py:23
|
||||
#: konova/filters/mixins/self_created.py:24 konova/filters/mixins/share.py:23
|
||||
#: konova/filters/mixins/user_log.py:17 konova/filters/mixins/user_log.py:18
|
||||
#: konova/forms/geometry_form.py:32 konova/forms/modals/document_form.py:26
|
||||
#: konova/forms/geometry_form.py:31 konova/forms/modals/document_form.py:26
|
||||
#: konova/forms/modals/document_form.py:36
|
||||
#: konova/forms/modals/document_form.py:50
|
||||
#: konova/forms/modals/document_form.py:62
|
||||
@@ -45,7 +45,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2025-12-14 17:23+0100\n"
|
||||
"POT-Creation-Date: 2026-09-13 12:06+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
@@ -129,6 +129,7 @@ msgstr ""
|
||||
#: analysis/templates/analysis/reports/includes/old_data/amount.html:3
|
||||
#: compensation/forms/modals/compensation_action.py:66
|
||||
#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:50
|
||||
#: intervention/templates/intervention/detail/includes/deductions.html:31
|
||||
msgid "Amount"
|
||||
msgstr "Menge"
|
||||
@@ -334,6 +335,7 @@ msgstr "Typ"
|
||||
|
||||
#: analysis/templates/analysis/reports/includes/old_data/amount.html:24
|
||||
#: compensation/tables/compensation.py:87
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:47
|
||||
#: intervention/forms/modals/deduction.py:58
|
||||
#: intervention/forms/modals/deduction.py:65 intervention/tables.py:92
|
||||
#: intervention/templates/intervention/detail/view.html:19
|
||||
@@ -448,7 +450,8 @@ msgid "Select the intervention for which this compensation compensates"
|
||||
msgstr "Wählen Sie den Eingriff, für den diese Kompensation bestimmt ist"
|
||||
|
||||
#: compensation/forms/compensation.py:114
|
||||
#: compensation/views/compensation/compensation.py:121
|
||||
#: compensation/views/compensation/compensation.py:96
|
||||
#: compensation/views/compensation/compensation.py:160
|
||||
msgid "New compensation"
|
||||
msgstr "Neue Kompensation"
|
||||
|
||||
@@ -475,7 +478,8 @@ msgid "When did the parties agree on this?"
|
||||
msgstr "Wann wurde dieses Ökokonto offiziell vereinbart?"
|
||||
|
||||
#: compensation/forms/eco_account.py:73
|
||||
#: compensation/views/eco_account/eco_account.py:105
|
||||
#: compensation/views/eco_account/eco_account.py:77
|
||||
#: compensation/views/eco_account/eco_account.py:127
|
||||
msgid "New Eco-Account"
|
||||
msgstr "Neues Ökokonto"
|
||||
|
||||
@@ -503,7 +507,8 @@ msgstr ""
|
||||
|
||||
#: compensation/forms/eco_account.py:257
|
||||
msgid "Please contact the responsible conservation office to find a solution!"
|
||||
msgstr "Kontaktieren Sie die zuständige Naturschutzbehörde um eine Lösung zu finden!"
|
||||
msgstr ""
|
||||
"Kontaktieren Sie die zuständige Naturschutzbehörde um eine Lösung zu finden!"
|
||||
|
||||
#: compensation/forms/mixins.py:37
|
||||
#: compensation/templates/compensation/detail/eco_account/view.html:63
|
||||
@@ -818,6 +823,7 @@ msgstr "Am {} von {} verzeichnet worden"
|
||||
|
||||
#: compensation/tables/eco_account.py:39
|
||||
#: compensation/templates/compensation/detail/eco_account/view.html:36
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:34
|
||||
#: konova/templates/konova/widgets/progressbar.html:3
|
||||
msgid "Available"
|
||||
msgstr "Verfügbar"
|
||||
@@ -948,7 +954,7 @@ msgstr "Wiedervorlage"
|
||||
|
||||
#: compensation/templates/compensation/detail/compensation/includes/controls.html:20
|
||||
#: compensation/templates/compensation/detail/eco_account/includes/controls.html:34
|
||||
#: ema/templates/ema/detail/includes/controls.html:34
|
||||
#: ema/templates/ema/detail/includes/controls.html:32
|
||||
#: intervention/templates/intervention/detail/includes/controls.html:39
|
||||
msgid "Edit"
|
||||
msgstr "Bearbeiten"
|
||||
@@ -962,7 +968,7 @@ msgstr "Log anzeigen"
|
||||
|
||||
#: compensation/templates/compensation/detail/compensation/includes/controls.html:27
|
||||
#: compensation/templates/compensation/detail/eco_account/includes/controls.html:41
|
||||
#: ema/templates/ema/detail/includes/controls.html:41
|
||||
#: ema/templates/ema/detail/includes/controls.html:43
|
||||
#: intervention/templates/intervention/detail/includes/controls.html:46
|
||||
msgid "Delete"
|
||||
msgstr "Löschen"
|
||||
@@ -1154,7 +1160,7 @@ msgstr "Verzeichnet am"
|
||||
#: compensation/templates/compensation/detail/compensation/view.html:107
|
||||
#: compensation/templates/compensation/detail/eco_account/view.html:85
|
||||
#: compensation/templates/compensation/report/compensation/report.html:54
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:47
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:75
|
||||
#: ema/templates/ema/detail/view.html:71
|
||||
#: ema/templates/ema/report/report.html:34
|
||||
#: intervention/templates/intervention/detail/view.html:113
|
||||
@@ -1188,7 +1194,7 @@ msgid "other users"
|
||||
msgstr "weitere Nutzer"
|
||||
|
||||
#: compensation/templates/compensation/detail/eco_account/includes/controls.html:18
|
||||
#: ema/templates/ema/detail/includes/controls.html:18
|
||||
#: ema/templates/ema/detail/includes/controls.html:19
|
||||
#: intervention/forms/modals/share.py:62
|
||||
#: intervention/templates/intervention/detail/includes/controls.html:18
|
||||
#: intervention/tests/unit/test_forms.py:150
|
||||
@@ -1258,11 +1264,11 @@ msgstr "Maßnahmenträger"
|
||||
msgid "Report"
|
||||
msgstr "Bericht"
|
||||
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:34
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:43
|
||||
msgid "Deductions for"
|
||||
msgstr "Abbuchungen für"
|
||||
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:42
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:64
|
||||
#: intervention/templates/intervention/report/report.html:53
|
||||
#: intervention/templates/intervention/report/report.html:66
|
||||
#: intervention/templates/intervention/report/report.html:76
|
||||
@@ -1292,40 +1298,44 @@ msgstr ""
|
||||
msgid "Responsible data"
|
||||
msgstr "Daten zu den verantwortlichen Stellen"
|
||||
|
||||
#: compensation/views/compensation/compensation.py:52
|
||||
#: compensation/views/compensation/compensation.py:53
|
||||
msgid "Compensations - Overview"
|
||||
msgstr "Kompensationen - Übersicht"
|
||||
|
||||
#: compensation/views/compensation/compensation.py:167
|
||||
#: compensation/views/compensation/compensation.py:203
|
||||
#: compensation/views/compensation/compensation.py:261
|
||||
#: compensation/views/eco_account/eco_account.py:169
|
||||
#: compensation/views/eco_account/eco_account.py:224 ema/views/ema.py:175
|
||||
#: ema/views/ema.py:229 intervention/views/intervention.py:176
|
||||
#: intervention/views/intervention.py:230
|
||||
msgid "Edit {}"
|
||||
msgstr "Bearbeite {}"
|
||||
|
||||
#: compensation/views/compensation/compensation.py:242
|
||||
#: konova/utils/message_templates.py:40
|
||||
msgid "Compensation {} edited"
|
||||
msgstr "Kompensation {} bearbeitet"
|
||||
|
||||
#: compensation/views/compensation/compensation.py:190
|
||||
#: compensation/views/eco_account/eco_account.py:168 ema/views/ema.py:173
|
||||
#: intervention/views/intervention.py:175
|
||||
msgid "Edit {}"
|
||||
msgstr "Bearbeite {}"
|
||||
|
||||
#: compensation/views/compensation/report.py:35
|
||||
#: compensation/views/eco_account/report.py:35 ema/views/report.py:35
|
||||
#: intervention/views/report.py:36
|
||||
msgid "Report {}"
|
||||
msgstr "Bericht {}"
|
||||
|
||||
#: compensation/views/eco_account/eco_account.py:49
|
||||
#: compensation/views/eco_account/eco_account.py:51
|
||||
msgid "Eco-account - Overview"
|
||||
msgstr "Ökokonten - Übersicht"
|
||||
|
||||
#: compensation/views/eco_account/eco_account.py:82
|
||||
#: compensation/views/eco_account/eco_account.py:108
|
||||
msgid "Eco-Account {} added"
|
||||
msgstr "Ökokonto {} hinzugefügt"
|
||||
|
||||
#: compensation/views/eco_account/eco_account.py:145
|
||||
#: compensation/views/eco_account/eco_account.py:205
|
||||
msgid "Eco-Account {} edited"
|
||||
msgstr "Ökokonto {} bearbeitet"
|
||||
|
||||
#: ema/forms.py:42 ema/tests/unit/test_forms.py:27 ema/views/ema.py:107
|
||||
#: ema/forms.py:42 ema/tests/unit/test_forms.py:27 ema/views/ema.py:79
|
||||
#: ema/views/ema.py:129
|
||||
msgid "New EMA"
|
||||
msgstr "Neue EMA hinzufügen"
|
||||
|
||||
@@ -1357,11 +1367,11 @@ msgstr "Ersatzzahlungsmaßnahme"
|
||||
msgid "EMAs - Overview"
|
||||
msgstr "EMAs - Übersicht"
|
||||
|
||||
#: ema/views/ema.py:85
|
||||
#: ema/views/ema.py:111
|
||||
msgid "EMA {} added"
|
||||
msgstr "EMA {} hinzugefügt"
|
||||
|
||||
#: ema/views/ema.py:150
|
||||
#: ema/views/ema.py:211
|
||||
msgid "EMA {} edited"
|
||||
msgstr "EMA {} bearbeitet"
|
||||
|
||||
@@ -1425,7 +1435,7 @@ msgstr "Datum Bestandskraft bzw. Rechtskraft"
|
||||
|
||||
#: intervention/forms/intervention.py:216
|
||||
#: intervention/tests/unit/test_forms.py:36
|
||||
#: intervention/views/intervention.py:109
|
||||
#: intervention/views/intervention.py:82 intervention/views/intervention.py:134
|
||||
msgid "New intervention"
|
||||
msgstr "Neuer Eingriff"
|
||||
|
||||
@@ -1661,15 +1671,15 @@ msgstr ""
|
||||
msgid "Check performed"
|
||||
msgstr "Prüfung durchgeführt"
|
||||
|
||||
#: intervention/views/intervention.py:53
|
||||
#: intervention/views/intervention.py:56
|
||||
msgid "Interventions - Overview"
|
||||
msgstr "Eingriffe - Übersicht"
|
||||
|
||||
#: intervention/views/intervention.py:86
|
||||
#: intervention/views/intervention.py:114
|
||||
msgid "Intervention {} added"
|
||||
msgstr "Eingriff {} hinzugefügt"
|
||||
|
||||
#: intervention/views/intervention.py:150
|
||||
#: intervention/views/intervention.py:212
|
||||
msgid "Intervention {} edited"
|
||||
msgstr "Eingriff {} bearbeitet"
|
||||
|
||||
@@ -1797,16 +1807,11 @@ msgstr "Speichern"
|
||||
msgid "Not editable"
|
||||
msgstr "Nicht editierbar"
|
||||
|
||||
#: konova/forms/geometry_form.py:31 konova/utils/quality.py:44
|
||||
#: konova/forms/geometry_form.py:30 konova/utils/quality.py:44
|
||||
#: konova/utils/quality.py:46 templates/form/collapsable/form.html:45
|
||||
msgid "Geometry"
|
||||
msgstr "Geometrie"
|
||||
|
||||
#: konova/forms/geometry_form.py:105
|
||||
msgid "Only surfaces allowed. Points or lines must be buffered."
|
||||
msgstr ""
|
||||
"Nur Flächen erlaubt. Punkte oder Linien müssen zu Flächen gepuffert werden."
|
||||
|
||||
#: konova/forms/modals/document_form.py:37
|
||||
msgid "When has this file been created? Important for photos."
|
||||
msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?"
|
||||
@@ -1961,6 +1966,7 @@ msgstr "Raumreferenz"
|
||||
#: konova/templates/konova/includes/parcels/parcels.html:28
|
||||
msgid "No geometry entry found on database. Please contact an admin!"
|
||||
msgstr ""
|
||||
"Keine Geometrie in Datenbank gefunden. Kontaktieren Sie einen Administrator!"
|
||||
|
||||
#: konova/templates/konova/includes/quickstart/compensations.html:20
|
||||
#: konova/templates/konova/includes/quickstart/ecoaccounts.html:20
|
||||
@@ -2006,39 +2012,52 @@ msgstr "In Zwischenablage kopiert"
|
||||
msgid "Search"
|
||||
msgstr "Suchen"
|
||||
|
||||
#: konova/utils/mailer.py:69 konova/utils/mailer.py:146
|
||||
#: konova/utils/geometry/geometry_validator.py:311
|
||||
msgid ""
|
||||
"This feature does not hold valid EPSG:25832 coordinates:\n"
|
||||
" {}"
|
||||
msgstr ""
|
||||
"Dieses Feature enthält keine validen EPSG:25832 Koordinaten:\n"
|
||||
" {}"
|
||||
|
||||
#: konova/utils/geometry/geometry_validator.py:319
|
||||
msgid "Only surfaces allowed. Points or lines must be buffered."
|
||||
msgstr ""
|
||||
"Nur Flächen erlaubt. Punkte oder Linien müssen zu Flächen gepuffert werden."
|
||||
|
||||
#: konova/utils/mailer.py:82 konova/utils/mailer.py:159
|
||||
msgid "{} - Shared access removed"
|
||||
msgstr "{} - Zugriff entzogen"
|
||||
|
||||
#: konova/utils/mailer.py:94 konova/utils/mailer.py:120
|
||||
#: konova/utils/mailer.py:107 konova/utils/mailer.py:133
|
||||
msgid "{} - Shared access given"
|
||||
msgstr "{} - Zugriff freigegeben"
|
||||
|
||||
#: konova/utils/mailer.py:172 konova/utils/mailer.py:325
|
||||
#: konova/utils/mailer.py:185 konova/utils/mailer.py:338
|
||||
msgid "{} - Shared data unrecorded"
|
||||
msgstr "{} - Freigegebene Daten entzeichnet"
|
||||
|
||||
#: konova/utils/mailer.py:198 konova/utils/mailer.py:300
|
||||
#: konova/utils/mailer.py:211 konova/utils/mailer.py:313
|
||||
msgid "{} - Shared data recorded"
|
||||
msgstr "{} - Freigegebene Daten verzeichnet"
|
||||
|
||||
#: konova/utils/mailer.py:224 konova/utils/mailer.py:375
|
||||
#: konova/utils/mailer.py:237 konova/utils/mailer.py:388
|
||||
msgid "{} - Shared data checked"
|
||||
msgstr "{} - Freigegebene Daten geprüft"
|
||||
|
||||
#: konova/utils/mailer.py:249 konova/utils/mailer.py:401
|
||||
#: konova/utils/mailer.py:262 konova/utils/mailer.py:414
|
||||
msgid "{} - Deduction changed"
|
||||
msgstr "{} - Abbuchung geändert"
|
||||
|
||||
#: konova/utils/mailer.py:275 konova/utils/mailer.py:350
|
||||
#: konova/utils/mailer.py:288 konova/utils/mailer.py:363
|
||||
msgid "{} - Shared data deleted"
|
||||
msgstr "{} - Freigegebene Daten gelöscht"
|
||||
|
||||
#: konova/utils/mailer.py:422 templates/email/api/verify_token.html:4
|
||||
#: konova/utils/mailer.py:435 templates/email/api/verify_token.html:4
|
||||
msgid "Request for new API token"
|
||||
msgstr "Anfrage für neuen API Token"
|
||||
|
||||
#: konova/utils/mailer.py:447
|
||||
#: konova/utils/mailer.py:460
|
||||
msgid "Resubmission - {}"
|
||||
msgstr "Wiedervorlage - {}"
|
||||
|
||||
@@ -2289,11 +2308,11 @@ msgstr "Neuer Token generiert. Administratoren sind informiert."
|
||||
msgid "missing"
|
||||
msgstr "fehlend"
|
||||
|
||||
#: konova/utils/tables.py:222
|
||||
#: konova/utils/tables.py:224
|
||||
msgid "Full access granted"
|
||||
msgstr "Für Sie freigegeben - Datensatz kann bearbeitet werden"
|
||||
|
||||
#: konova/utils/tables.py:222
|
||||
#: konova/utils/tables.py:224
|
||||
msgid "Access not granted"
|
||||
msgstr "Nicht freigegeben - Datensatz nur lesbar"
|
||||
|
||||
@@ -2303,7 +2322,7 @@ msgstr ""
|
||||
"Dieses Datum ist unrealistisch. Geben Sie bitte das korrekte Datum ein "
|
||||
"(>1950)."
|
||||
|
||||
#: konova/views/home.py:75 templates/navbars/navbar.html:16
|
||||
#: konova/views/home.py:76 templates/navbars/navbar.html:16
|
||||
msgid "Home"
|
||||
msgstr "Home"
|
||||
|
||||
@@ -2323,7 +2342,7 @@ msgstr "{} verzeichnet"
|
||||
msgid "Errors found:"
|
||||
msgstr "Fehler gefunden:"
|
||||
|
||||
#: konova/views/remove.py:35
|
||||
#: konova/views/remove.py:34
|
||||
msgid "{} removed"
|
||||
msgstr "{} entfernt"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user