diff options
Diffstat (limited to 'geometry/mercator.cpp')
| -rw-r--r-- | geometry/mercator.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/geometry/mercator.cpp b/geometry/mercator.cpp index b997aace27..3ba242c644 100644 --- a/geometry/mercator.cpp +++ b/geometry/mercator.cpp @@ -7,34 +7,34 @@ using namespace std; -m2::RectD MercatorBounds::MetresToXY(double lon, double lat, double lonMetresR, double latMetresR) +m2::RectD MercatorBounds::MetersToXY(double lon, double lat, double lonMetersR, double latMetersR) { - double const latDegreeOffset = latMetresR * degreeInMetres; + double const latDegreeOffset = latMetersR * kDegreesInMeter; double const minLat = max(-90.0, lat - latDegreeOffset); double const maxLat = min(90.0, lat + latDegreeOffset); double const cosL = max(cos(base::DegToRad(max(fabs(minLat), fabs(maxLat)))), 0.00001); ASSERT_GREATER(cosL, 0.0, ()); - double const lonDegreeOffset = lonMetresR * degreeInMetres / cosL; + double const lonDegreeOffset = lonMetersR * kDegreesInMeter / cosL; double const minLon = max(-180.0, lon - lonDegreeOffset); double const maxLon = min(180.0, lon + lonDegreeOffset); return m2::RectD(FromLatLon(minLat, minLon), FromLatLon(maxLat, maxLon)); } -m2::PointD MercatorBounds::GetSmPoint(m2::PointD const & pt, double lonMetresR, double latMetresR) +m2::PointD MercatorBounds::GetSmPoint(m2::PointD const & pt, double lonMetersR, double latMetersR) { double const lat = YToLat(pt.y); double const lon = XToLon(pt.x); - double const latDegreeOffset = latMetresR * degreeInMetres; + double const latDegreeOffset = latMetersR * kDegreesInMeter; double const newLat = min(90.0, max(-90.0, lat + latDegreeOffset)); double const cosL = max(cos(base::DegToRad(newLat)), 0.00001); ASSERT_GREATER(cosL, 0.0, ()); - double const lonDegreeOffset = lonMetresR * degreeInMetres / cosL; + double const lonDegreeOffset = lonMetersR * kDegreesInMeter / cosL; double const newLon = min(180.0, max(-180.0, lon + lonDegreeOffset)); return FromLatLon(newLat, newLon); |