new serializer for sources and locationgroupcategory

src/c3nav/mapdata/models/locations.py

@@ -292,6 +292,8 @@ class SpecificLocation(Location, models.Model):
 
 
 class LocationGroupCategory(SerializableMixin, models.Model):
+    new_serialize = True
+
     name = models.SlugField(_('Name'), unique=True, max_length=50)
     single = models.BooleanField(_('single selection'), default=False)
     title = I18nField(_('Title'), plural_name='titles', fallback_any=True)
@@ -314,26 +316,6 @@ class LocationGroupCategory(SerializableMixin, models.Model):
         default_related_name = 'locationgroupcategories'
         ordering = ('-priority', )
 
-    def _serialize(self, detailed=True, **kwargs):
-        result = super()._serialize(detailed=detailed, **kwargs)
-        result['name'] = self.name
-        result['single'] = self.single
-        if detailed:
-            result['titles'] = self.titles
-            result['titles_plural'] = self.titles_plural
-            result['help_texts'] = self.help_texts
-        result['title'] = self.title
-        result['title_plural'] = self.title_plural
-        result['help_text'] = self.help_text
-        result['allow_levels'] = self.allow_levels
-        result['allow_spaces'] = self.allow_spaces
-        result['allow_areas'] = self.allow_areas
-        result['allow_pois'] = self.allow_pois
-        result['allow_dynamic_locations'] = self.allow_dynamic_locations
-        result['priority'] = self.priority
-
-        return result
-
     def register_changed_geometries(self):
         from c3nav.mapdata.models.geometry.space import SpaceGeometryMixin
         query = self.groups.all()
@@ -403,17 +385,6 @@ class LocationGroup(Location, models.Model):
         self.orig_category_id = self.category_id
         self.orig_color = self.color
 
-    def _serialize(self, simple_geometry=False, **kwargs):
-        result = super()._serialize(simple_geometry=simple_geometry, **kwargs)
-        result['category'] = self.category_id
-        result['priority'] = self.priority
-        result['hierarchy'] = self.hierarchy
-        result['can_report_missing'] = self.can_report_missing
-        result['color'] = self.color
-        if simple_geometry:
-            result['locations'] = tuple(obj.pk for obj in getattr(self, 'locations', ()))
-        return result
-
     def details_display(self, editor_url=True, **kwargs):
         result = super().details_display(**kwargs)
         result['display'].insert(3, (_('Category'), self.category.title))

src/c3nav/mapdata/models/source.py

@@ -10,6 +10,8 @@ class Source(BoundsMixin, AccessRestrictionMixin, models.Model):
     """
     A map source, images of levels that can be useful as backgrounds for the map editor
     """
+    new_serialize = True
+
     name = models.CharField(_('Name'), unique=True, max_length=50)  # a slugfield would forbid periods
 
     class Meta:
@@ -24,8 +26,3 @@ class Source(BoundsMixin, AccessRestrictionMixin, models.Model):
     @property
     def title(self):
         return self.name
-
-    def _serialize(self, level=True, **kwargs):
-        result = super()._serialize(**kwargs)
-        result['name'] = self.name
-        return result