2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

treat empty strings and None as None rather than an empty geometry, to support optional geometry fields (Fixes C3NAV-37C3-V)

Browse source
This commit is contained in:
Gwendolyn 2023-12-20 15:44:56 +01:00
parent 50af5328e5
commit 5e9cd69ade
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/c3nav/mapdata/fields.py
View file

@ -50,6 +50,8 @@ class GeometryField(models.JSONField):
return name, path, args, kwargs
def from_db_value(self, value, expression, connection):
if value is None or value == '':
return None
return WrappedGeometry(super().from_db_value(value, expression, connection))
def to_python(self, value):
@ -108,7 +110,7 @@ class GeometryField(models.JSONField):
return format_geojson(mapping(value), rounded=False) if as_json else value
def get_prep_value(self, value):
if value is None:
if value is None or value == '':
return None
self._validate_geomtype(value, exception=TypeError)
if value.is_empty: