Changeset 9102 for src/django_gheat

Timestamp:

Apr 22, 2011, 3:44:39 PM (14 years ago)

Author:

dennisw

Message:

Zoomlevels fixed.

Location:

src/django_gheat/gheat

Files:

• __init__.py (modified) (1 diff)
• management/commands/gen_tiles.py (modified) (1 diff)
• models.py (modified) (1 diff)
• views.py (modified) (1 diff)

src/django_gheat/gheat/__init__.py

@@ -34 +34 @@
 
 SIZE = 256 # size of (square) tile; NB: changing this will break gmerc calls!
-MAX_ZOOM = 17 # this depends on Google API; 0 is furthest out as of recent ver.
+MAX_ZOOM = 22 # this depends on Google API; 0 is furthest out as of recent ver.
 
 

src/django_gheat/gheat/management/commands/gen_tiles.py

@@ -27 +27 @@
 class LatLonToTile:
 
-    def deg2num(self, lat_deg, lon_deg, zoom):
-        lat_rad = math.radians(lat_deg)
-        n = 2.0 ** zoom
-        xtile = int((lon_deg + 180.0) / 360.0 * n)
-        ytile = int((1.0 - math.log(math.tan(lat_rad) + (1 / math.cos(lat_rad))) / math.pi) / 2.0 * n)
-        return(xtile, ytile)
+  def deg2num(self, lat_deg, lon_deg, zoom):
+    lat_rad = math.radians(lat_deg)
+    n = 2.0 ** zoom
+    xtile = int((lon_deg + 180.0) / 360.0 * n)
+    ytile = int((1.0 - math.log(math.tan(lat_rad) + (1 / math.cos(lat_rad))) / math.pi) / 2.0 * n)
+    return(xtile, ytile)
 
 
 class Command(BaseCommand):
 
-    option_list = BaseCommand.option_list + (
-        make_option("-b", "--tileview", dest="viewname", default="serve_tile"),
-        make_option("-s", "--start", dest="start", default="52.132708,4.437389"),
-        make_option("-e", "--end", dest="end", default="52.178837,4.551029"),
-        make_option("-c", "--colorscheme", dest="color", default="classic"),
-    )
+  option_list = BaseCommand.option_list + (
+    make_option("-b", "--tileview", dest="viewname", default="serve_tile"),
+    make_option("-s", "--start", dest="start", default="52.132708,4.437389"),
+    make_option("-e", "--end", dest="end", default="52.178837,4.551029"),
+    make_option("-c", "--colorscheme", dest="color", default="classic"),
+  )
 
-    def handle(self, *args, **options):
+  def handle(self, *args, **options):
+    start = options['start'].split(',')
+    end = options['end'].split(',')
+    viewname = options['viewname']
+    colorscheme = str(options['color'])
 
-        start = options['start'].split(',')
-        end = options['end'].split(',')
-        viewname = options['viewname']
-        colorscheme = str(options['color'])
+    d2n = LatLonToTile()
 
-        d2n = LatLonToTile()
+    #initialize browser client
+    c = Client()
+    from gheat.models import MeetRondje
+ #   collection = MeetRondje.objects.values('naam')
+#    for col in collection:
+    for tz in range(1, 21):
+      #calculate start tiles
+      mxmin, mymax = d2n.deg2num(float(start[0]), float(start[1]), tz)
 
-        #initialize browser client
-        c = Client()
+      #calculate end tiles
+      mxmax, mymin = d2n.deg2num(float(end[0]), float(end[1]), tz)
 
-        for tz in range(1, 17):
-                #calculate start tiles
-                mxmin, mymax = d2n.deg2num(float(start[0]), float(start[1]), tz)
+      #loop through each tile and generate a request to the serve_tile view using Client
+      for ty in range(mymin, mymax+1):
+        for tx in range(mxmin, mxmax+1):
+          tileurl = reverse(viewname, kwargs={'color_scheme': colorscheme, 'zoom':tz, 'x':tx, 'y':ty})
+          generate_response = c.get(tileurl)
+          #lousy error handling. Should check why status 200 not returned... I.e. wrong colorscheme
+          if generate_response.status_code == 200:
+            print "Generated tile " + tileurl
+          else:
+            print "Failed generating tile " + tileurl
 
-                #calculate end tiles
-                mxmax, mymin = d2n.deg2num(float(end[0]), float(end[1]), tz)
-
-                #loop through each tile and generate a request to the serve_tile view using Client
-                for ty in range(mymin, mymax+1):
-                    for tx in range(mxmin, mxmax+1):
-                
-                        tileurl = reverse(viewname, kwargs={'color_scheme': colorscheme, 'zoom':tz, 'x':tx, 'y':ty})
-
-                        generate_response = c.get(tileurl)
-
-                        #lousy error handling. Should check why status 200 not returned... I.e. wrong colorscheme
-                        if generate_response.status_code == 200:
-                            print "Generated tile " + tileurl
-                        else:
-                            print "Failed generating tile " + tileurl
-

src/django_gheat/gheat/models.py

@@ -40 +40 @@
     return "%s @ %s,%s : %s" % (self.accespoint.ssid, self.latitude, self.longitude, self.signaal)
 
-class nodes(models.Model):
+class Node(models.Model):
   naam = models.CharField(max_length=64)
   ssid = models.CharField(max_length=64)

src/django_gheat/gheat/views.py

@@ -27 +27 @@
         x = int(x)
         y = int(y)
-        assert 0 <= zoom <= 17, "bad zoom: %d" % zoom
+        assert 0 <= zoom <= 22, "bad zoom: %d" % zoom
     except AssertionError, err:
         return HttpResponseBadRequest()