Prevent requests for downloading tiles at Zoom Level 19 and above for most map types

[andy/viking.git] / src / viktmsmapsource.c

diff --git a/src/viktmsmapsource.c b/src/viktmsmapsource.c
index afaed4def651169e8d6f44d997039c4c615053cf..674a5f2d1b501c00b3286455305a582996fcc59e 100644 (file)
--- a/src/viktmsmapsource.c
+++ b/src/viktmsmapsource.c
@@ -43,6 +43,7 @@
 
 #include "globals.h"
 #include "viktmsmapsource.h"
 
 #include "globals.h"
 #include "viktmsmapsource.h"

+#include "maputils.h"

 
 static gboolean _coord_to_mapcoord ( VikMapSource *self, const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest );
 static void _mapcoord_to_center_coord ( VikMapSource *self, MapCoord *src, VikCoord *dest );
 
 static gboolean _coord_to_mapcoord ( VikMapSource *self, const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest );
 static void _mapcoord_to_center_coord ( VikMapSource *self, MapCoord *src, VikCoord *dest );


@@ -255,34 +256,6 @@ vik_tms_map_source_class_init (VikTmsMapSourceClass *klass)
        object_class->finalize = vik_tms_map_source_finalize;
 }
 
        object_class->finalize = vik_tms_map_source_finalize;
 }
 

-/* 1 << (x) is like a 2**(x) */
-#define GZ(x) ((1<<(x)))
-
-static const gdouble scale_mpps[] = { GZ(0), GZ(1), GZ(2), GZ(3), GZ(4), GZ(5), GZ(6), GZ(7), GZ(8), GZ(9),
-                                           GZ(10), GZ(11), GZ(12), GZ(13), GZ(14), GZ(15), GZ(16), GZ(17) };
-
-static const gint num_scales = (sizeof(scale_mpps) / sizeof(scale_mpps[0]));
-
-static const gdouble scale_neg_mpps[] = { 1.0/GZ(0), 1.0/GZ(1), 1.0/GZ(2), 1.0/GZ(3) };
-static const gint num_scales_neg = (sizeof(scale_neg_mpps) / sizeof(scale_neg_mpps[0]));
-
-#define ERROR_MARGIN 0.01
-static gint tms_zoom ( gdouble mpp ) {
-  gint i;
-  for ( i = 0; i < num_scales; i++ ) {
-    if ( ABS(scale_mpps[i] - mpp) < ERROR_MARGIN ) {
-      return i;
-    }
-  }
-  for ( i = 0; i < num_scales_neg; i++ ) {
-    if ( ABS(scale_neg_mpps[i] - mpp) < 0.000001 ) {
-      return -i;
-    }
-  }
-
-  return 255;
-}
-

 static gboolean
 _is_direct_file_access ( VikMapSource *self )
 {
 static gboolean
 _is_direct_file_access ( VikMapSource *self )
 {


@@ -307,18 +280,18 @@ _coord_to_mapcoord ( VikMapSource *self, const VikCoord *src, gdouble xzoom, gdo
   if ( xzoom != yzoom )
     return FALSE;
 
   if ( xzoom != yzoom )
     return FALSE;
 

-  dest->scale = tms_zoom ( xzoom );
+  dest->scale = map_utils_mpp_to_scale ( xzoom );

   if ( dest->scale == 255 )
     return FALSE;
 
   if ( dest->scale == 255 )
     return FALSE;
 

-  /* Note : GZ(17) / xzoom / 2 = number of tile on Y axis */
+  /* Note : VIK_GZ(17) / xzoom / 2 = number of tile on Y axis */

        g_debug("%s: xzoom=%f yzoom=%f -> %f", __FUNCTION__,
        g_debug("%s: xzoom=%f yzoom=%f -> %f", __FUNCTION__,

-          xzoom, yzoom, GZ(17) / xzoom / 2);
-  dest->x = floor((src->east_west + 180) / 180 * GZ(17) / xzoom / 2);
+          xzoom, yzoom, VIK_GZ(17) / xzoom / 2);
+  dest->x = floor((src->east_west + 180) / 180 * VIK_GZ(17) / xzoom / 2);

   /* We should restore logic of viking:
    * tile index on Y axis follow a screen logic (top -> down)
    */
   /* We should restore logic of viking:
    * tile index on Y axis follow a screen logic (top -> down)
    */

-  dest->y = floor((180 - (src->north_south + 90)) / 180 * GZ(17) / xzoom / 2);
+  dest->y = floor((180 - (src->north_south + 90)) / 180 * VIK_GZ(17) / xzoom / 2);

   dest->z = 0;
   g_debug("%s: %f,%f -> %d,%d", __FUNCTION__,
           src->east_west, src->north_south, dest->x, dest->y);
   dest->z = 0;
   g_debug("%s: %f,%f -> %d,%d", __FUNCTION__,
           src->east_west, src->north_south, dest->x, dest->y);


@@ -330,15 +303,15 @@ _mapcoord_to_center_coord ( VikMapSource *self, MapCoord *src, VikCoord *dest )
 {
   gdouble socalled_mpp;
   if (src->scale >= 0)
 {
   gdouble socalled_mpp;
   if (src->scale >= 0)

-    socalled_mpp = GZ(src->scale);
+    socalled_mpp = VIK_GZ(src->scale);

   else
   else

-    socalled_mpp = 1.0/GZ(-src->scale);
+    socalled_mpp = 1.0/VIK_GZ(-src->scale);

   dest->mode = VIK_COORD_LATLON;
   dest->mode = VIK_COORD_LATLON;

-  dest->east_west = (src->x+0.5) * 180 / GZ(17) * socalled_mpp * 2 - 180;
+  dest->east_west = (src->x+0.5) * 180 / VIK_GZ(17) * socalled_mpp * 2 - 180;

   /* We should restore logic of viking:
    * tile index on Y axis follow a screen logic (top -> down)
    */
   /* We should restore logic of viking:
    * tile index on Y axis follow a screen logic (top -> down)
    */

-  dest->north_south = -((src->y+0.5) * 180 / GZ(17) * socalled_mpp * 2 - 90);
+  dest->north_south = -((src->y+0.5) * 180 / VIK_GZ(17) * socalled_mpp * 2 - 90);

   g_debug("%s: %d,%d -> %f,%f", __FUNCTION__,
           src->x, src->y, dest->east_west, dest->north_south);
 }
   g_debug("%s: %d,%d -> %f,%f", __FUNCTION__,
           src->x, src->y, dest->east_west, dest->north_south);
 }


@@ -354,7 +327,7 @@ _get_uri( VikMapSourceDefault *self, MapCoord *src )
      */
 
        /* Note : nb tiles on Y axis */
      */
 
        /* Note : nb tiles on Y axis */

-       gint nb_tiles = GZ(17 - src->scale - 1);
+       gint nb_tiles = VIK_GZ(17 - src->scale - 1);

 
        gchar *uri = g_strdup_printf (priv->url, 17 - src->scale - 1, src->x, nb_tiles - src->y - 1);
        
 
        gchar *uri = g_strdup_printf (priv->url, 17 - src->scale - 1, src->x, nb_tiles - src->y - 1);