mirror of
https://github.com/fsolla/teqo.git
synced 2026-11-15 10:43:07 +00:00
O /simplify da escala relativa do mapa achou um bug semantico real em computeAggregateTerritorialClass — somava o headroom dos slugs e comparava contra a mediana de UMA unidade, classificando um grupo grande como expansao quando ele e marginal. A mediana agora escala por slugs.length, com teste. As bolhas sairam do centro do bounding box para o centroide real e ganharam pane proprio (z-index 450), porque o bringToFront do hover as escondia atras do poligono. Legenda e pintura passaram a compartilhar o mesmo predicado, a copy dos quantis parou de prometer faixas de igual largura, e o subtitulo do painel parou de dizer "em 2026" com 2022 selecionado (defeito do B11). Fonte unica onde havia duas: NO_DATA_FILL, o raio das bolhas e formatPlacementOrdinal (ex-formatMunicipalityVoteRank, agora client-safe em electionFormat.ts). Os quatro debitos maiores que o cleanup viraram o fill-in B13+ (docs/plans/escala-dry-pos-b13.md); a flakiness dos e2e, reproduzida em main limpo, foi para o ledger com a causa afinada.
153 lines
4.3 KiB
TypeScript
153 lines
4.3 KiB
TypeScript
import type { PathOptions } from 'leaflet'
|
|
|
|
import {
|
|
choroplethFillColor,
|
|
choroplethMaxAbsValue,
|
|
choroplethMaxValue,
|
|
divergingFillColor,
|
|
NO_DATA_FILL,
|
|
} from '@/lib/choroplethColorScale'
|
|
|
|
export type ChoroplethValues = Record<string, number>
|
|
|
|
export type BahiaMapFillMode = 'sequential' | 'diverging'
|
|
|
|
export type FeatureKeyProperty = 'codarea' | 'code'
|
|
|
|
/**
|
|
* Feature key → fill, for the discrete relative scales (B13). When present it
|
|
* REPLACES the continuous ramp: a key absent from the record has no class and
|
|
* renders as "no data", which is not the same as a value of zero.
|
|
*/
|
|
export type ChoroplethFills = Record<string, string>
|
|
|
|
export type LayerStyleContext = {
|
|
values: ChoroplethValues
|
|
fillMode: BahiaMapFillMode
|
|
max: number
|
|
fillByKey?: ChoroplethFills
|
|
highlightSet: Set<string>
|
|
selectedKey: string | null
|
|
hoveredKey: string | null
|
|
}
|
|
|
|
type FeatureStyleInput = {
|
|
metric: number
|
|
highlighted: boolean
|
|
fillMode: BahiaMapFillMode
|
|
max: number
|
|
classFill?: string
|
|
classed: boolean
|
|
}
|
|
|
|
const getFeatureStyle = ({
|
|
metric,
|
|
highlighted,
|
|
fillMode,
|
|
max,
|
|
classFill,
|
|
classed,
|
|
}: FeatureStyleInput): PathOptions => ({
|
|
weight: highlighted ? 2 : 1,
|
|
color: highlighted ? '#c51414' : '#a8a29e',
|
|
fillColor: classed
|
|
? (classFill ?? NO_DATA_FILL)
|
|
: fillMode === 'diverging'
|
|
? divergingFillColor(metric, max)
|
|
: choroplethFillColor(metric, max),
|
|
fillOpacity: (classed ? classFill !== undefined : metric !== 0) ? 0.78 : 0.35,
|
|
})
|
|
|
|
export const computeChoroplethMax = (
|
|
values: ChoroplethValues,
|
|
fillMode: BahiaMapFillMode,
|
|
scaleMax?: number,
|
|
): number =>
|
|
scaleMax ??
|
|
(fillMode === 'diverging' ? choroplethMaxAbsValue(values) : choroplethMaxValue(values))
|
|
|
|
/**
|
|
* B13 — proportional symbols scale by the SQUARE ROOT of the magnitude, so the
|
|
* AREA of the circle carries the value: sizing the radius directly would make
|
|
* a município with twice the votes look four times as big. Flannery's
|
|
* perceptual correction is deliberately skipped — it inflates the large end on
|
|
* purpose, and here the exact number is one hover away in the readout.
|
|
*
|
|
* Lives here rather than in the Leaflet component because the legend draws its
|
|
* reference circles from the same formula; two implementations would let the
|
|
* key claim a size the map does not paint.
|
|
*/
|
|
const BUBBLE_MAX_RADIUS = 16
|
|
|
|
/** Small enough that a crowded east reads as texture, not as a second choropleth. */
|
|
const BUBBLE_MIN_RADIUS = 1.5
|
|
|
|
export const bubbleRadius = (value: number, max: number): number =>
|
|
max > 0 ? Math.max(BUBBLE_MIN_RADIUS, BUBBLE_MAX_RADIUS * Math.sqrt(value / max)) : 0
|
|
|
|
export const buildHighlightSet = (highlightKey: string): Set<string> =>
|
|
new Set(highlightKey.length > 0 ? highlightKey.split(',').filter(Boolean) : [])
|
|
|
|
export const canonicalMapKeysKey = (keys: string[]): string =>
|
|
keys.length > 0 ? [...keys].sort().join(',') : ''
|
|
|
|
export const keyPropertyForMode = (mode: 'municipality' | 'territory'): FeatureKeyProperty =>
|
|
mode === 'municipality' ? 'codarea' : 'code'
|
|
|
|
export const featureKeyFromProperties = (
|
|
properties: Record<string, string> | undefined,
|
|
keyProperty: FeatureKeyProperty,
|
|
): string | undefined => properties?.[keyProperty]
|
|
|
|
export const resolvePathStyle = (context: LayerStyleContext, key: string): PathOptions => {
|
|
const classed = context.fillByKey !== undefined
|
|
|
|
if (!key) {
|
|
return getFeatureStyle({
|
|
metric: 0,
|
|
highlighted: false,
|
|
fillMode: context.fillMode,
|
|
max: context.max,
|
|
classed,
|
|
})
|
|
}
|
|
|
|
const activeKey = context.hoveredKey ?? context.selectedKey
|
|
const metric = context.values[key] ?? 0
|
|
const highlighted = context.highlightSet.has(key) || key === activeKey
|
|
|
|
return getFeatureStyle({
|
|
metric,
|
|
highlighted,
|
|
fillMode: context.fillMode,
|
|
max: context.max,
|
|
classFill: context.fillByKey?.[key],
|
|
classed,
|
|
})
|
|
}
|
|
|
|
export const buildLayerStyleContext = ({
|
|
values,
|
|
fillMode,
|
|
scaleMax,
|
|
fillByKey,
|
|
highlightKey,
|
|
selectedKey,
|
|
hoveredKey = null,
|
|
}: {
|
|
values: ChoroplethValues
|
|
fillMode: BahiaMapFillMode
|
|
scaleMax?: number
|
|
fillByKey?: ChoroplethFills
|
|
highlightKey: string
|
|
selectedKey: string | null
|
|
hoveredKey?: string | null
|
|
}): LayerStyleContext => ({
|
|
values,
|
|
fillMode,
|
|
max: computeChoroplethMax(values, fillMode, scaleMax),
|
|
fillByKey,
|
|
highlightSet: buildHighlightSet(highlightKey),
|
|
selectedKey,
|
|
hoveredKey,
|
|
})
|