summaryrefslogtreecommitdiff
path: root/src/mbgl/map/transform_state.hpp
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-02-29 22:03:37 +0000
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-03-01 20:58:54 +0000
commitfde0ab98eedd77e652e1232605e4bc96f9fa65b9 (patch)
tree5a89e4718cfcb5a04715262775f300ea7d2fc817 /src/mbgl/map/transform_state.hpp
parent6e6d91478eb97afa750f2ad15625d6fca8981ae1 (diff)
downloadqtlocation-mapboxgl-fde0ab98eedd77e652e1232605e4bc96f9fa65b9.tar.gz
[core] Moved TileCoordinate to tile cover scope
Diffstat (limited to 'src/mbgl/map/transform_state.hpp')
-rw-r--r--src/mbgl/map/transform_state.hpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/mbgl/map/transform_state.hpp b/src/mbgl/map/transform_state.hpp
index 9f5f3a744d..e122fd8ac1 100644
--- a/src/mbgl/map/transform_state.hpp
+++ b/src/mbgl/map/transform_state.hpp
@@ -14,7 +14,6 @@
namespace mbgl {
class TileID;
-class TileCoordinate;
class TransformState {
friend class Transform;
@@ -38,7 +37,7 @@ public:
ConstrainMode getConstrainMode() const;
// Position
- LatLng getLatLng() const;
+ LatLng getLatLng(LatLng::WrapMode = LatLng::Wrapped) const;
double pixel_x() const;
double pixel_y() const;
@@ -66,13 +65,7 @@ public:
// Conversion and projection
ScreenCoordinate latLngToScreenCoordinate(const LatLng&) const;
- LatLng screenCoordinateToLatLng(const ScreenCoordinate&) const;
-
- TileCoordinate latLngToCoordinate(const LatLng&) const;
- LatLng coordinateToLatLng(const TileCoordinate&) const;
-
- ScreenCoordinate coordinateToPoint(const TileCoordinate&) const;
- TileCoordinate pointToCoordinate(const ScreenCoordinate&) const;
+ LatLng screenCoordinateToLatLng(const ScreenCoordinate&, LatLng::WrapMode = LatLng::Wrapped) const;
double xLng(double x, double worldSize) const;
double yLat(double y, double worldSize) const;