remove heatmap-color from android for now

7 files changed, 2 insertions, 113 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java
index bfc663449f..6b8fd65def 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java
@@ -168,32 +168,6 @@ public class HeatmapLayer extends Layer {
   }
 
   /**
-   * Get the HeatmapColor property
-   *
-   * @return property wrapper value around String
-   */
-  @SuppressWarnings("unchecked")
-  public PropertyValue<String> getHeatmapColor() {
-    return (PropertyValue<String>) new PropertyValue("heatmap-color", nativeGetHeatmapColor());
-  }
-
-  /**
-   * Defines the color of each pixel based on its density value in a heatmap.  Should be an expression that uses `["heatmap-density"]` as input.
-   *
-   * @return int representation of a rgba string color
-   * @throws RuntimeException thrown if property isn't a value
-   */
-  @ColorInt
-  public int getHeatmapColorAsInt() {
-    PropertyValue<String> value = getHeatmapColor();
-    if (value.isValue()) {
-      return rgbaToColor(value.getValue());
-    } else {
-      throw new RuntimeException("heatmap-color was set as a Function");
-    }
-  }
-
-  /**
    * Get the HeatmapOpacity property
    *
    * @return property wrapper value around Float
@@ -235,8 +209,6 @@ public class HeatmapLayer extends Layer {
 
   private native void nativeSetHeatmapIntensityTransition(long duration, long delay);
 
-  private native Object nativeGetHeatmapColor();
-
   private native Object nativeGetHeatmapOpacity();
 
   private native TransitionOptions nativeGetHeatmapOpacityTransition();
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
index 43f5be98cb..18ee05e63b 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
@@ -1615,36 +1615,6 @@ public class PropertyFactory {
   }
 
   /**
-   * Defines the color of each pixel based on its density value in a heatmap.  Should be an expression that uses `["heatmap-density"]` as input.
-   *
-   * @param value a int color value
-   * @return property wrapper around String color
-   */
-  public static PropertyValue<String> heatmapColor(@ColorInt int value) {
-    return new PaintPropertyValue<>("heatmap-color", colorToRgbaString(value));
-  }
-
-  /**
-   * Defines the color of each pixel based on its density value in a heatmap.  Should be an expression that uses `["heatmap-density"]` as input.
-   *
-   * @param value a String value
-   * @return property wrapper around String
-   */
-  public static PropertyValue<String> heatmapColor(String value) {
-    return new PaintPropertyValue<>("heatmap-color", value);
-  }
-
-  /**
-   * Defines the color of each pixel based on its density value in a heatmap.  Should be an expression that uses `["heatmap-density"]` as input.
-   *
-   * @param expression an expression statement
-   * @return property wrapper around an expression statement
-   */
-  public static PropertyValue<Expression> heatmapColor(Expression expression) {
-    return new PaintPropertyValue<>("heatmap-color", expression);
-  }
-
-  /**
    * The global opacity at which the heatmap layer will be drawn.
    *
    * @param value a Float value
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HeatmapLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HeatmapLayerTest.java
index 0a4c35f1fe..364c8d2679 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HeatmapLayerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HeatmapLayerTest.java
@@ -557,40 +557,6 @@ public class HeatmapLayerTest extends BaseActivityTest {
   }
 
   @Test
-  public void testHeatmapColorAsConstant() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("heatmap-color");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        layer.setProperties(heatmapColor("rgba(0, 0, 0, 1)"));
-        assertEquals((String) layer.getHeatmapColor().getValue(), (String) "rgba(0, 0, 0, 1)");
-      }
-    });
-  }
-
-  @Test
-  public void testHeatmapColorAsIntConstant() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("heatmap-color");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        layer.setProperties(heatmapColor(Color.RED));
-        assertEquals(layer.getHeatmapColorAsInt(), Color.RED);
-      }
-    });
-  }
-
-  @Test
   public void testHeatmapOpacityTransition() {
     validateTestSetup();
     setupLayer();
diff --git a/platform/android/scripts/generate-style-code.js b/platform/android/scripts/generate-style-code.js
index 65b0a399ac..b9fd165830 100755
--- a/platform/android/scripts/generate-style-code.js
+++ b/platform/android/scripts/generate-style-code.js
@@ -28,6 +28,7 @@ var layers = Object.keys(spec.layer.type.values).map((type) => {
   }, []);
 
   const paintProperties = Object.keys(spec[`paint_${type}`]).reduce((memo, name) => {
+    if (name === 'heatmap-color') return memo;
     spec[`paint_${type}`][name].name = name;
     memo.push(spec[`paint_${type}`][name]);
     return memo;
diff --git a/platform/android/src/style/conversion/property_value.hpp b/platform/android/src/style/conversion/property_value.hpp
index a44303c292..a58cf975a7 100644
--- a/platform/android/src/style/conversion/property_value.hpp
+++ b/platform/android/src/style/conversion/property_value.hpp
@@ -2,7 +2,6 @@
 
 #include <mbgl/style/property_value.hpp>
 #include <mbgl/style/data_driven_property_value.hpp>
-#include <mbgl/style/heatmap_color_property_value.hpp>
 #include "../../conversion/conversion.hpp"
 #include "../../conversion/constant.hpp"
 #include "types.hpp"
@@ -62,6 +61,7 @@ struct Converter<jni::jobject*, mbgl::style::PropertyValue<T>> {
 /**
  * Convert core data driven property values to java
  */
