Commit Graph

2760 Commits

Author SHA1 Message Date
thinkinggis e373beb475 fix(demo): fix eslint error 2020-05-18 19:36:01 +08:00
thinkinggis d5732a40d6 Merge branch 'District' of github.com:antvis/L7 into District 2020-05-18 13:59:29 +08:00
thinkinggis 72f9a6da9e Merge branch 'District' of github.com:antvis/L7 into District 2020-05-18 13:57:23 +08:00
thinkinggis 9c4ee4d6e0 Merge branch 'District' of github.com:antvis/L7 into District 2020-05-18 11:10:07 +08:00
thinkinggis 95130a01fb Merge branch 'District' of github.com:antvis/L7 into District 2020-05-18 11:04:49 +08:00
thinkinggis 9bc8cdbafa Merge branch 'District' of github.com:antvis/L7 into District 2020-05-18 10:43:32 +08:00
thinkinggis fece0cb156 chore: merge conflict 2020-05-18 10:43:13 +08:00
thinkinggis 496bdbc3be chore: merge conflict 2020-05-18 10:26:56 +08:00
thinkinggis cc4292ff2f feat(distict): add bubble map 2020-05-16 10:50:59 +08:00
thinkinggis d3910e3471 feat(distict): add bubble map 2020-05-15 21:07:04 +08:00
thinkinggis 17a791223f fix: draw polygon 编辑已有数据 & roullup alias 回滚到2.2.0 2020-05-12 23:03:01 +08:00
thinkinggis a13369eeca Merge branch 'master' into District 2020-05-12 18:06:01 +08:00
thinkinggis 8e5224113c docs(site): add site district example 2020-05-12 17:59:42 +08:00
thinkinggis 540197a83e Merge branch 'master' of github.com:antvis/L7 2020-05-12 17:52:14 +08:00
thinkinggis d7ede28c27 fix(layer): 数据映射设置成不存在字段时,不能正常渲染 2020-05-12 14:26:35 +08:00
thinkinggis 0233855ab4 fix(layer): 数据映射设置成不存在字段时,不能正常渲染 2020-05-12 14:24:09 +08:00
thinkinggis 1210267352 chore: publish 2020-05-12 10:01:40 +08:00
thinkinggis 64494c4fe2 chore: publish 2020-05-12 09:59:06 +08:00
@thinkinggis d09aa17ef5
Merge pull request #341 from antvis/District
fix(district): fix polygon layer setData 样式不生效 & 增加下钻上取地图
2020-05-12 09:53:00 +08:00
thinkinggis b6a92b1994 fix(district): fix polygon layer setData 样式不生效 & 增加下钻上取地图 2020-05-11 18:58:46 +08:00
@thinkinggis 6120d0904d
Merge pull request #316 from antvis/District
District
2020-05-10 21:46:02 +08:00
thinkinggis 5f50f9e333 chore: merge master 2020-05-10 20:10:46 +08:00
@thinkinggis 0cf2afb1a9
Merge pull request #336 from antvis/dependabot/npm_and_yarn/mapbox-gl-1.10.0
build(deps): bump mapbox-gl from 1.9.1 to 1.10.0
2020-05-10 19:54:35 +08:00
thinkinggis f762011c12 test: update district test 2020-05-10 19:53:13 +08:00
thinkinggis 6d88f5a4c7 fix(component): fix layer control css 2020-05-09 12:16:07 +08:00
dependabot-preview[bot] 76a9c729df
build(deps): bump mapbox-gl from 1.9.1 to 1.10.0
Bumps [mapbox-gl](https://github.com/mapbox/mapbox-gl-js) from 1.9.1 to 1.10.0.
- [Release notes](https://github.com/mapbox/mapbox-gl-js/releases)
- [Changelog](https://github.com/mapbox/mapbox-gl-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mapbox/mapbox-gl-js/compare/v1.9.1...v1.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-09 03:40:32 +00:00
@thinkinggis 651f1dfc9c
Merge pull request #337 from antvis/dependabot/npm_and_yarn/webpack-4.43.0
build(deps-dev): bump webpack from 4.42.1 to 4.43.0
2020-05-09 11:36:01 +08:00
@thinkinggis a447680f3a
Merge pull request #338 from antvis/dependabot/npm_and_yarn/commitizen-4.1.2
build(deps-dev): bump commitizen from 4.0.4 to 4.1.2
2020-05-09 11:35:04 +08:00
@thinkinggis 02ed653edd
Merge pull request #339 from antvis/dependabot/npm_and_yarn/copy-webpack-plugin-5.1.1
build(deps-dev): bump copy-webpack-plugin from 4.6.0 to 5.1.1
2020-05-09 11:34:34 +08:00
@thinkinggis ce36785cdf
Merge pull request #340 from antvis/dependabot/npm_and_yarn/babel-preset-gatsby-0.4.1
build(deps-dev): bump babel-preset-gatsby from 0.2.36 to 0.4.1
2020-05-09 11:34:18 +08:00
thinkinggis 89e5408e29 chore: merge 2020-05-09 11:33:08 +08:00
dependabot-preview[bot] f704a26833
build(deps-dev): bump babel-preset-gatsby from 0.2.36 to 0.4.1
Bumps [babel-preset-gatsby](https://github.com/gatsbyjs/gatsby/tree/HEAD/packages/babel-preset-gatsby) from 0.2.36 to 0.4.1.
- [Release notes](https://github.com/gatsbyjs/gatsby/releases)
- [Changelog](https://github.com/gatsbyjs/gatsby/blob/master/packages/babel-preset-gatsby/CHANGELOG.md)
- [Commits](https://github.com/gatsbyjs/gatsby/commits/babel-preset-gatsby@0.4.1/packages/babel-preset-gatsby)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-08 21:33:48 +00:00
dependabot-preview[bot] 2c57fa5946
build(deps-dev): bump copy-webpack-plugin from 4.6.0 to 5.1.1
Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin) from 4.6.0 to 5.1.1.
- [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/copy-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/copy-webpack-plugin/compare/v4.6.0...v5.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-08 21:32:51 +00:00
dependabot-preview[bot] 370e530a32
build(deps-dev): bump commitizen from 4.0.4 to 4.1.2
Bumps [commitizen](https://github.com/commitizen/cz-cli) from 4.0.4 to 4.1.2.
- [Release notes](https://github.com/commitizen/cz-cli/releases)
- [Commits](https://github.com/commitizen/cz-cli/compare/v4.0.4...v4.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-08 21:31:30 +00:00
dependabot-preview[bot] a7e0953f9a
build(deps-dev): bump webpack from 4.42.1 to 4.43.0
Bumps [webpack](https://github.com/webpack/webpack) from 4.42.1 to 4.43.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.42.1...v4.43.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-08 21:30:53 +00:00
@thinkinggis 523500c334
Merge pull request #335 from antvis/fix_draw
fix(draw): fix draw rect bug
2020-05-08 14:19:45 +08:00
thinkinggis e44c83d6b7 fix(draw): fix draw rect bug
fix #334
2020-05-08 12:31:03 +08:00
@thinkinggis 8f124c565d
Merge pull request #324 from antvis/dependabot/npm_and_yarn/style-loader-1.2.1
build(deps-dev): bump style-loader from 1.1.4 to 1.2.1
2020-05-08 11:28:55 +08:00
@thinkinggis 30bef22db5
Merge pull request #323 from antvis/dependabot/npm_and_yarn/cz-conventional-changelog-3.2.0
build(deps-dev): bump cz-conventional-changelog from 3.1.0 to 3.2.0
2020-05-08 11:16:09 +08:00
dependabot-preview[bot] d4308e2f2a
build(deps-dev): bump style-loader from 1.1.4 to 1.2.1
Bumps [style-loader](https://github.com/webpack-contrib/style-loader) from 1.1.4 to 1.2.1.
- [Release notes](https://github.com/webpack-contrib/style-loader/releases)
- [Changelog](https://github.com/webpack-contrib/style-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/style-loader/compare/v1.1.4...v1.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-08 03:12:32 +00:00
@thinkinggis e5952717d0
Merge pull request #325 from antvis/dependabot/npm_and_yarn/types/jest-25.2.1
build(deps-dev): bump @types/jest from 24.9.1 to 25.2.1
2020-05-08 11:12:19 +08:00
@thinkinggis ac30eac6c3
Merge pull request #326 from antvis/dependabot/npm_and_yarn/mapbox/martini-0.2.0
build(deps): bump @mapbox/martini from 0.1.0 to 0.2.0
2020-05-08 11:12:06 +08:00
@thinkinggis 4c3cb11e52
Merge pull request #327 from antvis/dependabot/npm_and_yarn/tslint-react-4.1.0
build(deps-dev): bump tslint-react from 3.6.0 to 4.1.0
2020-05-08 11:11:53 +08:00
@thinkinggis 3c1ca3c52c
Merge pull request #329 from antvis/dependabot/npm_and_yarn/rollup/plugin-alias-3.1.0
build(deps-dev): bump @rollup/plugin-alias from 2.2.0 to 3.1.0
2020-05-08 11:11:38 +08:00
@thinkinggis 53a3ccbe3a
Merge pull request #330 from antvis/dependabot/npm_and_yarn/raw-loader-4.0.1
build(deps-dev): bump raw-loader from 1.0.0 to 4.0.1
2020-05-08 11:11:14 +08:00
@thinkinggis b1c5a7202a
Merge pull request #331 from antvis/dependabot/npm_and_yarn/html-webpack-plugin-4.3.0
build(deps-dev): bump html-webpack-plugin from 3.2.0 to 4.3.0
2020-05-08 11:10:58 +08:00
@thinkinggis 32cee3c00e
Merge pull request #332 from antvis/dependabot/npm_and_yarn/sass-loader-8.0.2
build(deps-dev): bump sass-loader from 7.3.1 to 8.0.2
2020-05-08 11:10:39 +08:00
thinkinggis b8ef7fb565 feat(district): add drilldown layer 2020-05-08 10:31:57 +08:00
thinkinggis c73108a5b1 Merge branch 'master' of github.com:antvis/L7 2020-05-08 10:18:58 +08:00
thinkinggis cc512ce522 chore: publish 2020-05-08 10:16:12 +08:00