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

moving by 20cm is okay actually

Browse source
This commit is contained in:
Laura Klünder 2024-12-27 22:19:48 +01:00
parent da4cc419ca
commit c5c8df7678
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/c3nav/mapdata/management/commands/importnoc.py
View file

@ -39,9 +39,6 @@ class Command(BaseCommand):
self.do_import(items) self.do_import(items)
MapUpdate.objects.create(type='importnoc') MapUpdate.objects.create(type='importnoc')
def _get_space_geom(self, space):
return space.geometry.difference(unary_union([unwrap_geom(hole.geometry) for hole in space.holes.all()]))
def do_import(self, items: dict[str, NocImportItem]): def do_import(self, items: dict[str, NocImportItem]):
spaces_for_level = {} spaces_for_level = {}
levels = tuple(Level.objects.values_list("pk", flat=True)) levels = tuple(Level.objects.values_list("pk", flat=True))
@ -86,8 +83,11 @@ class Command(BaseCommand):
continue continue
# move point into space if needed # move point into space if needed
if not new_space.geometry.intersects(new_geometry): new_space_geometry = new_space.geometry.difference(
new_geometry = nearest_points(new_space.geometry.buffer(-0.05), new_geometry)[0] unary_union([unwrap_geom(hole.geometry) for hole in new_space.columns.all()])
)
if not new_space_geometry.intersects(new_geometry):
new_geometry = nearest_points(new_space_geometry.buffer(-0.05), new_geometry)[0]
elif len(possible_spaces) == 1: elif len(possible_spaces) == 1:
new_space = possible_spaces[0] new_space = possible_spaces[0]
print(f"SUCCESS: {name} is in {new_space.title}") print(f"SUCCESS: {name} is in {new_space.title}")
@ -118,16 +118,21 @@ class Command(BaseCommand):
old_result = None old_result = None
# build resulting object # build resulting object
altitude_quest = True
if not result: if not result:
old_result = result old_result = result
result = RangingBeacon(import_tag=import_tag) result = RangingBeacon(import_tag=import_tag)
else: else:
if result.space == new_space and distance(unwrap_geom(result.geometry), new_geometry) < 0.03: if result.space == new_space and distance(unwrap_geom(result.geometry), new_geometry) < 0.03:
continue continue
if result.space == new_space and distance(unwrap_geom(result.geometry), new_geometry) < 0.20:
altitude_quest = False
result.comment = name result.comment = name
result.space = new_space result.space = new_space
result.geometry = new_geometry result.geometry = new_geometry
result.altitude = 0 result.altitude = 0
if altitude_quest:
result.altitude_quest = True result.altitude_quest = True
result.save() # todo: onyl save if changes… etc result.save() # todo: onyl save if changes… etc