-
Notifications
You must be signed in to change notification settings - Fork 8.5k
[Maps] show custom color ramps in legend #53780
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
thomasneirynck
merged 21 commits into
elastic:master
from
thomasneirynck:maps/color_stops_legend
Jan 6, 2020
Merged
Changes from 15 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
87760d0
rename for clarity
thomasneirynck 462d48f
switch on ordinal
thomasneirynck 3c6c6aa
boilerplate for breaked legend
thomasneirynck 5f1b756
add ranged check
thomasneirynck decdb5a
fix
thomasneirynck 44bb317
add color breaks
thomasneirynck 6f2e262
Merge branch 'master' into maps/color_stops_legend
elasticmachine facba05
dont render custom label text legend (needs discussion)
thomasneirynck c00ad5f
add label color
thomasneirynck 704be5c
move label to center, similar to ramps
thomasneirynck 69cad7b
make spacing smaller
thomasneirynck 61e5891
Merge branch 'master' into maps/color_stops_legend
thomasneirynck b43fb8f
feedback (1)
thomasneirynck 71c7839
feedback (2)
thomasneirynck 775af3a
add jest test
thomasneirynck 6ed20ce
Merge branch 'master' into maps/color_stops_legend
thomasneirynck 2d79d46
reuse symbol-icon
thomasneirynck 0c1712f
handle empty strings in component
thomasneirynck 90313e1
fix test
thomasneirynck b60a94d
Merge branch 'master' into maps/color_stops_legend
thomasneirynck 2f461cb
update snapshot
thomasneirynck File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
113 changes: 113 additions & 0 deletions
113
.../public/layers/styles/vector/properties/__snapshots__/dynamic_color_property.test.js.snap
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
56 changes: 56 additions & 0 deletions
56
...gacy/plugins/maps/public/layers/styles/vector/properties/components/categorical_legend.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import _ from 'lodash'; | ||
| const EMPTY_VALUE = ''; | ||
|
|
||
| export class CategoricalLegend extends React.Component { | ||
| constructor() { | ||
| super(); | ||
| this._isMounted = false; | ||
| this.state = { | ||
| label: EMPTY_VALUE, | ||
| isPointsOnly: null, | ||
| isLinesOnly: null, | ||
| }; | ||
| } | ||
|
|
||
| async _loadParams() { | ||
| const label = await this.props.style.getField().getLabel(); | ||
| const isLinesOnly = await this.props.loadIsLinesOnly(); | ||
| const isPointsOnly = await this.props.loadIsPointsOnly(); | ||
| const newState = { label, isLinesOnly, isPointsOnly }; | ||
| if (this._isMounted && !_.isEqual(this.state, newState)) { | ||
| this.setState(newState); | ||
| } | ||
| } | ||
|
|
||
| componentDidUpdate() { | ||
| this._loadParams(); | ||
| } | ||
|
|
||
| componentWillUnmount() { | ||
| this._isMounted = false; | ||
| } | ||
|
|
||
| componentDidMount() { | ||
| this._isMounted = true; | ||
| this._loadParams(); | ||
| } | ||
|
|
||
| render() { | ||
| if (this.state.label === EMPTY_VALUE) { | ||
| return null; | ||
| } | ||
| return this.props.style.renderBreakedLegend({ | ||
| fieldLabel: this.state.label, | ||
| isLinesOnly: this.state.isLinesOnly, | ||
| isPointsOnly: this.state.isPointsOnly, | ||
| symbolId: this.props.symbolId, | ||
| }); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.