1 files changed, 31 insertions, 7 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java
index 6bc6d40287..d074592ffb 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java
@@ -5,6 +5,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.UiThread;
 
+import java.net.URI;
 import java.net.URL;
 
 /**
@@ -31,32 +32,44 @@ public class RasterDemSource extends Source {
    *
    * @param id  the source id
    * @param url the source url
+   * @deprecated use {@link #RasterDemSource(String, URI)} instead
    */
+  @Deprecated
   public RasterDemSource(String id, URL url) {
     this(id, url.toExternalForm());
   }
 
   /**
-   * Create the raster dem source from an URL
+   * Create the raster dem source from an URI
    *
    * @param id  the source id
-   * @param url the source url
+   * @param uri the source uri
+   */
+  public RasterDemSource(String id, URI uri) {
+    this(id, uri.toString());
+  }
+
+  /**
+   * Create the raster dem source from an URI
+   *
+   * @param id  the source id
+   * @param uri the source uri
    */
-  public RasterDemSource(String id, String url) {
+  public RasterDemSource(String id, String uri) {
     super();
-    initialize(id, url, DEFAULT_TILE_SIZE);
+    initialize(id, uri, DEFAULT_TILE_SIZE);
   }
 
   /**
    * Create the raster source from an URL with a specific tile size
    *
    * @param id       the source id
-   * @param url      the source url
+   * @param uri     the source url
    * @param tileSize the tile size
    */
-  public RasterDemSource(String id, String url, int tileSize) {
+  public RasterDemSource(String id, String uri, int tileSize) {
     super();
-    initialize(id, url, tileSize);
+    initialize(id, uri, tileSize);
   }
 
   /**
@@ -84,13 +97,24 @@ public class RasterDemSource extends Source {
 
   /**
    * @return The url or null
+   * @deprecated use {@link #getUri()} instead
    */
+  @Deprecated
   @Nullable
   public String getUrl() {
     checkThread();
     return nativeGetUrl();
   }
 
+  /**
+   * @return The uri or null
+   */
+  @Nullable
+  public String getUri() {
+    checkThread();
+    return nativeGetUrl();
+  }
+
   @Keep
   protected native void initialize(String layerId, Object payload, int tileSize);