+template <class T>
 struct Converter<jni::jobject*, mbgl::style::DataDrivenPropertyValue<T>> {
 
     Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::DataDrivenPropertyValue<T>& value) const {
@@ -70,17 +70,6 @@ struct Converter<jni::jobject*, mbgl::style::DataDrivenPropertyValue<T>> {
     }
 };
 
-/**
- * Convert core heatmap color property values to java
- */
-struct Converter<jni::jobject*, mbgl::style::HeatmapColorPropertyValue> {
-
-    Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::HeatmapColorPropertyValue& value) const {
-        PropertyValueEvaluator<T> evaluator(env);
-        return value.evaluate(evaluator);
-    }
-};
-
 } // namespace conversion
 } // namespace android
 } // namespace mbgl
diff --git a/platform/android/src/style/layers/heatmap_layer.cpp b/platform/android/src/style/layers/heatmap_layer.cpp
index 3f1d35feb2..609499ec93 100644
--- a/platform/android/src/style/layers/heatmap_layer.cpp
+++ b/platform/android/src/style/layers/heatmap_layer.cpp
@@ -79,12 +79,6 @@ namespace android {
         layer.as<mbgl::style::HeatmapLayer>()->HeatmapLayer::setHeatmapIntensityTransition(options);
     }
 
-    jni::Object<jni::ObjectTag> HeatmapLayer::getHeatmapColor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        Result<jni::jobject*> converted = convert<jni::jobject*>(env, layer.as<mbgl::style::HeatmapLayer>()->HeatmapLayer::getHeatmapColor());
-        return jni::Object<jni::ObjectTag>(*converted);
-    }
-
     jni::Object<jni::ObjectTag> HeatmapLayer::getHeatmapOpacity(jni::JNIEnv& env) {
         using namespace mbgl::android::conversion;
         Result<jni::jobject*> converted = convert<jni::jobject*>(env, layer.as<mbgl::style::HeatmapLayer>()->HeatmapLayer::getHeatmapOpacity());
@@ -131,7 +125,6 @@ namespace android {
             METHOD(&HeatmapLayer::getHeatmapIntensityTransition, "nativeGetHeatmapIntensityTransition"),
             METHOD(&HeatmapLayer::setHeatmapIntensityTransition, "nativeSetHeatmapIntensityTransition"),
             METHOD(&HeatmapLayer::getHeatmapIntensity, "nativeGetHeatmapIntensity"),
-            METHOD(&HeatmapLayer::getHeatmapColor, "nativeGetHeatmapColor"),
             METHOD(&HeatmapLayer::getHeatmapOpacityTransition, "nativeGetHeatmapOpacityTransition"),
             METHOD(&HeatmapLayer::setHeatmapOpacityTransition, "nativeSetHeatmapOpacityTransition"),
             METHOD(&HeatmapLayer::getHeatmapOpacity, "nativeGetHeatmapOpacity"));
diff --git a/platform/android/src/style/layers/heatmap_layer.hpp b/platform/android/src/style/layers/heatmap_layer.hpp
index 9e8908b062..85f9f0292e 100644
--- a/platform/android/src/style/layers/heatmap_layer.hpp
+++ b/platform/android/src/style/layers/heatmap_layer.hpp
@@ -39,8 +39,6 @@ public:
     void setHeatmapIntensityTransition(jni::JNIEnv&, jlong duration, jlong delay);
     jni::Object<TransitionOptions> getHeatmapIntensityTransition(jni::JNIEnv&);
 
-    jni::Object<jni::ObjectTag> getHeatmapColor(jni::JNIEnv&);
-
     jni::Object<jni::ObjectTag> getHeatmapOpacity(jni::JNIEnv&);
     void setHeatmapOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay);
     jni::Object<TransitionOptions> getHeatmapOpacityTransition(jni::JNIEnv&);