1 files changed, 62 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java
index 8562ef1bf4..6628fee47a 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java
@@ -17,15 +17,77 @@ public class CircleLayer extends Layer {
     protected native void initialize(String layerId, String sourceId);
 
     public void setSourceLayer(String sourceLayer) {
+        checkValidity();
         nativeSetSourceLayer(sourceLayer);
     }
 
     public void setFilter(Filter.Statement filter) {
+        checkValidity();
         this.setFilter(filter.toArray());
     }
 
     public void setFilter(Object[] filter) {
+        checkValidity();
         nativeSetFilter(filter);
     }
 
+
+    // Property getters
+
+    @SuppressWarnings("unchecked")
+    public PropertyValue<Float> getCircleRadius() {
+        checkValidity();
+        return (PropertyValue<Float>) new PropertyValue(nativeGetCircleRadius());
+    }
+
+    @SuppressWarnings("unchecked")
+    public PropertyValue<String> getCircleColor() {
+        checkValidity();
+        return (PropertyValue<String>) new PropertyValue(nativeGetCircleColor());
+    }
+
+    @SuppressWarnings("unchecked")
+    public PropertyValue<Float> getCircleBlur() {
+        checkValidity();
+        return (PropertyValue<Float>) new PropertyValue(nativeGetCircleBlur());
+    }
+
+    @SuppressWarnings("unchecked")
+    public PropertyValue<Float> getCircleOpacity() {
+        checkValidity();
+        return (PropertyValue<Float>) new PropertyValue(nativeGetCircleOpacity());
+    }
+
+    @SuppressWarnings("unchecked")
+    public PropertyValue<Float[]> getCircleTranslate() {
+        checkValidity();
+        return (PropertyValue<Float[]>) new PropertyValue(nativeGetCircleTranslate());
+    }
+
+    @SuppressWarnings("unchecked")
+    public PropertyValue<String> getCircleTranslateAnchor() {
+        checkValidity();
+        return (PropertyValue<String>) new PropertyValue(nativeGetCircleTranslateAnchor());
+    }
+
+    @SuppressWarnings("unchecked")
+    public PropertyValue<String> getCirclePitchScale() {
+        checkValidity();
+        return (PropertyValue<String>) new PropertyValue(nativeGetCirclePitchScale());
+    }
+
+    private native Object nativeGetCircleRadius();
+
+    private native Object nativeGetCircleColor();
+
+    private native Object nativeGetCircleBlur();
+
+    private native Object nativeGetCircleOpacity();
+
+    private native Object nativeGetCircleTranslate();
+
+    private native Object nativeGetCircleTranslateAnchor();
+
+    private native Object nativeGetCirclePitchScale();
+
 }