add simple_geometry to location api

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

@@ -1,6 +1,8 @@
+import math
 from collections import OrderedDict
 
 from django.db import models
+from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _
 from shapely.geometry import Point, mapping
 
@@ -59,16 +61,25 @@ class GeometryMixin(SerializableMixin):
             result['geomtype'] = cls._meta.get_field('geometry').geomtype
         return result
 
+    @cached_property
+    def centroid(self):
+        return self.geometry.centroid
+
     def serialize(self, geometry=True, **kwargs):
         result = super().serialize(geometry=geometry, **kwargs)
         if geometry:
             result.move_to_end('geometry')
         return result
 
-    def _serialize(self, geometry=True, **kwargs):
-        result = super()._serialize(**kwargs)
+    def _serialize(self, geometry=True, simple_geometry=False, **kwargs):
+        result = super()._serialize(simple_geometry=simple_geometry, **kwargs)
         if geometry:
             result['geometry'] = format_geojson(mapping(self.geometry), round=False)
+        if simple_geometry:
+            result['point'] = (self.level_id, ) + tuple(round(i, 2) for i in self.centroid.coords[0])
+            if not isinstance(self.geometry, Point):
+                result['bounds'] = ((int(math.floor(self.miny)), int(math.floor(self.minx))),
+                                    (int(math.ceil(self.maxy)), int(math.ceil(self.maxx))))
         return result
 
     def get_shadow_geojson(self):

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

@@ -1,4 +1,5 @@
 from django.db import models
+from django.utils.functional import cached_property
 from django.utils.text import format_lazy
 from django.utils.translation import ugettext_lazy as _
 from shapely.geometry import CAP_STYLE, JOIN_STYLE, mapping
@@ -16,11 +17,9 @@ class SpaceGeometryMixin(GeometryMixin):
     class Meta:
         abstract = True
 
-    def _serialize(self, space=True, **kwargs):
-        result = super()._serialize(**kwargs)
-        if space:
-            result['space'] = self.space_id
-        return result
+    @cached_property
+    def level_id(self):
+        return self.space.level_id
 
     def get_geojson_properties(self, *args, **kwargs) -> dict:
         result = super().get_geojson_properties(*args, **kwargs)

src/c3nav/mapdata/models/locations.py

@@ -83,7 +83,8 @@ class Location(LocationSlug, AccessRestrictionMixin, TitledMixin, models.Model):
         result = super().serialize(detailed=detailed, **kwargs)
         if not detailed:
             result = OrderedDict((
-                (name, result[name]) for name in ('slug', 'title', 'subtitle')
+                (name, result[name]) for name in ('id', 'slug', 'title', 'subtitle', 'point', 'bounds', 'locations')
+                if name in result
             ))
         return result
 
@@ -246,10 +247,12 @@ class LocationGroup(Location, models.Model):
         self.orig_category_id = self.category_id
         self.orig_color = self.color
 
-    def _serialize(self, **kwargs):
-        result = super()._serialize(**kwargs)
+    def _serialize(self, simple_geometry=False, **kwargs):
+        result = super()._serialize(simple_geometry=simple_geometry, **kwargs)
         result['category'] = self.category_id
         result['color'] = self.color
+        if simple_geometry:
+            result['locations'] = tuple(obj.pk for obj in getattr(self, 'locations', ()))
         return result
 
     @property