summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2015-11-10 13:55:21 +0200
committerBruno de Oliveira Abinader <bruno@mapbox.com>2015-11-11 16:59:49 +0200
commit5a24ac605b23ae1d28ac052eb6eeae559db3bb79 (patch)
treef792f232400117599ef68e8bb9714ad04d609d92 /include
parent99ac8d8720fcd838141b291e4c85466aefbb88f6 (diff)
downloadqtlocation-mapboxgl-5a24ac605b23ae1d28ac052eb6eeae559db3bb79.tar.gz
[core] Use PrecisionPoint in zoom and angle functions
Diffstat (limited to 'include')
-rw-r--r--include/mbgl/map/map.hpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index d71387a67f..ea4073f4bf 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -107,8 +107,8 @@ public:
void resetPosition();
// Scale
- void scaleBy(double ds, double cx = -1, double cy = -1, const Duration& = Duration::zero());
- void setScale(double scale, double cx = -1, double cy = -1, const Duration& = Duration::zero());
+ void scaleBy(double ds, const PrecisionPoint& = { 0, 0 }, const Duration& = Duration::zero());
+ void setScale(double scale, const PrecisionPoint& = { 0, 0 }, const Duration& = Duration::zero());
double getScale() const;
void setZoom(double zoom, const Duration& = Duration::zero());
double getZoom() const;
@@ -120,9 +120,9 @@ public:
double getMaxZoom() const;
// Rotation
- void rotateBy(double sx, double sy, double ex, double ey, const Duration& = Duration::zero());
+ void rotateBy(const PrecisionPoint& first, const PrecisionPoint& second, const Duration& = Duration::zero());
void setBearing(double degrees, const Duration& = Duration::zero());
- void setBearing(double degrees, double cx, double cy);
+ void setBearing(double degrees, const PrecisionPoint&);
double getBearing() const;
void resetNorth();
@@ -135,9 +135,10 @@ public:
uint16_t getHeight() const;
// Projection
- void getWorldBoundsMeters(ProjectedMeters &sw, ProjectedMeters &ne) const;
- void getWorldBoundsLatLng(LatLng &sw, LatLng &ne) const;
- double getMetersPerPixelAtLatitude(const double lat, const double zoom) const;
+ void getWorldBoundsMeters(ProjectedMeters& sw, ProjectedMeters& ne) const;
+ void getWorldBoundsLatLng(LatLng& sw, LatLng& ne) const;
+
+ double getMetersPerPixelAtLatitude(double lat, double zoom) const;
ProjectedMeters projectedMetersForLatLng(const LatLng&) const;
LatLng latLngForProjectedMeters(const ProjectedMeters&) const;
PrecisionPoint pixelForLatLng(const LatLng&) const;