Permalink
Browse files

Merge branch '2.0' of transparency:farmsubsidy into 2.0

  • Loading branch information...
2 parents bd1013f + baf2a21 commit e702697779828a5958f8c80adc896b8b7da29e67 @symroe symroe committed Dec 9, 2010
Showing with 4 additions and 5 deletions.
  1. +2 −2 web/data/management/commands/heatmap.py
  2. +1 −1 web/data/templates/heatmap.html
  3. +1 −2 web/data/views.py
@@ -11,12 +11,12 @@
class Command(BaseCommand):
def handle(self, **options):
- shutil.rmtree(ROOT)
+ #shutil.rmtree(ROOT)
Point.objects.all().delete()
for recipient in GeoRecipient.objects.all():
Point(uid=recipient.pk,
latitude=recipient.location.x,
longitude=recipient.location.y,
density=1,
- ).save()
+ ).save()
@@ -127,4 +127,4 @@
<div id="map"></div>
-</body>
+</body>
View
@@ -423,7 +423,6 @@ def heatmap(request):
def serve_tile(request,color_scheme,zoom,x,y):
# Check arguments
- print "serving"
try:
assert color_scheme in color_schemes, ( "bad color_scheme: "
+ color_scheme
@@ -447,4 +446,4 @@ def serve_tile(request,color_scheme,zoom,x,y):
bytes = storage_backend.get_tile_bytes(tile, 'farm')
# Write the bytes out to the HttpResponse
- return HttpResponse(bytes, content_type="image/png")
+ return HttpResponse(bytes, content_type="image/png")

0 comments on commit e702697

Please sign in to comment.