diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-02-16 10:47:06 +0100 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2018-03-01 11:29:53 +0100 |
commit | 2e008aa29ef0ae783f8461a712011dcdba3f0653 (patch) | |
tree | 2b4cb7188351d2772834d0634de4e87ba2593cdc /platform/android/MapboxGLAndroidSDKTestApp | |
parent | 2187d140df730585064857c4f799ebd6324a188e (diff) | |
download | qtlocation-mapboxgl-2e008aa29ef0ae783f8461a712011dcdba3f0653.tar.gz |
[android] - add heatmap color property
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp')
2 files changed, 15 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs index 206497b860..4e014c4384 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs @@ -123,6 +123,7 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest { } <% } -%> <% for (const property of properties) { -%> +<% if (property.name != 'heatmap-color') { -%> <% if (property.transition) { -%> @Test @@ -456,5 +457,6 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest { } <% } -%> <% } -%> +<% } -%> } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HeatmapLayerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HeatmapLayerActivity.java index b42734ea67..52509e3297 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HeatmapLayerActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HeatmapLayerActivity.java @@ -16,6 +16,7 @@ import java.net.URL; import timber.log.Timber; import static com.mapbox.mapboxsdk.style.expressions.Expression.get; +import static com.mapbox.mapboxsdk.style.expressions.Expression.heatmapDensity; import static com.mapbox.mapboxsdk.style.expressions.Expression.interpolate; import static com.mapbox.mapboxsdk.style.expressions.Expression.linear; import static com.mapbox.mapboxsdk.style.expressions.Expression.literal; @@ -28,6 +29,7 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleOpacity; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleRadius; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleStrokeColor; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleStrokeWidth; +import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.heatmapColor; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.heatmapIntensity; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.heatmapOpacity; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.heatmapRadius; @@ -51,7 +53,6 @@ public class HeatmapLayerActivity extends AppCompatActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_heatmaplayer); - mapView = (MapView) findViewById(R.id.mapView); mapView.onCreate(savedInstanceState); mapView.getMapAsync(map -> { @@ -76,11 +77,20 @@ public class HeatmapLayerActivity extends AppCompatActivity { layer.setSourceLayer(HEATMAP_LAYER_SOURCE); layer.setProperties( - // TODO add heatmap color https://github.com/mapbox/mapbox-gl-native/issues/11172 // Color ramp for heatmap. Domain is 0 (low) to 1 (high). // Begin color ramp at 0-stop with a 0-transparancy color // to create a blur-like effect. - //heatmapColor(), + heatmapColor( + interpolate( + linear(), heatmapDensity(), + literal(0), rgba(33, 102, 172, 0), + literal(0.2), rgb(103, 169, 207), + literal(0.4), rgb(209, 229, 240), + literal(0.6), rgb(253, 219, 199), + literal(0.8), rgb(239, 138, 98), + literal(1), rgb(178, 24, 43) + ) + ), // Increase the heatmap weight based on frequency and property magnitude heatmapWeight( |