Correct annotation for fixed properties, javadoc fixes

21 files changed, 231 insertions, 136 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/annotation.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/annotation.java.ejs
index 228f3e1faf..cf62963a78 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/annotation.java.ejs
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/annotation.java.ejs
@@ -12,6 +12,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.mapbox.geojson.*;
 import com.mapbox.mapboxsdk.geometry.LatLng;
+import com.mapbox.mapboxsdk.style.layers.Property;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -121,6 +122,7 @@ public class <%- camelize(type) %> {
    *
    * @return property wrapper value around <%- propertyType(property) %>
    */
+  <%- propertyTypeAnnotation(property) %><%- iff(() => propertyTypeAnnotation(property), "") %>
   public <%- propertyType(property) %> get<%- camelize(property.name) %>() {
     JsonArray jsonArray = jsonObject.getAsJsonArray("<%-property.name %>");
     <%- propertyType(property) %> value = new <%- propertyType(property).substring(0, propertyType(property).length-1) %>jsonArray.size()];
@@ -135,7 +137,7 @@ public class <%- camelize(type) %> {
    *
    * @return property wrapper value around <%- propertyType(property) %>
    */
-  public void set<%- camelize(property.name) %>(<%- propertyType(property) %> value) {
+  public void set<%- camelize(property.name) %>(<%- propertyTypeAnnotation(property) %><%- iff(() => propertyTypeAnnotation(property), "") %><%- propertyType(property) %> value) {
     JsonArray jsonArray = new JsonArray();
     for (<%- propertyType(property).substring(0, propertyType(property).length-2) %> element : value) {
       jsonArray.add(element);
@@ -150,6 +152,7 @@ public class <%- camelize(type) %> {
    *
    * @return property wrapper value around <%- propertyType(property) %>
    */
+  <%- propertyTypeAnnotation(property) %><%- iff(() => propertyTypeAnnotation(property), "") %>
   public <%- propertyType(property) %> get<%- camelize(property.name) %>() {
     return jsonObject.get("<%- property.name %>").getAs<%- propertyType(property) %>();
   }
@@ -157,9 +160,9 @@ public class <%- camelize(type) %> {
   /**
    * Set the <%- camelize(property.name) %> property
    *
-   * @return property wrapper value around <%- propertyType(property) %>
+   * @param value constant property value for <%- propertyType(property) %>
    */
-  public void set<%- camelize(property.name) %>(<%- propertyType(property) %> value) {
+  public void set<%- camelize(property.name) %>(<%- propertyTypeAnnotation(property) %><%- iff(() => propertyTypeAnnotation(property), "") %> <%- propertyType(property) %> value) {
     jsonObject.addProperty("<%- property.name %>", value);
     <%- type %>Manager.updateSource();
   }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/annotationManager.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/annotationManager.java.ejs
index d9a4deb9d4..ad69520cf3 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/annotationManager.java.ejs
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/annotationManager.java.ejs
@@ -20,6 +20,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.layers.PropertyValue;
 import com.mapbox.mapboxsdk.style.layers.<%- camelize(type) %>Layer;
 import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
+import com.mapbox.mapboxsdk.style.layers.Property;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -212,6 +213,7 @@ public class <%- camelize(type) %>Manager {
    *
    * @return property wrapper value around <%- propertyType(property) %>
    */
+  <%- propertyTypeAnnotation(property) %><%- iff(() => propertyTypeAnnotation(property), "") %>
   public <%- propertyType(property) %> get<%- camelize(property.name) %>() {
     return layer.get<%- camelize(property.name) %>().value;
   }
@@ -221,7 +223,7 @@ public class <%- camelize(type) %>Manager {
    *
    * @param value property wrapper value around <%- propertyType(property) %>
    */
-  public void set<%- camelize(property.name) %>(<%- propertyType(property) %> value) {
+  public void set<%- camelize(property.name) %>(<%- propertyTypeAnnotation(property) %><%- iff(() => propertyTypeAnnotation(property), "") %> <%- propertyType(property) %> value) {
     layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>(value));
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/circle/Circle.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/circle/Circle.java
index 5d94f0049d..354790ff57 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/circle/Circle.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/circle/Circle.java
@@ -7,6 +7,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.mapbox.geojson.*;
 import com.mapbox.mapboxsdk.geometry.LatLng;
+import com.mapbox.mapboxsdk.style.layers.Property;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -77,6 +78,7 @@ public class Circle {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getCircleRadius() {
     return jsonObject.get("circle-radius").getAsFloat();
   }
@@ -84,9 +86,9 @@ public class Circle {
   /**
    * Set the CircleRadius property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setCircleRadius(Float value) {
+  public void setCircleRadius( Float value) {
     jsonObject.addProperty("circle-radius", value);
     circleManager.updateSource();
   }
@@ -96,6 +98,7 @@ public class Circle {
    *
    * @return property wrapper value around String
    */
+  
   public String getCircleColor() {
     return jsonObject.get("circle-color").getAsString();
   }
@@ -103,9 +106,9 @@ public class Circle {
   /**
    * Set the CircleColor property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setCircleColor(String value) {
+  public void setCircleColor( String value) {
     jsonObject.addProperty("circle-color", value);
     circleManager.updateSource();
   }
@@ -115,6 +118,7 @@ public class Circle {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getCircleBlur() {
     return jsonObject.get("circle-blur").getAsFloat();
   }
@@ -122,9 +126,9 @@ public class Circle {
   /**
    * Set the CircleBlur property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setCircleBlur(Float value) {
+  public void setCircleBlur( Float value) {
     jsonObject.addProperty("circle-blur", value);
     circleManager.updateSource();
   }
@@ -134,6 +138,7 @@ public class Circle {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getCircleOpacity() {
     return jsonObject.get("circle-opacity").getAsFloat();
   }
@@ -141,9 +146,9 @@ public class Circle {
   /**
    * Set the CircleOpacity property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setCircleOpacity(Float value) {
+  public void setCircleOpacity( Float value) {
     jsonObject.addProperty("circle-opacity", value);
     circleManager.updateSource();
   }
@@ -153,6 +158,7 @@ public class Circle {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getCircleStrokeWidth() {
     return jsonObject.get("circle-stroke-width").getAsFloat();
   }
@@ -160,9 +166,9 @@ public class Circle {
   /**
    * Set the CircleStrokeWidth property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setCircleStrokeWidth(Float value) {
+  public void setCircleStrokeWidth( Float value) {
     jsonObject.addProperty("circle-stroke-width", value);
     circleManager.updateSource();
   }
@@ -172,6 +178,7 @@ public class Circle {
    *
    * @return property wrapper value around String
    */
+  
   public String getCircleStrokeColor() {
     return jsonObject.get("circle-stroke-color").getAsString();
   }
@@ -179,9 +186,9 @@ public class Circle {
   /**
    * Set the CircleStrokeColor property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setCircleStrokeColor(String value) {
+  public void setCircleStrokeColor( String value) {
     jsonObject.addProperty("circle-stroke-color", value);
     circleManager.updateSource();
   }
@@ -191,6 +198,7 @@ public class Circle {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getCircleStrokeOpacity() {
     return jsonObject.get("circle-stroke-opacity").getAsFloat();
   }
@@ -198,9 +206,9 @@ public class Circle {
   /**
    * Set the CircleStrokeOpacity property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setCircleStrokeOpacity(Float value) {
+  public void setCircleStrokeOpacity( Float value) {
     jsonObject.addProperty("circle-stroke-opacity", value);
     circleManager.updateSource();
   }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/circle/CircleManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/circle/CircleManager.java
index e371eaa31d..5cc1af7d0f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/circle/CircleManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/circle/CircleManager.java
@@ -15,6 +15,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.layers.PropertyValue;
 import com.mapbox.mapboxsdk.style.layers.CircleLayer;
 import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
+import com.mapbox.mapboxsdk.style.layers.Property;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -174,6 +175,7 @@ public class CircleManager {
    *
    * @return property wrapper value around Float[]
    */
+  
   public Float[] getCircleTranslate() {
     return layer.getCircleTranslate().value;
   }
@@ -183,7 +185,7 @@ public class CircleManager {
    *
    * @param value property wrapper value around Float[]
    */
-  public void setCircleTranslate(Float[] value) {
+  public void setCircleTranslate( Float[] value) {
     layer.setProperties(circleTranslate(value));
   }
 
@@ -192,6 +194,7 @@ public class CircleManager {
    *
    * @return property wrapper value around String
    */
+  @Property.CIRCLE_TRANSLATE_ANCHOR
   public String getCircleTranslateAnchor() {
     return layer.getCircleTranslateAnchor().value;
   }
@@ -201,7 +204,7 @@ public class CircleManager {
    *
    * @param value property wrapper value around String
    */
-  public void setCircleTranslateAnchor(String value) {
+  public void setCircleTranslateAnchor(@Property.CIRCLE_TRANSLATE_ANCHOR String value) {
     layer.setProperties(circleTranslateAnchor(value));
   }
 
@@ -210,6 +213,7 @@ public class CircleManager {
    *
    * @return property wrapper value around String
    */
+  @Property.CIRCLE_PITCH_SCALE
   public String getCirclePitchScale() {
     return layer.getCirclePitchScale().value;
   }
@@ -219,7 +223,7 @@ public class CircleManager {
    *
    * @param value property wrapper value around String
    */
-  public void setCirclePitchScale(String value) {
+  public void setCirclePitchScale(@Property.CIRCLE_PITCH_SCALE String value) {
     layer.setProperties(circlePitchScale(value));
   }
 
@@ -228,6 +232,7 @@ public class CircleManager {
    *
    * @return property wrapper value around String
    */
+  @Property.CIRCLE_PITCH_ALIGNMENT
   public String getCirclePitchAlignment() {
     return layer.getCirclePitchAlignment().value;
   }
@@ -237,7 +242,7 @@ public class CircleManager {
    *
    * @param value property wrapper value around String
    */
-  public void setCirclePitchAlignment(String value) {
+  public void setCirclePitchAlignment(@Property.CIRCLE_PITCH_ALIGNMENT String value) {
     layer.setProperties(circlePitchAlignment(value));
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/fill/Fill.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/fill/Fill.java
index bd3da0c57f..1fb1d767f0 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/fill/Fill.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/fill/Fill.java
@@ -7,6 +7,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.mapbox.geojson.*;
 import com.mapbox.mapboxsdk.geometry.LatLng;
+import com.mapbox.mapboxsdk.style.layers.Property;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -85,6 +86,7 @@ public class Fill {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getFillOpacity() {
     return jsonObject.get("fill-opacity").getAsFloat();
   }
@@ -92,9 +94,9 @@ public class Fill {
   /**
    * Set the FillOpacity property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setFillOpacity(Float value) {
+  public void setFillOpacity( Float value) {
     jsonObject.addProperty("fill-opacity", value);
     fillManager.updateSource();
   }
@@ -104,6 +106,7 @@ public class Fill {
    *
    * @return property wrapper value around String
    */
+  
   public String getFillColor() {
     return jsonObject.get("fill-color").getAsString();
   }
@@ -111,9 +114,9 @@ public class Fill {
   /**
    * Set the FillColor property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setFillColor(String value) {
+  public void setFillColor( String value) {
     jsonObject.addProperty("fill-color", value);
     fillManager.updateSource();
   }
@@ -123,6 +126,7 @@ public class Fill {
    *
    * @return property wrapper value around String
    */
+  
   public String getFillOutlineColor() {
     return jsonObject.get("fill-outline-color").getAsString();
   }
@@ -130,9 +134,9 @@ public class Fill {
   /**
    * Set the FillOutlineColor property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setFillOutlineColor(String value) {
+  public void setFillOutlineColor( String value) {
     jsonObject.addProperty("fill-outline-color", value);
     fillManager.updateSource();
   }
@@ -142,6 +146,7 @@ public class Fill {
    *
    * @return property wrapper value around String
    */
+  
   public String getFillPattern() {
     return jsonObject.get("fill-pattern").getAsString();
   }
@@ -149,9 +154,9 @@ public class Fill {
   /**
    * Set the FillPattern property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setFillPattern(String value) {
+  public void setFillPattern( String value) {
     jsonObject.addProperty("fill-pattern", value);
     fillManager.updateSource();
   }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/fill/FillManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/fill/FillManager.java
index e9a5ee6680..c3cd03a691 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/fill/FillManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/fill/FillManager.java
@@ -15,6 +15,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.layers.PropertyValue;
 import com.mapbox.mapboxsdk.style.layers.FillLayer;
 import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
+import com.mapbox.mapboxsdk.style.layers.Property;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -170,6 +171,7 @@ public class FillManager {
    *
    * @return property wrapper value around Boolean
    */
+  
   public Boolean getFillAntialias() {
     return layer.getFillAntialias().value;
   }
@@ -179,7 +181,7 @@ public class FillManager {
    *
    * @param value property wrapper value around Boolean
    */
-  public void setFillAntialias(Boolean value) {
+  public void setFillAntialias( Boolean value) {
     layer.setProperties(fillAntialias(value));
   }
 
@@ -188,6 +190,7 @@ public class FillManager {
    *
    * @return property wrapper value around Float[]
    */
+  
   public Float[] getFillTranslate() {
     return layer.getFillTranslate().value;
   }
@@ -197,7 +200,7 @@ public class FillManager {
    *
    * @param value property wrapper value around Float[]
    */
-  public void setFillTranslate(Float[] value) {
+  public void setFillTranslate( Float[] value) {
     layer.setProperties(fillTranslate(value));
   }
 
@@ -206,6 +209,7 @@ public class FillManager {
    *
    * @return property wrapper value around String
    */
+  @Property.FILL_TRANSLATE_ANCHOR
   public String getFillTranslateAnchor() {
     return layer.getFillTranslateAnchor().value;
   }
@@ -215,7 +219,7 @@ public class FillManager {
    *
    * @param value property wrapper value around String
    */
-  public void setFillTranslateAnchor(String value) {
+  public void setFillTranslateAnchor(@Property.FILL_TRANSLATE_ANCHOR String value) {
     layer.setProperties(fillTranslateAnchor(value));
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/line/Line.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/line/Line.java
index 723516c93c..2dca2b6bf3 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/line/Line.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/line/Line.java
@@ -7,6 +7,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.mapbox.geojson.*;
 import com.mapbox.mapboxsdk.geometry.LatLng;
+import com.mapbox.mapboxsdk.style.layers.Property;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -81,6 +82,7 @@ public class Line {
    *
    * @return property wrapper value around String
    */
+  @Property.LINE_JOIN
   public String getLineJoin() {
     return jsonObject.get("line-join").getAsString();
   }
@@ -88,9 +90,9 @@ public class Line {
   /**
    * Set the LineJoin property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setLineJoin(String value) {
+  public void setLineJoin(@Property.LINE_JOIN String value) {
     jsonObject.addProperty("line-join", value);
     lineManager.updateSource();
   }
@@ -100,6 +102,7 @@ public class Line {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getLineOpacity() {
     return jsonObject.get("line-opacity").getAsFloat();
   }
@@ -107,9 +110,9 @@ public class Line {
   /**
    * Set the LineOpacity property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setLineOpacity(Float value) {
+  public void setLineOpacity( Float value) {
     jsonObject.addProperty("line-opacity", value);
     lineManager.updateSource();
   }
@@ -119,6 +122,7 @@ public class Line {
    *
    * @return property wrapper value around String
    */
+  
   public String getLineColor() {
     return jsonObject.get("line-color").getAsString();
   }
@@ -126,9 +130,9 @@ public class Line {
   /**
    * Set the LineColor property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setLineColor(String value) {
+  public void setLineColor( String value) {
     jsonObject.addProperty("line-color", value);
     lineManager.updateSource();
   }
@@ -138,6 +142,7 @@ public class Line {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getLineWidth() {
     return jsonObject.get("line-width").getAsFloat();
   }
@@ -145,9 +150,9 @@ public class Line {
   /**
    * Set the LineWidth property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setLineWidth(Float value) {
+  public void setLineWidth( Float value) {
     jsonObject.addProperty("line-width", value);
     lineManager.updateSource();
   }
@@ -157,6 +162,7 @@ public class Line {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getLineGapWidth() {
     return jsonObject.get("line-gap-width").getAsFloat();
   }
@@ -164,9 +170,9 @@ public class Line {
   /**
    * Set the LineGapWidth property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setLineGapWidth(Float value) {
+  public void setLineGapWidth( Float value) {
     jsonObject.addProperty("line-gap-width", value);
     lineManager.updateSource();
   }
@@ -176,6 +182,7 @@ public class Line {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getLineOffset() {
     return jsonObject.get("line-offset").getAsFloat();
   }
@@ -183,9 +190,9 @@ public class Line {
   /**
    * Set the LineOffset property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setLineOffset(Float value) {
+  public void setLineOffset( Float value) {
     jsonObject.addProperty("line-offset", value);
     lineManager.updateSource();
   }
@@ -195,6 +202,7 @@ public class Line {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getLineBlur() {
     return jsonObject.get("line-blur").getAsFloat();
   }
@@ -202,9 +210,9 @@ public class Line {
   /**
    * Set the LineBlur property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setLineBlur(Float value) {
+  public void setLineBlur( Float value) {
     jsonObject.addProperty("line-blur", value);
     lineManager.updateSource();
   }
@@ -214,6 +222,7 @@ public class Line {
    *
    * @return property wrapper value around String
    */
+  
   public String getLinePattern() {
     return jsonObject.get("line-pattern").getAsString();
   }
@@ -221,9 +230,9 @@ public class Line {
   /**
    * Set the LinePattern property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setLinePattern(String value) {
+  public void setLinePattern( String value) {
     jsonObject.addProperty("line-pattern", value);
     lineManager.updateSource();
   }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/line/LineManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/line/LineManager.java
index a7865a62cb..3e285bdd8d 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/line/LineManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/line/LineManager.java
@@ -15,6 +15,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.layers.PropertyValue;
 import com.mapbox.mapboxsdk.style.layers.LineLayer;
 import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
+import com.mapbox.mapboxsdk.style.layers.Property;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -174,6 +175,7 @@ public class LineManager {
    *
    * @return property wrapper value around String
    */
+  @Property.LINE_CAP
   public String getLineCap() {
     return layer.getLineCap().value;
   }
@@ -183,7 +185,7 @@ public class LineManager {
    *
    * @param value property wrapper value around String
    */
-  public void setLineCap(String value) {
+  public void setLineCap(@Property.LINE_CAP String value) {
     layer.setProperties(lineCap(value));
   }
 
@@ -192,6 +194,7 @@ public class LineManager {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getLineMiterLimit() {
     return layer.getLineMiterLimit().value;
   }
@@ -201,7 +204,7 @@ public class LineManager {
    *
    * @param value property wrapper value around Float
    */
-  public void setLineMiterLimit(Float value) {
+  public void setLineMiterLimit( Float value) {
     layer.setProperties(lineMiterLimit(value));
   }
 
@@ -210,6 +213,7 @@ public class LineManager {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getLineRoundLimit() {
     return layer.getLineRoundLimit().value;
   }
@@ -219,7 +223,7 @@ public class LineManager {
    *
    * @param value property wrapper value around Float
    */
-  public void setLineRoundLimit(Float value) {
+  public void setLineRoundLimit( Float value) {
     layer.setProperties(lineRoundLimit(value));
   }
 
@@ -228,6 +232,7 @@ public class LineManager {
    *
    * @return property wrapper value around Float[]
    */
+  
   public Float[] getLineTranslate() {
     return layer.getLineTranslate().value;
   }
@@ -237,7 +242,7 @@ public class LineManager {
    *
    * @param value property wrapper value around Float[]
    */
-  public void setLineTranslate(Float[] value) {
+  public void setLineTranslate( Float[] value) {
     layer.setProperties(lineTranslate(value));
   }
 
@@ -246,6 +251,7 @@ public class LineManager {
    *
    * @return property wrapper value around String
    */
+  @Property.LINE_TRANSLATE_ANCHOR
   public String getLineTranslateAnchor() {
     return layer.getLineTranslateAnchor().value;
   }
@@ -255,7 +261,7 @@ public class LineManager {
    *
    * @param value property wrapper value around String
    */
-  public void setLineTranslateAnchor(String value) {
+  public void setLineTranslateAnchor(@Property.LINE_TRANSLATE_ANCHOR String value) {
     layer.setProperties(lineTranslateAnchor(value));
   }
 
@@ -264,6 +270,7 @@ public class LineManager {
    *
    * @return property wrapper value around Float[]
    */
+  
   public Float[] getLineDasharray() {
     return layer.getLineDasharray().value;
   }
@@ -273,7 +280,7 @@ public class LineManager {
    *
    * @param value property wrapper value around Float[]
    */
-  public void setLineDasharray(Float[] value) {
+  public void setLineDasharray( Float[] value) {
     layer.setProperties(lineDasharray(value));
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/symbol/Symbol.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/symbol/Symbol.java
index 698d4c7346..dec408225e 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/symbol/Symbol.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/symbol/Symbol.java
@@ -7,6 +7,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.mapbox.geojson.*;
 import com.mapbox.mapboxsdk.geometry.LatLng;
+import com.mapbox.mapboxsdk.style.layers.Property;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -77,6 +78,7 @@ public class Symbol {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getIconSize() {
     return jsonObject.get("icon-size").getAsFloat();
   }
@@ -84,9 +86,9 @@ public class Symbol {
   /**
    * Set the IconSize property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setIconSize(Float value) {
+  public void setIconSize( Float value) {
     jsonObject.addProperty("icon-size", value);
     symbolManager.updateSource();
   }
@@ -96,6 +98,7 @@ public class Symbol {
    *
    * @return property wrapper value around String
    */
+  
   public String getIconImage() {
     return jsonObject.get("icon-image").getAsString();
   }
@@ -103,9 +106,9 @@ public class Symbol {
   /**
    * Set the IconImage property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setIconImage(String value) {
+  public void setIconImage( String value) {
     jsonObject.addProperty("icon-image", value);
     symbolManager.updateSource();
   }
@@ -115,6 +118,7 @@ public class Symbol {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getIconRotate() {
     return jsonObject.get("icon-rotate").getAsFloat();
   }
@@ -122,9 +126,9 @@ public class Symbol {
   /**
    * Set the IconRotate property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setIconRotate(Float value) {
+  public void setIconRotate( Float value) {
     jsonObject.addProperty("icon-rotate", value);
     symbolManager.updateSource();
   }
@@ -134,6 +138,7 @@ public class Symbol {
    *
    * @return property wrapper value around Float[]
    */
+  
   public Float[] getIconOffset() {
     JsonArray jsonArray = jsonObject.getAsJsonArray("icon-offset");
     Float[] value = new Float[jsonArray.size()];
@@ -162,6 +167,7 @@ public class Symbol {
    *
    * @return property wrapper value around String
    */
+  @Property.ICON_ANCHOR
   public String getIconAnchor() {
     return jsonObject.get("icon-anchor").getAsString();
   }
@@ -169,9 +175,9 @@ public class Symbol {
   /**
    * Set the IconAnchor property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setIconAnchor(String value) {
+  public void setIconAnchor(@Property.ICON_ANCHOR String value) {
     jsonObject.addProperty("icon-anchor", value);
     symbolManager.updateSource();
   }
@@ -181,6 +187,7 @@ public class Symbol {
    *
    * @return property wrapper value around String
    */
+  
   public String getTextField() {
     return jsonObject.get("text-field").getAsString();
   }
@@ -188,9 +195,9 @@ public class Symbol {
   /**
    * Set the TextField property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setTextField(String value) {
+  public void setTextField( String value) {
     jsonObject.addProperty("text-field", value);
     symbolManager.updateSource();
   }
@@ -200,6 +207,7 @@ public class Symbol {
    *
    * @return property wrapper value around String[]
    */
+  
   public String[] getTextFont() {
     JsonArray jsonArray = jsonObject.getAsJsonArray("text-font");
     String[] value = new String[jsonArray.size()];
@@ -228,6 +236,7 @@ public class Symbol {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getTextSize() {
     return jsonObject.get("text-size").getAsFloat();
   }
@@ -235,9 +244,9 @@ public class Symbol {
   /**
    * Set the TextSize property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setTextSize(Float value) {
+  public void setTextSize( Float value) {
     jsonObject.addProperty("text-size", value);
     symbolManager.updateSource();
   }
@@ -247,6 +256,7 @@ public class Symbol {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getTextMaxWidth() {
     return jsonObject.get("text-max-width").getAsFloat();
   }
@@ -254,9 +264,9 @@ public class Symbol {
   /**
    * Set the TextMaxWidth property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setTextMaxWidth(Float value) {
+  public void setTextMaxWidth( Float value) {
     jsonObject.addProperty("text-max-width", value);
     symbolManager.updateSource();
   }
@@ -266,6 +276,7 @@ public class Symbol {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getTextLetterSpacing() {
     return jsonObject.get("text-letter-spacing").getAsFloat();
   }
@@ -273,9 +284,9 @@ public class Symbol {
   /**
    * Set the TextLetterSpacing property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setTextLetterSpacing(Float value) {
+  public void setTextLetterSpacing( Float value) {
     jsonObject.addProperty("text-letter-spacing", value);
     symbolManager.updateSource();
   }
@@ -285,6 +296,7 @@ public class Symbol {
    *
    * @return property wrapper value around String
    */
+  @Property.TEXT_JUSTIFY
   public String getTextJustify() {
     return jsonObject.get("text-justify").getAsString();
   }
@@ -292,9 +304,9 @@ public class Symbol {
   /**
    * Set the TextJustify property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setTextJustify(String value) {
+  public void setTextJustify(@Property.TEXT_JUSTIFY String value) {
     jsonObject.addProperty("text-justify", value);
     symbolManager.updateSource();
   }
@@ -304,6 +316,7 @@ public class Symbol {
    *
    * @return property wrapper value around String
    */
+  @Property.TEXT_ANCHOR
   public String getTextAnchor() {
     return jsonObject.get("text-anchor").getAsString();
   }
@@ -311,9 +324,9 @@ public class Symbol {
   /**
    * Set the TextAnchor property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setTextAnchor(String value) {
+  public void setTextAnchor(@Property.TEXT_ANCHOR String value) {
     jsonObject.addProperty("text-anchor", value);
     symbolManager.updateSource();
   }
@@ -323,6 +336,7 @@ public class Symbol {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getTextRotate() {
     return jsonObject.get("text-rotate").getAsFloat();
   }
@@ -330,9 +344,9 @@ public class Symbol {
   /**
    * Set the TextRotate property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setTextRotate(Float value) {
+  public void setTextRotate( Float value) {
     jsonObject.addProperty("text-rotate", value);
     symbolManager.updateSource();
   }
@@ -342,6 +356,7 @@ public class Symbol {
    *
    * @return property wrapper value around String
    */
+  @Property.TEXT_TRANSFORM
   public String getTextTransform() {
     return jsonObject.get("text-transform").getAsString();
   }
@@ -349,9 +364,9 @@ public class Symbol {
   /**
    * Set the TextTransform property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setTextTransform(String value) {
+  public void setTextTransform(@Property.TEXT_TRANSFORM String value) {
     jsonObject.addProperty("text-transform", value);
     symbolManager.updateSource();
   }
@@ -361,6 +376,7 @@ public class Symbol {
    *
    * @return property wrapper value around Float[]
    */
+  
   public Float[] getTextOffset() {
     JsonArray jsonArray = jsonObject.getAsJsonArray("text-offset");
     Float[] value = new Float[jsonArray.size()];
@@ -389,6 +405,7 @@ public class Symbol {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getIconOpacity() {
     return jsonObject.get("icon-opacity").getAsFloat();
   }
@@ -396,9 +413,9 @@ public class Symbol {
   /**
    * Set the IconOpacity property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setIconOpacity(Float value) {
+  public void setIconOpacity( Float value) {
     jsonObject.addProperty("icon-opacity", value);
     symbolManager.updateSource();
   }
@@ -408,6 +425,7 @@ public class Symbol {
    *
    * @return property wrapper value around String
    */
+  
   public String getIconColor() {
     return jsonObject.get("icon-color").getAsString();
   }
@@ -415,9 +433,9 @@ public class Symbol {
   /**
    * Set the IconColor property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setIconColor(String value) {
+  public void setIconColor( String value) {
     jsonObject.addProperty("icon-color", value);
     symbolManager.updateSource();
   }
@@ -427,6 +445,7 @@ public class Symbol {
    *
    * @return property wrapper value around String
    */
+  
   public String getIconHaloColor() {
     return jsonObject.get("icon-halo-color").getAsString();
   }
@@ -434,9 +453,9 @@ public class Symbol {
   /**
    * Set the IconHaloColor property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setIconHaloColor(String value) {
+  public void setIconHaloColor( String value) {
     jsonObject.addProperty("icon-halo-color", value);
     symbolManager.updateSource();
   }
@@ -446,6 +465,7 @@ public class Symbol {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getIconHaloWidth() {
     return jsonObject.get("icon-halo-width").getAsFloat();
   }
@@ -453,9 +473,9 @@ public class Symbol {
   /**
    * Set the IconHaloWidth property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setIconHaloWidth(Float value) {
+  public void setIconHaloWidth( Float value) {
     jsonObject.addProperty("icon-halo-width", value);
     symbolManager.updateSource();
   }
@@ -465,6 +485,7 @@ public class Symbol {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getIconHaloBlur() {
     return jsonObject.get("icon-halo-blur").getAsFloat();
   }
@@ -472,9 +493,9 @@ public class Symbol {
   /**
    * Set the IconHaloBlur property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setIconHaloBlur(Float value) {
+  public void setIconHaloBlur( Float value) {
     jsonObject.addProperty("icon-halo-blur", value);
     symbolManager.updateSource();
   }
@@ -484,6 +505,7 @@ public class Symbol {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getTextOpacity() {
     return jsonObject.get("text-opacity").getAsFloat();
   }
@@ -491,9 +513,9 @@ public class Symbol {
   /**
    * Set the TextOpacity property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setTextOpacity(Float value) {
+  public void setTextOpacity( Float value) {
     jsonObject.addProperty("text-opacity", value);
     symbolManager.updateSource();
   }
@@ -503,6 +525,7 @@ public class Symbol {
    *
    * @return property wrapper value around String
    */
+  
   public String getTextColor() {
     return jsonObject.get("text-color").getAsString();
   }
@@ -510,9 +533,9 @@ public class Symbol {
   /**
    * Set the TextColor property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setTextColor(String value) {
+  public void setTextColor( String value) {
     jsonObject.addProperty("text-color", value);
     symbolManager.updateSource();
   }
@@ -522,6 +545,7 @@ public class Symbol {
    *
    * @return property wrapper value around String
    */
+  
   public String getTextHaloColor() {
     return jsonObject.get("text-halo-color").getAsString();
   }
@@ -529,9 +553,9 @@ public class Symbol {
   /**
    * Set the TextHaloColor property
    *
-   * @return property wrapper value around String
+   * @param value constant property value for String
    */
-  public void setTextHaloColor(String value) {
+  public void setTextHaloColor( String value) {
     jsonObject.addProperty("text-halo-color", value);
     symbolManager.updateSource();
   }
@@ -541,6 +565,7 @@ public class Symbol {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getTextHaloWidth() {
     return jsonObject.get("text-halo-width").getAsFloat();
   }
@@ -548,9 +573,9 @@ public class Symbol {
   /**
    * Set the TextHaloWidth property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setTextHaloWidth(Float value) {
+  public void setTextHaloWidth( Float value) {
     jsonObject.addProperty("text-halo-width", value);
     symbolManager.updateSource();
   }
@@ -560,6 +585,7 @@ public class Symbol {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getTextHaloBlur() {
     return jsonObject.get("text-halo-blur").getAsFloat();
   }
@@ -567,9 +593,9 @@ public class Symbol {
   /**
    * Set the TextHaloBlur property
    *
-   * @return property wrapper value around Float
+   * @param value constant property value for Float
    */
-  public void setTextHaloBlur(Float value) {
+  public void setTextHaloBlur( Float value) {
     jsonObject.addProperty("text-halo-blur", value);
     symbolManager.updateSource();
   }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/symbol/SymbolManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/symbol/SymbolManager.java
index ad10d45c2d..a81200a55f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/symbol/SymbolManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/symbol/SymbolManager.java
@@ -15,6 +15,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.layers.PropertyValue;
 import com.mapbox.mapboxsdk.style.layers.SymbolLayer;
 import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
+import com.mapbox.mapboxsdk.style.layers.Property;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -192,6 +193,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around String
    */
+  @Property.SYMBOL_PLACEMENT
   public String getSymbolPlacement() {
     return layer.getSymbolPlacement().value;
   }
@@ -201,7 +203,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around String
    */
-  public void setSymbolPlacement(String value) {
+  public void setSymbolPlacement(@Property.SYMBOL_PLACEMENT String value) {
     layer.setProperties(symbolPlacement(value));
   }
 
@@ -210,6 +212,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getSymbolSpacing() {
     return layer.getSymbolSpacing().value;
   }
@@ -219,7 +222,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around Float
    */
-  public void setSymbolSpacing(Float value) {
+  public void setSymbolSpacing( Float value) {
     layer.setProperties(symbolSpacing(value));
   }
 
@@ -228,6 +231,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around Boolean
    */
+  
   public Boolean getSymbolAvoidEdges() {
     return layer.getSymbolAvoidEdges().value;
   }
@@ -237,7 +241,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around Boolean
    */
-  public void setSymbolAvoidEdges(Boolean value) {
+  public void setSymbolAvoidEdges( Boolean value) {
     layer.setProperties(symbolAvoidEdges(value));
   }
 
@@ -246,6 +250,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around String
    */
+  @Property.SYMBOL_Z_ORDER
   public String getSymbolZOrder() {
     return layer.getSymbolZOrder().value;
   }
@@ -255,7 +260,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around String
    */
-  public void setSymbolZOrder(String value) {
+  public void setSymbolZOrder(@Property.SYMBOL_Z_ORDER String value) {
     layer.setProperties(symbolZOrder(value));
   }
 
@@ -264,6 +269,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around Boolean
    */
+  
   public Boolean getIconAllowOverlap() {
     return layer.getIconAllowOverlap().value;
   }
@@ -273,7 +279,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around Boolean
    */
-  public void setIconAllowOverlap(Boolean value) {
+  public void setIconAllowOverlap( Boolean value) {
     layer.setProperties(iconAllowOverlap(value));
   }
 
@@ -282,6 +288,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around Boolean
    */
+  
   public Boolean getIconIgnorePlacement() {
     return layer.getIconIgnorePlacement().value;
   }
@@ -291,7 +298,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around Boolean
    */
-  public void setIconIgnorePlacement(Boolean value) {
+  public void setIconIgnorePlacement( Boolean value) {
     layer.setProperties(iconIgnorePlacement(value));
   }
 
@@ -300,6 +307,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around Boolean
    */
+  
   public Boolean getIconOptional() {
     return layer.getIconOptional().value;
   }
@@ -309,7 +317,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around Boolean
    */
-  public void setIconOptional(Boolean value) {
+  public void setIconOptional( Boolean value) {
     layer.setProperties(iconOptional(value));
   }
 
@@ -318,6 +326,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around String
    */
+  @Property.ICON_ROTATION_ALIGNMENT
   public String getIconRotationAlignment() {
     return layer.getIconRotationAlignment().value;
   }
@@ -327,7 +336,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around String
    */
-  public void setIconRotationAlignment(String value) {
+  public void setIconRotationAlignment(@Property.ICON_ROTATION_ALIGNMENT String value) {
     layer.setProperties(iconRotationAlignment(value));
   }
 
@@ -336,6 +345,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around String
    */
+  @Property.ICON_TEXT_FIT
   public String getIconTextFit() {
     return layer.getIconTextFit().value;
   }
@@ -345,7 +355,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around String
    */
-  public void setIconTextFit(String value) {
+  public void setIconTextFit(@Property.ICON_TEXT_FIT String value) {
     layer.setProperties(iconTextFit(value));
   }
 
@@ -354,6 +364,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around Float[]
    */
+  
   public Float[] getIconTextFitPadding() {
     return layer.getIconTextFitPadding().value;
   }
@@ -363,7 +374,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around Float[]
    */
-  public void setIconTextFitPadding(Float[] value) {
+  public void setIconTextFitPadding( Float[] value) {
     layer.setProperties(iconTextFitPadding(value));
   }
 
@@ -372,6 +383,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getIconPadding() {
     return layer.getIconPadding().value;
   }
@@ -381,7 +393,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around Float
    */
-  public void setIconPadding(Float value) {
+  public void setIconPadding( Float value) {
     layer.setProperties(iconPadding(value));
   }
 
@@ -390,6 +402,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around Boolean
    */
+  
   public Boolean getIconKeepUpright() {
     return layer.getIconKeepUpright().value;
   }
@@ -399,7 +412,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around Boolean
    */
-  public void setIconKeepUpright(Boolean value) {
+  public void setIconKeepUpright( Boolean value) {
     layer.setProperties(iconKeepUpright(value));
   }
 
@@ -408,6 +421,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around String
    */
+  @Property.ICON_PITCH_ALIGNMENT
   public String getIconPitchAlignment() {
     return layer.getIconPitchAlignment().value;
   }
@@ -417,7 +431,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around String
    */
-  public void setIconPitchAlignment(String value) {
+  public void setIconPitchAlignment(@Property.ICON_PITCH_ALIGNMENT String value) {
     layer.setProperties(iconPitchAlignment(value));
   }
 
@@ -426,6 +440,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around String
    */
+  @Property.TEXT_PITCH_ALIGNMENT
   public String getTextPitchAlignment() {
     return layer.getTextPitchAlignment().value;
   }
@@ -435,7 +450,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around String
    */
-  public void setTextPitchAlignment(String value) {
+  public void setTextPitchAlignment(@Property.TEXT_PITCH_ALIGNMENT String value) {
     layer.setProperties(textPitchAlignment(value));
   }
 
@@ -444,6 +459,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around String
    */
+  @Property.TEXT_ROTATION_ALIGNMENT
   public String getTextRotationAlignment() {
     return layer.getTextRotationAlignment().value;
   }
@@ -453,7 +469,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around String
    */
-  public void setTextRotationAlignment(String value) {
+  public void setTextRotationAlignment(@Property.TEXT_ROTATION_ALIGNMENT String value) {
     layer.setProperties(textRotationAlignment(value));
   }
 
@@ -462,6 +478,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getTextLineHeight() {
     return layer.getTextLineHeight().value;
   }
@@ -471,7 +488,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around Float
    */
-  public void setTextLineHeight(Float value) {
+  public void setTextLineHeight( Float value) {
     layer.setProperties(textLineHeight(value));
   }
 
@@ -480,6 +497,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getTextMaxAngle() {
     return layer.getTextMaxAngle().value;
   }
@@ -489,7 +507,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around Float
    */
-  public void setTextMaxAngle(Float value) {
+  public void setTextMaxAngle( Float value) {
     layer.setProperties(textMaxAngle(value));
   }
 
@@ -498,6 +516,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around Float
    */
+  
   public Float getTextPadding() {
     return layer.getTextPadding().value;
   }
@@ -507,7 +526,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around Float
    */
-  public void setTextPadding(Float value) {
+  public void setTextPadding( Float value) {
     layer.setProperties(textPadding(value));
   }
 
@@ -516,6 +535,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around Boolean
    */
+  
   public Boolean getTextKeepUpright() {
     return layer.getTextKeepUpright().value;
   }
@@ -525,7 +545,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around Boolean
    */
-  public void setTextKeepUpright(Boolean value) {
+  public void setTextKeepUpright( Boolean value) {
     layer.setProperties(textKeepUpright(value));
   }
 
@@ -534,6 +554,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around Boolean
    */
+  
   public Boolean getTextAllowOverlap() {
     return layer.getTextAllowOverlap().value;
   }
@@ -543,7 +564,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around Boolean
    */
-  public void setTextAllowOverlap(Boolean value) {
+  public void setTextAllowOverlap( Boolean value) {
     layer.setProperties(textAllowOverlap(value));
   }
 
@@ -552,6 +573,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around Boolean
    */
+  
   public Boolean getTextIgnorePlacement() {
     return layer.getTextIgnorePlacement().value;
   }
@@ -561,7 +583,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around Boolean
    */
-  public void setTextIgnorePlacement(Boolean value) {
+  public void setTextIgnorePlacement( Boolean value) {
     layer.setProperties(textIgnorePlacement(value));
   }
 
@@ -570,6 +592,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around Boolean
    */
+  
   public Boolean getTextOptional() {
     return layer.getTextOptional().value;
   }
@@ -579,7 +602,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around Boolean
    */
-  public void setTextOptional(Boolean value) {
+  public void setTextOptional( Boolean value) {
     layer.setProperties(textOptional(value));
   }
 
@@ -588,6 +611,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around Float[]
    */
+  
   public Float[] getIconTranslate() {
     return layer.getIconTranslate().value;
   }
@@ -597,7 +621,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around Float[]
    */
-  public void setIconTranslate(Float[] value) {
+  public void setIconTranslate( Float[] value) {
     layer.setProperties(iconTranslate(value));
   }
 
@@ -606,6 +630,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around String
    */
+  @Property.ICON_TRANSLATE_ANCHOR
   public String getIconTranslateAnchor() {
     return layer.getIconTranslateAnchor().value;
   }
@@ -615,7 +640,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around String
    */
-  public void setIconTranslateAnchor(String value) {
+  public void setIconTranslateAnchor(@Property.ICON_TRANSLATE_ANCHOR String value) {
     layer.setProperties(iconTranslateAnchor(value));
   }
 
@@ -624,6 +649,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around Float[]
    */
+  
   public Float[] getTextTranslate() {
     return layer.getTextTranslate().value;
   }
@@ -633,7 +659,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around Float[]
    */
-  public void setTextTranslate(Float[] value) {
+  public void setTextTranslate( Float[] value) {
     layer.setProperties(textTranslate(value));
   }
 
@@ -642,6 +668,7 @@ public class SymbolManager {
    *
    * @return property wrapper value around String
    */
+  @Property.TEXT_TRANSLATE_ANCHOR
   public String getTextTranslateAnchor() {
     return layer.getTextTranslateAnchor().value;
   }
@@ -651,7 +678,7 @@ public class SymbolManager {
    *
    * @param value property wrapper value around String
    */
-  public void setTextTranslateAnchor(String value) {
+  public void setTextTranslateAnchor(@Property.TEXT_TRANSLATE_ANCHOR String value) {
     layer.setProperties(textTranslateAnchor(value));
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/symbol/SymbolManagerTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/symbol/SymbolManagerTest.java
index 4cc9c21f87..991016a1ee 100644
--- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/symbol/SymbolManagerTest.java
+++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/symbol/SymbolManagerTest.java
@@ -1,6 +1,5 @@
 package com.mapbox.mapboxsdk.annotations.symbol;
 
-import android.support.v4.util.LongSparseArray;
 import com.mapbox.geojson.Point;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/CircleManagerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/CircleManagerTest.java
index 2aa658906c..3053d0758f 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/CircleManagerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/CircleManagerTest.java
@@ -1,6 +1,6 @@
 // This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
 
-package com.mapbox.mapboxsdk.testapp.symbol;
+package com.mapbox.mapboxsdk.testapp.annotations;
 
 import android.support.test.runner.AndroidJUnit4;
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/CircleTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/CircleTest.java
index 7a5e5164ab..2b35849564 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/CircleTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/CircleTest.java
@@ -1,6 +1,6 @@
 // This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
 
-package com.mapbox.mapboxsdk.testapp.symbol;
+package com.mapbox.mapboxsdk.testapp.annotations;
 
 import android.support.test.runner.AndroidJUnit4;
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/FillManagerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/FillManagerTest.java
index 8163a1756d..84c1017a35 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/FillManagerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/FillManagerTest.java
@@ -1,6 +1,6 @@
 // This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
 
-package com.mapbox.mapboxsdk.testapp.symbol;
+package com.mapbox.mapboxsdk.testapp.annotations;
 
 import android.support.test.runner.AndroidJUnit4;
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/FillTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/FillTest.java
index 48f342e0a2..77d98215c7 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/FillTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/FillTest.java
@@ -1,6 +1,6 @@
 // This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
 
-package com.mapbox.mapboxsdk.testapp.symbol;
+package com.mapbox.mapboxsdk.testapp.annotations;
 
 import android.support.test.runner.AndroidJUnit4;
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/LineManagerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/LineManagerTest.java
index b87a8b0506..3eb4693f95 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/LineManagerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/LineManagerTest.java
@@ -1,6 +1,6 @@
 // This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
 
-package com.mapbox.mapboxsdk.testapp.symbol;
+package com.mapbox.mapboxsdk.testapp.annotations;
 
 import android.support.test.runner.AndroidJUnit4;
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/LineTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/LineTest.java
index e998f4bcb5..b4580c8b46 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/LineTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/LineTest.java
@@ -1,6 +1,6 @@
 // This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
 
-package com.mapbox.mapboxsdk.testapp.symbol;
+package com.mapbox.mapboxsdk.testapp.annotations;
 
 import android.support.test.runner.AndroidJUnit4;
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/SymbolManagerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/SymbolManagerTest.java
index 7f1708eb82..33004f562e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/SymbolManagerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/SymbolManagerTest.java
@@ -1,6 +1,6 @@
 // This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
 
-package com.mapbox.mapboxsdk.testapp.symbol;
+package com.mapbox.mapboxsdk.testapp.annotations;
 
 import android.support.test.runner.AndroidJUnit4;
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/SymbolTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/SymbolTest.java
index 6517bc5e32..060f8271c3 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/SymbolTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/SymbolTest.java
@@ -1,6 +1,6 @@
 // This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
 
-package com.mapbox.mapboxsdk.testapp.symbol;
+package com.mapbox.mapboxsdk.testapp.annotations;
 
 import android.support.test.runner.AndroidJUnit4;
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/annotation.junit.ejs b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/annotation.junit.ejs
index 3bc12a98b1..bf74d2b11e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/annotation.junit.ejs
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/annotation.junit.ejs
@@ -4,7 +4,7 @@
 -%>
 // This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
 
-package com.mapbox.mapboxsdk.testapp.symbol;
+package com.mapbox.mapboxsdk.testapp.annotations;
 
 import android.support.test.runner.AndroidJUnit4;
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/annotationmanager.junit.ejs b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/annotationmanager.junit.ejs
index 7367d1e143..b4efb3757a 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/annotationmanager.junit.ejs
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/annotationmanager.junit.ejs
@@ -4,7 +4,7 @@
 -%>
 // This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
 
-package com.mapbox.mapboxsdk.testapp.symbol;
+package com.mapbox.mapboxsdk.testapp.annotations;
 
 import android.support.test.runner.AndroidJUnit4;