1 files changed, 191 insertions, 2 deletions
diff --git a/src/mbgl/style/layers/heatmap_layer.cpp b/src/mbgl/style/layers/heatmap_layer.cpp
index 21016ee509..a90aab7009 100644
--- a/src/mbgl/style/layers/heatmap_layer.cpp
+++ b/src/mbgl/style/layers/heatmap_layer.cpp
@@ -3,10 +3,13 @@
 #include <mbgl/style/layers/heatmap_layer.hpp>
 #include <mbgl/style/layers/heatmap_layer_impl.hpp>
 #include <mbgl/style/layer_observer.hpp>
-// for constructing default heatmap-color ramp expression from style JSON
-#include <mbgl/style/conversion.hpp>
 #include <mbgl/style/conversion/color_ramp_property_value.hpp>
+#include <mbgl/style/conversion/constant.hpp>
+#include <mbgl/style/conversion/property_value.hpp>
+#include <mbgl/style/conversion/transition_options.hpp>
 #include <mbgl/style/conversion/json.hpp>
+#include <mbgl/style/conversion_impl.hpp>
+#include <mbgl/util/fnv_hash.hpp>
 
 namespace mbgl {
 namespace style {
@@ -237,5 +240,191 @@ TransitionOptions HeatmapLayer::getHeatmapOpacityTransition() const {
     return impl().paint.template get<HeatmapOpacity>().options;
 }
 
+using namespace conversion;
+
+optional<Error> HeatmapLayer::setPaintProperty(const std::string& name, const Convertible& value) {
+    enum class Property {
+        Unknown,
+        HeatmapRadius,
+        HeatmapWeight,
+        HeatmapIntensity,
+        HeatmapColor,
+        HeatmapOpacity,
+        HeatmapRadiusTransition,
+        HeatmapWeightTransition,
+        HeatmapIntensityTransition,
+        HeatmapColorTransition,
+        HeatmapOpacityTransition,
+    };
+
+    Property property = Property::Unknown;
+    switch (util::hashFNV1a(name.c_str())) {
+    case util::hashFNV1a("heatmap-radius"):
+        if (name == "heatmap-radius") {
+            property = Property::HeatmapRadius;
+        }
+        break;
+    case util::hashFNV1a("heatmap-radius-transition"):
+        if (name == "heatmap-radius-transition") {
+            property = Property::HeatmapRadiusTransition;
+        }
+        break;
+    case util::hashFNV1a("heatmap-weight"):
+        if (name == "heatmap-weight") {
+            property = Property::HeatmapWeight;
+        }
+        break;
+    case util::hashFNV1a("heatmap-weight-transition"):
+        if (name == "heatmap-weight-transition") {
+            property = Property::HeatmapWeightTransition;
+        }
+        break;
+    case util::hashFNV1a("heatmap-intensity"):
+        if (name == "heatmap-intensity") {
+            property = Property::HeatmapIntensity;
+        }
+        break;
+    case util::hashFNV1a("heatmap-intensity-transition"):
+        if (name == "heatmap-intensity-transition") {
+            property = Property::HeatmapIntensityTransition;
+        }
+        break;
+    case util::hashFNV1a("heatmap-color"):
+        if (name == "heatmap-color") {
+            property = Property::HeatmapColor;
+        }
+        break;
+    case util::hashFNV1a("heatmap-color-transition"):
+        if (name == "heatmap-color-transition") {
+            property = Property::HeatmapColorTransition;
+        }
+        break;
+    case util::hashFNV1a("heatmap-opacity"):
+        if (name == "heatmap-opacity") {
+            property = Property::HeatmapOpacity;
+        }
+        break;
+    case util::hashFNV1a("heatmap-opacity-transition"):
+        if (name == "heatmap-opacity-transition") {
+            property = Property::HeatmapOpacityTransition;
+        }
+        break;
+    
+    }
+
+    if (property == Property::Unknown) {
+        return Error { "layer doesn't support this property" };
+    }
+
+        
+    if (property == Property::HeatmapRadius || property == Property::HeatmapWeight) {
+        Error error;
+        optional<PropertyValue<float>> typedValue = convert<PropertyValue<float>>(value, error, true, false);
+        if (!typedValue) {
+            return error;
+        }
+        
+        if (property == Property::HeatmapRadius) {
+            setHeatmapRadius(*typedValue);
+            return nullopt;
+        }
+        
+        if (property == Property::HeatmapWeight) {
+            setHeatmapWeight(*typedValue);
+            return nullopt;
+        }
+        
+    }
+    
+    if (property == Property::HeatmapIntensity || property == Property::HeatmapOpacity) {
+        Error error;
+        optional<PropertyValue<float>> typedValue = convert<PropertyValue<float>>(value, error, false, false);
+        if (!typedValue) {
+            return error;
+        }
+        
+        if (property == Property::HeatmapIntensity) {
+            setHeatmapIntensity(*typedValue);
+            return nullopt;
+        }
+        
+        if (property == Property::HeatmapOpacity) {
+            setHeatmapOpacity(*typedValue);
+            return nullopt;
+        }
+        
+    }
+    
+    if (property == Property::HeatmapColor) {
+        Error error;
+        optional<ColorRampPropertyValue> typedValue = convert<ColorRampPropertyValue>(value, error, false, false);
+        if (!typedValue) {
+            return error;
+        }
+        
+        setHeatmapColor(*typedValue);
+        return nullopt;
+        
+    }
+    
+
+    Error error;
+    optional<TransitionOptions> transition = convert<TransitionOptions>(value, error);
+    if (!transition) {
+        return error;
+    }
+    
+    if (property == Property::HeatmapRadiusTransition) {
+        setHeatmapRadiusTransition(*transition);
+        return nullopt;
+    }
+    
+    if (property == Property::HeatmapWeightTransition) {
+        setHeatmapWeightTransition(*transition);
+        return nullopt;
+    }
+    
+    if (property == Property::HeatmapIntensityTransition) {
+        setHeatmapIntensityTransition(*transition);
+        return nullopt;
+    }
+    
+    if (property == Property::HeatmapColorTransition) {
+        setHeatmapColorTransition(*transition);
+        return nullopt;
+    }
+    
+    if (property == Property::HeatmapOpacityTransition) {
+        setHeatmapOpacityTransition(*transition);
+        return nullopt;
+    }
+    
+
+    return Error { "layer doesn't support this property" };
+}
+
+optional<Error> HeatmapLayer::setLayoutProperty(const std::string& name, const Convertible& value) {
+    if (name == "visibility") {
+        return Layer::setVisibility(value);
+    }
+
+    enum class Property {
+        Unknown,
+    };
+
+    Property property = Property::Unknown;
+    switch (util::hashFNV1a(name.c_str())) {
+    
+    }
+
+    if (property == Property::Unknown) {
+        return Error { "layer doesn't support this property" };
+    }
+
+        
+
+    return Error { "layer doesn't support this property" };
+}
+
 } // namespace style
 } // namespace mbgl