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

no need to explicitly serialize the grid

Browse source
This commit is contained in:
Laura Klünder 2024-12-04 12:20:27 +01:00
parent 05890de06a
commit 07a3c5ffa9
3 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/c3nav/mapdata/api/map.py
View file

@ -50,7 +50,7 @@ def map_settings(request):
return MapSettingsSchema( return MapSettingsSchema(
initial_bounds=initial_bounds, initial_bounds=initial_bounds,
initial_level=settings.INITIAL_LEVEL or None, initial_level=settings.INITIAL_LEVEL or None,
grid=grid.serialize().model_dump() if grid else None, grid=grid if grid else None,
tile_server=settings.TILE_CACHE_SERVER, tile_server=settings.TILE_CACHE_SERVER,
) )

8
src/c3nav/mapdata/grid.py
View file

@ -50,14 +50,6 @@ class Grid(AbstractGrid):
else: else:
raise ValueError('column coordinates are not ordered') raise ValueError('column coordinates are not ordered')
def serialize(self) -> GridSchema:
return GridSchema(
rows=self.rows,
cols=self.cols,
invert_x=self.invert_y,
invert_y=self.invert_y,
)
def get_square_for_point(self, x, y): def get_square_for_point(self, x, y):
x = bisect.bisect(self.cols, x) x = bisect.bisect(self.cols, x)
if x <= 0 or x >= len(self.cols): if x <= 0 or x >= len(self.cols):

4
src/c3nav/site/views.py
View file

@ -31,7 +31,7 @@ from django.views.i18n import LANGUAGE_QUERY_PARAMETER, set_language
from c3nav import __version__ as c3nav_version from c3nav import __version__ as c3nav_version
from c3nav.api.models import Secret from c3nav.api.models import Secret
from c3nav.control.forms import AccessPermissionForm, SignedPermissionDataError from c3nav.control.forms import AccessPermissionForm, SignedPermissionDataError
from c3nav.mapdata.grid import grid from c3nav.mapdata.grid import grid, GridSchema
from c3nav.mapdata.models import Location, Source from c3nav.mapdata.models import Location, Source
from c3nav.mapdata.models.access import AccessPermission, AccessPermissionToken from c3nav.mapdata.models.access import AccessPermission, AccessPermissionToken
from c3nav.mapdata.models.locations import (LocationGroup, LocationRedirect, Position, SpecificLocation, from c3nav.mapdata.models.locations import (LocationGroup, LocationRedirect, Position, SpecificLocation,
@ -217,7 +217,7 @@ def map_index(request, mode=None, slug=None, slug2=None, details=None, options=N
} }
if grid.enabled: if grid.enabled:
ctx['grid'] = json.dumps(grid.serialize().model_dump(), separators=(',', ':'), cls=DjangoJSONEncoder) ctx['grid'] = json.dumps(GridSchema.model_validate(grid).model_dump(), separators=(',', ':'), cls=DjangoJSONEncoder)
csrf.get_token(request) csrf.get_token(request)