From 46416a8751c009660d4b9d745dfa52e85a4c6364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=83=C2=A2=C3=82=C2=80=C3=82=C2=9Cosana=C3=83=C2=A2?=
 =?UTF-8?q?=C3=82=C2=80=C3=82=C2=9D?= <osana.babayan@mapbox.com>
Date: Wed, 16 May 2018 15:29:19 -0400
Subject: [PATCH] Move TurfAssertions.getCoord() to TurfMeta.getCoord() to
 follow Turf.js

---
 .../java/com/mapbox/turf/TurfAssertions.java     | 16 ----------------
 .../src/main/java/com/mapbox/turf/TurfMeta.java  | 16 ++++++++++++++++
 .../java/com/mapbox/turf/TurfAssertionsTest.java |  8 --------
 .../test/java/com/mapbox/turf/TurfMetaTest.java  |  8 ++++++++
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/services-turf/src/main/java/com/mapbox/turf/TurfAssertions.java b/services-turf/src/main/java/com/mapbox/turf/TurfAssertions.java
index 6710eec7d..af0686270 100644
--- a/services-turf/src/main/java/com/mapbox/turf/TurfAssertions.java
+++ b/services-turf/src/main/java/com/mapbox/turf/TurfAssertions.java
@@ -3,7 +3,6 @@
 import com.mapbox.geojson.Feature;
 import com.mapbox.geojson.FeatureCollection;
 import com.mapbox.geojson.GeoJson;
-import com.mapbox.geojson.Point;
 import com.mapbox.core.utils.TextUtils;
 
 /**
@@ -19,21 +18,6 @@ private TurfAssertions() {
     // Private constructor preventing initialization of this class
   }
 
-  /**
-   * Unwrap a coordinate {@link Point} from a Feature with a Point geometry.
-   *
-   * @param obj any value
-   * @return a coordinate
-   * @see <a href="http://turfjs.org/docs/#getcoord">Turf getCoord documentation</a>
-   * @since 1.2.0
-   */
-  public static Point getCoord(Feature obj) {
-    if (obj.geometry() instanceof Point) {
-      return (Point) obj.geometry();
-    }
-    throw new TurfException("A feature with a Point geometry is required.");
-  }
-
   /**
    * Enforce expectations about types of GeoJson objects for Turf.
    *
diff --git a/services-turf/src/main/java/com/mapbox/turf/TurfMeta.java b/services-turf/src/main/java/com/mapbox/turf/TurfMeta.java
index 00ec5e430..bee7842f3 100644
--- a/services-turf/src/main/java/com/mapbox/turf/TurfMeta.java
+++ b/services-turf/src/main/java/com/mapbox/turf/TurfMeta.java
@@ -2,6 +2,7 @@
 
 import android.support.annotation.NonNull;
 
+import com.mapbox.geojson.Feature;
 import com.mapbox.geojson.LineString;
 import com.mapbox.geojson.MultiLineString;
 import com.mapbox.geojson.MultiPoint;
@@ -140,4 +141,19 @@ public static List<Point> coordAll(@NonNull MultiPolygon multiPolygon, boolean e
     }
     return coords;
   }
+
+  /**
+   * Unwrap a coordinate {@link Point} from a Feature with a Point geometry.
+   *
+   * @param obj any value
+   * @return a coordinate
+   * @see <a href="http://turfjs.org/docs/#getcoord">Turf getCoord documentation</a>
+   * @since 3.2.0
+   */
+  public static Point getCoord(Feature obj) {
+    if (obj.geometry() instanceof Point) {
+      return (Point) obj.geometry();
+    }
+    throw new TurfException("A Feature with a Point geometry is required.");
+  }
 }
diff --git a/services-turf/src/test/java/com/mapbox/turf/TurfAssertionsTest.java b/services-turf/src/test/java/com/mapbox/turf/TurfAssertionsTest.java
index 6e15c7264..04de24fbc 100644
--- a/services-turf/src/test/java/com/mapbox/turf/TurfAssertionsTest.java
+++ b/services-turf/src/test/java/com/mapbox/turf/TurfAssertionsTest.java
@@ -108,12 +108,4 @@ public void testInvariantCollectionOf4() {
       + "type: 'Point', coordinates: [0, 0]}, properties: {}}]}";
     TurfAssertions.collectionOf(FeatureCollection.fromJson(json), "Point", "myfn");
   }
-
-
-  @Test
-  public void testInvariantGetCoord() {
-    String jsonFeature = "{type: 'Feature', geometry: {type: 'Point', coordinates: [1, 2]}}";
-    assertEquals(TurfAssertions.getCoord(Feature.fromJson(jsonFeature)),
-      Point.fromLngLat(1, 2));
-  }
 }
\ No newline at end of file
diff --git a/services-turf/src/test/java/com/mapbox/turf/TurfMetaTest.java b/services-turf/src/test/java/com/mapbox/turf/TurfMetaTest.java
index cbafe6fd7..49f6faa94 100644
--- a/services-turf/src/test/java/com/mapbox/turf/TurfMetaTest.java
+++ b/services-turf/src/test/java/com/mapbox/turf/TurfMetaTest.java
@@ -1,5 +1,6 @@
 package com.mapbox.turf;
 
+import com.mapbox.geojson.Feature;
 import com.mapbox.geojson.LineString;
 import com.mapbox.geojson.Point;
 import com.mapbox.geojson.Polygon;
@@ -77,4 +78,11 @@ public void coordAllMultiPolygon() throws TurfException {
     assertEquals(resultList.get(2), Point.fromLngLat(0, 1));
     assertEquals(resultList.get(3), Point.fromLngLat(0, 0));
   }
+
+  @Test
+  public void testInvariantGetCoord() {
+    String jsonFeature = "{type: 'Feature', geometry: {type: 'Point', coordinates: [1, 2]}}";
+    assertEquals(TurfMeta.getCoord(Feature.fromJson(jsonFeature)),
+      Point.fromLngLat(1, 2));
+  }
 }
\ No newline at end of file