From c745b128d3522766a778caabe3ef06eb9bc01f7d Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun.van.nuland@gmail.com>
Date: Mon, 19 Feb 2018 08:49:58 +0100
Subject: [android] - add default heatmap color to getter

---
 platform/android/src/style/layers/heatmap_layer.cpp |  6 +++++-
 platform/android/src/style/layers/layer.cpp.ejs     | 13 +++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/platform/android/src/style/layers/heatmap_layer.cpp b/platform/android/src/style/layers/heatmap_layer.cpp
index 3f1d35feb2..b3d90faab7 100644
--- a/platform/android/src/style/layers/heatmap_layer.cpp
+++ b/platform/android/src/style/layers/heatmap_layer.cpp
@@ -81,7 +81,11 @@ namespace android {
 
     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());
+        auto propertyValue = layer.as<mbgl::style::HeatmapLayer>()->HeatmapLayer::getHeatmapColor();
+        if (propertyValue.isUndefined()) {
+            propertyValue = layer.as<mbgl::style::HeatmapLayer>()->HeatmapLayer::getDefaultHeatmapColor();
+        }
+        Result<jni::jobject*> converted = convert<jni::jobject*>(env, propertyValue);
         return jni::Object<jni::ObjectTag>(*converted);
     }
 
diff --git a/platform/android/src/style/layers/layer.cpp.ejs b/platform/android/src/style/layers/layer.cpp.ejs
index 1debb096a3..b08f0ec4dc 100644
--- a/platform/android/src/style/layers/layer.cpp.ejs
+++ b/platform/android/src/style/layers/layer.cpp.ejs
@@ -48,12 +48,25 @@ namespace android {
     // Property getters
 
 <% for (const property of properties) { -%>
+<% if (property.name != 'heatmap-color') { -%>
     jni::Object<jni::ObjectTag> <%- camelize(type) %>Layer::get<%- camelize(property.name) %>(jni::JNIEnv& env) {
         using namespace mbgl::android::conversion;
         Result<jni::jobject*> converted = convert<jni::jobject*>(env, layer.as<mbgl::style::<%- camelize(type) %>Layer>()-><%- camelize(type) %>Layer::get<%- camelize(property.name) %>());
         return jni::Object<jni::ObjectTag>(*converted);
     }
 
+<% } else { -%>
+    jni::Object<jni::ObjectTag> HeatmapLayer::getHeatmapColor(jni::JNIEnv& env) {
+        using namespace mbgl::android::conversion;
+        auto propertyValue = layer.as<mbgl::style::HeatmapLayer>()->HeatmapLayer::getHeatmapColor();
+        if (propertyValue.isUndefined()) {
+            propertyValue = layer.as<mbgl::style::HeatmapLayer>()->HeatmapLayer::getDefaultHeatmapColor();
+        }
+        Result<jni::jobject*> converted = convert<jni::jobject*>(env, propertyValue);
+        return jni::Object<jni::ObjectTag>(*converted);
+    }
+
+<% } -%>
 <% if (property.transition) { -%>
     jni::Object<TransitionOptions> <%- camelize(type) %>Layer::get<%- camelize(property.name) %>Transition(jni::JNIEnv& env) {
         using namespace mbgl::android::conversion;
-- 
cgit v1.2.1