Remove old JSON export, we're using DRF now

panorama/models.py

@@ -81,23 +81,6 @@ class ReferencePoint(Point):
     name = models.CharField(verbose_name="name", max_length=255,
                             help_text="Name of the point")
 
-    def to_dict(self):
-        """Useful to pass information to the javascript code as JSON"""
-        return {"id": self.id,
-                "name": self.name,
-                "latitude": self.latitude,
-                "longitude": self.longitude,
-                "altitude": self.altitude}
-
-    def to_dict_extended(self, point):
-        """Same as above, but also includes information relative
-        to the given point: bearing, azimuth, distance."""
-        d = self.to_dict()
-        d['distance'] = self.line_distance(point)
-        d['bearing'] = point.bearing(self)
-        d['elevation'] = point.elevation(self)
-        return d
-    
     def __str__(self):
         return "Reference point : " + self.name
 

panorama/urls.py

@@ -10,7 +10,5 @@ urlpatterns = patterns('',
     url(r'^$', PanoramaList.as_view(), name="list"),
     url(r'^pano/new/$', PanoramaUpload.as_view(), name="new"),
     url(r'^pano/view/(?P<pk>\d+)/$', PanoramaView.as_view(), name="view_pano"),
-    url(r'^pano/json/(?P<pk>\d+)/$', pano_json, name="pano_json"),
     url(r'^pano/gen_tiles/(?P<id>\d+)/$', PanoramaGenTiles.as_view(), name="gen_tiles"),
-    url(r'^refpoints/around/pano/(?P<pk>\d+)/$', pano_refpoints, name="pano_refpoints"),
 )

panorama/views.py

@@ -24,21 +24,6 @@ class PanoramaView(DetailView):
     context_object_name = "panorama"
 
 
-def pano_json(request, pk):
-    pano = get_object_or_404(Panorama, pk=pk)
-    return JsonResponse(pano.to_dict())
-
-def pano_refpoints(request, pk):
-    """Returns the reference points that are close to the given panorama, as a
-    JSON object.  Each reference point also includes information relative
-    to the given panorama (bearing, elevation, distance).
-    """
-    pano = get_object_or_404(Panorama, pk=pk)
-    refpoints = [r.to_dict_extended(pano) for r in ReferencePoint.objects.all()
-                 if r.line_distance(pano) <= settings.PANORAMA_MAX_DISTANCE]
-    return JsonResponse(refpoints, safe=False)
-
-
 class PanoramaGenTiles(RedirectView):
     permanent = False
     pattern_name = "panorama:list"
@@ -53,5 +38,3 @@ class PanoramaList(ListView):
     model = Panorama
     template_name = "panorama/list.html"
     context_object_name = "panoramas"
-
-