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

reorder to make pois work

Browse source
This commit is contained in:
Laura Klünder 2017-12-20 17:24:37 +01:00
parent f785349141
commit 8736ad8ee3
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/c3nav/routing/router.py
View file

@ -115,22 +115,6 @@ class Router:
areas[area.pk] = area areas[area.pk] = area
space.areas.add(area.pk) space.areas.add(area.pk)
for poi in space_obj.pois.all():
for group in poi.groups.all():
groups.setdefault(group.pk, {}).setdefault('pois', set()).add(poi.pk)
poi._prefetched_objects_cache = {}
poi = RouterPoint(poi)
altitudearea = space.altitudearea_for_point(poi.geometry)
poi.altitude = altitudearea.get_altitude(poi.geometry)
poi_nodes = altitudearea.nodes_for_point(poi.geometry, all_nodes=nodes)
poi.nodes = set(i for i in poi_nodes.keys())
poi.nodes_addition = poi_nodes
pois[poi.pk] = poi
space.pois.add(poi.pk)
space_obj._prefetched_objects_cache = {}
for area in level.altitudeareas.all(): for area in level.altitudeareas.all():
if not space.geometry_prep.intersects(area.geometry): if not space.geometry_prep.intersects(area.geometry):
continue continue
@ -168,6 +152,22 @@ class Router:
RouterEdge(fallback_node, nearest_node, 0) RouterEdge(fallback_node, nearest_node, 0)
) )
for poi in space_obj.pois.all():
for group in poi.groups.all():
groups.setdefault(group.pk, {}).setdefault('pois', set()).add(poi.pk)
poi._prefetched_objects_cache = {}
poi = RouterPoint(poi)
altitudearea = space.altitudearea_for_point(poi.geometry)
poi.altitude = altitudearea.get_altitude(poi.geometry)
poi_nodes = altitudearea.nodes_for_point(poi.geometry, all_nodes=nodes)
poi.nodes = set(i for i in poi_nodes.keys())
poi.nodes_addition = poi_nodes
pois[poi.pk] = poi
space.pois.add(poi.pk)
space_obj._prefetched_objects_cache = {}
space.src.geometry = accessible_geom space.src.geometry = accessible_geom
spaces[space.pk] = space spaces[space.pk] = space