feat: z_coord can now be optional

traffic_control/admin/plan.py

@@ -31,6 +31,7 @@ class PlanAdmin(
     AuditLogHistoryAdmin,
 ):
     form = PlanModelForm
+    SHOW_Z_COORD = False
     fieldsets = (
         (
             _("General information"),

traffic_control/admin/road_marking.py

@@ -105,6 +105,7 @@ class RoadMarkingPlanAdmin(
     resource_class = RoadMarkingPlanResource
     extra_export_resource_classes = [RoadMarkingPlanToRealTemplateResource]
     form = RoadMarkingPlanModelForm
+    SHOW_Z_COORD = False
     fieldsets = (
         (
             _("General information"),
@@ -234,6 +235,7 @@ class RoadMarkingRealAdmin(
     plan_model_field_name = "road_marking_plan"
     resource_class = RoadMarkingRealResource
     form = RoadMarkingRealModelForm
+    SHOW_Z_COORD = False
     fieldsets = (
         (
             _("General information"),

traffic_control/forms.py

@@ -178,7 +178,7 @@ def clean(self):
 class Geometry3DFieldForm(forms.ModelForm):
     """Form class that allows entering a z coordinate for 3d point and location in ewkt format"""
 
-    z_coord = forms.FloatField(label=_("Location (z)"), initial=0)
+    z_coord = forms.FloatField(label=_("Location (z)"), initial=0, required=False)
     location_ewkt = forms.CharField(label=_("Location (EWKT)"), widget=forms.Textarea, required=False)
 
     def __init__(self, *args, **kwargs):
@@ -195,7 +195,7 @@ def __init__(self, *args, **kwargs):
 
     def clean(self):
         cleaned_data = super().clean()
-        z_coord = cleaned_data.pop("z_coord", 0)
+        z_coord = cleaned_data.pop("z_coord", 0) or 0
         location = cleaned_data.get("location", None)
         location_ewkt = cleaned_data.get("location_ewkt", None)
         new_geom = self._get_new_geom(location, location_ewkt, z_coord)

traffic_control/mixins/admin.py

@@ -23,6 +23,17 @@ class Geometry3DFieldAdminMixin:
     """
 
     gis_widget = CityInfra3DOSMWidget
+    SHOW_Z_COORD = True
+
+    def get_fieldsets(self, request, obj=None, **kwargs):
+        fieldsets = super().get_fieldsets(request, obj, **kwargs)
+        if not self.SHOW_Z_COORD:
+            for _, fields in fieldsets:
+                if "z_coord" in fields["fields"]:
+                    temp_list = list(fields["fields"])
+                    temp_list.remove("z_coord")
+                    fields["fields"] = temp_list
+        return fieldsets
 
 
 class UserStampedAdminMixin: