api/utils/serializer/serializer.py

@@ -136,6 +136,8 @@ class AbstractModelAPISerializer:
         geometry = geos.fromstr(geojson)
         if geometry.srid != DEFAULT_SRID_RLP:
             geometry.transform(DEFAULT_SRID_RLP)
+        if geometry.empty:
+            geometry = None
         return geometry
 
     def _get_obj_from_db(self, id, user):

compensation/forms/compensation.py

@@ -129,11 +129,12 @@ class NewCompensationForm(AbstractCompensationForm,
         self.initialize_form_field("identifier", identifier)
         self.fields["identifier"].widget.attrs["url"] = reverse_lazy("compensation:new-id")
 
-    def __create_comp(self, user):
+    def __create_comp(self, user, geom_form) -> Compensation:
         """ Creates the compensation from form data
 
         Args:
             user (User): The performing user
+            geom_form (SimpleGeomForm): The geometry form
 
         Returns:
             comp (Compensation): The compensation object
@@ -149,6 +150,8 @@ class NewCompensationForm(AbstractCompensationForm,
 
         # Create log entry
         action = UserActionLogEntry.get_created_action(user)
+        # Process the geometry form
+        geometry = geom_form.save(action)
 
         # Finally create main object
         comp = Compensation.objects.create(
@@ -159,23 +162,18 @@ class NewCompensationForm(AbstractCompensationForm,
             is_cef=is_cef,
             is_coherence_keeping=is_coherence_keeping,
             is_pik=is_pik,
+            geometry=geometry,
             comment=comment,
         )
 
         # Add the log entry to the main objects log list
         comp.log.add(action)
-        return comp, action
+        return comp
 
     def save(self, user: User, geom_form: SimpleGeomForm):
         with transaction.atomic():
-            comp, action = self.__create_comp(user)
+            comp = self.__create_comp(user, geom_form)
             comp.intervention.mark_as_edited(user, edit_comment=COMPENSATION_ADDED_TEMPLATE.format(comp.identifier))
-
-        # Process the geometry form
-        geometry = geom_form.save(action)
-        comp.geometry = geometry
-        comp.save()
-
         return comp
 
 
@@ -207,9 +205,6 @@ class EditCompensationForm(NewCompensationForm):
 
     def save(self, user: User, geom_form: SimpleGeomForm):
         with transaction.atomic():
-            # Create log entry
-            action = UserActionLogEntry.get_edited_action(user)
-
             # Fetch data from cleaned POST values
             identifier = self.cleaned_data.get("identifier", None)
             title = self.cleaned_data.get("title", None)
@@ -219,9 +214,17 @@ class EditCompensationForm(NewCompensationForm):
             is_pik = self.cleaned_data.get("is_pik", None)
             comment = self.cleaned_data.get("comment", None)
 
+            # Create log entry
+            action = UserActionLogEntry.get_edited_action(user)
+
+            # Process the geometry form
+            geometry = geom_form.save(action)
+
+            # Finally create main object
             self.instance.identifier = identifier
             self.instance.title = title
             self.instance.intervention = intervention
+            self.instance.geometry = geometry
             self.instance.is_cef = is_cef
             self.instance.is_coherence_keeping = is_coherence_keeping
             self.instance.comment = comment
@@ -230,11 +233,6 @@ class EditCompensationForm(NewCompensationForm):
             self.instance.save()
 
             self.instance.log.add(action)
+
             intervention.mark_as_edited(user, self.request, EDITED_GENERAL_DATA)
-
-        # Process the geometry form (NOT ATOMIC TRANSACTION DUE TO CELERY!)
-        geometry = geom_form.save(action)
-        self.instance.geometry = geometry
-        self.instance.save()
-
-        return self.instance
+        return self.instance

compensation/forms/eco_account.py

@@ -94,6 +94,8 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
 
             # Create log entry
             action = UserActionLogEntry.get_created_action(user)
+            # Process the geometry form
+            geometry = geom_form.save(action)
 
             handler = Handler.objects.create(
                 type=handler_type,
@@ -117,6 +119,7 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
                 responsible=responsible,
                 deductable_surface=surface,
                 created=action,
+                geometry=geometry,
                 comment=comment,
                 is_pik=is_pik,
                 legal=legal
@@ -126,10 +129,6 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
             # Add the log entry to the main objects log list
             acc.log.add(action)
 
-        # Process the geometry form
-        geometry = geom_form.save(action)
-        acc.geometry = geometry
-        acc.save()
         acc.update_deductable_rest()
         return acc
 
@@ -186,6 +185,9 @@ class EditEcoAccountForm(NewEcoAccountForm):
             # Create log entry
             action = UserActionLogEntry.get_edited_action(user)
 
+            # Process the geometry form
+            geometry = geom_form.save(action)
+
             # Update responsible data
             self.instance.responsible.handler.type = handler_type
             self.instance.responsible.handler.detail = handler_detail
@@ -202,6 +204,7 @@ class EditEcoAccountForm(NewEcoAccountForm):
             self.instance.identifier = identifier
             self.instance.title = title
             self.instance.deductable_surface = surface
+            self.instance.geometry = geometry
             self.instance.comment = comment
             self.instance.is_pik = is_pik
             self.instance.modified = action
@@ -210,10 +213,6 @@ class EditEcoAccountForm(NewEcoAccountForm):
             # Add the log entry to the main objects log list
             self.instance.log.add(action)
 
-        # Process the geometry form (NOT ATOMIC TRANSACTION DUE TO CELERY!)
-        geometry = geom_form.save(action)
-        self.instance.geometry = geometry
-        self.instance.save()
         self.instance.update_deductable_rest()
         return self.instance
 

ema/forms.py

@@ -64,6 +64,8 @@ class NewEmaForm(AbstractCompensationForm, CompensationResponsibleFormMixin, Pik
 
             # Create log entry
             action = UserActionLogEntry.get_created_action(user)
+            # Process the geometry form
+            geometry = geom_form.save(action)
 
             handler = Handler.objects.create(
                 type=handler_type,
@@ -81,6 +83,7 @@ class NewEmaForm(AbstractCompensationForm, CompensationResponsibleFormMixin, Pik
                 title=title,
                 responsible=responsible,
                 created=action,
+                geometry=geometry,
                 comment=comment,
                 is_pik=is_pik,
             )
@@ -90,11 +93,6 @@ class NewEmaForm(AbstractCompensationForm, CompensationResponsibleFormMixin, Pik
 
             # Add the log entry to the main objects log list
             acc.log.add(action)
-
-        # Process the geometry form (NOT ATOMIC TRANSACTION DUE TO CELERY!)
-        geometry = geom_form.save(action)
-        acc.geometry = geometry
-        acc.save()
         return acc
 
 
@@ -143,6 +141,8 @@ class EditEmaForm(NewEmaForm):
 
             # Create log entry
             action = UserActionLogEntry.get_edited_action(user)
+            # Process the geometry form
+            geometry = geom_form.save(action)
 
             # Update responsible data
             self.instance.responsible.handler.type = handler_type
@@ -155,6 +155,7 @@ class EditEmaForm(NewEmaForm):
             # Update main oject data
             self.instance.identifier = identifier
             self.instance.title = title
+            self.instance.geometry = geometry
             self.instance.comment = comment
             self.instance.is_pik = is_pik
             self.instance.modified = action
@@ -162,11 +163,6 @@ class EditEmaForm(NewEmaForm):
 
             # Add the log entry to the main objects log list
             self.instance.log.add(action)
-
-        # Process the geometry form (NOT ATOMIC TRANSACTION DUE TO CELERY!)
-        geometry = geom_form.save(action)
-        self.instance.geometry = geometry
-        self.instance.save()
         return self.instance
 
 

intervention/forms/intervention.py

@@ -263,6 +263,9 @@ class NewInterventionForm(BaseForm):
                 handler=handler,
             )
 
+            # Process the geometry form
+            geometry = geom_form.save(action)
+
             # Finally create main object, holding the other objects
             intervention = Intervention.objects.create(
                 identifier=identifier,
@@ -270,6 +273,7 @@ class NewInterventionForm(BaseForm):
                 responsible=responsibility_data,
                 legal=legal_data,
                 created=action,
+                geometry=geometry,
                 comment=comment,
             )
 
@@ -278,12 +282,6 @@ class NewInterventionForm(BaseForm):
 
             # Add the performing user as the first user having access to the data
             intervention.share_with_user(user)
-
-        # Process the geometry form (NOT ATOMIC TRANSACTION DUE TO CELERY!)
-        geometry = geom_form.save(action)
-        intervention.geometry = geometry
-        intervention.save()
-
         return intervention
 
 
@@ -372,6 +370,9 @@ class EditInterventionForm(NewInterventionForm):
 
             user_action = self.instance.mark_as_edited(user, edit_comment=EDITED_GENERAL_DATA)
 
+            geometry = geom_form.save(user_action)
+            self.instance.geometry = geometry
+
             self.instance.log.add(user_action)
 
             self.instance.identifier = identifier
@@ -380,10 +381,5 @@ class EditInterventionForm(NewInterventionForm):
             self.instance.modified = user_action
             self.instance.save()
 
-        # Process the geometry form (NOT ATOMIC TRANSACTION DUE TO CELERY!)
-        geometry = geom_form.save(user_action)
-        self.instance.geometry = geometry
-        self.instance.save()
-
         return self.instance
 

konova/forms/geometry_form.py

@@ -63,7 +63,6 @@ class SimpleGeomForm(BaseForm):
         geom = self.data["geom"]
         if geom is None or len(geom) == 0:
             # empty geometry is a valid geometry
-            self.cleaned_data["geom"] = MultiPolygon(srid=DEFAULT_SRID_RLP).ewkt
             return is_valid
         geom = json.loads(geom)
 
@@ -107,8 +106,6 @@ class SimpleGeomForm(BaseForm):
                 return is_valid
 
             features.append(polygon)
-
-        # Unionize all geometry features into one new MultiPolygon
         form_geom = MultiPolygon(srid=DEFAULT_SRID_RLP)
         for feature in features:
             form_geom = form_geom.union(feature)

konova/models/geometry.py

@@ -116,11 +116,6 @@ class Geometry(BaseResource):
 
         """
         from konova.models import Parcel, District, ParcelIntersection, Municipal, ParcelGroup
-
-        if self.geom.empty:
-            # Nothing to do
-            return
-
         parcel_fetcher = ParcelWFSFetcher(
             geometry_id=self.id,
         )

konova/templates/konova/includes/parcels/parcels.html

@@ -17,17 +17,11 @@
             </div>
         </div>
         <div class="card-body">
-            {% if geom_form.instance.geometry %}
             <div hx-trigger="load, every 5s" hx-get="{% url 'geometry-parcels' geom_form.instance.geometry.id %}">
                 <div class="row justify-content-center">
                     <span class="spinner-border rlp-r-inv" role="status"></span>
                 </div>
             </div>
-            {% else %}
-            <div class="alert alert-danger">
-                {% translate 'No geometry entry found on database. Please contact an admin!' %}
-            </div>
-            {% endif %}
         </div>
     </div>
 </div>

konova/views/geometry.py

@@ -32,16 +32,16 @@ def get_geom_parcels(request: HttpRequest, id: str):
     parcels = geom.get_underlying_parcels()
     geos_geom = geom.geom
 
-    geometry_exists = not geos_geom.empty
-    parcels_are_currently_calculated = geometry_exists and geos_geom.area > 0 and len(parcels) == 0
+    parcels_are_currently_calculated = geos_geom is not None and geos_geom.area > 0 and len(parcels) == 0
     parcels_available = len(parcels) > 0
+    no_geometry_given = geos_geom is None
 
     if parcels_are_currently_calculated:
         # Parcels are being calculated right now. Change the status code, so polling stays active for fetching
         # resutls after the calculation
         status_code = 200
 
-    if parcels_available or not geometry_exists:
+    if parcels_available or no_geometry_given:
         parcels = parcels.order_by("-municipal", "flr", "flrstck_zhlr", "flrstck_nnr")
         municipals = parcels.order_by("municipal").distinct("municipal").values("municipal__id")
         municipals = Municipal.objects.filter(id__in=municipals)