Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

feat(geo): support styling region in original GeoJSON data #20564

Merged
merged 1 commit into from
Dec 6, 2024
Merged

feat(geo): support styling region in original GeoJSON data #20564

merged 1 commit into from
Dec 6, 2024

Conversation

plainheart
Copy link
Member

@plainheart plainheart commented Dec 6, 2024 •
edited
Loading

Brief Information

This pull request is in the type of:

  • bug fixing
  • new feature
  • others

What does this PR do?

This PR supersedes #20561. Apply echartsStyle in the Model instead of View.

Demo

Document Info

One of the following should be checked.

  • This PR doesn't relate to document changes
  • The document should be updated later
  • The document changes have been made in apache/echarts-doc#xxx

Misc

ZRender Changes

  • This PR depends on ZRender changes (ecomfe/zrender#xxx).

Related test cases or examples to use the new APIs

Please refer to the 2nd test case in test/geo-map.html and test/map-nested.html.

Others

Merging options

  • Please squash the commits into a single one when merging.

Other information

@echarts-bot echarts-bot bot added PR: author is committer PR: awaiting doc Document changes is required for this PR. labels Dec 6, 2024
@echarts-bot ECharts Bot
Copy link

echarts-bot bot commented Dec 6, 2024

Thanks for your contribution!
The community will review it ASAP. In the meanwhile, please checkout the coding standard and Wiki about How to make a pull request.

The pull request is marked to be PR: author is committer because you are a committer of this project.

Document changes are required in this PR. Please also make a PR to apache/echarts-doc for document changes and update the issue id in the PR description. When the doc PR is merged, the maintainers will remove the PR: awaiting doc label.

@plainheart plainheart marked this pull request as ready for review December 6, 2024 05:58
@plainheart plainheart added this to the 5.5.2 milestone Dec 6, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 6, 2024

The changes brought by this PR can be previewed at: https://echarts.apache.org/examples/editor?version=PR-20564@3ec7b26

plainheart
plainheart commented Dec 6, 2024
View reviewed changes
src/data/SeriesData.ts
@@ -583,7 +583,7 @@ class SeriesData<
* Each item is exactly corresponding to a dimension.
*/
appendValues(values: any[][], names?: string[]): void {
const {start, end} = this._store.appendValues(values, names.length);
const {start, end} = this._store.appendValues(values, names && names.length);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes a potential NPE.

100pah
100pah approved these changes Dec 6, 2024
View reviewed changes
Copy link
Member

@100pah 100pah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@plainheart plainheart merged commit ab5de8e into release-dev Dec 6, 2024
2 checks passed
@echarts-bot ECharts Bot
Copy link

echarts-bot bot commented Dec 6, 2024

Congratulations! Your PR has been merged. Thanks for your contribution! 👍

@plainheart plainheart deleted the feat/geo/styling-in-geojson branch December 6, 2024 07:56
@bmotmans bmotmans mentioned this pull request Jan 21, 2025
Open
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@100pah 100pah 100pah approved these changes

Assignees
No one assigned
Labels
PR: author is committer PR: awaiting doc Document changes is required for this PR. size/M
Projects
None yet
Milestone
5.6.0
Development

Successfully merging this pull request may close these issues.
2 participants
@plainheart @100pah