summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMarcus Lundblad <ml@update.uu.se>2019-09-23 21:56:40 +0200
committerMarcus Lundblad <ml@update.uu.se>2019-09-23 21:56:40 +0200
commit61f0a90793869015841731fa45d34811d91ac6a5 (patch)
tree23cfdb0c2a7bc13697988e07a208134906548bff /lib
parentd3dcfeed13290622d488ab3a34faaad799b47e17 (diff)
downloadgnome-maps-61f0a90793869015841731fa45d34811d91ac6a5.tar.gz
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).
Diffstat (limited to 'lib')
-rw-r--r--lib/maps-file-tile-source.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/maps-file-tile-source.c b/lib/maps-file-tile-source.c
index 25e73a43..0085d704 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;
}