1 files changed, 21 insertions, 10 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java
index f5db6f2a37..14bd8bb9ed 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java
@@ -8,26 +8,37 @@ import java.net.URL;
  * @see <a href="https://www.mapbox.com/mapbox-gl-style-spec/#sources-raster">The style specificition</a>
  */
 public class RasterSource extends Source {
-    public static final String TYPE = "raster";
-    private static final String URL_KEY = "url";
-    private static final String TILE_SIZE_KEY = "tileSize";
+    public static final int DEFAULT_TILE_SIZE = 512;
+
+    /**
+     * Internal use
+     */
+    public RasterSource(long nativePtr) {
+        super(nativePtr);
+    }
 
     public RasterSource(String id, URL url) {
         this(id, url.toExternalForm());
     }
 
     public RasterSource(String id, String url) {
-        super(id, TYPE);
-        this.put(URL_KEY, url);
+        initialize(id, url, DEFAULT_TILE_SIZE);
+    }
+
+    public RasterSource(String id, String url, int tileSize) {
+        initialize(id, url, tileSize);
     }
 
     public RasterSource(String id, TileSet tileSet) {
-        super(id, TYPE);
-        this.putAll(tileSet.toValueObject());
+        initialize(id, tileSet.toValueObject(), DEFAULT_TILE_SIZE);
     }
 
-    public RasterSource withTileSize(int tileSize) {
-        this.put(TILE_SIZE_KEY, (float) tileSize);
-        return this;
+    public RasterSource(String id, TileSet tileSet, int tileSize) {
+        initialize(id, tileSet.toValueObject(), tileSize);
     }
+
+    protected native void initialize(String layerId, Object payload, int tileSize);
+
+    @Override
+    protected native void finalize() throws Throwable;
 }