Moved Json Rest into a view dir where they belong.

Author: pykler

mainapp/models.py

@@ -1,4 +1,3 @@
-
 from django.db import models, connection
 from django.contrib.gis.db import models
 from django.contrib.gis.maps.google import GoogleMap, GMarker, GEvent, GPolygon, GIcon
@@ -16,7 +15,6 @@
 from contrib.stdimage import StdImageField
 import libxml2
 from django.utils.encoding import iri_to_uri
-from contrib.django_restapi.model_resource import Collection
 
 
 class Province(models.Model):
@@ -299,18 +297,6 @@ def __unicode__(self):
         return mark_safe('GMarker(%s)' % ( self.js_params))
 
 
-class ReportJSON(Collection):
-
-    def read(self, request):
-        lon = request.GET["lon"]
-        lat = request.GET["lat"]
-        radius = int(request.GET.get('r', 4))
-        point_str = "POINT(%s %s)" %(lon, lat)
-        pnt = fromstr(point_str, srid=4326)
-        reports = Report.objects.filter(is_confirmed = True,point__distance_lte=(pnt,D(km=radius))).distance(pnt).order_by('distance')
-        return self.responder.list(request, reports)
-
-
 class FixMyStreetMap(GoogleMap):  
     """
         Overrides the GoogleMap class that comes with GeoDjango.  Optionally,

mainapp/views/json.py

@@ -0,0 +1,25 @@
+from contrib.django_restapi.model_resource import Collection
+from contrib.django_restapi.responder import JSONResponder
+from django.contrib.gis.geos import fromstr 
+from django.contrib.gis.measure import D
+
+from mainapp.models import Report
+
+class ReportJSON(Collection):
+
+    def read(self, request):
+        lon = request.GET["lon"]
+        lat = request.GET["lat"]
+        radius = float(request.GET.get('r', 4))
+        point_str = "POINT(%s %s)" %(lon, lat)
+        pnt = fromstr(point_str, srid=4326)
+        reports = Report.objects.filter(is_confirmed = True,point__distance_lte=(pnt,D(km=radius))).distance(pnt).order_by('distance')
+        return self.responder.list(request, reports)
+
+reports_resource = ReportJSON(
+    queryset=Report.objects.all(),
+    permitted_methods = ('GET', 'POST'),
+#     expose_fields = ('id','point'),
+    responder = JSONResponder()
+#     responder = JSONResponder(paginate_by = 2)
+)

urls.py

@@ -3,10 +3,6 @@
 from django.http import HttpResponseRedirect
 from django.contrib import admin
 from mainapp.feeds import LatestReports, LatestReportsByCity, LatestReportsByWard, LatestUpdatesByReport
-from contrib.django_restapi.responder import JSONResponder
-
-# models
-from mainapp.models import Report, ReportJSON
 
 
 feeds = {
@@ -84,17 +80,9 @@
     (r'^ajax/categories/(\d+)', 'category_desc'),
 )
 
-# REST
-json_report_resource = ReportJSON(
-    queryset=Report.objects.all(),
-    permitted_methods = ('GET', 'POST'),
-#     expose_fields = ('id','point'),
-    responder = JSONResponder()
-#     responder = JSONResponder(paginate_by = 2)
-)
-
-urlpatterns += patterns('',
-   url(r'^json/report/?$', json_report_resource),
+# REST Urls
+urlpatterns += patterns('mainapp.views.json',
+   url(r'^json/report/?$', 'reports_resource'),
 )