mapbox · zugaldia · Jul 8, 2016 · Jul 8, 2016 · Jul 8, 2016 · Jul 8, 2016
diff --git a/libandroid/CHANGELOG.md b/libandroid/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 Mapbox welcomes participation and contributions from everyone.
 
+### v1.2.0
+
+* Updated to `libjava` v1.2.0
+* Several examples added to the TestApp
+* Improved documentation
+
+Full changelog: https://github.com/mapbox/mapbox-java/issues?q=milestone%3Av1.2.0+is%3Aclosed
+
 ### v1.1.0
 
 * Updated to `libjava` v1.1.0

diff --git a/...pp/src/main/java/com/mapbox/services/android/testapp/staticimage/StaticImageActivity.java b/...pp/src/main/java/com/mapbox/services/android/testapp/staticimage/StaticImageActivity.java
@@ -21,7 +21,7 @@ public class StaticImageActivity extends AppCompatActivity {
     // All default Mapbox styles
     public final static String[] MAPBOX_STYLES = {
             Constants.MAPBOX_STYLE_STREETS, Constants.MAPBOX_STYLE_LIGHT,
-            Constants.MAPBOX_STYLE_DARK, Constants.MAPBOX_OUTDOORS,
+            Constants.MAPBOX_STYLE_DARK, Constants.MAPBOX_STYLE_OUTDOORS,
             Constants.MAPBOX_STYLE_SATELLITE, Constants.MAPBOX_STYLE_SATELLITE_HYBRID};
 
     // The ten venues for Copa America Centenario

diff --git a/...roid/app/src/main/java/com/mapbox/services/android/testapp/utils/MapMatchingActivity.java b/...roid/app/src/main/java/com/mapbox/services/android/testapp/utils/MapMatchingActivity.java
@@ -219,8 +219,10 @@ public void onResponse(Call<MapMatchingResponse> call, Response<MapMatchingRespo
                     // Check that the map matching API response is "OK".
                     if (response.code() == 200) {
                         // Convert the map matched response list from position to latlng coordinates.
-                        for (int i = 0; i < response.body().getMatchedPoints().size(); i++) {
-                            mapMatchedPoints.add(new LatLng(response.body().getMatchedPoints().get(i).getLatitude(), response.body().getMatchedPoints().get(i).getLongitude()));
+                        for (int i = 0; i < response.body().getMatchedPoints().length; i++) {
+                            mapMatchedPoints.add(new LatLng(
+                                    response.body().getMatchedPoints()[i].getLatitude(),
+                                    response.body().getMatchedPoints()[i].getLongitude()));
                         }
 
                         if (mapMatchedRoute != null) {

diff --git a/...app/src/main/java/com/mapbox/services/android/testapp/utils/SimplifyPolylineActivity.java b/...app/src/main/java/com/mapbox/services/android/testapp/utils/SimplifyPolylineActivity.java
@@ -222,7 +222,7 @@ private void drawSimplify(List<Position> points, double tolerance, boolean quali
         Position[] before = new Position[points.size()];
         for (int i = 0; i < points.size(); i++) before[i] = points.get(i);
 
-        Position[] after = PolylineUtils.simplify(before, tolerance, quality);
+        Position[] after = PolylineUtils.simplify(before, 0.001 * tolerance, quality);
 
         simplifiedRoutePoints = after.length;
 

diff --git a/libandroid/lib/build.gradle b/libandroid/lib/build.gradle
@@ -10,8 +10,8 @@ android {
 
         // This should be updated together with gradle.properties
         // Last number is 0 for a SNAPSHOT, 1 for a release
-        versionCode 1 * 1000 + 1 * 100 + 0 * 10 + 0
-        versionName "1.1.0-SNAPSHOT"
+        versionCode 2 * 1000 + 0 * 100 + 0 * 10 + 0
+        versionName "2.0.0-SNAPSHOT"
     }
 
     compileOptions {
@@ -33,7 +33,7 @@ dependencies {
     compile 'com.android.support:design:23.3.0'
 
     // Mapbox Java Services
-    compile ('com.mapbox.mapboxsdk:mapbox-java-services:1.2.0-SNAPSHOT@jar') {
+    compile ('com.mapbox.mapboxsdk:mapbox-java-services:1.2.0@jar') {
         transitive=true
     }
 

diff --git a/libandroid/lib/gradle.properties b/libandroid/lib/gradle.properties
@@ -1,5 +1,5 @@
 # Version name should be updated in build.gradle too.
-VERSION_NAME=1.2.0-SNAPSHOT
+VERSION_NAME=2.0.0-SNAPSHOT
 
 GROUP=com.mapbox.mapboxsdk
 

diff --git a/libjava/CHANGELOG.md b/libjava/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 Mapbox welcomes participation and contributions from everyone.
 
+### v1.2.0
+
+* Support for the Map Matching API
+* Improved Geocoder API (including support for `wikidata` and `bbox`)
+* Better Static Image API
+* Some [Turf](http://turfjs.org/) methods ported to Java: `TurfMeasurement.bearing`, `TurfMeasurement.destination`, `TurfMeasurement.distance`, `TurfMeasurement.lineDistance`, `TurfHelpers.distanceToRadians`, `TurfHelpers.radiansToDistance`, `TurfMisc.lineSlice`
+* [`simplify-js`](https://github.com/mourner/simplify-js) ported to Java
+
+Full changelog: https://github.com/mapbox/mapbox-java/issues?q=milestone%3Av1.2.0+is%3Aclosed
+
 ### v1.1.0
 
 * Support for directions API v5

diff --git a/libjava/lib/gradle.properties b/libjava/lib/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1.2.0-SNAPSHOT
+VERSION_NAME=2.0.0-SNAPSHOT
 GROUP=com.mapbox.mapboxsdk
 
 POM_DESCRIPTION=Mapbox Java Services

diff --git a/libjava/lib/src/main/java/com/mapbox/services/Constants.java b/libjava/lib/src/main/java/com/mapbox/services/Constants.java
@@ -7,7 +7,7 @@ public class Constants {
     /**
      * Package version
      */
-    public final static String MAPBOX_JAVA_VERSION = "1.2.0-SNAPSHOT";
+    public final static String MAPBOX_JAVA_VERSION = "2.0.0-SNAPSHOT";
 
     /**
      * User agent for HTTP requests

diff --git a/...rc/main/java/com/mapbox/services/mapmatching/v4/gson/MapMatchingGeometryDeserializer.java b/...rc/main/java/com/mapbox/services/mapmatching/v4/gson/MapMatchingGeometryDeserializer.java
@@ -12,7 +12,7 @@
 
 /**
  * Custom deserializer that assumes a Polyline string.
- * <p/>
+ *
  * In case of a json object, null is returned to support the geometry=false option
  * (empty object is returned instead of null)
  *
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ @@
     /**
      * Custom deserializer that assumes a Polyline string.
-     * <p/>
+     *
      * In case of a json object, null is returned to support the geometry=false option
      * (empty object is returned instead of null)
      *
@@ Expand Down @@