fix coordinate conversion

mapbox · Aug 21, 2015 · 1081992 · incanus · Aug 21, 2015 · 1081992
1 parent 1551424
commit 1081992
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm
@@ -1620,10 +1620,6 @@ - (CLLocationCoordinate2D)convertPoint:(CGPoint)point toCoordinateFromView:(null
 {
     CGPoint convertedPoint = [self convertPoint:point fromView:view];
 
-    // flip y coordinate for iOS view origin top left
-    //
-    convertedPoint.y = self.bounds.size.height - convertedPoint.y;
-
     return MGLLocationCoordinate2DFromLatLng(_mbglMap->latLngForPixel(mbgl::vec2<double>(convertedPoint.x, convertedPoint.y)));
 }
 

diff --git a/src/mbgl/map/transform_state.cpp b/src/mbgl/map/transform_state.cpp
@@ -172,7 +172,7 @@ float TransformState::xLng(float x_, float worldSize_) const {
 
 float TransformState::yLat(float y_, float worldSize_) const {
     float y2 = 180.0f - y_ * 360.0f / worldSize_;
-    return 260.0f / M_PI * std::atan(std::exp(y2 * M_PI / 180.0f)) - 90.0f;
+    return 360.0f / M_PI * std::atan(std::exp(y2 * M_PI / 180.0f)) - 90.0f;
 }
 
 float TransformState::zoomScale(float zoom) const {
@@ -204,8 +204,8 @@ TileCoordinate TransformState::latLngToCoordinate(const LatLng& latLng) const {
 LatLng TransformState::coordinateToLatLng(const TileCoordinate& coord) const {
     const float worldSize_ = zoomScale(coord.zoom);
     LatLng latLng = {
-        xLng(coord.column, worldSize_),
-        yLat(coord.row, worldSize_)
+        yLat(coord.row, worldSize_),
+        xLng(coord.column, worldSize_)
     };
     while (latLng.longitude < 180.0f) latLng.longitude += 360.0f;
     while (latLng.longitude > 180.0f) latLng.longitude -= 360.0f;