add ability to handle encoded coordinates in RouteOptions#toUrl

Author: Łukasz Paczos

services-directions-models/src/main/java/com/mapbox/api/directions/v5/models/RouteOptions.java

@@ -873,15 +873,15 @@ public static RouteOptions fromUrl(@NonNull URL url) {
 
     optionsJson.addProperty("baseUrl", url.getProtocol() + "://" + url.getHost());
 
-    String[] pathElements = url.getPath().split("/");
-    optionsJson.addProperty("user", pathElements[3]);
-    optionsJson.addProperty("profile", pathElements[4]);
-    optionsJson.addProperty("coordinates", pathElements[5]);
-
-    String[] queryElements = url.getQuery().split("&");
-    for (String query : queryElements) {
-      int idx = query.indexOf("=");
-      try {
+    try {
+      String[] pathElements = url.getPath().split("/");
+      optionsJson.addProperty("user", URLDecoder.decode(pathElements[3], UTF_8));
+      optionsJson.addProperty("profile", URLDecoder.decode(pathElements[4], UTF_8));
+      optionsJson.addProperty("coordinates", URLDecoder.decode(pathElements[5], UTF_8));
+
+      String[] queryElements = url.getQuery().split("&");
+      for (String query : queryElements) {
+        int idx = query.indexOf("=");
         String property = URLDecoder.decode(query.substring(0, idx), UTF_8);
         String value = URLDecoder.decode(query.substring(idx + 1), UTF_8);
 
@@ -904,9 +904,9 @@ public static RouteOptions fromUrl(@NonNull URL url) {
             value
           );
         }
-      } catch (UnsupportedEncodingException ex) {
-        throw new RuntimeException(ex);
       }
+    } catch (UnsupportedEncodingException ex) {
+      throw new RuntimeException(ex);
     }
 
     return fromJsonString(optionsJson.toString());

services-directions-models/src/test/java/com/mapbox/api/directions/v5/models/RouteOptionsTest.java

@@ -432,6 +432,25 @@ public void routeOptions_toUrl_fromUrl_withEncodedChars() {
     assertEquals(expectedOptions, resultingOptions);
   }
 
+  @Test
+  public void routeOptions_fromUrl_withEncodedCoordinates() throws MalformedURLException {
+    List<Point> coordinates = new ArrayList<>();
+    coordinates.add(Point.fromLngLat(-122.4003312, 37.7736941));
+    coordinates.add(Point.fromLngLat(-122.4187529, 37.7689715));
+
+    RouteOptions expectedOptions = RouteOptions.builder()
+      .profile(DirectionsCriteria.PROFILE_DRIVING)
+      .coordinatesList(coordinates)
+      .waypointNames("my starting position;my destination")
+      .build();
+
+    String url = "https://api.mapbox.com/directions/v5/mapbox/driving/-122.4003312%2C37.7736941;-122.4187529%2C37.7689715?access_token=pk.token&geometries=polyline6&waypoint_names=my%20starting%20position;my%20destination";
+
+    RouteOptions resultingOptions = RouteOptions.fromUrl(new URL(url));
+
+    assertEquals(expectedOptions, resultingOptions);
+  }
+
   @Test
   public void routeOptionsWithUTF8Chars_toUrlWithEncodedChars() {
     String expectedEncodedUrl =