Skip to content

tweak geo-style #597

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.

Sign up for GitHub

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
merged 3 commits into from
Jul 19, 2018
Merged

tweak geo-style #597

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a82467e
tweak geo-style
nicolaskruchten Jul 18, 2018
332714c
Merge branch 'master' into geo2
nicolaskruchten Jul 18, 2018
c1de999
Merge branch 'master' into geo2
nicolaskruchten Jul 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 36 additions & 22 deletions src/default_panels/StyleLayoutPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,36 +61,30 @@ const StyleLayoutPanel = (props, {localize: _}) => (
<Numeric label={_('Padding')} attr="margin.pad" units="px" />
</PlotlyFold>
<PlotlyFold name={_('Geo Style')}>
<PlotlySection name={_('Land')} attr="geo.showland">
<Radio
attr="geo.showland"
options={[
{label: _('Show'), value: true},
{label: _('Hide'), value: false},
]}
/>
<ColorPicker label={_('Color')} attr="geo.landcolor" />
</PlotlySection>
<PlotlySection name={_('Lakes')} attr="geo.showlakes">
<PlotlySection name={_('Country Borders')} attr="geo.showcountries">
<Radio
attr="geo.showlakes"
attr="geo.showcountries"
options={[
{label: _('Show'), value: true},
{label: _('Hide'), value: false},
]}
/>
<ColorPicker label={_('Color')} attr="geo.lakecolor" />
<Numeric label={_('Border Width')} attr="geo.countrywidth" units="px" />
<ColorPicker label={_('Border Color')} attr="geo.countrycolor" />
</PlotlySection>
<PlotlySection name={_('Rivers')} attr="geo.showrivers">
<PlotlySection
name={_('Sub-Country Unit Borders')}
attr="geo.showsubunits"
>
<Radio
attr="geo.showrivers"
attr="geo.showsubunits"
options={[
{label: _('Show'), value: true},
{label: _('Hide'), value: false},
]}
/>
<Numeric label={_('Width')} attr="geo.riverwidth" units="px" />
<ColorPicker label={_('Color')} attr="geo.rivercolor" />
<Numeric label={_('Border Width')} attr="geo.subunitwidth" units="px" />
<ColorPicker label={_('Border Color')} attr="geo.subunitcolor" />
</PlotlySection>
<PlotlySection name={_('Coastlines')} attr="geo.showcoastlines">
<Radio
Expand All @@ -113,18 +107,38 @@ const StyleLayoutPanel = (props, {localize: _}) => (
/>
<ColorPicker label={_('Color')} attr="geo.oceancolor" />
</PlotlySection>
<PlotlySection name={_('Countries')} attr="geo.showcountries">
<PlotlySection name={_('Land')} attr="geo.showland">
<Radio
attr="geo.showcountries"
attr="geo.showland"
options={[
{label: _('Show'), value: true},
{label: _('Hide'), value: false},
]}
/>
<Numeric label={_('Border Width')} attr="geo.countrywidth" units="px" />
<ColorPicker label={_('Border Color')} attr="geo.countrycolor" />
<ColorPicker label={_('Color')} attr="geo.landcolor" />
</PlotlySection>
<PlotlySection name={_('Lakes')} attr="geo.showlakes">
<Radio
attr="geo.showlakes"
options={[
{label: _('Show'), value: true},
{label: _('Hide'), value: false},
]}
/>
<ColorPicker label={_('Color')} attr="geo.lakecolor" />
</PlotlySection>
<PlotlySection name={_('Rivers')} attr="geo.showrivers">
<Radio
attr="geo.showrivers"
options={[
{label: _('Show'), value: true},
{label: _('Hide'), value: false},
]}
/>
<Numeric label={_('Width')} attr="geo.riverwidth" units="px" />
<ColorPicker label={_('Color')} attr="geo.rivercolor" />
</PlotlySection>
<PlotlySection name={_('Frame')} attr="geo.showframe">
<PlotlySection name={_('Map Frame')} attr="geo.showframe">
<Radio
attr="geo.showframe"
options={[
Expand Down