Merge branch 'master' into 138_New_map_client

# Conflicts:
#	konova/models/geometry.py
#	konova/urls.py
#	locale/de/LC_MESSAGES/django.mo
#	locale/de/LC_MESSAGES/django.po

konova/models/geometry.py

@@ -118,32 +118,38 @@ class Geometry(BaseResource):
         _now = timezone.now()
         underlying_parcels = []
         for result in fetched_parcels:
-            fetched_parcel = result[typename]
+            parcel_properties = result["properties"]
             # There could be parcels which include the word 'Flur',
             # which needs to be deleted and just keep the numerical values
             ## THIS CAN BE REMOVED IN THE FUTURE, WHEN 'Flur' WON'T OCCUR ANYMORE!
-            flr_val = fetched_parcel["ave:flur"].replace("Flur ", "")
+            flr_val = parcel_properties["flur"].replace("Flur ", "")
             district = District.objects.get_or_create(
-                key=fetched_parcel["ave:kreisschl"],
-                name=fetched_parcel["ave:kreis"],
+                key=parcel_properties["kreisschl"],
+                name=parcel_properties["kreis"],
             )[0]
             municipal = Municipal.objects.get_or_create(
-                key=fetched_parcel["ave:gmdschl"],
-                name=fetched_parcel["ave:gemeinde"],
+                key=parcel_properties["gmdschl"],
+                name=parcel_properties["gemeinde"],
                 district=district,
             )[0]
             parcel_group = ParcelGroup.objects.get_or_create(
-                key=fetched_parcel["ave:gemaschl"],
-                name=fetched_parcel["ave:gemarkung"],
+                key=parcel_properties["gemaschl"],
+                name=parcel_properties["gemarkung"],
                 municipal=municipal,
             )[0]
+            flrstck_nnr = parcel_properties['flstnrnen']
+            if not flrstck_nnr:
+                flrstck_nnr = None
+            flrstck_zhlr = parcel_properties['flstnrzae']
+            if not flrstck_zhlr:
+                flrstck_zhlr = None
             parcel_obj = Parcel.objects.get_or_create(
                 district=district,
                 municipal=municipal,
                 parcel_group=parcel_group,
                 flr=flr_val,
-                flrstck_nnr=fetched_parcel['ave:flstnrnen'],
-                flrstck_zhlr=fetched_parcel['ave:flstnrzae'],
+                flrstck_nnr=flrstck_nnr,
+                flrstck_zhlr=flrstck_zhlr,
             )[0]
             parcel_obj.district = district
             parcel_obj.updated_on = _now
@@ -151,6 +157,7 @@ class Geometry(BaseResource):
             underlying_parcels.append(parcel_obj)
 
         # Update the linked parcels
+        self.parcels.clear()
         self.parcels.set(underlying_parcels)
 
         # Set the calculated_on intermediate field, so this related data will be found on lookups
@@ -171,7 +178,6 @@ class Geometry(BaseResource):
         Returns:
             parcels (QuerySet): The related parcels as queryset
         """
-
         parcels = self.parcels.filter(
             parcelintersection__calculated_on__isnull=False,
         ).prefetch_related(
@@ -183,6 +189,17 @@ class Geometry(BaseResource):
 
         return parcels
 
+    def count_underlying_parcels(self):
+        """ Getter for number of underlying parcels
+
+        Returns:
+
+        """
+        num_parcels = self.parcels.filter(
+            parcelintersection__calculated_on__isnull=False,
+        ).count()
+        return num_parcels
+
     def as_feature_collection(self, srid=DEFAULT_SRID_RLP):
         """ Returns a FeatureCollection structure holding all polygons of the MultiPolygon as single features
 
@@ -211,7 +228,6 @@ class Geometry(BaseResource):
         return geojson
 
 
-
 class GeometryConflict(UuidModel):
     """
     Geometry conflicts model

konova/models/object.py

@@ -652,10 +652,21 @@ class GeoReferencedMixin(models.Model):
         Returns:
             parcels (Iterable): An empty list or a Queryset
         """
+        result = []
         if self.geometry is not None:
-            return self.geometry.get_underlying_parcels()
-        else:
-            return []
+            result = self.geometry.get_underlying_parcels()
+        return result
+
+    def count_underlying_parcels(self):
+        """ Getter for number of underlying parcels
+
+        Returns:
+
+        """
+        result = 0
+        if self.geometry is not None:
+            result = self.geometry.count_underlying_parcels()
+        return result
 
     def set_geometry_conflict_message(self, request: HttpRequest):
         if self.geometry is None: