Skip to content
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

Polishing the maps #302

Merged
merged 22 commits into from
Feb 1, 2022
Merged

Polishing the maps #302

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a1d0330
refactor: Extract OnOffControlTabField to a separate component
bprusinowski Jan 31, 2022
fb7b75f
feat: Use OnOffControlTabField for BaseLayer in maps
bprusinowski Jan 31, 2022
d7a97e7
fix: Make baseLayer and symbolLayer mandatory in econdings
bprusinowski Jan 31, 2022
83fd526
feat: Update translations for maps
bprusinowski Jan 31, 2022
d527cf0
feat: Add urql devtools to development env
bprusinowski Jan 31, 2022
9ba7ad8
fix: Duplicated CubeObservationsQuery for maps
bprusinowski Jan 31, 2022
c7c2038
refactor: Stop fetching geoCoordinates on each filter change
bprusinowski Feb 1, 2022
698cc51
refactor: Stop fetching geoShapes on each filter change
bprusinowski Feb 1, 2022
716a1f9
chore: Support urql devtools and conditionally import based on NODE_ENV
bprusinowski Feb 1, 2022
fdf9c90
feat: Remove border top from map legend
bprusinowski Feb 1, 2022
350617e
feat: Update dimension values only on filter reorder
bprusinowski Feb 1, 2022
0594a7a
feat: Update applying of shape color for undefined values
bprusinowski Feb 1, 2022
753fd8b
chore: Update deck.gl
bprusinowski Feb 1, 2022
aeb6c2d
feat: Enable tiles caching so zooming is not as flickering
bprusinowski Feb 1, 2022
afc6bde
chore: Update WebMarcatorViewport type
bprusinowski Feb 1, 2022
3235c6c
fix: Make sure a map is rendered when trying to constrain zoom
bprusinowski Feb 1, 2022
0099792
fix: Firing event when clicking on disabled days in DayPicker
bprusinowski Feb 1, 2022
048d241
feat: Update icons and title for base, area and symbol layers
bprusinowski Feb 1, 2022
8164e5d
Merge branch 'main' of github.com:visualize-admin/visualization-tool …
bprusinowski Feb 1, 2022
2aaede8
feat: Add select a color translation
bprusinowski Feb 1, 2022
c523b77
docs: Add OnOffControlTab
bprusinowski Feb 1, 2022
7733eb1
chore: Add missing translation
bprusinowski Feb 1, 2022
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
19 changes: 6 additions & 13 deletions app/configurator/components/chart-options-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,19 +178,12 @@ const EncodingOptionsPanel = ({
const getFieldLabelHint = {
x: t({ id: "controls.select.dimension", message: "Select a dimension" }),
y: t({ id: "controls.select.measure", message: "Select a measure" }),
baseLayer: t({ id: "chart.map.layers.base", message: "Base Layer" }),
areaLayer: t({
id: "controls.select.measure",
message: "Select a measure",
}),
symbolLayer: t({
id: "controls.select.measure",
message: "Select a measure",
}),
segment: t({
id: "controls.select.dimension",
message: "Select a dimension",
}),
// FIXME: encoding types, so we don't need these there (chart options are
// handled in a separate file)
bprusinowski marked this conversation as resolved.
Show resolved Hide resolved
baseLayer: "",
areaLayer: "",
symbolLayer: "",
segment: "",
};

useEffect(() => {
Expand Down
14 changes: 7 additions & 7 deletions app/configurator/map/map-chart-options.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export const BaseLayersSettings = memo(() => {
return (
<ControlSection>
<SectionTitle iconName="mapMaptype">
<Trans id="chart.map.settings">Settings</Trans>
<Trans id="chart.map.layers.base">Base Layer</Trans>
</SectionTitle>
<ControlSectionContent side="right">
<ChartOptionCheckboxField
Expand Down Expand Up @@ -160,8 +160,8 @@ export const AreaLayerSettings = memo(
return (
<>
<ControlSection>
<SectionTitle iconName="settings">
<Trans id="chart.map.settings">Settings</Trans>
<SectionTitle iconName="mapRegions">
<Trans id="chart.map.layers.area">Areas</Trans>
</SectionTitle>
<ControlSectionContent side="right">
<ChartOptionCheckboxField
Expand All @@ -176,7 +176,7 @@ export const AreaLayerSettings = memo(
</ControlSectionContent>
</ControlSection>
<ControlSection>
<SectionTitle iconName="mapRegions">
<SectionTitle iconName="chartMap">
{t({
id: "controls.dimension.geographical",
message: "Geographical dimension",
Expand Down Expand Up @@ -370,8 +370,8 @@ export const SymbolLayerSettings = memo(
return (
<>
<ControlSection>
<SectionTitle iconName="settings">
<Trans id="chart.map.settings">Settings</Trans>
<SectionTitle iconName="mapSymbols">
<Trans id="chart.map.layers.symbol">Symbols</Trans>
</SectionTitle>
<ControlSectionContent side="right">
<ChartOptionCheckboxField
Expand All @@ -386,7 +386,7 @@ export const SymbolLayerSettings = memo(
</ControlSectionContent>
</ControlSection>
<ControlSection>
<SectionTitle iconName="mapSymbols">
<SectionTitle iconName="chartMap">
{t({
id: "controls.dimension.geographical",
message: "Geographical dimension",
Expand Down