Merge branch 'drf-integration'

api/serializers.py

@@ -0,0 +1,19 @@
+from rest_framework import serializers
+
+from panorama.models import Panorama, ReferencePoint
+
+class PanoramaSerializer(serializers.HyperlinkedModelSerializer):
+    # fixme : return absolute URL for tiles_url
+    class Meta:
+        model = Panorama
+        fields = ("url", "name", "loop",
+                  "latitude", "longitude", "altitude",
+                  "tiles_url")
+
+class ReferencePointSerializer(serializers.HyperlinkedModelSerializer):
+    # fixme : return absolute URL for tiles_url
+    class Meta:
+        model = ReferencePoint
+        fields = ("url", "name",
+                  "latitude", "longitude", "altitude")
+

api/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

api/urls.py

@@ -0,0 +1,12 @@
+from django.conf.urls import url, include
+from rest_framework import routers
+from . import views
+
+router = routers.DefaultRouter()
+router.register(r'panoramas', views.PanoramaViewSet)
+router.register(r'refpoints', views.ReferencePointViewSet)
+
+urlpatterns = [
+    url(r'^', include(router.urls)),
+#    url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework'))
+]

api/views.py

@@ -0,0 +1,14 @@
+from rest_framework import viewsets
+
+from panorama.models import Panorama, ReferencePoint
+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
+
+

panorama/models.py

@@ -115,16 +115,6 @@ class Panorama(ReferencePoint):
         return os.path.join(settings.MEDIA_URL, settings.PANORAMA_TILES_DIR,
                             str(self.pk))
 
-    def to_dict(self):
-        """Useful to pass information to the javascript code as JSON"""
-        return {"id": self.id,
-                "name": self.name,
-                "loop": self.loop,
-                "latitude": self.latitude,
-                "longitude": self.longitude,
-                "altitude": self.altitude,
-                "tiles_url": self.tiles_url()}
-
     def generate_tiles(self):
         # The trailing slash is necessary for the shell script.
         tiles_dir = self.tiles_dir()  + "/"

requirements.txt

@@ -0,0 +1,3 @@
+Django==1.7.4
+djangorestframework==3.0.5
+Pillow==2.7.0

ztulec/settings.py

@@ -36,7 +36,9 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'rest_framework',
     'panorama',
+    'api'
 )
 
 MIDDLEWARE_CLASSES = (

ztulec/urls.py

@@ -8,5 +8,6 @@ urlpatterns = patterns('',
     # url(r'^$', 'ztulec.views.home', name='home'),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^', include('panorama.urls', namespace="panorama")),
+    url(r'^api/v1/', include('api.urls')),
 # In debug mode, serve tiles
 ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)