[android] data driven style implementation

1 files changed, 51 insertions, 51 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java
index abc516d6d0..2ed6dfa582 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java
@@ -1,6 +1,7 @@
-package com.mapbox.mapboxsdk.style.layers;
 // This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
 
+package com.mapbox.mapboxsdk.style.layers;
+
 import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.support.annotation.UiThread;
@@ -96,14 +97,13 @@ public class SymbolLayer extends Layer {
     return this;
   }
 
-
   /**
    * Set a property or properties.
    *
    * @param properties the var-args properties
    * @return This
    */
-  public SymbolLayer withProperties(@NonNull Property<?>... properties) {
+  public SymbolLayer withProperties(@NonNull PropertyValue<?>... properties) {
     setProperties(properties);
     return this;
   }
@@ -117,7 +117,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getSymbolPlacement() {
-    return (PropertyValue<String>) new PropertyValue(nativeGetSymbolPlacement());
+    return (PropertyValue<String>) new PropertyValue("symbol-placement", nativeGetSymbolPlacement());
   }
 
   /**
@@ -127,7 +127,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getSymbolSpacing() {
-    return (PropertyValue<Float>) new PropertyValue(nativeGetSymbolSpacing());
+    return (PropertyValue<Float>) new PropertyValue("symbol-spacing", nativeGetSymbolSpacing());
   }
 
   /**
@@ -137,7 +137,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Boolean> getSymbolAvoidEdges() {
-    return (PropertyValue<Boolean>) new PropertyValue(nativeGetSymbolAvoidEdges());
+    return (PropertyValue<Boolean>) new PropertyValue("symbol-avoid-edges", nativeGetSymbolAvoidEdges());
   }
 
   /**
@@ -147,7 +147,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Boolean> getIconAllowOverlap() {
-    return (PropertyValue<Boolean>) new PropertyValue(nativeGetIconAllowOverlap());
+    return (PropertyValue<Boolean>) new PropertyValue("icon-allow-overlap", nativeGetIconAllowOverlap());
   }
 
   /**
@@ -157,7 +157,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Boolean> getIconIgnorePlacement() {
-    return (PropertyValue<Boolean>) new PropertyValue(nativeGetIconIgnorePlacement());
+    return (PropertyValue<Boolean>) new PropertyValue("icon-ignore-placement", nativeGetIconIgnorePlacement());
   }
 
   /**
@@ -167,7 +167,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Boolean> getIconOptional() {
-    return (PropertyValue<Boolean>) new PropertyValue(nativeGetIconOptional());
+    return (PropertyValue<Boolean>) new PropertyValue("icon-optional", nativeGetIconOptional());
   }
 
   /**
@@ -177,7 +177,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getIconRotationAlignment() {
-    return (PropertyValue<String>) new PropertyValue(nativeGetIconRotationAlignment());
+    return (PropertyValue<String>) new PropertyValue("icon-rotation-alignment", nativeGetIconRotationAlignment());
   }
 
   /**
@@ -187,7 +187,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getIconSize() {
-    return (PropertyValue<Float>) new PropertyValue(nativeGetIconSize());
+    return (PropertyValue<Float>) new PropertyValue("icon-size", nativeGetIconSize());
   }
 
   /**
@@ -197,7 +197,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getIconTextFit() {
-    return (PropertyValue<String>) new PropertyValue(nativeGetIconTextFit());
+    return (PropertyValue<String>) new PropertyValue("icon-text-fit", nativeGetIconTextFit());
   }
 
   /**
@@ -207,7 +207,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float[]> getIconTextFitPadding() {
-    return (PropertyValue<Float[]>) new PropertyValue(nativeGetIconTextFitPadding());
+    return (PropertyValue<Float[]>) new PropertyValue("icon-text-fit-padding", nativeGetIconTextFitPadding());
   }
 
   /**
@@ -217,7 +217,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getIconImage() {
-    return (PropertyValue<String>) new PropertyValue(nativeGetIconImage());
+    return (PropertyValue<String>) new PropertyValue("icon-image", nativeGetIconImage());
   }
 
   /**
@@ -227,7 +227,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getIconRotate() {
-    return (PropertyValue<Float>) new PropertyValue(nativeGetIconRotate());
+    return (PropertyValue<Float>) new PropertyValue("icon-rotate", nativeGetIconRotate());
   }
 
   /**
@@ -237,7 +237,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getIconPadding() {
-    return (PropertyValue<Float>) new PropertyValue(nativeGetIconPadding());
+    return (PropertyValue<Float>) new PropertyValue("icon-padding", nativeGetIconPadding());
   }
 
   /**
@@ -247,7 +247,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Boolean> getIconKeepUpright() {
-    return (PropertyValue<Boolean>) new PropertyValue(nativeGetIconKeepUpright());
+    return (PropertyValue<Boolean>) new PropertyValue("icon-keep-upright", nativeGetIconKeepUpright());
   }
 
   /**
@@ -257,7 +257,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float[]> getIconOffset() {
-    return (PropertyValue<Float[]>) new PropertyValue(nativeGetIconOffset());
+    return (PropertyValue<Float[]>) new PropertyValue("icon-offset", nativeGetIconOffset());
   }
 
   /**
@@ -267,7 +267,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getTextPitchAlignment() {
-    return (PropertyValue<String>) new PropertyValue(nativeGetTextPitchAlignment());
+    return (PropertyValue<String>) new PropertyValue("text-pitch-alignment", nativeGetTextPitchAlignment());
   }
 
   /**
@@ -277,7 +277,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getTextRotationAlignment() {
-    return (PropertyValue<String>) new PropertyValue(nativeGetTextRotationAlignment());
+    return (PropertyValue<String>) new PropertyValue("text-rotation-alignment", nativeGetTextRotationAlignment());
   }
 
   /**
@@ -287,7 +287,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getTextField() {
-    return (PropertyValue<String>) new PropertyValue(nativeGetTextField());
+    return (PropertyValue<String>) new PropertyValue("text-field", nativeGetTextField());
   }
 
   /**
@@ -297,7 +297,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String[]> getTextFont() {
-    return (PropertyValue<String[]>) new PropertyValue(nativeGetTextFont());
+    return (PropertyValue<String[]>) new PropertyValue("text-font", nativeGetTextFont());
   }
 
   /**
@@ -307,7 +307,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getTextSize() {
-    return (PropertyValue<Float>) new PropertyValue(nativeGetTextSize());
+    return (PropertyValue<Float>) new PropertyValue("text-size", nativeGetTextSize());
   }
 
   /**
@@ -317,7 +317,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getTextMaxWidth() {
-    return (PropertyValue<Float>) new PropertyValue(nativeGetTextMaxWidth());
+    return (PropertyValue<Float>) new PropertyValue("text-max-width", nativeGetTextMaxWidth());
   }
 
   /**
@@ -327,7 +327,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getTextLineHeight() {
-    return (PropertyValue<Float>) new PropertyValue(nativeGetTextLineHeight());
+    return (PropertyValue<Float>) new PropertyValue("text-line-height", nativeGetTextLineHeight());
   }
 
   /**
@@ -337,7 +337,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getTextLetterSpacing() {
-    return (PropertyValue<Float>) new PropertyValue(nativeGetTextLetterSpacing());
+    return (PropertyValue<Float>) new PropertyValue("text-letter-spacing", nativeGetTextLetterSpacing());
   }
 
   /**
@@ -347,7 +347,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getTextJustify() {
-    return (PropertyValue<String>) new PropertyValue(nativeGetTextJustify());
+    return (PropertyValue<String>) new PropertyValue("text-justify", nativeGetTextJustify());
   }
 
   /**
@@ -357,7 +357,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getTextAnchor() {
-    return (PropertyValue<String>) new PropertyValue(nativeGetTextAnchor());
+    return (PropertyValue<String>) new PropertyValue("text-anchor", nativeGetTextAnchor());
   }
 
   /**
@@ -367,7 +367,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getTextMaxAngle() {
-    return (PropertyValue<Float>) new PropertyValue(nativeGetTextMaxAngle());
+    return (PropertyValue<Float>) new PropertyValue("text-max-angle", nativeGetTextMaxAngle());
   }
 
   /**
@@ -377,7 +377,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getTextRotate() {
-    return (PropertyValue<Float>) new PropertyValue(nativeGetTextRotate());
+    return (PropertyValue<Float>) new PropertyValue("text-rotate", nativeGetTextRotate());
   }
 
   /**
@@ -387,7 +387,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getTextPadding() {
-    return (PropertyValue<Float>) new PropertyValue(nativeGetTextPadding());
+    return (PropertyValue<Float>) new PropertyValue("text-padding", nativeGetTextPadding());
   }
 
   /**
@@ -397,7 +397,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Boolean> getTextKeepUpright() {
-    return (PropertyValue<Boolean>) new PropertyValue(nativeGetTextKeepUpright());
+    return (PropertyValue<Boolean>) new PropertyValue("text-keep-upright", nativeGetTextKeepUpright());
   }
 
   /**
@@ -407,7 +407,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getTextTransform() {
-    return (PropertyValue<String>) new PropertyValue(nativeGetTextTransform());
+    return (PropertyValue<String>) new PropertyValue("text-transform", nativeGetTextTransform());
   }
 
   /**
@@ -417,7 +417,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float[]> getTextOffset() {
-    return (PropertyValue<Float[]>) new PropertyValue(nativeGetTextOffset());
+    return (PropertyValue<Float[]>) new PropertyValue("text-offset", nativeGetTextOffset());
   }
 
   /**
@@ -427,7 +427,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Boolean> getTextAllowOverlap() {
-    return (PropertyValue<Boolean>) new PropertyValue(nativeGetTextAllowOverlap());
+    return (PropertyValue<Boolean>) new PropertyValue("text-allow-overlap", nativeGetTextAllowOverlap());
   }
 
   /**
@@ -437,7 +437,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Boolean> getTextIgnorePlacement() {
-    return (PropertyValue<Boolean>) new PropertyValue(nativeGetTextIgnorePlacement());
+    return (PropertyValue<Boolean>) new PropertyValue("text-ignore-placement", nativeGetTextIgnorePlacement());
   }
 
   /**
@@ -447,7 +447,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Boolean> getTextOptional() {
-    return (PropertyValue<Boolean>) new PropertyValue(nativeGetTextOptional());
+    return (PropertyValue<Boolean>) new PropertyValue("text-optional", nativeGetTextOptional());
   }
 
   /**
@@ -457,7 +457,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getIconOpacity() {
-    return (PropertyValue<Float>) new PropertyValue(nativeGetIconOpacity());
+    return (PropertyValue<Float>) new PropertyValue("icon-opacity", nativeGetIconOpacity());
   }
 
   /**
@@ -467,7 +467,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getIconColor() {
-    return (PropertyValue<String>) new PropertyValue(nativeGetIconColor());
+    return (PropertyValue<String>) new PropertyValue("icon-color", nativeGetIconColor());
   }
 
   /**
@@ -494,7 +494,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getIconHaloColor() {
-    return (PropertyValue<String>) new PropertyValue(nativeGetIconHaloColor());
+    return (PropertyValue<String>) new PropertyValue("icon-halo-color", nativeGetIconHaloColor());
   }
 
   /**
@@ -521,7 +521,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getIconHaloWidth() {
-    return (PropertyValue<Float>) new PropertyValue(nativeGetIconHaloWidth());
+    return (PropertyValue<Float>) new PropertyValue("icon-halo-width", nativeGetIconHaloWidth());
   }
 
   /**
@@ -531,7 +531,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getIconHaloBlur() {
-    return (PropertyValue<Float>) new PropertyValue(nativeGetIconHaloBlur());
+    return (PropertyValue<Float>) new PropertyValue("icon-halo-blur", nativeGetIconHaloBlur());
   }
 
   /**
@@ -541,7 +541,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float[]> getIconTranslate() {
-    return (PropertyValue<Float[]>) new PropertyValue(nativeGetIconTranslate());
+    return (PropertyValue<Float[]>) new PropertyValue("icon-translate", nativeGetIconTranslate());
   }
 
   /**
@@ -551,7 +551,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getIconTranslateAnchor() {
-    return (PropertyValue<String>) new PropertyValue(nativeGetIconTranslateAnchor());
+    return (PropertyValue<String>) new PropertyValue("icon-translate-anchor", nativeGetIconTranslateAnchor());
   }
 
   /**
@@ -561,7 +561,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getTextOpacity() {
-    return (PropertyValue<Float>) new PropertyValue(nativeGetTextOpacity());
+    return (PropertyValue<Float>) new PropertyValue("text-opacity", nativeGetTextOpacity());
   }
 
   /**
@@ -571,7 +571,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getTextColor() {
-    return (PropertyValue<String>) new PropertyValue(nativeGetTextColor());
+    return (PropertyValue<String>) new PropertyValue("text-color", nativeGetTextColor());
   }
 
   /**
@@ -598,7 +598,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getTextHaloColor() {
-    return (PropertyValue<String>) new PropertyValue(nativeGetTextHaloColor());
+    return (PropertyValue<String>) new PropertyValue("text-halo-color", nativeGetTextHaloColor());
   }
 
   /**
@@ -625,7 +625,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getTextHaloWidth() {
-    return (PropertyValue<Float>) new PropertyValue(nativeGetTextHaloWidth());
+    return (PropertyValue<Float>) new PropertyValue("text-halo-width", nativeGetTextHaloWidth());
   }
 
   /**
@@ -635,7 +635,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getTextHaloBlur() {
-    return (PropertyValue<Float>) new PropertyValue(nativeGetTextHaloBlur());
+    return (PropertyValue<Float>) new PropertyValue("text-halo-blur", nativeGetTextHaloBlur());
   }
 
   /**
@@ -645,7 +645,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<Float[]> getTextTranslate() {
-    return (PropertyValue<Float[]>) new PropertyValue(nativeGetTextTranslate());
+    return (PropertyValue<Float[]>) new PropertyValue("text-translate", nativeGetTextTranslate());
   }
 
   /**
@@ -655,7 +655,7 @@ public class SymbolLayer extends Layer {
    */
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getTextTranslateAnchor() {
-    return (PropertyValue<String>) new PropertyValue(nativeGetTextTranslateAnchor());
+    return (PropertyValue<String>) new PropertyValue("text-translate-anchor", nativeGetTextTranslateAnchor());
   }
 
   private native Object nativeGetSymbolPlacement();