more performance improvements (no ordereddict, directly access geojson)

src/c3nav/mapdata/models/geometry/base.py

@@ -1,5 +1,4 @@
 import math
-from collections import OrderedDict
 
 from django.db import models
 from django.utils.functional import cached_property
@@ -42,11 +41,11 @@ class GeometryMixin(SerializableMixin):
         return result
 
     def to_geojson(self, instance=None) -> dict:
-        result = OrderedDict((
-            ('type', 'Feature'),
-            ('properties', self.get_geojson_properties(instance=instance)),
-            ('geometry', format_geojson(smart_mapping(self.geometry), round=False)),
-        ))
+        result = {
+            'type': 'Feature',
+            'properties': self.get_geojson_properties(instance=instance),
+            'geometry': format_geojson(smart_mapping(self.geometry), round=False),
+        }
         original_geometry = getattr(self, 'original_geometry', None)
         if original_geometry:
             result['original_geometry'] = format_geojson(smart_mapping(original_geometry), round=False)
@@ -63,12 +62,6 @@ class GeometryMixin(SerializableMixin):
     def point(self):
         return good_representative_point(self.geometry)
 
-    def serialize(self, **kwargs):
-        result = super().serialize(**kwargs)
-        if 'geometry' in result:
-            result.move_to_end('geometry')
-        return result
-
     def _serialize(self, geometry=True, simple_geometry=False, **kwargs):
         result = super()._serialize(simple_geometry=simple_geometry, **kwargs)
         if geometry:

src/c3nav/mapdata/models/geometry/space.py

@@ -195,12 +195,6 @@ class LineObstacle(SpaceGeometryMixin, models.Model):
         verbose_name_plural = _('Line Obstacles')
         default_related_name = 'lineobstacles'
 
-    def serialize(self, geometry=True, **kwargs):
-        result = super().serialize(geometry=geometry, **kwargs)
-        if geometry:
-            result.move_to_end('buffered_geometry')
-        return result
-
     def _serialize(self, geometry=True, **kwargs):
         result = super()._serialize(geometry=geometry, **kwargs)
         result['width'] = float(str(self.width))

src/c3nav/mapdata/models/graph.py

@@ -1,4 +1,3 @@
-from collections import OrderedDict
 from decimal import Decimal
 
 from django.core.validators import MinValueValidator
@@ -26,6 +25,10 @@ class GraphNode(SpaceGeometryMixin, models.Model):
         result = super().get_geojson_properties(*args, **kwargs)
         return result
 
+    @property
+    def coords(self):
+        return self.geometry.wrapped_geojson['coordinates']
+
 
 class WayType(SerializableMixin, models.Model):
     """
@@ -70,19 +73,19 @@ class GraphEdge(AccessRestrictionMixin, models.Model):
         unique_together = (('from_node', 'to_node'), )
 
     def to_geojson(self, instance=None) -> dict:
-        result = OrderedDict((
-            ('type', 'Feature'),
-            ('properties', OrderedDict((
-                ('id', self.pk),
-                ('type', 'graphedge'),
-                ('from_node', self.from_node_id),
-                ('to_node', self.to_node_id),
-            ))),
-            ('geometry', {
+        result = {
+            'type': 'Feature',
+            'properties': {
+                'id': self.pk,
+                'type': 'graphedge',
+                'from_node': self.from_node_id,
+                'to_node': self.to_node_id,
+            },
+            'geometry': {
                 'type': 'LineString',
-                'coordinates': (self.from_node.geometry.coords[0], self.to_node.geometry.coords[0]),
-            }),
-        ))
+                'coordinates': (self.from_node.coords, self.to_node.coords),
+            },
+        }
         if self.waytype_id is not None:
             result['properties']['color'] = self.waytype.color
         return result

src/c3nav/mapdata/utils/json.py

@@ -1,5 +1,4 @@
 import json
-from collections import OrderedDict
 
 from django.core.serializers.json import DjangoJSONEncoder
 
@@ -39,14 +38,14 @@ def json_encoder_reindent(method, data, *args, **kwargs):
 def format_geojson(data, round=True):
     coordinates = data.get('coordinates', None)
     if coordinates is not None:
-        return OrderedDict((
-            ('type', data['type']),
-            ('coordinates', round_coordinates(data['coordinates']) if round else data['coordinates']),
-        ))
-    return OrderedDict((
-        ('type', data['type']),
-        ('geometries', [format_geojson(geometry, round=round) for geometry in data['geometries']]),
-    ))
+        return {
+            'type': data['type'],
+            'coordinates': round_coordinates(data['coordinates']) if round else data['coordinates'],
+        }
+    return {
+        'type': data['type'],
+        'geometries': [format_geojson(geometry, round=round) for geometry in data['geometries']],
+    }
 
 
 def round_coordinates(data):