2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

all mapdata models use new_serialize now

Browse source
This commit is contained in:
Laura Klünder 2024-12-04 12:20:17 +01:00
parent 40f19afc28
commit 05890de06a
7 changed files with 4 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/c3nav/mapdata/models/geometry/space.py
View file

@ -50,12 +50,6 @@ class SpaceGeometryMixin(GeometryMixin):
result['opacity'] = self.opacity
return result
def _serialize(self, space=True, **kwargs):
result = super()._serialize(**kwargs)
if space:
result['space'] = self.space_id
return result
@property
def subtitle(self):
base_subtitle = super().subtitle
@ -280,17 +274,6 @@ class LineObstacle(SpaceGeometryMixin, models.Model):
result['color'] = color
return result
def _serialize(self, geometry=True, **kwargs):
result = super()._serialize(geometry=geometry, **kwargs)
result['width'] = float(str(self.width))
result['height'] = float(str(self.height))
result['altitude'] = float(str(self.altitude))
from c3nav.mapdata.render.theme import ColorManager
result['color'] = self.get_color(ColorManager.for_theme(None))
if geometry:
result['buffered_geometry'] = format_geojson(mapping(self.buffered_geometry))
return result
@property
def color(self):
from c3nav.mapdata.render.theme import ColorManager