diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-11-11 16:48:58 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-11-11 16:59:49 +0200 |
commit | aa8857643d404a5512b1bc3cec380e56f88b6f75 (patch) | |
tree | f7b5dff95ae661b4ca0877a20ff861f31636a5a3 /include/mbgl/util/projection.hpp | |
parent | cd0266f25cc96358e665b6f39e358a263f6d4ab8 (diff) | |
download | qtlocation-mapboxgl-aa8857643d404a5512b1bc3cec380e56f88b6f75.tar.gz |
[core] Added MetersBounds
Diffstat (limited to 'include/mbgl/util/projection.hpp')
-rw-r--r-- | include/mbgl/util/projection.hpp | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/include/mbgl/util/projection.hpp b/include/mbgl/util/projection.hpp index 9563900851..391e37dd34 100644 --- a/include/mbgl/util/projection.hpp +++ b/include/mbgl/util/projection.hpp @@ -11,24 +11,14 @@ namespace mbgl { class Projection { public: - static inline void getWorldBoundsMeters(ProjectedMeters &sw, ProjectedMeters &ne) { + static inline MetersBounds getWorldBoundsMeters() { const double d = util::EARTH_RADIUS_M * M_PI; - - sw.easting = -d; - sw.northing = -d; - - ne.easting = d; - ne.northing = d; + return { { -d, -d }, { d, d } }; } - static inline void getWorldBoundsLatLng(LatLng &sw, LatLng &ne) { - ProjectedMeters projectedMetersSW = ProjectedMeters(); - ProjectedMeters projectedMetersNE = ProjectedMeters(); - - getWorldBoundsMeters(projectedMetersSW, projectedMetersNE); - - sw = latLngForProjectedMeters(projectedMetersSW); - ne = latLngForProjectedMeters(projectedMetersNE); + static inline LatLngBounds getWorldBoundsLatLng() { + MetersBounds bounds = getWorldBoundsMeters(); + return { latLngForProjectedMeters(bounds.sw), latLngForProjectedMeters(bounds.ne) }; } static inline double getMetersPerPixelAtLatitude(const double lat, const double zoom) { |