[android] - add get source id to supported layer types

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java

@@ -67,6 +67,16 @@ public CircleLayer withSourceLayer(String sourceLayer) {
     return this;
   }
 
+  /**
+   * Get the source id.
+   *
+   * @return id of the source
+   */
+  public String getSourceId() {
+    checkThread();
+    return nativeGetSourceId();
+  }
+
   /**
    * Get the source layer.
    *

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java

@@ -67,6 +67,16 @@ public FillExtrusionLayer withSourceLayer(String sourceLayer) {
     return this;
   }
 
+  /**
+   * Get the source id.
+   *
+   * @return id of the source
+   */
+  public String getSourceId() {
+    checkThread();
+    return nativeGetSourceId();
+  }
+
   /**
    * Get the source layer.
    *

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java

@@ -67,6 +67,16 @@ public FillLayer withSourceLayer(String sourceLayer) {
     return this;
   }
 
+  /**
+   * Get the source id.
+   *
+   * @return id of the source
+   */
+  public String getSourceId() {
+    checkThread();
+    return nativeGetSourceId();
+  }
+
   /**
    * Get the source layer.
    *

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java

@@ -67,6 +67,16 @@ public HeatmapLayer withSourceLayer(String sourceLayer) {
     return this;
   }
 
+  /**
+   * Get the source id.
+   *
+   * @return id of the source
+   */
+  public String getSourceId() {
+    checkThread();
+    return nativeGetSourceId();
+  }
+
   /**
    * Get the source layer.
    *

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java

@@ -67,6 +67,16 @@ public HillshadeLayer withSourceLayer(String sourceLayer) {
     return this;
   }
 
+  /**
+   * Get the source id.
+   *
+   * @return id of the source
+   */
+  public String getSourceId() {
+    checkThread();
+    return nativeGetSourceId();
+  }
+
   /**
    * Set a property or properties.
    *

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java

@@ -108,6 +108,9 @@ public void setMaxZoom(float zoom) {
   @Keep
   protected native String nativeGetSourceLayer();
 
+  @Keep
+  protected native String nativeGetSourceId();
+
   @Keep
   protected native float nativeGetMinZoom();
 

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java

@@ -67,6 +67,16 @@ public LineLayer withSourceLayer(String sourceLayer) {
     return this;
   }
 
+  /**
+   * Get the source id.
+   *
+   * @return id of the source
+   */
+  public String getSourceId() {
+    checkThread();
+    return nativeGetSourceId();
+  }
+
   /**
    * Get the source layer.
    *

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java

@@ -67,6 +67,16 @@ public RasterLayer withSourceLayer(String sourceLayer) {
     return this;
   }
 
+  /**
+   * Get the source id.
+   *
+   * @return id of the source
+   */
+  public String getSourceId() {
+    checkThread();
+    return nativeGetSourceId();
+  }
+
   /**
    * Set a property or properties.
    *

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java

@@ -67,6 +67,16 @@ public SymbolLayer withSourceLayer(String sourceLayer) {
     return this;
   }
 
+  /**
+   * Get the source id.
+   *
+   * @return id of the source
+   */
+  public String getSourceId() {
+    checkThread();
+    return nativeGetSourceId();
+  }
+
   /**
    * Get the source layer.
    *

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs

@@ -87,6 +87,18 @@ public class <%- camelize(type) %>Layer extends Layer {
     return this;
   }
 
+<% } -%>
+<% if (type !== 'background' && type !== 'custom') { -%>
+  /**
+   * Get the source id.
+   *
+   * @return id of the source
+   */
+  public String getSourceId() {
+    checkThread();
+    return nativeGetSourceId();
+  }
+
 <% } -%>
 <% if (type !== 'background' && type !== 'raster' && type !== 'hillshade') { -%>
   /**

platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java

@@ -50,6 +50,18 @@ private void setupLayer() {
     });
   }
 
+  @Test
+  public void testSourceId() {
+    validateTestSetup();
+    setupLayer();
+    Timber.i("SourceId");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+      // Get source id
+      assertEquals(layer.getSourceId(), "composite");
+    });
+  }
+
   @Test
   public void testSetVisibility() {
     validateTestSetup();

platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java

@@ -50,6 +50,18 @@ private void setupLayer() {
     });
   }
 
+  @Test
+  public void testSourceId() {
+    validateTestSetup();
+    setupLayer();
+    Timber.i("SourceId");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+      // Get source id
+      assertEquals(layer.getSourceId(), "composite");
+    });
+  }
+
   @Test
   public void testSetVisibility() {
     validateTestSetup();

platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java

@@ -50,6 +50,18 @@ private void setupLayer() {
     });
   }
 
+  @Test
+  public void testSourceId() {
+    validateTestSetup();
+    setupLayer();
+    Timber.i("SourceId");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+      // Get source id
+      assertEquals(layer.getSourceId(), "composite");
+    });
+  }
+
   @Test
   public void testSetVisibility() {
     validateTestSetup();

platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HeatmapLayerTest.java

@@ -50,6 +50,18 @@ private void setupLayer() {
     });
   }
 
+  @Test
+  public void testSourceId() {
+    validateTestSetup();
+    setupLayer();
+    Timber.i("SourceId");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+      // Get source id
+      assertEquals(layer.getSourceId(), "composite");
+    });
+  }
+
   @Test
   public void testSetVisibility() {
     validateTestSetup();

platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HillshadeLayerTest.java

@@ -50,6 +50,18 @@ private void setupLayer() {
     });
   }
 
+  @Test
+  public void testSourceId() {
+    validateTestSetup();
+    setupLayer();
+    Timber.i("SourceId");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+      // Get source id
+      assertEquals(layer.getSourceId(), "composite");
+    });
+  }
+
   @Test
   public void testSetVisibility() {
     validateTestSetup();

platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java

@@ -50,6 +50,18 @@ private void setupLayer() {
     });
   }
 
+  @Test
+  public void testSourceId() {
+    validateTestSetup();
+    setupLayer();
+    Timber.i("SourceId");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+      // Get source id
+      assertEquals(layer.getSourceId(), "composite");
+    });
+  }
+
   @Test
   public void testSetVisibility() {
     validateTestSetup();

platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java

@@ -50,6 +50,18 @@ private void setupLayer() {
     });
   }
 
+  @Test
+  public void testSourceId() {
+    validateTestSetup();
+    setupLayer();
+    Timber.i("SourceId");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+      // Get source id
+      assertEquals(layer.getSourceId(), "composite");
+    });
+  }
+
   @Test
   public void testSetVisibility() {
     validateTestSetup();

platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java

@@ -50,6 +50,18 @@ private void setupLayer() {
     });
   }
 
+  @Test
+  public void testSourceId() {
+    validateTestSetup();
+    setupLayer();
+    Timber.i("SourceId");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+      // Get source id
+      assertEquals(layer.getSourceId(), "composite");
+    });
+  }
+
   @Test
   public void testSetVisibility() {
     validateTestSetup();

platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs

@@ -60,6 +60,20 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
     });
 <% } -%>
   }
+<% if (type !== 'background') { -%>
+
+  @Test
+  public void testSourceId() {
+    validateTestSetup();
+    setupLayer();
+    Timber.i("SourceId");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+      // Get source id
+      assertEquals(layer.getSourceId(), "composite");
+    });
+  }
+<% } -%>
 
   @Test
   public void testSetVisibility() {

platform/android/src/style/layers/layer.cpp

@@ -25,6 +25,8 @@
 
 // C++ -> Java conversion
 #include "../conversion/property_value.hpp"
+#include "custom_layer.hpp"
+#include "background_layer.hpp"
 #include <mbgl/style/filter.hpp>
 
 #include <string>
@@ -204,6 +206,25 @@ namespace android {
         return jni::Make<jni::String>(env, layer.accept(GetSourceLayerEvaluator()));
     }
 
+    struct GetSourceIdEvaluator {
+        std::string noop(std::string layerType) {
+            Log::Warning(mbgl::Event::JNI, "%s doesn't support get source id", layerType.c_str());
+            return {};
+        }
+
+        std::string operator()(style::BackgroundLayer&) { return noop("BackgroundLayer"); }
+        std::string operator()(style::CustomLayer&) { return noop("CustomLayer"); }
+
+        template <class LayerType>
+        std::string operator()(LayerType& layer) {
+            return layer.getSourceID();
+        }
+    };
+
+    jni::String Layer::getSourceId(jni::JNIEnv& env) {
+        return jni::Make<jni::String>(env, layer.accept(GetSourceIdEvaluator()));
+    }
+
     jni::jfloat Layer::getMinZoom(jni::JNIEnv&){
         return layer.getMinZoom();
     }
@@ -242,6 +263,7 @@ namespace android {
             METHOD(&Layer::getFilter, "nativeGetFilter"),
             METHOD(&Layer::setSourceLayer, "nativeSetSourceLayer"),
             METHOD(&Layer::getSourceLayer, "nativeGetSourceLayer"),
+            METHOD(&Layer::getSourceId, "nativeGetSourceId"),
             METHOD(&Layer::getMinZoom, "nativeGetMinZoom"),
             METHOD(&Layer::getMaxZoom, "nativeGetMaxZoom"),
             METHOD(&Layer::setMinZoom, "nativeSetMinZoom"),

platform/android/src/style/layers/layer.hpp

@@ -49,6 +49,8 @@ class Layer : private mbgl::util::noncopyable {
 
     jni::String getId(jni::JNIEnv&);
 
+    jni::String getSourceId(jni::JNIEnv&);
+
     style::Layer& get();
 
     void setLayoutProperty(jni::JNIEnv&, jni::String, jni::Object<> value);