From f0f0300055fdc2217fc5f7bc24ddfd3083013c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Fri, 22 Dec 2017 01:13:29 +0100 Subject: [PATCH] =?UTF-8?q?don't=20show=20graph=20contents=20in=20level=20?= =?UTF-8?q?graph=20view=E2=80=A6=20it's=20just=20too=20much?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/c3nav/editor/api.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/c3nav/editor/api.py b/src/c3nav/editor/api.py index fe1266bb..8802cba5 100644 --- a/src/c3nav/editor/api.py +++ b/src/c3nav/editor/api.py @@ -99,21 +99,21 @@ class EditorViewSet(ViewSet): levels_on_top = [levels[pk] for pk in levels_on_top] # todo: permissions - graphnodes = tuple(chain(*(space.graphnodes.all() - for space in chain(*(level.spaces.all() for level in levels.values()))))) - graphnodes_lookup = {node.pk: node for node in graphnodes} + # graphnodes = tuple(chain(*(space.graphnodes.all() + # for space in chain(*(level.spaces.all() for level in levels.values()))))) + # graphnodes_lookup = {node.pk: node for node in graphnodes} - graphedges = request.changeset.wrap_model('GraphEdge').objects.all() - graphedges = graphedges.filter(Q(from_node__in=graphnodes) | Q(to_node__in=graphnodes)) - graphedges = graphedges.select_related('waytype') + # graphedges = request.changeset.wrap_model('GraphEdge').objects.all() + # graphedges = graphedges.filter(Q(from_node__in=graphnodes) | Q(to_node__in=graphnodes)) + # graphedges = graphedges.select_related('waytype') # this is faster because we only deserialize graphnode geometries once - missing_graphnodes = graphnodes_qs.filter(pk__in=set(chain(*((edge.from_node_id, edge.to_node_id) - for edge in graphedges)))) - graphnodes_lookup.update({node.pk: node for node in missing_graphnodes}) - for edge in graphedges: - edge._from_node_cache = graphnodes_lookup[edge.from_node_id] - edge._to_node_cache = graphnodes_lookup[edge.to_node_id] + # missing_graphnodes = graphnodes_qs.filter(pk__in=set(chain(*((edge.from_node_id, edge.to_node_id) + # for edge in graphedges)))) + # graphnodes_lookup.update({node.pk: node for node in missing_graphnodes}) + # for edge in graphedges: + # edge._from_node_cache = graphnodes_lookup[edge.from_node_id] + # edge._to_node_cache = graphnodes_lookup[edge.to_node_id] # graphedges = [edge for edge in graphedges if edge.from_node.space_id != edge.to_node.space_id] @@ -122,8 +122,8 @@ class EditorViewSet(ViewSet): self._get_level_geometries(level), *(self._get_level_geometries(l) for l in levels_on_top), *(space.altitudemarkers.all() for space in level.spaces.all()), - graphedges, - graphnodes, + # graphedges, + # graphnodes, ) return Response([obj.to_geojson(instance=obj) for obj in results])