Commit Graph

270 Commits

Author SHA1 Message Date
thinkinggis df78b71380 fix(merge):fix conflict 2019-08-19 11:15:09 +08:00
thinkinggis 841161e4df fix(merge):fix conflict 2019-08-19 11:00:58 +08:00
thinkinggis 7eea71f010 feat(json): point数据coord 设置支持数组 2019-08-19 10:50:57 +08:00
@thinkinggis 0282f742a8 Merge pull request #13 from antvis/dev-map-labeling
新增文本标注
增加source更新事件
2019-08-19 10:34:06 +08:00
thinkinggis 3728790dae feat(label): add textlayer 2019-08-19 10:16:40 +08:00
thinkinggis 4054f3e50e merge github master 2019-08-16 11:50:25 +08:00
thinkinggis 6e8e1f6af2 fix(conflict): merge text branch 2019-08-16 11:48:30 +08:00
thinkinggis cf0fe86fd9 Merge branch 'master' of https://github.com/antvis/L7 into github_master 2019-08-16 10:49:10 +08:00
xiaoiver 98383a34e0 feat: 增加对于点要素的自动标注 2019-08-14 19:52:44 +08:00
@thinkinggis 3af8059e71 Merge pull request #12 from czizzy/meshline-bugfix
fix: meshline triangulation bug
2019-08-14 15:34:20 +08:00
izzy.cz f5da732099 fix: meshline triangulation bug 2019-08-14 12:00:10 +08:00
thinkinggis 420d720ef6 feat(src) update version inteaction 2019-08-13 18:18:04 +08:00
@thinkinggis ec56e40348 Merge pull request #11 from antvis/marker
新增地图组件
放大缩小
比例尺
图层列表
marker
popup
2019-08-13 17:49:10 +08:00
thinkinggis 65a910926e fix(travis); update node version 2019-08-13 17:43:49 +08:00
thinkinggis 109780f9e8 refactor(camera): update camera async 2019-08-13 17:26:27 +08:00
thinkinggis b97c928c74 refactor(map): container layout 2019-08-12 14:52:50 +08:00
thinkinggis ee3244bec7 perf(shader): 优化线动画效果 2019-08-12 10:35:50 +08:00
thinkinggis c9901d2a34 feat(control): add marker 2019-08-09 10:16:40 +08:00
thinkinggis bb29d6ecf9 fix(lint): lint warning 2019-08-07 19:18:36 +08:00
thinkinggis a7e2e7aaac update readme 2019-08-07 18:10:58 +08:00
thinkinggis 2c5f2815b9 fix(lib) delete lib 2019-08-07 17:50:37 +08:00
thinkinggis 72d11e603a merge source code 2019-08-07 17:42:57 +08:00
thinkinggis 0bd203aecd fix(render):antialias 2019-08-07 17:13:09 +08:00
thinkinggis 4383e095d1 postcss inline 2019-08-07 17:08:53 +08:00
thinkinggis cf87ba975d Merge branch 'master' into webworker 2019-08-07 15:44:41 +08:00
thinkinggis 19a068e5ee fix(gitignore) 2019-08-07 15:43:27 +08:00
thinkinggis fe5925fcc9 fix lint err 2019-08-07 15:40:42 +08:00
thinkinggis 48d5c8cc44 delete report 2019-08-07 15:36:10 +08:00
thinkinggis 5efd5ac745 fix(package):index 2019-08-07 15:34:21 +08:00
thinkinggis bc74edeb66 feat(control): add scale, layer.zoom control 2019-08-07 10:44:29 +08:00
thinkinggis dbf449e2a8 fix(src): lint err 2019-08-01 20:40:09 +08:00
thinkinggis 488d2cfc6b update version 2019-08-01 19:25:32 +08:00
thinkinggis a00cdae0df Merge branch 'rollup' into 'master'
Rollup

瓦片地图WebWorker

升级打包工具为Rollup

重构buffer

增加3d热力图

See merge request !41
2019-08-01 19:02:11 +08:00
thinkinggis 6b4d7be942 fix demo 2019-08-01 18:25:27 +08:00
thinkinggis 890ca8cc7f update readme 2019-08-01 18:23:38 +08:00
thinkinggis 98a30bdbef refactor(pick) 2019-08-01 18:14:52 +08:00
thinkinggis bb9361b7c8 refactor(heatmap) buffer 2019-07-31 11:52:52 +08:00
thinkinggis 06789902aa refactor grid buffer 2019-07-24 18:25:55 +08:00
thinkinggis 8cde7121dc refactor: line & polygon buffer 2019-07-23 21:43:52 +08:00
thinkinggis 24ebc5724e merge greatCirlce 2019-07-23 21:09:07 +08:00
thinkinggis 7684815b57 fix(rewind):vector tile not rewind 2019-07-16 19:36:05 +08:00
thinkinggis b0606a30a0 Merge branch 'master' into rollup 2019-07-15 20:45:53 +08:00
thinkinggis bd4dc61798 fix(rendermask): maskmesh 2019-07-15 20:45:45 +08:00
thinkinggis 6c06e4676d Merge branch 'greatCircle' into 'master'
fix(scene):  engine run



See merge request !40
2019-07-15 11:47:16 +08:00
thinkinggis cc4460ba6f fix(scene): engine run 2019-07-15 11:46:28 +08:00
thinkinggis 269bc30c87 Merge branch 'greatCircle' into 'master'
feat(line): greatCircle

line 图层增加greatCircleshape

See merge request !39
2019-07-15 11:44:45 +08:00
thinkinggis 38ebb3ccb9 fix(shader): fix conflict 2019-07-15 11:42:00 +08:00
thinkinggis ca3df19c20 feat(line): greatCircle 2019-07-15 11:35:07 +08:00
thinkinggis 56e986cd33 Merge branch 'patternline' into 'master'
线支持pattern



See merge request !38
2019-07-15 10:23:55 +08:00
izzy.cz 5f61ee5f07 线支持pattern 2019-07-12 20:38:20 +08:00