Commit Graph

786 Commits

Author SHA1 Message Date
thinkinggis 582c4df952 Merge branch 'master' into heatmap-fix 2019-03-25 21:03:26 +08:00
thinkinggis 8158a1d7e1 Merge branch 'master' into heatmap-fix 2019-03-25 21:03:26 +08:00
thinkinggis f527be22cc fix(text): layer 2019-03-25 21:02:56 +08:00
thinkinggis 725c0cf232 fix(text): layer 2019-03-25 21:02:56 +08:00
thinkinggis 92cb458c98 fix(package): update version 2019-03-25 20:40:57 +08:00
thinkinggis 335021de1b fix(package): update version 2019-03-25 20:40:57 +08:00
thinkinggis 3aa4c14cfc Merge branch 'composer' into 'master'
fix(code): shaderpass



See merge request !21
2019-03-25 20:23:24 +08:00
thinkinggis 4b560b9c13 Merge branch 'composer' into 'master'
fix(code): shaderpass



See merge request !21
2019-03-25 20:23:24 +08:00
thinkinggis d79d7a3df4 fix(core): file name 2019-03-25 20:22:22 +08:00
thinkinggis cd652880bf fix(core): file name 2019-03-25 20:22:22 +08:00
thinkinggis 349e04a206 fix(code): shaderpass 2019-03-25 20:18:35 +08:00
thinkinggis 65df7ce180 fix(code): shaderpass 2019-03-25 20:18:35 +08:00
thinkinggis 81ac8874a7 Merge branch 'composer' into 'master'
Composer

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

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

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

See merge request !20
2019-03-25 20:13:20 +08:00
thinkinggis 9015a3f513 fix(src): merge master 2019-03-25 20:10:49 +08:00
thinkinggis 115d4e9e2a fix(src): merge master 2019-03-25 20:10:49 +08:00
thinkinggis 1374309d89 refactor(heatmap): composer heatmap 2019-03-25 19:59:59 +08:00
thinkinggis d08c47b3d9 refactor(heatmap): composer heatmap 2019-03-25 19:59:59 +08:00
thinkinggis 9d936e7a3c fix(core): shaderpass 2019-03-25 15:50:31 +08:00
thinkinggis 07672fe219 fix(core): shaderpass 2019-03-25 15:50:31 +08:00
thinkinggis b5583715e3 fix(core): delete composer.js 2019-03-25 15:09:12 +08:00
thinkinggis 1ca12ff2f9 fix(core): delete composer.js 2019-03-25 15:09:12 +08:00
thinkinggis 0bea6a42e7 Merge branch 'shaderPass' into 'master'
add shaderPass & renderPass



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



See merge request !19
2019-03-25 14:54:12 +08:00
mipha.ly 07dff3d7f9 add shaderPass & renderPass 2019-03-25 14:45:42 +08:00
mipha.ly 20b54d635e add shaderPass & renderPass 2019-03-25 14:45:42 +08:00
thinkinggis c8e8814879 refactor(layer): text layer 2019-03-25 00:57:09 +08:00
thinkinggis 35c4f90b20 refactor(layer): text layer 2019-03-25 00:57:09 +08:00
thinkinggis b8883b047b reactor(layer): scaleContorller 2019-03-23 18:30:28 +08:00
thinkinggis 51b6b6b056 reactor(layer): scaleContorller 2019-03-23 18:30:28 +08:00
thinkinggis fbadd00dff fix(layer) getlegendcfg 2019-03-22 17:09:20 +08:00
thinkinggis 889d0c0acb fix(layer) getlegendcfg 2019-03-22 17:09:20 +08:00
thinkinggis 40ee07a796 Merge branch 'heatmap-fix' into 'master'
feat(layer): add lengendcdg method

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

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

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

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

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

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

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

See merge request !18
2019-03-22 16:18:55 +08:00
thinkinggis c8ac525c02 feat(layer): add lengendcdg method 2019-03-22 16:10:35 +08:00
thinkinggis 14ce71d7bb feat(layer): add lengendcdg method 2019-03-22 16:10:35 +08:00
thinkinggis 4cbcf77873 fix(source) 2019-03-22 10:42:54 +08:00
thinkinggis 4739377935 fix(source) 2019-03-22 10:42:54 +08:00
thinkinggis b3811543f6 Merge branch 'heatmap-fix' into 'master'
fix(Amap): fix map

添加高德地图参数

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

添加高德地图参数

See merge request !17
2019-03-20 17:25:24 +08:00
thinkinggis 2a84b5480e fix(Amap): fix map 2019-03-20 17:23:28 +08:00
thinkinggis 64906f7e9d fix(Amap): fix map 2019-03-20 17:23:28 +08:00
thinkinggis a55c9b42d2 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 8683cd65e4 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 6588614d7f fix(Amap): setstyle 2019-03-19 15:18:28 +08:00
thinkinggis 907ea56ece fix(Amap): setstyle 2019-03-19 15:18:28 +08:00
thinkinggis cd541a3c65 Merge branch 'heatmap-fix' into 'master'
Heatmap fix



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



See merge request !15
2019-03-18 11:59:16 +08:00