From 82d67d6912008f179054c8e2e74a84d2cd62d31c Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 2 Feb 2016 18:04:25 -0800 Subject: [PATCH] [core] Remove unused --- include/mbgl/map/map.hpp | 3 --- include/mbgl/util/projection.hpp | 10 ---------- src/mbgl/map/map.cpp | 8 -------- 3 files changed, 21 deletions(-) diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 5b89bf4a9..b9aa0c138 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -144,9 +144,6 @@ public: uint16_t getHeight() const; // Projection - MetersBounds getWorldBoundsMeters() const; - LatLngBounds getWorldBoundsLatLng() const; - double getMetersPerPixelAtLatitude(double lat, double zoom) const; ProjectedMeters projectedMetersForLatLng(const LatLng&) const; LatLng latLngForProjectedMeters(const ProjectedMeters&) const; diff --git a/include/mbgl/util/projection.hpp b/include/mbgl/util/projection.hpp index f067db2e1..bee5eac8a 100644 --- a/include/mbgl/util/projection.hpp +++ b/include/mbgl/util/projection.hpp @@ -11,16 +11,6 @@ namespace mbgl { class Projection { public: - static inline MetersBounds getWorldBoundsMeters() { - const double d = util::EARTH_RADIUS_M * M_PI; - return { { -d, -d }, { d, d } }; - } - - static inline LatLngBounds getWorldBoundsLatLng() { - MetersBounds bounds = getWorldBoundsMeters(); - return { latLngForProjectedMeters(bounds.sw), latLngForProjectedMeters(bounds.ne) }; - } - static inline double getMetersPerPixelAtLatitude(double lat, double zoom) { const double mapPixelWidthAtZoom = std::pow(2.0, zoom) * util::tileSize; const double constrainedLatitude = ::fmin(::fmax(lat, -util::LATITUDE_MAX), util::LATITUDE_MAX); diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index e013619cf..e435ec32b 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -398,14 +398,6 @@ NorthOrientation Map::getNorthOrientation() const { #pragma mark - Projection -MetersBounds Map::getWorldBoundsMeters() const { - return Projection::getWorldBoundsMeters(); -} - -LatLngBounds Map::getWorldBoundsLatLng() const { - return Projection::getWorldBoundsLatLng(); -} - double Map::getMetersPerPixelAtLatitude(double lat, double zoom) const { return Projection::getMetersPerPixelAtLatitude(lat, zoom); }