[gnome-maps/gnome-3-34] file-tile-source: Don't hardcode tile size

[Marcus Lundblad <mlundblad src gnome org>]

commit 527ec3a6ed87a6e3a3f23c3f29f83b88ee6e9260
Author: Marcus Lundblad <ml update uu se>
Date:   Mon Sep 23 21:56:40 2019 +0200

    file-tile-source: Don't hardcode tile size
    
    Get tile size using champlain_map_source_get_tile_size when
    computing offsets instead of hard-coding a tile size (also
    not matching the current tile size we get from Mapbox).

 lib/maps-file-tile-source.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/lib/maps-file-tile-source.c b/lib/maps-file-tile-source.c
index 25e73a4..0085d70 100644
--- a/lib/maps-file-tile-source.c
+++ b/lib/maps-file-tile-source.c
@@ -476,6 +476,7 @@ maps_file_tile_source_prepare (MapsFileTileSource *tile_source,
 
   ChamplainMapSource *source = (ChamplainMapSource *) tile_source;
   gboolean ret = TRUE;
+  guint tile_size = champlain_map_source_get_tile_size (source);
 
   if (!get_zoom_levels (tile_source, error)) {
     ret = FALSE;
@@ -490,16 +491,20 @@ maps_file_tile_source_prepare (MapsFileTileSource *tile_source,
   tile_source->priv->world = champlain_bounding_box_new ();
   tile_source->priv->world->left = champlain_map_source_get_longitude (source,
                                                     tile_source->priv->min_zoom,
-                                                    tile_source->priv->min_x * 256);
+                                                    tile_source->priv->min_x *
+                                                    tile_size);
   tile_source->priv->world->right = champlain_map_source_get_longitude (source,
                                                      tile_source->priv->min_zoom,
-                                                     tile_source->priv->max_x * 256);
+                                                     tile_source->priv->max_x *
+                                                     tile_size);
   tile_source->priv->world->top = champlain_map_source_get_latitude (source,
                                                      tile_source->priv->min_zoom,
-                                                     tile_source->priv->min_y * 256);
+                                                     tile_source->priv->min_y *
+                                                     tile_size);
   tile_source->priv->world->bottom = champlain_map_source_get_latitude (source,
                                                   tile_source->priv->min_zoom,
-                                                  tile_source->priv->max_y * 256);
+                                                  tile_source->priv->max_y *
+                                                  tile_size);
  out:
   return ret;
 }