Commit Graph

574 Commits

Author SHA1 Message Date
thinkinggis 2585a202ed Merge branch 'master' into rollup 2019-07-15 20:45:53 +08:00
thinkinggis 4e6ec5a2c4 Merge branch 'master' into rollup 2019-07-15 20:45:53 +08:00
thinkinggis 1c2c33ed05 fix(rendermask): maskmesh 2019-07-15 20:45:45 +08:00
thinkinggis d55ffff5aa fix(rendermask): maskmesh 2019-07-15 20:45:45 +08:00
thinkinggis fd5d345efa Merge branch 'greatCircle' into 'master'
fix(scene):  engine run



See merge request !40
2019-07-15 11:47:16 +08:00
thinkinggis f50ec3cb3e Merge branch 'greatCircle' into 'master'
fix(scene):  engine run



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

line 图层增加greatCircleshape

See merge request !39
2019-07-15 11:44:45 +08:00
thinkinggis baf60d25f7 Merge branch 'greatCircle' into 'master'
feat(line): greatCircle

line 图层增加greatCircleshape

See merge request !39
2019-07-15 11:44:45 +08:00
thinkinggis 386538719d fix(shader): fix conflict 2019-07-15 11:42:00 +08:00
thinkinggis 926cc74a3e fix(shader): fix conflict 2019-07-15 11:42:00 +08:00
thinkinggis 4977426645 feat(line): greatCircle 2019-07-15 11:35:07 +08:00
thinkinggis 6188d0783a feat(line): greatCircle 2019-07-15 11:35:07 +08:00
thinkinggis 47201052f1 Merge branch 'patternline' into 'master'
线支持pattern



See merge request !38
2019-07-15 10:23:55 +08:00
thinkinggis 55d6a94439 Merge branch 'patternline' into 'master'
线支持pattern



See merge request !38
2019-07-15 10:23:55 +08:00
izzy.cz ebc892607a 线支持pattern 2019-07-12 20:38:20 +08:00
izzy.cz 0785dc7631 线支持pattern 2019-07-12 20:38:20 +08:00
thinkinggis 36f6e1dfa9 merge master 2019-07-10 14:57:17 +08:00
thinkinggis af8b0f247b merge master 2019-07-10 14:57:17 +08:00
thinkinggis 3ed7ed4d25 Merge branch 'polygonJson' into 'master'
fix(extrude): add geojson rewind

增加geojson-rewind 自动转换

See merge request !37
2019-07-10 14:40:26 +08:00
thinkinggis f9797e6749 Merge branch 'polygonJson' into 'master'
fix(extrude): add geojson rewind

增加geojson-rewind 自动转换

See merge request !37
2019-07-10 14:40:26 +08:00
thinkinggis 9ab41ff9d2 fix(map): map style map 2019-07-10 14:39:27 +08:00
thinkinggis ac1056c3a2 fix(map): map style map 2019-07-10 14:39:27 +08:00
thinkinggis 0d833f52d6 fix(extrude): add geojson rewind 2019-07-10 12:08:11 +08:00
thinkinggis 12ca2c7e36 fix(extrude): add geojson rewind 2019-07-10 12:08:11 +08:00
thinkinggis 8e219c8da2 Merge branch 'polygonJson' into 'master'
fix(poylygon): json source

修复 polygon对json数据源的支持

See merge request !36
2019-07-10 11:27:21 +08:00
thinkinggis 12d95157cd Merge branch 'polygonJson' into 'master'
fix(poylygon): json source

修复 polygon对json数据源的支持

See merge request !36
2019-07-10 11:27:21 +08:00
thinkinggis a43c3e5eb6 update version 2019-07-10 11:26:29 +08:00
thinkinggis 8e97486472 update version 2019-07-10 11:26:29 +08:00
thinkinggis 3296975d04 fix(poylygon): json source 2019-07-10 11:18:40 +08:00
thinkinggis 0b099cac5e fix(poylygon): json source 2019-07-10 11:18:40 +08:00
thinkinggis 7d9329767d Merge branch 'pattern' into 'master'
Pattern

新增pattern数据映射

See merge request !35
2019-07-08 16:53:45 +08:00
thinkinggis c3c93e00d4 Merge branch 'pattern' into 'master'
Pattern

新增pattern数据映射

See merge request !35
2019-07-08 16:53:45 +08:00
thinkinggis a5767f2575 feat(attr): add pattern 2019-07-08 16:10:22 +08:00
thinkinggis 1eef58a29a feat(attr): add pattern 2019-07-08 16:10:22 +08:00
thinkinggis 40947c04ec feat(worker): worker Source 2019-07-08 16:08:44 +08:00
thinkinggis 1a5faaea45 feat(worker): worker Source 2019-07-08 16:08:44 +08:00
thinkinggis 3bbdb5ec88 feat(worker): worker Source 2019-07-08 16:07:47 +08:00
thinkinggis d7d66a26f6 feat(worker): worker Source 2019-07-08 16:07:47 +08:00
thinkinggis bab462ac40 feat(layer): style 增加blending 配置项 2019-07-03 10:58:58 +08:00
thinkinggis 53f726872a feat(layer): style 增加blending 配置项 2019-07-03 10:58:58 +08:00
thinkinggis 7795e181ed update version 2019-07-02 20:54:49 +08:00
thinkinggis c5dd7a402a update version 2019-07-02 20:54:49 +08:00
thinkinggis 161e4ddf3a fix(worker):test 2019-07-02 20:27:23 +08:00
thinkinggis 5a1cfded2d fix(worker):test 2019-07-02 20:27:23 +08:00
thinkinggis 629d388520 refactor(src) file name 2019-06-26 14:30:29 +08:00
thinkinggis 5086aa1d73 refactor(src) file name 2019-06-26 14:30:29 +08:00
thinkinggis e6bf28557c fix(package): update version 2019-06-25 16:03:48 +08:00
thinkinggis 1db0b47172 fix(package): update version 2019-06-25 16:03:48 +08:00