Skip to content

Commit

Permalink
Update USA and World GeoJSON to used in GeoMap (#154)
Browse files Browse the repository at this point in the history
* Update USA and World Maps to Grafana GeoMap

* Update Styles
  • Loading branch information
mikhail-vl authored Apr 12, 2023
1 parent 921bbdf commit 294b845
Show file tree
Hide file tree
Showing 6 changed files with 240 additions and 59 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Change Log

## 4.3.0 (IN PROGRESS)
## 4.3.0 (2023-04-12)

### Features / Enhancements

- Update to Grafana 9.4.7 (#146)
- Add getDataSourceSrv parameter to retrieve the entry point to data sources (#146)
- Update to Apache ECharts 5.4.2 (#147)
- Update USA and World GeoJSON to used in GeoMap (#154)

## 4.2.0 (2023-03-04)

Expand Down
4 changes: 2 additions & 2 deletions echarts.volkovlabs.io/geo-map.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/components/EChartsPanel/EChartsPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { getAppEvents, getDataSourceSrv, locationService } from '@grafana/runtim
import { Alert, useStyles2, useTheme2 } from '@grafana/ui';
import { Map } from '../../constants';
import { loadBaidu, loadGaode, loadGoogle, registerMaps } from '../../maps';
import { getStyles } from '../../styles';
import { Styles } from '../../styles';
import { PanelOptions } from '../../types';

/**
Expand All @@ -39,7 +39,7 @@ export const EChartsPanel: React.FC<Props> = ({ options, data, width, height, re
* Styles and Theme
*/
const theme = useTheme2();
const styles = useStyles2(getStyles);
const styles = useStyles2(Styles);

/**
* Events
Expand Down
104 changes: 52 additions & 52 deletions src/maps/USA.json

Large diffs are not rendered by default.

182 changes: 181 additions & 1 deletion src/maps/world.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { css } from '@emotion/css';
/**
* Styles
*/
export const getStyles = () => ({
export const Styles = () => ({
wrapper: css`
position: relative;
`,
Expand Down

0 comments on commit 294b845

Please sign in to comment.