reimplement wrapped prefetch_related

src/c3nav/mapdata/models/base.py

@@ -26,7 +26,7 @@ class SerializableMixin(models.Model):
         result = OrderedDict()
         if include_type:
             result['type'] = self.__class__.__name__.lower()
-        result['id'] = self.id
+        result['id'] = self.pk
         return result
 
 

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

@@ -20,7 +20,7 @@ class GeometryMixin(EditorFormMixin):
     def get_geojson_properties(self) -> dict:
         result = OrderedDict((
             ('type', self.__class__.__name__.lower()),
-            ('id', self.id),
+            ('id', self.pk),
         ))
         if getattr(self, 'bounds', False):
             result['bounds'] = True