eurostat-map 4.10.3 → 4.10.5

package/build/types/core/decoration/LabelsConfig.d.ts

@@ -1,96 +1,115 @@
-/**
- * A single map label (country name, statistical value label, etc.)
- */
-export interface Label {
-    text: string
-    x: number
-    y: number
-    class?: string
-    /** Font size in pixels. @deprecated Use CSS classes instead. */
-    size?: number
-    rotate?: number | null
-    letterSpacing?: number
-    /** Country code, when this label represents a country. */
-    cc?: string
-}
-
-/**
- * Configuration for map labels (country names, statistical values, etc.)
- */
-export interface LabelsConfig {
-    /**
-     * Array of label objects with text and coordinates.
-     * Use eurostatmap.getDefaultLabels() to get predefined geographic labels.
-     */
-    labels?: Label[]
-
-    /**
-     * Show statistical values as labels on regions.
-     * @default false
-     */
-    values?: boolean
-
-    /**
-     * Apply halo/shadow effect around labels for better readability.
-     * @default false
-     */
-    halos?: boolean
-
-    /**
-     * Legacy alias for halos.
-     * @deprecated Use halos instead
-     */
-    shadows?: boolean
-
-    /**
-     * Apply solid background rectangles behind labels.
-     * Takes precedence over halos when both are set.
-     * @default false
-     */
-    backgrounds?: boolean
-
-    /**
-     * Fill color for label background rectangles (CSS color string).
-     * Only applies when backgrounds is true.
-     * @default '#ffffff'
-     * @example 'white'
-     * @example '#B19122'
-     * @example 'rgba(255, 255, 255, 0.9)'
-     */
-    backgroundFill?: string
-
-    /**
-     * Scale labels when zooming in/out.
-     * @default true
-     */
-    scaleOnZoom?: boolean
-
-    /**
-     * Custom formatter function for statistical value labels.
-     * @example (value) => value.toFixed(1) + '%'
-     */
-    valuesFormatter?: (value: number) => string
-
-    /**
-     * Filter function to show/hide statistical value labels for specific regions.
-     * @param region - GeoJSON feature object
-     * @param map - Map instance
-     * @returns true to show label, false to hide
-     */
-    statLabelsFilterFunction?: (region: any, map: any) => boolean
-
-    /**
-     * Override default centroid positions for statistical value labels.
-     * Keys are region IDs (e.g., 'DE', 'FR01'), values are {x, y} coordinates.
-     */
-    statLabelsPositions?: Record<string, { x: number; y: number }>
-
-    /**
-     * Function to adjust calculated centroids for value labels.
-     * @param region - GeoJSON feature object
-     * @param centroid - Calculated centroid [x, y]
-     * @returns Adjusted centroid [x, y]
-     * @example (region, centroid) => [centroid[0] + 10, centroid[1] - 10]
-     */
-    processValueLabelCentroids?: (region: any, centroid: [number, number]) => [number, number]
-}
+/**
+ * A single map label (country name, statistical value label, etc.)
+ */
+export interface Label {
+    text: string
+    x: number
+    y: number
+    class?: string
+    /** Font size in pixels. @deprecated Use CSS classes instead. */
+    size?: number
+    rotate?: number | null
+    letterSpacing?: number
+    /** Country code, when this label represents a country. */
+    cc?: string
+}
+
+/**
+ * Configuration for map labels (country names, statistical values, etc.)
+ */
+export interface LabelsConfig {
+    /**
+     * Array of label objects with text and coordinates.
+     * Use eurostatmap.getDefaultLabels() to get predefined geographic labels.
+     */
+    labels?: Label[]
+
+    /**
+     * Show statistical values as labels on regions.
+     * @default false
+     */
+    values?: boolean
+
+    /**
+     * Apply halo/shadow effect around labels for better readability.
+     * @default false
+     */
+    halos?: boolean
+
+    /**
+     * Legacy alias for halos.
+     * @deprecated Use halos instead
+     */
+    shadows?: boolean
+
+    /**
+     * Apply solid background rectangles behind labels.
+     * Takes precedence over halos when both are set.
+     * @default false
+     */
+    backgrounds?: boolean
+
+    /**
+     * Fill color for label background rectangles (CSS color string).
+     * Only applies when backgrounds is true.
+     * @default '#ffffff'
+     * @example 'white'
+     * @example '#B19122'
+     * @example 'rgba(255, 255, 255, 0.9)'
+     */
+    backgroundFill?: string
+
+    /**
+     * Fill/stroke color for statistical value label text.
+     * @default '#111111'
+     */
+    statLabelTextColor?: string
+
+    /**
+     * Padding between statistical label text and its background edge, in pixels.
+     * A number applies equal padding on both axes; an object controls each axis.
+     * @default { x: 5, y: 2 }
+     */
+    backgroundPadding?: number | { x?: number; y?: number }
+
+    /** Background shape used for statistical value labels. @default 'rect' */
+    backgroundShape?: 'rect' | 'circle'
+
+    /** Corner radius in pixels when backgroundShape is 'rect'. @default 0 */
+    backgroundBorderRadius?: number
+
+    /**
+     * Scale labels when zooming in/out.
+     * @default true
+     */
+    scaleOnZoom?: boolean
+
+    /**
+     * Custom formatter function for statistical value labels.
+     * @example (value) => value.toFixed(1) + '%'
+     */
+    valuesFormatter?: (value: number) => string
+
+    /**
+     * Filter function to show/hide statistical value labels for specific regions.
+     * @param region - GeoJSON feature object
+     * @param map - Map instance
+     * @returns true to show label, false to hide
+     */
+    statLabelsFilterFunction?: (region: any, map: any) => boolean
+
+    /**
+     * Override default centroid positions for statistical value labels.
+     * Keys are region IDs (e.g., 'DE', 'FR01'), values are {x, y} coordinates.
+     */
+    statLabelsPositions?: Record<string, { x: number; y: number }>
+
+    /**
+     * Function to adjust calculated centroids for value labels.
+     * @param region - GeoJSON feature object
+     * @param centroid - Calculated centroid [x, y]
+     * @returns Adjusted centroid [x, y]
+     * @example (region, centroid) => [centroid[0] + 10, centroid[1] - 10]
+     */
+    processValueLabelCentroids?: (region: any, centroid: [number, number]) => [number, number]
+}

