IT-Naturschutz/konova
7
1
Fork 0
Code Issues 6 Pull Requests 1 Actions Projects Releases 28 Wiki Activity

Merge pull request '439_Wartungskommando_Nachverschneidung' (#446) from 439_Wartungskommando_Nachverschneidung into master

Browse Source 
Reviewed-on: #446
This commit is contained in:
mpeltriaux 2024-10-26 10:24:50 +02:00
commit 439a211e01
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
konova/management/commands/recalculate_parcels.py
View File

@ -34,7 +34,9 @@ class Command(BaseKonovaCommand):
def recalculate_parcels(self, options: dict): def recalculate_parcels(self, options: dict):
force_all = options.get("force_all", False) force_all = options.get("force_all", False)
geometry_objects = Geometry.objects.all() geometry_objects = Geometry.objects.all().exclude(
geom=None
)
if not force_all: if not force_all:
# Fetch all intersections # Fetch all intersections
@ -46,16 +48,17 @@ class Command(BaseKonovaCommand):
"geometry__id", "geometry__id",
flat=True flat=True
) )
# Filter those geometries out (they have intersections and do not need to be processed) intersected_geom_objs = Geometry.objects.filter(
geometry_objects = geometry_objects.exclude(
id__in=geom_with_intersection_ids id__in=geom_with_intersection_ids
) )
# Filter those geometries out (they have intersections and do not need to be processed)
geometry_objects = geometry_objects.difference(intersected_geom_objs)
self._write_warning("=== Update parcels and districts ===") self._write_warning("=== Update parcels and districts ===")
# Order geometries by size to process smaller once at first # Order geometries by size to process smaller once at first
geometries = geometry_objects.exclude( geometries = geometry_objects.annotate(
geom=None area=Area("geom")
).annotate(area=Area("geom")).order_by( ).order_by(
'area' 'area'
) )
self._write_warning(f"Process parcels for {geometries.count()} geometry entries now ...") self._write_warning(f"Process parcels for {geometries.count()} geometry entries now ...")

2
konova/models/parcel.py
View File

@ -159,7 +159,6 @@ class Parcel(UuidModel):
return f"{self.parcel_group} | {self.flr} | {self.flrstck_zhlr} | {self.flrstck_nnr}" return f"{self.parcel_group} | {self.flr} | {self.flrstck_zhlr} | {self.flrstck_nnr}"
@classmethod @classmethod
@transaction.atomic
def make_unique(cls, **kwargs): def make_unique(cls, **kwargs):
""" Checks for duplicates of a Parcel, choose a (now) unique one, """ Checks for duplicates of a Parcel, choose a (now) unique one,
repairs relations for ParcelIntersection and removes duplicates. repairs relations for ParcelIntersection and removes duplicates.
@ -188,6 +187,7 @@ class Parcel(UuidModel):
intersection_objs = ParcelIntersection.objects.filter( intersection_objs = ParcelIntersection.objects.filter(
parcel__in=parcel_objs parcel__in=parcel_objs
) )
# Change each intersection, so they point on the 'true one' parcel from now on # Change each intersection, so they point on the 'true one' parcel from now on
for intersection in intersection_objs: for intersection in intersection_objs:
intersection.parcel = unique_parcel intersection.parcel = unique_parcel