Commit Graph

106 Commits

Author SHA1 Message Date
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 4e3729f399 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 25acf0d897 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 f5825ee22c 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 bdbcd8fecd 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 3cf8e41305 fix(l7): update package 2019-03-16 20:49:30 +08:00
thinkinggis 4c2804bfb3 Merge branch 'fix-renderPass' into 'master'
fix(renderTarget): 修复了threeJS更新版本后引发的renderPass渲染问题

threeJs版本更新后,对于renderTarget的使用应为:
```
renderer.setRenderTarget( target );
renderer.render( scene, camera );
//渲染到屏幕
renderer.setRenderTarget (null); 
```
但是不知为何,这样挂载renderTarget的效果是错误的,具体原因还没看。
heatmap和其他layer无法混用的问题,目前采用这种方式解决:
```
renderer.render(scene,camera,target,true);
renderer.setRenderTarget(null);
```

See merge request !14
2019-03-16 20:47:53 +08:00
mipha.ly 9b72cdc527 fix(renderTarget): 修复了threeJS更新版本后引发的renderPass渲染问题 2019-03-16 20:03:26 +08:00
thinkinggis 5bff968ab1 fix(util): geo convert 2019-03-14 15:58:54 +08:00
thinkinggis 3e34b8d214 Merge branch 'pick' into 'master'
fix(util): extent

修复extent计算问题

See merge request !13
2019-03-14 15:16:35 +08:00
thinkinggis eca60bb4f4 fix(layer): conflict 2019-03-14 15:16:05 +08:00
thinkinggis f8737ba6d1 fix(layer): conflict 2019-03-14 15:14:34 +08:00
thinkinggis f180bba13a Merge branch 'fix-heatmap' into 'master'
fix(heat-map): 修复bbox计算逻辑



See merge request !12
2019-03-14 15:07:45 +08:00
thinkinggis be13993b60 fix(util): extent 2019-03-14 15:04:47 +08:00
mipha.ly 8d5388a2b4 fix(heat-map): 修复bbox计算逻辑 2019-03-14 15:00:07 +08:00
mipha.ly ea0e544ff9 fix(heat-map): 渲染逻辑 & bbox 2019-03-14 14:35:59 +08:00
thinkinggis f0a864d847 Merge branch 'pick' into 'master'
Pick

统一shader拾取方法


See merge request !11
2019-03-13 11:57:21 +08:00
thinkinggis 234ef1b52f update version 2019-03-13 10:30:17 +08:00
thinkinggis 2ded43c877 feat(package): update version 2019-03-13 10:26:14 +08:00
thinkinggis e4415b51df feat(pick): update pick method 2019-03-12 15:58:44 +08:00
thinkinggis d1f827db69 fix pick 2019-03-07 16:06:52 +08:00
thinkinggis 93e8895e29 Merge branch 'pick' into 'master'
Pick

修复了geojson 面状图形高亮颜色错乱的问题

See merge request !10
2019-03-06 16:46:25 +08:00
thinkinggis 530425bdec fix(layer) active feature bug 2019-03-06 16:39:18 +08:00
thinkinggis 9154f6a238 delete unuse util file 2019-03-06 14:11:33 +08:00
thinkinggis 879535f3f8 feat(layer) add fitbounds 2019-03-05 21:06:12 +08:00
thinkinggis b5389f107d merge heatmap 2019-03-01 15:03:47 +08:00
thinkinggis b67f14fdea fix package 2019-03-01 15:00:48 +08:00
thinkinggis 1d12795019 fix layer zoom 2019-03-01 13:09:41 +08:00
thinkinggis da4810903e remove track 2019-03-01 12:03:04 +08:00
thinkinggis d1fa487515 fix bug 2019-03-01 11:38:38 +08:00
thinkinggis 0fc0d706cd Merge branch 'master' into feat-heatmap 2019-03-01 11:23:50 +08:00
mipha.ly 664bdb08bb 移除three不必要的模块basic material 2019-03-01 11:15:33 +08:00
象数 8b1a15851c Merge branch 'rollup' into 'master'
fix(src): require 引入方式切换成import



See merge request !9
2019-03-01 10:55:55 +08:00
thinkinggis ea4d2bb447 merge master 2019-03-01 10:51:52 +08:00
thinkinggis 28bb7776db fix(src): require 引入方式切换成import 2019-03-01 10:43:36 +08:00
象数 6a1a36fcad Merge branch 'grid-heatMap' into 'master'
update three

升级threejs到101版本
测试框架可以运行

See merge request !7
2019-03-01 10:23:39 +08:00
mipha.ly d6829f30b9 fix(heatmap): 解决颜色插值问题,优化渲染性能 2019-02-28 11:55:04 +08:00
mipha.ly@alibaba-inc.com 852c21b312 feat(l7): feat heatmap layer 2019-02-27 17:16:16 +08:00
mipha.ly@alibaba-inc.com e5e4688d0d resolve conflicts 2019-02-27 17:00:27 +08:00
thinkinggis a5193075be update three 2019-02-27 16:44:33 +08:00
象数 d58364d6d3 Merge branch 'grid-heatMap' into 'master'
feat(hexagon): hexagon heatmap



See merge request !6
2019-02-27 15:44:23 +08:00
thinkinggis 46edff6626 feat(hexagon): hexagon heatmap 2019-02-27 15:33:38 +08:00
mipha.ly@alibaba-inc.com bced1b7110 feat heatmap layer 2019-02-27 14:50:10 +08:00
thinkinggis d1f69a03cd fix(transform): stattistics 2019-02-26 19:32:09 +08:00
象数 1094b106bb Merge branch 'grid-heatMap' into 'master'
Grid heat map

增加mapbox
增加多边形热力图

See merge request !5
2019-02-26 17:28:35 +08:00
thinkinggis cb153f639e fix(map): mapbox 2019-02-26 17:22:55 +08:00