package/build/types/index.d.ts

@@ -213,7 +213,7 @@ export function map(type: 'bar' | 'barComposition', config?: BarMapConfig): BarM
 export function map(type: 'stripeComposition' | 'scomp' | 'stripe', config?: StripeMapConfig): StripeMap
 export function map(type: 'waffle', config?: WaffleMapConfig): WaffleMap
 export function map(type: 'mushroom', config?: MushroomMapConfig): MushroomMap
-export function map(type: 'pieChart' | 'pie', config?: PieMapConfig): PieMap
+export function map(type: 'pieChart' | 'pie' | 'composition', config?: PieMapConfig): PieMap
 export function map(type: 'sparkline' | 'spark' | 'sparklines', config?: SparkMapConfig): SparkMap
 export function map(type: 'flow' | 'flowmap', config?: FlowMapConfig): FlowMap
 export function map(type: MapType, config?: MapConfig): MapInstance

package/build/types/layers/MapType.d.ts

@@ -19,6 +19,7 @@ export type MapType =
     | 'stripe'
     | 'pieChart'
     | 'pie'
+    | 'composition'
     | 'sparkline'
     | 'spark'
     | 'sparklines'

package/build/types/layers/proportional-symbol/ProportionalSymbolConfig.d.ts

@@ -1,47 +1,52 @@
-import type { MapConfig } from '../../core/MapConfig'
-
-export interface ProportionalSymbolSettings {
-    shape?: string
-    customShape?: any
-    customSVG?: any
-    spikeWidth?: number
-    offset?: { x: number; y: number }
-    barWidth?: number
-    minValue?: number | undefined
-    maxValue?: number | undefined
-    fill?: string
-    fillOpacity?: number
-    stroke?: string
-    strokeWidth?: number
-    strokeOpacity?: number
-    sizeScale?: 'sqrt' | 'linear' | any
-    minSize?: number
-    maxSize?: number
-    classes?: number
-    colors?: string[] | null
-    colorFun?: any
-    classToFillStyle?: any
-    thresholds?: number[]
-    classificationMethod?: string
-    brightenFactor?: number
-    codeLabels?: boolean
-}
-
-/**
- * Configuration for proportional symbol maps
- */
-export interface ProportionalSymbolConfig extends MapConfig {
-    /** Symbol shape used for markers. */
-    symbol?: 'circle' | 'square'
-    /** Base symbol size factor. */
-    size?: number
-
-    /** Dorling cartogram. */
-    dorling?: boolean
-
-    /** Size function. */
-    psCustomSize?: (value: number) => number
-
-    /** Grouped proportional symbol style settings. */
-    psSettings?: ProportionalSymbolSettings
-}
+import type { MapConfig } from '../../core/MapConfig'
+
+export interface ProportionalSymbolSettings {
+    shape?: string
+    customShape?: any
+    customSVG?: any
+    spikeWidth?: number
+    offset?: { x: number; y: number }
+    barWidth?: number
+    minValue?: number | undefined
+    maxValue?: number | undefined
+    fill?: string
+    fillOpacity?: number
+    stroke?: string
+    strokeWidth?: number
+    strokeOpacity?: number
+    sizeScale?: 'sqrt' | 'linear' | any
+    minSize?: number
+    maxSize?: number
+    classes?: number
+    colors?: string[] | null
+    colorFun?: any
+    classToFillStyle?: any
+    thresholds?: number[]
+    classificationMethod?: string
+    brightenFactor?: number
+    codeLabels?: boolean
+}
+
+/**
+ * Configuration for proportional symbol maps
+ */
+export interface ProportionalSymbolConfig extends MapConfig {
+    /** Fill styles for categorical exceptions in the color dataset, keyed by raw value. */
+    categoryFillStyle?: { [rawValue: string]: string }
+    /** Legend and tooltip labels for categorical exceptions, keyed by raw value. */
+    categoryText?: { [rawValue: string]: string }
+
+    /** Symbol shape used for markers. */
+    symbol?: 'circle' | 'square'
+    /** Base symbol size factor. */
+    size?: number
+
+    /** Dorling cartogram. */
+    dorling?: boolean
+
+    /** Size function. */
+    psCustomSize?: (value: number) => number
+
+    /** Grouped proportional symbol style settings. */
+    psSettings?: ProportionalSymbolSettings
+}

