diff options
Diffstat (limited to 'src/mbgl/util/tile_coordinate.hpp')
| -rw-r--r-- | src/mbgl/util/tile_coordinate.hpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mbgl/util/tile_coordinate.hpp b/src/mbgl/util/tile_coordinate.hpp index 46073c0dc9..bcd1c8444f 100644 --- a/src/mbgl/util/tile_coordinate.hpp +++ b/src/mbgl/util/tile_coordinate.hpp @@ -18,23 +18,25 @@ public: TileCoordinatePoint p; double z; - static TileCoordinate fromLatLng(const TransformState& state, double zoom, const LatLng& latLng) { - const double scale = std::pow(2, zoom - state.getZoom()); - return { Projection::project(latLng, state.getScale()) * scale / double(util::tileSize), zoom }; + static TileCoordinate fromLatLng(double zoom, const LatLng& latLng) { + const double scale = std::pow(2.0, zoom); + return { Projection::project(latLng, scale) / double(util::tileSize), zoom }; } static TileCoordinate fromScreenCoordinate(const TransformState& state, double zoom, const ScreenCoordinate& screenCoordinate) { - return fromLatLng(state, zoom, state.screenCoordinateToLatLng(screenCoordinate)); + return fromLatLng(zoom, state.screenCoordinateToLatLng(screenCoordinate)); } TileCoordinate zoomTo(double zoom) const { - return { p * std::pow(2, zoom - z), zoom }; + const double scaleDiff = std::pow(2.0, zoom - z); + return { p * scaleDiff, zoom }; } static GeometryCoordinate toGeometryCoordinate(const UnwrappedTileID& tileID, const TileCoordinatePoint& point) { + const double scale = std::pow(2.0, tileID.canonical.z); auto zoomed = TileCoordinate { point, 0 }.zoomTo(tileID.canonical.z); return { - int16_t(util::clamp<int64_t>((zoomed.p.x - tileID.canonical.x - tileID.wrap * std::pow(2.0, tileID.canonical.z)) * util::EXTENT, + int16_t(util::clamp<int64_t>((zoomed.p.x - tileID.canonical.x - tileID.wrap * scale) * util::EXTENT, std::numeric_limits<int16_t>::min(), std::numeric_limits<int16_t>::max())), int16_t(util::clamp<int64_t>((zoomed.p.y - tileID.canonical.y) * util::EXTENT, |