Commit Graph

604 Commits

Author SHA1 Message Date
thinkinggis 841161e4df fix(merge):fix conflict 2019-08-19 11:00:58 +08:00
thinkinggis a1d759d16a 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 2b6d06dbf6 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 094fe4e925 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 17e7152417 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 43e92a0bf3 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 c2aa687cb5 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
thinkinggis f4961df54d 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
yuqi.pyq 4ec14dfda5 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
@thinkinggis b296a98589 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
izzy.cz 30cf3f424a 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 ed41d1b5ae 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 fac18eafd3 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 f1174af34c 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 ffc8e24798 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 42c14dd84b 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 4bd1f27b47 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 77caab4b51 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 34df410b1c 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 74332619ce 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 e527c54f3e 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 51d04cee61 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 7984924266 fix(render):antialias 2019-08-07 17:13:09 +08:00
thinkinggis 4383e095d1 postcss inline 2019-08-07 17:08:53 +08:00
thinkinggis 793a3fcad6 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 ceca9d5fb8 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 f349af859a fix(gitignore) 2019-08-07 15:43:27 +08:00