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

[MRXN23-487]: map: updates palette colour #1548

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[MRXN23-487]: map: updates palette colour #1548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions app/hooks/features/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,9 @@ export function useSelectedFeatures(
}

const color =
features.length > COLORS['features-preview'].ramp.length
? chroma.scale(COLORS['features-preview'].ramp).colors(features.length)[index]
: COLORS['features-preview'].ramp[index];
features.length > COLORS.features.ramp.length
? chroma.scale(COLORS.features.ramp).colors(features.length)[index]
: COLORS.features.ramp[index];

return {
...d,
Expand Down
91 changes: 37 additions & 54 deletions app/hooks/map/constants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,59 +16,34 @@ import SQUARE_SVG from 'svgs/map/square.svg?sprite';
import { UseLegend } from './types';

export const COLORS = {
primary: '#00BFFF',
'features-preview': {
default: '#FFCC00',
hover: '#FF9900',
ramp: [
'#4b5eef',
'#f15100',
'#31a904',
'#2c18bd',
'#bf3220',
'#9d2e38',
'#e5e001',
'#f15100',
'#f4af00',
'#218134',
'#775b32',
'#cb9c00',
'#294635',
'#ba5da9',
'#5c3b85',
'#de4210',
],
},
wdpa: '#12EC80',
'wdpa-preview': '#00f',
features: '#6F53F7',
primary: '#01768F',
wdpa: '#5156CB',
'wdpa-preview': '#01768F',
highlightFeatures: '#BE6BFF',
abundance: {
default: '#FFF',
features: {
default: '#24242D',
ramp: [
'#4b5eef',
'#f15100',
'#31a904',
'#2c18bd',
'#bf3220',
'#9d2e38',
'#e5e001',
'#f15100',
'#f4af00',
'#218134',
'#775b32',
'#cb9c00',
'#294635',
'#ba5da9',
'#5c3b85',
'#de4210',
'#66C379',
'#3C8BC4',
'#8B91EC',
'#E98842',
'#51A1B2',
'#CFD897',
'#BE6BFF',
'#B0A6CC',
'#71AADF',
'#E896BE',
'#C48259',
'#E9AB42',
'#B059B8',
],
},
include: '#03E7D1',
exclude: '#FF472E',
available: '#FFCA42',
cost: ['#3C1002', '#FF440A'],
frequency: ['#0C2C32', '#006D83', '#008B8C', '#0BC6C2'],
include: '#66F39F',
exclude: '#FF6847',
available: '#F1B61E',
cost: ['#292F4D', '#732669', '#DE7239', '#FAFCA8'],
frequency: ['#292F4D', '#4D5784', '#99D693', '#FFFFC6'],
solution: '#9FD1F7',
compare: {
'#1F1F1F': ['00'],
'#0F0559': ['01', '10', '11'],
Expand Down Expand Up @@ -287,9 +262,9 @@ export const LEGEND_LAYERS = {
},
items: items.map((item, i) => {
const COLOR =
items.length > COLORS['features-preview'].ramp.length
? chroma.scale(COLORS['features-preview'].ramp).colors(items.length)[i]
: COLORS['features-preview'].ramp[i];
items.length > COLORS.features.ramp.length
? chroma.scale(COLORS.features.ramp).colors(items.length)[i]
: COLORS.features.ramp[i];

return {
value: item.name,
Expand Down Expand Up @@ -351,7 +326,7 @@ export const LEGEND_LAYERS = {
},
items: [
{
color: COLORS.abundance.default,
color: COLORS.features.default,
value: `${amountRange.min === amountRange.max ? 0 : amountRange.min}`,
},
{
Expand Down Expand Up @@ -385,6 +360,14 @@ export const LEGEND_LAYERS = {
},
{
color: COLORS.cost[1],
value: null,
},
{
color: COLORS.cost[2],
value: null,
},
{
color: COLORS.cost[3],
value: `${max}`,
},
],
Expand Down Expand Up @@ -522,7 +505,7 @@ export const LEGEND_LAYERS = {
<Icon
icon={HEXAGON_SVG}
className="mt-0.5 h-3.5 w-3.5 stroke-current stroke-2"
style={{ color: COLORS.primary }}
style={{ color: COLORS.solution }}
/>
),
settingsManager: {
Expand Down
14 changes: 9 additions & 5 deletions app/hooks/map/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,11 +403,11 @@ export function useTargetedPreviewLayers({
const ID = splitted ? parentId : id;

const COLOR =
selectedFeatures.length > COLORS['features-preview'].ramp.length
? chroma.scale(COLORS['features-preview'].ramp).colors(selectedFeatures.length)[
selectedFeatures.length > COLORS.features.ramp.length
? chroma.scale(COLORS.features.ramp).colors(selectedFeatures.length)[
selectedFeatures.length - 1 - index
]
: COLORS['features-preview'].ramp[selectedFeatures.length - 1 - index];
: COLORS.features.ramp[selectedFeatures.length - 1 - index];

return {
id: `feature-${id}-targeted-preview-layer-${cache}`,
Expand Down Expand Up @@ -770,8 +770,12 @@ export function usePUGridLayer({
['get', 'costValue'],
cost.min === cost.max ? 0 : cost.min,
COLORS.cost[0],
cost.max,
cost.max * 0.33,
COLORS.cost[1],
cost.max * 0.66,
COLORS.cost[2],
cost.max,
COLORS.cost[3],
],
'fill-opacity': 0.75 * CostOpacity,
},
Expand Down Expand Up @@ -902,7 +906,7 @@ export function usePUGridLayer({
},
filter: ['all', ['in', `-${runId}-`, ['get', 'valuePosition']]],
paint: {
'fill-color': COLORS.primary,
'fill-color': COLORS.solution,
'fill-opacity': 0.75 * SolutionOpacity,
},
},
Expand Down
6 changes: 3 additions & 3 deletions app/layout/project/sidebar/project/inventory-panel/features/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ const InventoryPanelFeatures = ({ noData: noDataMessage }: { noData: string }):
select: ({ data }) => {
return data?.map((feature, index) => {
const color =
data.length > COLORS['features-preview'].ramp.length
? chroma.scale(COLORS['features-preview'].ramp).colors(data.length)[index]
: COLORS['features-preview'].ramp[index];
data.length > COLORS.features.ramp.length
? chroma.scale(COLORS.features.ramp).colors(data.length)[index]
: COLORS.features.ramp[index];

return {
id: feature.id,
Expand Down
12 changes: 6 additions & 6 deletions ...layout/project/sidebar/scenario/grid-setup/planning-unit-status/actions-summary/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,13 @@ export const ActionsSummary = ({
<span className="flex flex-1 items-center space-x-2">
<Icon
icon={HEXAGON_SVG}
className="h-5 w-5 fill-none stroke-current stroke-[1.5px] text-green-400"
className="h-5 w-5 fill-none stroke-current stroke-[1.5px] text-[#66F39F]"
/>
<span className="text-sm text-white">Included areas</span>
</span>
<span
className={cn('flex flex-1 items-center justify-center text-sm text-white', {
'text-green-400': puAction === 'include',
'text-[#66F39F]': puAction === 'include',
})}
>
{puTmpIncludedValue.length + puIncludedValue.length} PU
Expand Down Expand Up @@ -225,13 +225,13 @@ export const ActionsSummary = ({
<span className="flex flex-1 items-center space-x-2">
<Icon
icon={HEXAGON_SVG}
className="h-5 w-5 fill-none stroke-current stroke-[1.5px] text-red-700"
className="h-5 w-5 fill-none stroke-current stroke-[1.5px] text-[#FF6847]"
/>
<span className="text-sm text-white">Excluded areas</span>
</span>
<span
className={cn('flex flex-1 items-center justify-center text-sm text-white', {
'text-red-700': puAction === 'exclude',
'text-[#FF6847]': puAction === 'exclude',
})}
>
{puTmpExcludedValue.length + puExcludedValue.length} PU
Expand Down Expand Up @@ -264,13 +264,13 @@ export const ActionsSummary = ({
<span className="flex flex-1 items-center space-x-2">
<Icon
icon={HEXAGON_SVG}
className="h-5 w-5 fill-none stroke-current stroke-[1.5px] text-yellow-400"
className="h-5 w-5 fill-none stroke-current stroke-[1.5px] text-[#F1B61E]"
/>
<span className="text-sm text-white">Available areas</span>
</span>
<span
className={cn('flex flex-1 items-center justify-center text-sm text-white', {
'text-yellow-400': puAction === 'available',
'text-[#F1B61E]': puAction === 'available',
})}
>
{puTmpAvailableValue.length + puAvailableValue.length} PU
Expand Down
12 changes: 6 additions & 6 deletions app/layout/projects/show/map/legend/hooks/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ export const useFeatureAbundanceLegend = () => {
projectFeaturesQuery.data?.map(
({ id, featureClassName, amountRange = { min: 5000, max: 100000 } }, index) => {
const color =
totalItems > COLORS['features-preview'].ramp.length
? chroma.scale(COLORS['features-preview'].ramp).colors(totalItems)[index]
: COLORS['features-preview'].ramp[index];
totalItems > COLORS.features.ramp.length
? chroma.scale(COLORS.features.ramp).colors(totalItems)[index]
: COLORS.features.ramp[index];

return {
id,
Expand Down Expand Up @@ -166,9 +166,9 @@ export const useFeaturesLegend = () => {
const items =
projectFeaturesQuery.data?.map(({ id, featureClassName }, index) => {
const color =
totalItems > COLORS['features-preview'].ramp.length
? chroma.scale(COLORS['features-preview'].ramp).colors(totalItems)[index]
: COLORS['features-preview'].ramp[index];
totalItems > COLORS.features.ramp.length
? chroma.scale(COLORS.features.ramp).colors(totalItems)[index]
: COLORS.features.ramp[index];

return {
id,
Expand Down
12 changes: 6 additions & 6 deletions app/layout/scenarios/edit/map/legend/hooks/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ export const useFeatureAbundanceLegend = () => {
const items =
features?.map(({ id, name, amountRange = { min: 5000, max: 100000 } }, index) => {
const color =
totalItems > COLORS['features-preview'].ramp.length
? chroma.scale(COLORS['features-preview'].ramp).colors(totalItems)[index]
: COLORS['features-preview'].ramp[index];
totalItems > COLORS.features.ramp.length
? chroma.scale(COLORS.features.ramp).colors(totalItems)[index]
: COLORS.features.ramp[index];

return {
id,
Expand Down Expand Up @@ -183,9 +183,9 @@ export const useFeaturesLegend = () => {
const items =
features?.map(({ id, name }, index) => {
const color =
totalItems > COLORS['features-preview'].ramp.length
? chroma.scale(COLORS['features-preview'].ramp).colors(totalItems)[index]
: COLORS['features-preview'].ramp[index];
totalItems > COLORS.features.ramp.length
? chroma.scale(COLORS.features.ramp).colors(totalItems)[index]
: COLORS.features.ramp[index];

return {
id,
Expand Down
Loading