p90524618
/
antv-l7
mirror of https://gitee.com/antv-l7/antv-l7
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mvt

This commit is contained in:
thinkinggis 2019-05-14 17:44:03 +08:00
parent cfc4bfdcd2 6154a1cc77
commit e851483951
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/layer/render/heatmap/heatmap.js
View File

@ -68,7 +68,7 @@ function copyPass(layer) {
const style = layer.get('styleOptions'); const style = layer.get('styleOptions');
const material = new HeatmapColorizeMaterial({ const material = new HeatmapColorizeMaterial({
u_rampColors: layer.rampColors, u_rampColors: layer.rampColors,
u_opacity: style.opacity u_opacity: style.opacity || 1.0
}, {}); }, {});
const copyPass = new ShaderPass(material, 'u_texture'); const copyPass = new ShaderPass(material, 'u_texture');
return copyPass; return copyPass;

20
src/map/AMap.js
View File

@ -38,15 +38,17 @@ export default class GaodeMap extends Base {
initMap() { initMap() {
const mapStyle = this.get('mapStyle'); const mapStyle = this.get('mapStyle');
switch (mapStyle) { if (mapStyle) {
case 'dark': switch (mapStyle) {
this.set('mapStyle', Theme.DarkTheme.mapStyle); case 'dark':
break; this.set('mapStyle', Theme.DarkTheme.mapStyle);
case 'light': break;
this.set('mapStyle', Theme.LightTheme.mapStyle); case 'light':
break; this.set('mapStyle', Theme.LightTheme.mapStyle);
default: break;
this.set('mapStyle', mapStyle); default:
this.set('mapStyle', mapStyle);
}
} }
this.set('zooms', [ this.get('minZoom'), this.get('maxZoom') ]); this.set('zooms', [ this.get('minZoom'), this.get('maxZoom') ]);
const map = this.get('map'); const map = this.get('map');