package/build/types/layers/proportional-symbol/ProportionalSymbolMap.d.ts

@@ -1,94 +1,100 @@
-import { MapInstance } from '../../core/MapInstance'
-import type { ProportionalSymbolSettings } from './ProportionalSymbolConfig'
-
-/**
- * Proportional symbol map object
- */
-export interface ProportionalSymbolMap extends MapInstance {
-    psSettings(): ProportionalSymbolSettings
-    psSettings(v: ProportionalSymbolSettings): this
-
-    psMaxSize(): number
-    psMaxSize(v: number): this
-
-    psMinSize(): number
-    psMinSize(v: number): this
-
-    psMaxValue(): number | undefined
-    psMaxValue(v: number | undefined): this
-
-    psMinValue(): number | undefined
-    psMinValue(v: number | undefined): this
-
-    psFill(): string
-    psFill(v: string): this
-
-    psFillOpacity(): number
-    psFillOpacity(v: number): this
-
-    psStrokeOpacity(): number
-    psStrokeOpacity(v: number): this
-
-    psStroke(): string
-    psStroke(v: string): this
-
-    psStrokeWidth(): number
-    psStrokeWidth(v: number): this
-
-    classifierSize(): any
-    classifierSize(v: any): this
-
-    classifierColor(): any
-    classifierColor(v: any): this
-
-    psShape(): string
-    psShape(v: string): this
-
-    psCustomShape(): any
-    psCustomShape(v: any): this
-
-    psBarWidth(): number
-    psBarWidth(v: number): this
-
-    psClassToFillStyle(): any
-    psClassToFillStyle(v: any): this
-
-    psColorFun(): any
-    psColorFun(v: any): this
-
-    psSizeScale(): any
-    psSizeScale(v: any): this
-
-    noDataFillStyle(): string
-    noDataFillStyle(v: string): this
-
-    psThresholds(): number[]
-    psThresholds(v: number[]): this
-
-    psColors(): string[] | null
-    psColors(v: string[] | null): this
-
-    psCustomSVG(): any
-    psCustomSVG(v: any): this
-
-    psOffset(): { x: number; y: number }
-    psOffset(v: { x: number; y: number }): this
-
-    psClassificationMethod(): string
-    psClassificationMethod(v: string): this
-
-    psClasses(): number
-    psClasses(v: number): this
-
-    dorling(): boolean
-    dorling(v: boolean): this
-
-    psSpikeWidth(): number
-    psSpikeWidth(v: number): this
-
-    psCodeLabels(): boolean
-    psCodeLabels(v: boolean): this
-
-    psBrightenFactor(): number
-    psBrightenFactor(v: number): this
-}
+import { MapInstance } from '../../core/MapInstance'
+import type { ProportionalSymbolSettings } from './ProportionalSymbolConfig'
+
+/**
+ * Proportional symbol map object
+ */
+export interface ProportionalSymbolMap extends MapInstance {
+    categoryFillStyle(): { [rawValue: string]: string } | undefined
+    categoryFillStyle(v: { [rawValue: string]: string }): this
+
+    categoryText(): { [rawValue: string]: string } | undefined
+    categoryText(v: { [rawValue: string]: string }): this
+
+    psSettings(): ProportionalSymbolSettings
+    psSettings(v: ProportionalSymbolSettings): this
+
+    psMaxSize(): number
+    psMaxSize(v: number): this
+
+    psMinSize(): number
+    psMinSize(v: number): this
+
+    psMaxValue(): number | undefined
+    psMaxValue(v: number | undefined): this
+
+    psMinValue(): number | undefined
+    psMinValue(v: number | undefined): this
+
+    psFill(): string
+    psFill(v: string): this
+
+    psFillOpacity(): number
+    psFillOpacity(v: number): this
+
+    psStrokeOpacity(): number
+    psStrokeOpacity(v: number): this
+
+    psStroke(): string
+    psStroke(v: string): this
+
+    psStrokeWidth(): number
+    psStrokeWidth(v: number): this
+
+    classifierSize(): any
+    classifierSize(v: any): this
+
+    classifierColor(): any
+    classifierColor(v: any): this
+
+    psShape(): string
+    psShape(v: string): this
+
+    psCustomShape(): any
+    psCustomShape(v: any): this
+
+    psBarWidth(): number
+    psBarWidth(v: number): this
+
+    psClassToFillStyle(): any
+    psClassToFillStyle(v: any): this
+
+    psColorFun(): any
+    psColorFun(v: any): this
+
+    psSizeScale(): any
+    psSizeScale(v: any): this
+
+    noDataFillStyle(): string
+    noDataFillStyle(v: string): this
+
+    psThresholds(): number[]
+    psThresholds(v: number[]): this
+
+    psColors(): string[] | null
+    psColors(v: string[] | null): this
+
+    psCustomSVG(): any
+    psCustomSVG(v: any): this
+
+    psOffset(): { x: number; y: number }
+    psOffset(v: { x: number; y: number }): this
+
+    psClassificationMethod(): string
+    psClassificationMethod(v: string): this
+
+    psClasses(): number
+    psClasses(v: number): this
+
+    dorling(): boolean
+    dorling(v: boolean): this
+
+    psSpikeWidth(): number
+    psSpikeWidth(v: number): this
+
+    psCodeLabels(): boolean
+    psCodeLabels(v: boolean): this
+
+    psBrightenFactor(): number
+    psBrightenFactor(v: number): this
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eurostat-map",
-    "version": "4.10.3",
+    "version": "4.10.5",
     "description": "Reusable library to quickly create and customise web maps showing Eurostat data directly retrieved from Eurostat database.",
     "keywords": [
         "cartography",
@@ -37,7 +37,7 @@
         "build-prod": "npm run copy-types && webpack --config webpack/webpack.config.prod.js",
         "build-prod-debug": "webpack --config webpack/webpack.config.debug-size.js",
         "format": "prettier --write .",
-        "copy-types": "copyfiles -u 2 \"src/types/**/*.d.ts\" build/types",
+        "copy-types": "node scripts/copy-types.js",
         "check:types:legend-config-sync": "node scripts/check-legend-config-sync.js",
         "type-check": "npm run check:types:legend-config-sync && tsc --noEmit --skipLibCheck && tsc --noEmit --skipLibCheck test/typescript-test.ts",
         "update-all": "npm run update-types && npm run update-docs && npm run update-examples",
@@ -78,7 +78,6 @@
         "@babel/preset-env": "^7.22.6",
         "@babel/runtime": "^7.12.1",
         "babel-loader": "^9.1.2",
-        "copyfiles": "^2.4.1",
         "css-loader": "^7.1.2",
         "playwright": "^1.60.0",
         "prettier": "^3.4.1",