Browse Source

Add missing serializer fields, including relational fields

Baptiste Jonglez 10 years ago
parent
commit
f9fe40a6f6
2 changed files with 17 additions and 11 deletions
  1. 12 8
      api/serializers.py
  2. 5 3
      api/views.py

+ 12 - 8
api/serializers.py

@@ -2,20 +2,24 @@ from rest_framework import serializers
 
 from panorama.models import Panorama, ReferencePoint, Reference
 
+
+class ReferencePointSerializer(serializers.HyperlinkedModelSerializer):
+    class Meta:
+        model = ReferencePoint
+        fields = ("url", "name",
+                  "latitude", "longitude", "altitude",
+                  "refpoint_references")
+
+
 class PanoramaSerializer(serializers.HyperlinkedModelSerializer):
     # fixme : return absolute URL for tiles_url
     class Meta:
         model = Panorama
-        fields = ("url", "name", "loop",
+        fields = ("url", "name", "loop", "image_width", "image_height",
                   "latitude", "longitude", "altitude",
-                  "tiles_url")
+                  "tiles_url",
+                  "panorama_references")
 
-class ReferencePointSerializer(serializers.HyperlinkedModelSerializer):
-    # fixme : return absolute URL for tiles_url
-    class Meta:
-        model = ReferencePoint
-        fields = ("url", "name",
-                  "latitude", "longitude", "altitude")
 
 class ReferenceSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:

+ 5 - 3
api/views.py

@@ -3,15 +3,17 @@ from rest_framework import viewsets
 from panorama.models import Panorama, ReferencePoint, Reference
 from .serializers import *
 
-class PanoramaViewSet(viewsets.ModelViewSet):
-    queryset = Panorama.objects.all()
-    serializer_class = PanoramaSerializer
 
 class ReferencePointViewSet(viewsets.ModelViewSet):
     queryset = ReferencePoint.objects.all()
     serializer_class = ReferencePointSerializer
 
 
+class PanoramaViewSet(viewsets.ModelViewSet):
+    queryset = Panorama.objects.all()
+    serializer_class = PanoramaSerializer
+
+
 class ReferenceViewSet(viewsets.ModelViewSet):
     queryset = Reference.objects.all()
     serializer_class = ReferenceSerializer