From c83e91bc78ede94d972e588f59fb2d85977ce840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Wed, 25 Dec 2024 17:01:30 +0100 Subject: [PATCH] loadgroup in editor and API --- src/c3nav/editor/forms.py | 1 + src/c3nav/editor/urls.py | 1 + src/c3nav/editor/views/edit.py | 1 + src/c3nav/mapdata/api/map.py | 17 +++++++++++++++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/c3nav/editor/forms.py b/src/c3nav/editor/forms.py index 03d873b3..575d4602 100644 --- a/src/c3nav/editor/forms.py +++ b/src/c3nav/editor/forms.py @@ -399,6 +399,7 @@ def create_editor_form(editor_model): 'color_obstacles_default_fill', 'color_obstacles_default_border', 'stroke_color', 'stroke_width', 'stroke_opacity', 'fill_color', 'fill_opacity', 'interactive', 'point_icon', 'extra_data', 'show_label', 'show_geometry', 'show_label', 'show_geometry', 'default_geomtype', + "load_group_display", "load_group_contribute", "altitude_quest", ] field_names = [field.name for field in editor_model._meta.get_fields() diff --git a/src/c3nav/editor/urls.py b/src/c3nav/editor/urls.py index 2c3e66dc..fe4f50ef 100644 --- a/src/c3nav/editor/urls.py +++ b/src/c3nav/editor/urls.py @@ -72,6 +72,7 @@ urlpatterns.extend(add_editor_urls('AccessRestriction')) urlpatterns.extend(add_editor_urls('AccessRestrictionGroup')) urlpatterns.extend(add_editor_urls('Source')) urlpatterns.extend(add_editor_urls('LabelSettings')) +urlpatterns.extend(add_editor_urls('LoadGroup')) urlpatterns.extend(add_editor_urls('Theme')) urlpatterns.extend(add_editor_urls('DataOverlay')) urlpatterns.extend(add_editor_urls('Building', 'Level')) diff --git a/src/c3nav/editor/views/edit.py b/src/c3nav/editor/views/edit.py index 75e5c1d2..f7ccff75 100644 --- a/src/c3nav/editor/views/edit.py +++ b/src/c3nav/editor/views/edit.py @@ -63,6 +63,7 @@ def main_index(request): child_model(request, 'AccessRestriction'), child_model(request, 'AccessRestrictionGroup'), child_model(request, 'LabelSettings'), + child_model(request, 'LoadGroup'), child_model(request, 'Source'), child_model(request, 'Theme'), child_model(request, 'DataOverlay'), diff --git a/src/c3nav/mapdata/api/map.py b/src/c3nav/mapdata/api/map.py index ddfd503e..a2944ef7 100644 --- a/src/c3nav/mapdata/api/map.py +++ b/src/c3nav/mapdata/api/map.py @@ -20,7 +20,7 @@ from c3nav.mapdata.api.base import api_etag, api_stats, can_access_geometry from c3nav.mapdata.grid import grid from c3nav.mapdata.models import Source, Theme, Area, Space from c3nav.mapdata.models.geometry.space import ObstacleGroup, Obstacle -from c3nav.mapdata.models.locations import DynamicLocation, LocationRedirect, Position, LocationGroup +from c3nav.mapdata.models.locations import DynamicLocation, LocationRedirect, Position, LocationGroup, LoadGroup from c3nav.mapdata.quests.base import QuestSchema, get_all_quests_for_request from c3nav.mapdata.render.theme import ColorManager from c3nav.mapdata.schemas.filters import BySearchableFilter, RemoveGeometryFilter @@ -403,4 +403,17 @@ Quests response={200: list[QuestSchema], **auth_responses}) @api_etag(permissions=True, quests=True) def list_quests(request): - return get_all_quests_for_request(request) \ No newline at end of file + return get_all_quests_for_request(request) + + +""" +Room load +""" + + +@map_api_router.get('/load/', summary="get load group loads", + response={200: dict[PositiveInt, float], **auth_responses}) +def get_load(request): + # todo: cache + import random + return {pk: random.randrange(0, 100)/100 for pk in LoadGroup.objects.values_list("pk", flat=True)} \ No newline at end of file