[ios, macos] Fix code style

mapbox · May 11, 2017 · 5c0b9f2 · 5c0b9f2
1 parent e4ccdad
commit 5c0b9f2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/platform/darwin/src/MGLGeometry.mm b/platform/darwin/src/MGLGeometry.mm
@@ -14,8 +14,6 @@
 
 const MGLCoordinateSpan MGLCoordinateSpanZero = {0, 0};
 
-const double MGLMetersPerRadian = 6373000.0;
-
 CGRect MGLExtendRect(CGRect rect, CGPoint point) {
     if (point.x < rect.origin.x) {
         rect.size.width += rect.origin.x - point.x;

diff --git a/platform/darwin/src/MGLGeometry_Private.h b/platform/darwin/src/MGLGeometry_Private.h
@@ -12,8 +12,6 @@ typedef double MGLLocationRadians;
 typedef double MGLRadianDistance;
 typedef double MGLRadianDirection;
 
-extern double const MGLMetersPerRadian;
-
 /** Defines the coordinate by a `MGLRadianCoordinate2D`. */
 typedef struct MGLRadianCoordinate2D {
     MGLLocationRadians latitude;

diff --git a/platform/darwin/src/MGLPolyline.mm b/platform/darwin/src/MGLPolyline.mm
@@ -58,8 +58,8 @@ - (CLLocationCoordinate2D)coordinate {
     NSAssert(count > 0, @"Polyline must have coordinates");
 
     CLLocationCoordinate2D *coordinates = self.coordinates;
-    double middle = [self polylineLongitud] / 2.0;
-    double traveled = 0.0;
+    CLLocationDistance middle = [self length] / 2.0;
+    CLLocationDistance traveled = 0.0;
 
     if (count > 1 || middle > traveled) {
         for (NSUInteger i = 0; i < count; i++) {
@@ -73,38 +73,34 @@ - (CLLocationCoordinate2D)coordinate {
                     return coordinates[i];
                 }
                 to = MGLRadianCoordinateFromLocationCoordinate(coordinates[i - 1]);
-                MGLRadianDirection direction = [self direction:from to:to] - 180;
+                CLLocationDirection direction = [self direction:from to:to] - 180;
                 MGLRadianCoordinate2D otherCoordinate = MGLRadianCoordinateAtDistanceFacingDirection(from,
-                                                                                                     overshoot/MGLMetersPerRadian,
+                                                                                                     overshoot/mbgl::util::M2PI * mbgl::util::EARTH_RADIUS_M,
                                                                                                      MGLRadiansFromDegrees(direction));
                 return CLLocationCoordinate2DMake(MGLDegreesFromRadians(otherCoordinate.latitude),
                                                   MGLDegreesFromRadians(otherCoordinate.longitude));
             }
 
-            traveled += (MGLDistanceBetweenRadianCoordinates(from, to) * 6373000.0);
+            traveled += (MGLDistanceBetweenRadianCoordinates(from, to) * mbgl::util::EARTH_RADIUS_M);
 
         }
     }
 
     return coordinates[count - 1];
 }
 
-- (double)polylineLongitud
+- (CLLocationDistance)length
 {
-    double longitude = 0.0;
+    CLLocationDistance length = 0.0;
 
     NSUInteger count = self.pointCount;
     CLLocationCoordinate2D *coordinates = self.coordinates;
 
-    for (NSUInteger i = 0; i < count; i++) {
-        if (i + 1 >= count) {
-            return longitude;
-        }
-
-        longitude += (MGLDistanceBetweenRadianCoordinates(MGLRadianCoordinateFromLocationCoordinate(coordinates[i]),                                                  MGLRadianCoordinateFromLocationCoordinate(coordinates[i + 1])) * 6373000.0);
+    for (NSUInteger i = 0; i < count - 1; i++) {        
+        length += (MGLDistanceBetweenRadianCoordinates(MGLRadianCoordinateFromLocationCoordinate(coordinates[i]),                                                  MGLRadianCoordinateFromLocationCoordinate(coordinates[i + 1])) * mbgl::util::EARTH_RADIUS_M);
     }
 
-    return longitude;
+    return length;
 }
 
 - (CLLocationDirection)direction:(MGLRadianCoordinate2D)from to:(MGLRadianCoordinate2D)to