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

start of proj4 support (part of GPS support)

Browse source
This commit is contained in:
Jenny Danzmayr 2024-08-13 21:17:36 +02:00
parent edba90481e
commit aa49840806
4 changed files with 129 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,7 @@ from ninja import Router as APIRouter
from pydantic import Field as APIField
from pydantic import PositiveInt
from c3nav import settings
from c3nav.api.auth import auth_permission_responses, auth_responses, validate_responses
from c3nav.api.exceptions import API404, APIPermissionDenied, APIRequestValidationFailed
from c3nav.api.schema import BaseSchema
@ -19,8 +20,9 @@ from c3nav.mapdata.models.locations import DynamicLocation, LocationRedirect, Po
from c3nav.mapdata.schemas.filters import BySearchableFilter, RemoveGeometryFilter
from c3nav.mapdata.schemas.model_base import AnyLocationID, AnyPositionID, CustomLocationID
from c3nav.mapdata.schemas.models import (AnyPositionStatusSchema, FullListableLocationSchema, FullLocationSchema,
LocationDisplay, SlimListableLocationSchema, SlimLocationSchema,
all_location_definitions, listable_location_definitions)
LocationDisplay, ProjectionPipelineSchema, ProjectionSchema,
SlimListableLocationSchema, SlimLocationSchema, all_location_definitions,
listable_location_definitions)
from c3nav.mapdata.schemas.responses import LocationGeometry, WithBoundsSchema
from c3nav.mapdata.utils.locations import (get_location_by_id_for_request, get_location_by_slug_for_request,
searchable_locations_for_request, visible_locations_for_request)
@ -310,3 +312,20 @@ def set_position(request, position_id: AnyPositionID, update: UpdatePositionSche
location.save()
return location.serialize_position()
@map_api_router.get('/projection/', summary='get proj4 string',
description="get proj4 string for converting WGS84 coordinates to c3nva coordinates",
response={200: Union[ProjectionSchema, ProjectionPipelineSchema], **auth_responses})
def get_projection(request):
obj = {
"pipeline": settings.PROJECTION_TRANSFORMER_STRING
}
if True:
obj.update({
'proj4': settings.PROJECTION_PROJ4,
'zero_point': settings.PROJECTION_ZERO_POINT,
'rotation': settings.PROJECTION_ROTATION,
'rotation_matrix': settings.PROJECTION_ROTATION_MATRIX,
})
return obj

43
src/c3nav/mapdata/schemas/models.py
View file

@ -793,3 +793,46 @@ AnyPositionStatusSchema = Annotated[
],
Discriminator("available"),
]
class ProjectionPipelineSchema(BaseSchema):
pipeline: Union[
Annotated[NonEmptyStr, APIField(title='proj4 string')],
Annotated[None, APIField(title='null', description='projection not available')]
] = APIField(
title='proj4 string',
description='proj4 string for converting WGS84 coordinates to c3nav coordinates if available',
example='+proj=utm +zone=33 +ellps=GRS80 +units=m +no_defs'
)
class ProjectionSchema(ProjectionPipelineSchema):
proj4: NonEmptyStr = APIField(
title='proj4 string',
description='proj4 string for converting WGS84 coordinates to c3nav coordinates without offset and rotation',
example='+proj=utm +zone=33 +ellps=GRS80 +units=m +no_defs'
)
zero_point: tuple[float, float] = APIField(
title='zero point',
description='coordinates of the zero point of the c3nav coordinate system',
example=(0.0, 0.0),
)
rotation: float = APIField(
title='rotation',
description='rotational offset of the c3nav coordinate system',
example=0.0,
)
rotation_matrix: Optional[tuple[
float, float, float, float,
float, float, float, float,
float, float, float, float,
float, float, float, float,
]] = APIField(
title='rotation matrix',
description='rotation matrix for rotational offset of the c3nav coordinate system',
example=[
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1
]
)