[gnome-maps/wip/mlundblad/update-local-tile-size: 1/2] file-tile-source: Don't hardcode tile size
- From: Marcus Lundblad <mlundblad src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-maps/wip/mlundblad/update-local-tile-size: 1/2] file-tile-source: Don't hardcode tile size
- Date: Mon, 23 Sep 2019 20:08:06 +0000 (UTC)
commit 61f0a90793869015841731fa45d34811d91ac6a5
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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]