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 fb26f6e5e8 9be646b8ab
commit 2ceb4069e6
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;

2
src/map/AMap.js
View File

@ -38,6 +38,7 @@ export default class GaodeMap extends Base {
initMap() { initMap() {
const mapStyle = this.get('mapStyle'); const mapStyle = this.get('mapStyle');
if (mapStyle) {
switch (mapStyle) { switch (mapStyle) {
case 'dark': case 'dark':
this.set('mapStyle', Theme.DarkTheme.mapStyle); this.set('mapStyle', Theme.DarkTheme.mapStyle);
@ -48,6 +49,7 @@ export default class GaodeMap extends Base {
default: default:
this.set('mapStyle', mapStyle); 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');
if (map instanceof AMap.Map) { if (map instanceof AMap.Map) {