[paparazzi-commits] [4761] name zoom max

[Pascal Brisset]

Revision: 4761
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4761
Author:   hecto
Date:     2010-03-29 15:57:49 +0000 (Mon, 29 Mar 2010)
Log Message:
-----------
 name zoom max

Modified Paths:
--------------
    paparazzi3/trunk/sw/lib/ocaml/gm.ml

Modified: paparazzi3/trunk/sw/lib/ocaml/gm.ml
===================================================================
--- paparazzi3/trunk/sw/lib/ocaml/gm.ml 2010-03-29 15:56:20 UTC (rev 4760)
+++ paparazzi3/trunk/sw/lib/ocaml/gm.ml 2010-03-29 15:57:49 UTC (rev 4761)
@@ -30,6 +30,7 @@
 open Printf
 
 let tile_size = 256, 256
+let zoom_max = 18
 
 let cache_path = ref "/var/tmp"
 
@@ -59,7 +60,7 @@
 let norm_lat = fun l -> Latlong.mercator_lat l /. pi
 
 let tile_coverage = fun lat zoom ->
-  let normed_size = 2. /. (2. ** (float (18-zoom))) in
+  let normed_size = 2. /. (2. ** (float (zoom_max-zoom))) in
   let normed_lat = norm_lat lat in
   let normed_lat' = normed_lat +. normed_size in
   let lat' = inv_norm_lat normed_lat' in
@@ -79,7 +80,7 @@
 (** Returns a keyhole string for a longitude (x), latitude (y), and zoom 
    for Google Maps (http://www.ponies.me.uk/maps/GoogleTileUtils.java) *)
 let tile_of_geo = fun wgs84 zoom ->
-  let zoom = 18 - zoom in
+  let zoom = zoom_max - zoom in
   
   (* first convert the lat lon to transverse mercator coordintes.*)
   let lon = (Rad>>Deg)wgs84.posn_long in