Commit Graph

628 Commits

Author SHA1 Message Date
thinkinggis 7a4153b58e fix(core): file name 2019-03-25 20:22:22 +08:00
thinkinggis b8517610af fix(core): file name 2019-03-25 20:22:22 +08:00
thinkinggis 75b15d3625 fix(code): shaderpass 2019-03-25 20:18:35 +08:00
thinkinggis 2235e86a6b fix(code): shaderpass 2019-03-25 20:18:35 +08:00
thinkinggis 2c4a14fd57 Merge branch 'composer' into 'master'
Composer

热力图渲染方式 effectComposer方式渲染,性能提高

See merge request !20
2019-03-25 20:13:20 +08:00
thinkinggis f7cc3ecaa0 Merge branch 'composer' into 'master'
Composer

热力图渲染方式 effectComposer方式渲染,性能提高

See merge request !20
2019-03-25 20:13:20 +08:00
thinkinggis 7758108d3f fix(src): merge master 2019-03-25 20:10:49 +08:00
thinkinggis 21e0d1d056 fix(src): merge master 2019-03-25 20:10:49 +08:00
thinkinggis 0d30fac948 refactor(heatmap): composer heatmap 2019-03-25 19:59:59 +08:00
thinkinggis 5438c7cd8d refactor(heatmap): composer heatmap 2019-03-25 19:59:59 +08:00
thinkinggis 99c8faa598 fix(core): shaderpass 2019-03-25 15:50:31 +08:00
thinkinggis 0224267066 fix(core): shaderpass 2019-03-25 15:50:31 +08:00
thinkinggis 681ba5feee fix(core): delete composer.js 2019-03-25 15:09:12 +08:00
thinkinggis 876206c3cd fix(core): delete composer.js 2019-03-25 15:09:12 +08:00
thinkinggis 45b3bd95fb Merge branch 'shaderPass' into 'master'
add shaderPass & renderPass



See merge request !19
2019-03-25 14:54:12 +08:00
thinkinggis 6d0f00b1f7 Merge branch 'shaderPass' into 'master'
add shaderPass & renderPass



See merge request !19
2019-03-25 14:54:12 +08:00
mipha.ly d50feadf15 add shaderPass & renderPass 2019-03-25 14:45:42 +08:00
mipha.ly 6f6c94a4db add shaderPass & renderPass 2019-03-25 14:45:42 +08:00
thinkinggis 5fb4466d46 refactor(layer): text layer 2019-03-25 00:57:09 +08:00
thinkinggis 6a40f55104 refactor(layer): text layer 2019-03-25 00:57:09 +08:00
thinkinggis 972b98ddd9 reactor(layer): scaleContorller 2019-03-23 18:30:28 +08:00
thinkinggis b5119e659f reactor(layer): scaleContorller 2019-03-23 18:30:28 +08:00
thinkinggis de559a204f fix(layer) getlegendcfg 2019-03-22 17:09:20 +08:00
thinkinggis 14fbc7d604 fix(layer) getlegendcfg 2019-03-22 17:09:20 +08:00
thinkinggis 28d4d9b337 Merge branch 'heatmap-fix' into 'master'
feat(layer): add lengendcdg method

高亮颜色不受全局透明度影响
增加获取图例配置项参数

See merge request !18
2019-03-22 16:18:57 +08:00
thinkinggis f6b25226cf Merge branch 'heatmap-fix' into 'master'
feat(layer): add lengendcdg method

高亮颜色不受全局透明度影响
增加获取图例配置项参数

See merge request !18
2019-03-22 16:18:57 +08:00
thinkinggis cefc9ec47f Merge branch 'heatmap-fix' into 'master'
feat(layer): add lengendcdg method

高亮颜色不受全局透明度影响
增加获取图例配置项参数

See merge request !18
2019-03-22 16:18:55 +08:00
thinkinggis af831960a4 Merge branch 'heatmap-fix' into 'master'
feat(layer): add lengendcdg method

高亮颜色不受全局透明度影响
增加获取图例配置项参数

See merge request !18
2019-03-22 16:18:55 +08:00
thinkinggis 93a3eb7f42 feat(layer): add lengendcdg method 2019-03-22 16:10:35 +08:00
thinkinggis 4fec5823e2 feat(layer): add lengendcdg method 2019-03-22 16:10:35 +08:00
thinkinggis e115012994 fix(source) 2019-03-22 10:42:54 +08:00
thinkinggis b23a1ffb4c fix(source) 2019-03-22 10:42:54 +08:00
thinkinggis f6592552a6 Merge branch 'heatmap-fix' into 'master'
fix(Amap): fix map

添加高德地图参数

See merge request !17
2019-03-20 17:25:24 +08:00
thinkinggis 1f6d74aa2e Merge branch 'heatmap-fix' into 'master'
fix(Amap): fix map

添加高德地图参数

See merge request !17
2019-03-20 17:25:24 +08:00
thinkinggis 4e3729f399 fix(Amap): fix map 2019-03-20 17:23:28 +08:00
thinkinggis 0734fba363 fix(Amap): fix map 2019-03-20 17:23:28 +08:00
thinkinggis 7e8b8b379c Merge branch 'heatmap-fix' into 'master'
fix(Amap): setstyle

update set map style

See merge request !16
2019-03-19 15:26:24 +08:00
thinkinggis 58aa492a1a Merge branch 'heatmap-fix' into 'master'
fix(Amap): setstyle

update set map style

See merge request !16
2019-03-19 15:26:24 +08:00
thinkinggis 25acf0d897 fix(Amap): setstyle 2019-03-19 15:18:28 +08:00
thinkinggis daa942d92e fix(Amap): setstyle 2019-03-19 15:18:28 +08:00
thinkinggis ee06edd89c Merge branch 'heatmap-fix' into 'master'
Heatmap fix



See merge request !15
2019-03-18 11:59:16 +08:00
thinkinggis 2a64e37f75 Merge branch 'heatmap-fix' into 'master'
Heatmap fix



See merge request !15
2019-03-18 11:59:16 +08:00
thinkinggis f5825ee22c Merge branch 'heatmap-fix' into 'master'
Heatmap fix



See merge request !15
2019-03-18 11:59:11 +08:00
thinkinggis c5bedcfac2 Merge branch 'heatmap-fix' into 'master'
Heatmap fix



See merge request !15
2019-03-18 11:59:11 +08:00
thinkinggis 9d67daabc5 Merge branch 'heatmap-fix' into 'master'
Heatmap fix



See merge request !15
2019-03-18 11:59:09 +08:00
thinkinggis 11729fd959 Merge branch 'heatmap-fix' into 'master'
Heatmap fix



See merge request !15
2019-03-18 11:59:09 +08:00
thinkinggis bdbcd8fecd fix(heatmap): performance 2019-03-18 11:57:28 +08:00
thinkinggis 3c2906610a fix(heatmap): performance 2019-03-18 11:57:28 +08:00
thinkinggis 4277e8db09 Merge branch 'master' of gitlab.alipay-inc.com:datavis/L7_beta 2019-03-16 20:49:53 +08:00
thinkinggis 7307904624 Merge branch 'master' of gitlab.alipay-inc.com:datavis/L7_beta 2019-03-16 20:49:53 +08:00