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

don't lock all mapupates during AltitudeArea.recalculate()

Browse source
This commit is contained in:
Laura Klünder 2017-11-17 22:01:07 +01:00
parent aaabc7e37c
commit 69bacc321f
1 changed files with 38 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

78
src/c3nav/mapdata/models/geometry/level.py
View file

@ -439,51 +439,49 @@ class AltitudeArea(LevelGeometryMixin, models.Model):
level_areas[level] = set(area.tmpid for area in level_areas.get(level, [])) level_areas[level] = set(area.tmpid for area in level_areas.get(level, []))
# save to database # save to database
from c3nav.mapdata.models import MapUpdate areas_to_save = set(range(len(areas)))
with MapUpdate.lock():
areas_to_save = set(range(len(areas)))
all_candidates = AltitudeArea.objects.select_related('level') all_candidates = AltitudeArea.objects.select_related('level')
for candidate in all_candidates: for candidate in all_candidates:
candidate.area = candidate.geometry.area candidate.area = candidate.geometry.area
all_candidates = sorted(all_candidates, key=attrgetter('area'), reverse=True) all_candidates = sorted(all_candidates, key=attrgetter('area'), reverse=True)
num_modified = 0 num_modified = 0
num_deleted = 0 num_deleted = 0
num_created = 0 num_created = 0
for candidate in all_candidates: for candidate in all_candidates:
new_area = None new_area = None
for tmpid in level_areas.get(candidate.level, set()): for tmpid in level_areas.get(candidate.level, set()):
area = areas[tmpid] area = areas[tmpid]
if area.geometry.almost_equals(candidate.geometry, 1): if area.geometry.almost_equals(candidate.geometry, 1):
new_area = area new_area = area
break break
if new_area is None: if new_area is None:
potential_areas = [(tmpid, areas[tmpid].geometry.intersection(candidate.geometry.buffer(0)).area) potential_areas = [(tmpid, areas[tmpid].geometry.intersection(candidate.geometry.buffer(0)).area)
for tmpid in level_areas.get(candidate.level, set())] for tmpid in level_areas.get(candidate.level, set())]
potential_areas = [(tmpid, size) for tmpid, size in potential_areas potential_areas = [(tmpid, size) for tmpid, size in potential_areas
if candidate.area and size/candidate.area > 0.9] if candidate.area and size/candidate.area > 0.9]
if potential_areas: if potential_areas:
num_modified += 1 num_modified += 1
new_area = areas[max(potential_areas, key=itemgetter(1))[0]] new_area = areas[max(potential_areas, key=itemgetter(1))[0]]
if new_area is None: if new_area is None:
candidate.delete() candidate.delete()
num_deleted += 1 num_deleted += 1
continue continue
candidate.geometry = new_area.geometry candidate.geometry = new_area.geometry
candidate.altitude = new_area.altitude candidate.altitude = new_area.altitude
candidate.save() candidate.save()
areas_to_save.discard(new_area.tmpid) areas_to_save.discard(new_area.tmpid)
level_areas[new_area.level].discard(new_area.tmpid) level_areas[new_area.level].discard(new_area.tmpid)
for tmpid in areas_to_save: for tmpid in areas_to_save:
num_created += 1 num_created += 1
areas[tmpid].save() areas[tmpid].save()
logger = logging.getLogger('c3nav') logger = logging.getLogger('c3nav')
logger.info(_('%d altitude areas built.') % len(areas)) logger.info(_('%d altitude areas built.') % len(areas))
logger.info(_('%d modified, %d deleted, %d created.') % (num_modified, num_deleted, num_created)) logger.info(_('%d modified, %d deleted, %d created.') % (num_modified, num_deleted, num_created))