eurostat-map 4.4.3 → 4.4.5

package/build/package.json

@@ -1,87 +1,87 @@
-{
-    "name": "eurostat-map",
-    "version": "4.4.3",
-    "description": "Reusable library to quickly create and customise web maps showing Eurostat data directly retrieved from Eurostat database.",
-    "keywords": [
-        "eurostat",
-        "statistics",
-        "europe",
-        "SVG",
-        "NUTS",
-        "map",
-        "D3",
-        "cartography",
-        "thematic",
-        "mapping",
-        "eurostat-map",
-        "dataviz",
-        "data visualization"
-    ],
-    "homepage": "https://github.com/eurostat/eurostat-map",
-    "author": "",
-    "license": "EUPL-1.2",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/eurostat/eurostat-map.git"
-    },
-    "main": "build/eurostatmap.min.js",
-    "unpkg": "build/eurostatmap.min.js",
-    "module": "build/eurostatmap.js",
-    "types": "build/types/index.d.ts",
-    "typings": "build/types/index.d.ts",
-    "files": [
-        "build"
-    ],
-    "scripts": {
-        "start": "webpack --config webpack/webpack.config.dev.js",
-        "server": "webpack-dev-server --open --watch",
-        "build-types": "tsc --project tsconfig.json",
-        "build-prod": "npm run build-types && webpack --config webpack/webpack.config.prod.js",
-        "build-prod-debug": "webpack --config webpack/webpack.config.debug-size.js",
-        "format": "prettier --write .",
-        "test": "jest",
-        "type-check": "tsc --noEmit"
-    },
-    "dependencies": {
-        "d3-array": "^3.2.4",
-        "d3-axis": "^3.0.0",
-        "d3-ease": "^3.0.1",
-        "d3-fetch": "^3.0.1",
-        "d3-force": "^3.0.0",
-        "d3-format": "^3.1.0",
-        "d3-geo": "^3.1.1",
-        "d3-geo-projection": "^3.0.0",
-        "d3-interpolate": "^3.0.1",
-        "d3-scale": "^4.0.2",
-        "d3-scale-chromatic": "^3.1.0",
-        "d3-selection": "^3.0.0",
-        "d3-shape": "^3.2.0",
-        "d3-svg-annotation": "^2.5.1",
-        "d3-zoom": "^3.0.0",
-        "idb-keyval": "^6.2.2",
-        "jsonstat-toolkit": "^1.0.8",
-        "proj4": "^2.17.0",
-        "simple-statistics": "^7.8.8",
-        "topojson-client": "^3.1.0"
-    },
-    "overrides": {
-        "d3-color": "3.1.0"
-    },
-    "devDependencies": {
-        "@babel/core": "^7.22.6",
-        "@babel/plugin-transform-runtime": "^7.22.6",
-        "@babel/preset-env": "^7.22.6",
-        "@babel/runtime": "^7.12.1",
-        "babel-loader": "^9.1.2",
-        "css-loader": "^7.1.2",
-        "prettier": "^3.4.1",
-        "style-loader": "^4.0.0",
-        "ts-loader": "^9.5.4",
-        "typescript": "^5.9.3",
-        "webpack": "^5.88.1",
-        "webpack-bundle-analyzer": "^4.10.2",
-        "webpack-cli": "^5.0.0",
-        "webpack-dev-server": "^5.2.2",
-        "webpack-livereload-plugin": "^3.0.2"
-    }
-}
+{
+    "name": "eurostat-map",
+    "version": "4.4.5",
+    "description": "Reusable library to quickly create and customise web maps showing Eurostat data directly retrieved from Eurostat database.",
+    "keywords": [
+        "eurostat",
+        "statistics",
+        "europe",
+        "SVG",
+        "NUTS",
+        "map",
+        "D3",
+        "cartography",
+        "thematic",
+        "mapping",
+        "eurostat-map",
+        "dataviz",
+        "data visualization"
+    ],
+    "homepage": "https://github.com/eurostat/eurostat-map",
+    "author": "",
+    "license": "EUPL-1.2",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/eurostat/eurostat-map.git"
+    },
+    "main": "build/eurostatmap.min.js",
+    "unpkg": "build/eurostatmap.min.js",
+    "module": "build/eurostatmap.js",
+    "types": "build/types/index.d.ts",
+    "typings": "build/types/index.d.ts",
+    "files": [
+        "build"
+    ],
+    "scripts": {
+        "start": "webpack --config webpack/webpack.config.dev.js",
+        "server": "webpack-dev-server --open --watch",
+        "build-types": "tsc --project tsconfig.json",
+        "build-prod": "npm run build-types && webpack --config webpack/webpack.config.prod.js",
+        "build-prod-debug": "webpack --config webpack/webpack.config.debug-size.js",
+        "format": "prettier --write .",
+        "test": "jest",
+        "type-check": "tsc --noEmit"
+    },
+    "dependencies": {
+        "d3-array": "^3.2.4",
+        "d3-axis": "^3.0.0",
+        "d3-ease": "^3.0.1",
+        "d3-fetch": "^3.0.1",
+        "d3-force": "^3.0.0",
+        "d3-format": "^3.1.0",
+        "d3-geo": "^3.1.1",
+        "d3-geo-projection": "^3.0.0",
+        "d3-interpolate": "^3.0.1",
+        "d3-scale": "^4.0.2",
+        "d3-scale-chromatic": "^3.1.0",
+        "d3-selection": "^3.0.0",
+        "d3-shape": "^3.2.0",
+        "d3-svg-annotation": "^2.5.1",
+        "d3-zoom": "^3.0.0",
+        "idb-keyval": "^6.2.2",
+        "jsonstat-toolkit": "^1.0.8",
+        "proj4": "^2.17.0",
+        "simple-statistics": "^7.8.8",
+        "topojson-client": "^3.1.0"
+    },
+    "overrides": {
+        "d3-color": "3.1.0"
+    },
+    "devDependencies": {
+        "@babel/core": "^7.22.6",
+        "@babel/plugin-transform-runtime": "^7.22.6",
+        "@babel/preset-env": "^7.22.6",
+        "@babel/runtime": "^7.12.1",
+        "babel-loader": "^9.1.2",
+        "css-loader": "^7.1.2",
+        "prettier": "^3.4.1",
+        "style-loader": "^4.0.0",
+        "ts-loader": "^9.5.4",
+        "typescript": "^5.9.3",
+        "webpack": "^5.88.1",
+        "webpack-bundle-analyzer": "^4.10.2",
+        "webpack-cli": "^5.0.0",
+        "webpack-dev-server": "^5.2.2",
+        "webpack-livereload-plugin": "^3.0.2"
+    }
+}

package/build/types/core/MapConfig.d.ts

@@ -112,6 +112,9 @@ export interface MapConfig {
     /** Show/hide inset map toggle button. */
     insetsButton?: boolean
 
+    /** Show/hide legend toggle button. */
+    legendButton?: boolean
+
     /** Show/hide placename labels. */
     placenames?: boolean
 
@@ -151,6 +154,9 @@ export interface MapConfig {
     /** Position adjustment for insets button: [x, y] */
     insetsButtonPosition?: [number, number]
 
+    /** Position adjustment for legend button: [x, y] */
+    legendButtonPosition?: [number, number]
+
     /** Pointer hover color for NUTS regions. */
     hoverColor?: string
 

package/build/types/core/MapInstance.d.ts

@@ -266,6 +266,10 @@ export interface MapInstance {
     insetsButton(): boolean
     insetsButton(show: boolean): this
 
+    /** Show/hide legend toggle button. */
+    legendButton(): boolean
+    legendButton(show: boolean): this
+
     /** Filter function for placename labels. */
     placenamesFilter(): ((name: any) => boolean) | undefined
     placenamesFilter(fn: (name: any) => boolean): this
@@ -314,6 +318,10 @@ export interface MapInstance {
     insetsButtonPosition(): [number, number] | undefined
     insetsButtonPosition(pos: [number, number]): this
 
+    /** Position adjustment for legend button: [x, y] */
+    legendButtonPosition(): [number, number] | undefined
+    legendButtonPosition(pos: [number, number]): this
+
     /** Pointer hover color for NUTS regions. */
     hoverColor(): string
     hoverColor(color: string): this

package/build/types/index.d.ts

@@ -15,7 +15,7 @@ import type { ValueByAlphaConfig } from './map-types/choropleth/ValueByAlphaConf
 import type { ValueByAlphaMap } from './map-types/choropleth/ValueByAlphaMap'
 import type { BivariateChoroplethConfig } from './map-types/choropleth/BivariateChoroplethConfig'
 import type { BivariateChoroplethMap } from './map-types/choropleth/BivariateChoroplethMap'
-import type { TrivariateChoroplethConfig } from './map-types/choropleth/TrivariateChoroplethConfig'
+import type { TrivariateChoroplethConfig, TrivariateTernarySettings } from './map-types/choropleth/TrivariateChoroplethConfig'
 import type { TrivariateChoroplethMap } from './map-types/choropleth/TrivariateChoroplethMap'
 
 // Categorical map types
@@ -122,6 +122,7 @@ export type {
     BivariateChoroplethConfig,
     BivariateChoroplethMap,
     TrivariateChoroplethConfig,
+    TrivariateTernarySettings,
     TrivariateChoroplethMap,
 }
 

package/build/types/legend/choropleth/legend-choropleth-bivariate.d.ts

@@ -1,2 +1,2 @@
-/** Creates a bivariate choropleth legend */
-export function legend(config?: any): any
+/** Creates a bivariate choropleth legend */
+export function legend(config?: any): any

package/build/types/legend/choropleth/legend-choropleth-trivariate.d.ts

@@ -1,2 +1,2 @@
-/** Creates a trivariate choropleth legend */
-export function legend(config?: any): any
+/** Creates a trivariate choropleth legend */
+export function legend(config?: any): any

package/build/types/legend/choropleth/legend-choropleth.d.ts

@@ -1,2 +1,2 @@
-/** Creates a choropleth legend */
-export function legend(config?: any): any
+/** Creates a choropleth legend */
+export function legend(config?: any): any

package/build/types/legend/composition/legend-bar-chart.d.ts

@@ -1,2 +1,2 @@
-/** Creates a bar chart legend */
-export function legend(config?: any): any
+/** Creates a bar chart legend */
+export function legend(config?: any): any

package/build/types/legend/flow/legend-flow.d.ts

@@ -1,2 +1,2 @@
-/** Creates a flow map legend */
-export function legend(config?: any): any
+/** Creates a flow map legend */
+export function legend(config?: any): any

package/build/types/legend/legend-categorical.d.ts

@@ -1,2 +1,2 @@
-/** Creates a categorical legend */
-export function legend(config?: any): any
+/** Creates a categorical legend */
+export function legend(config?: any): any

package/build/types/legend/legend-continuous.d.ts

@@ -1,2 +1,2 @@
-/** Creates a continuous legend */
-export function legend(config?: any): any
+/** Creates a continuous legend */
+export function legend(config?: any): any

package/build/types/legend/legend-discrete.d.ts

@@ -1,2 +1,2 @@
-/** Creates a discrete legend */
-export function legend(config?: any): any
+/** Creates a discrete legend */
+export function legend(config?: any): any

package/build/types/legend/legend.d.ts

@@ -1,13 +1,13 @@
-import type { MapInstance } from '../core/MapInstance'
-
-/** Base legend configuration */
-export interface LegendConfig {
-  title?: string
-  titleFontSize?: number
-  labelFontSize?: number
-  labelDelimiter?: string
-  noDataText?: string
-}
-
-/** Creates a legend instance */
-export function legend(config?: LegendConfig): any
+import type { MapInstance } from '../core/MapInstance'
+
+/** Base legend configuration */
+export interface LegendConfig {
+  title?: string
+  titleFontSize?: number
+  labelFontSize?: number
+  labelDelimiter?: string
+  noDataText?: string
+}
+
+/** Creates a legend instance */
+export function legend(config?: LegendConfig): any

package/build/types/legend/proportional-symbol/legend-proportional-symbols.d.ts

@@ -1,2 +1,2 @@
-/** Creates a proportional symbols legend */
-export function legend(config?: any): any
+/** Creates a proportional symbols legend */
+export function legend(config?: any): any

package/build/types/map-types/CategoricalMapConfig.d.ts

@@ -1,11 +1,11 @@
-import type { MapConfig } from '../core/MapConfig'
-
-/**
- * Configuration for categorical map
- */
-export interface CategoricalMapConfig extends MapConfig {
-    /** Category-to-color mapping */
-    classToFillStyle?: Record<string, string>
-    /** Fill style for regions with no data */
-    noDataFillStyle?: string
-}
+import type { MapConfig } from '../core/MapConfig'
+
+/**
+ * Configuration for categorical map
+ */
+export interface CategoricalMapConfig extends MapConfig {
+    /** Category-to-color mapping */
+    classToFillStyle?: Record<string, string>
+    /** Fill style for regions with no data */
+    noDataFillStyle?: string
+}

package/build/types/map-types/choropleth/TrivariateChoroplethConfig.d.ts

@@ -1,6 +1,30 @@
 import type { MapConfig } from '../../core/MapConfig'
 import type { TrivariateLegendConfig } from '../../legend/choropleth/TrivariateLegendConfig'
 
+/**
+ * Ternary color settings for trivariate choropleth maps.
+ */
+export interface TrivariateTernarySettings {
+    /** Use sextant color mapping instead of continuous tricolore. */
+    sextant?: boolean
+    /** Array of 6 colors used when sextant mode is enabled. */
+    sextantColors?: [string, string, string, string, string, string]
+    /** Hue. */
+    hue?: number
+    /** Chroma. */
+    chroma?: number
+    /** Lightness. */
+    lightness?: number
+    /** Contrast. */
+    contrast?: number
+    /** Spread. */
+    spread?: number
+    /** Breaks. */
+    breaks?: number
+    /** Mean centering. */
+    meanCentering?: boolean
+}
+
 /**
  * Configuration for trivariate choropleth maps.
  */
@@ -13,20 +37,5 @@ export interface TrivariateChoroplethConfig extends MapConfig {
     /** No data fill style. */
     noDataFillStyle?: string
     /** Ternary settings. */
-    ternarySettings?: {
-        /** Hue. */
-        hue?: number
-        /** Chroma. */
-        chroma?: number
-        /** Lightness. */
-        lightness?: number
-        /** Contrast. */
-        contrast?: number
-        /** Spread. */
-        spread?: number
-        /** Breaks. */
-        breaks?: number
-        /** Mean centering. */
-        meanCentering?: boolean
-    }
+    ternarySettings?: TrivariateTernarySettings
 }

package/build/types/map-types/choropleth/TrivariateChoroplethMap.d.ts

@@ -1,4 +1,7 @@
 import type { MapInstance } from '../../core/MapInstance'
+import type { TrivariateChoroplethConfig, TrivariateTernarySettings } from './TrivariateChoroplethConfig'
+
+type TernarySettings = TrivariateTernarySettings
 
 /**
  * Trivariate choropleth map type.
@@ -10,6 +13,6 @@ export interface TrivariateChoroplethMap extends MapInstance {
     noDataFillStyle(): string
     noDataFillStyle(v: string): this
 
-    ternarySettings(): any
-    ternarySettings(v: any): this
+    ternarySettings(): TernarySettings
+    ternarySettings(v: Partial<TernarySettings>): this
 }

package/build/types/map-types/choropleth/map-choropleth-bivariate.d.ts

@@ -1,4 +1,4 @@
-import type { MapInstance } from '../../core/MapInstance'
-
-/** Creates a bivariate choropleth map instance */
-export function map(config?: any): MapInstance
+import type { MapInstance } from '../../core/MapInstance'
+
+/** Creates a bivariate choropleth map instance */
+export function map(config?: any): MapInstance

package/build/types/map-types/choropleth/map-choropleth-trivariate.d.ts

@@ -1,4 +1,4 @@
-import type { MapInstance } from '../../core/MapInstance'
-
-/** Creates a trivariate choropleth map instance */
-export function map(config?: any): MapInstance
+import type { MapInstance } from '../../core/MapInstance'
+
+/** Creates a trivariate choropleth map instance */
+export function map(config?: any): MapInstance

package/build/types/map-types/choropleth/map-value-by-alpha.d.ts

@@ -1,4 +1,4 @@
-import type { MapInstance } from '../../core/MapInstance'
-
-/** Creates a value-by-alpha map instance */
-export function map(config?: any): MapInstance
+import type { MapInstance } from '../../core/MapInstance'
+
+/** Creates a value-by-alpha map instance */
+export function map(config?: any): MapInstance

package/build/types/map-types/composition/CompositionStatConfig.d.ts

@@ -1,8 +1,24 @@
 /**
  * Statistical configuration for composition maps (pie, bar, waffle, stripe).
+ *
+ * Either `eurostatDatasetCode` + `categoryParameter` (Eurostat API path)
+ * or `customData` (custom data path) must be provided.
  */
-export interface CompositionStatConfig {
-    /** Eurostat dataset code. */
+export interface CompositionStatConfig<TCustomData = Record<string, Record<string, number>>> {
+    /**
+     * Custom data keyed by region ID then category code.
+     * Use instead of `eurostatDatasetCode` when supplying data directly.
+     * When `customData` is set, `eurostatDatasetCode` and `categoryParameter`
+     * are not required.
+     * @example
+     * customData: {
+     *   ES: { cat1: 2, cat2: 3, cat3: 5 },
+     *   DE: { cat1: 4, cat2: 1, cat3: 6 },
+     * }
+     */
+    customData?: TCustomData
+
+    /** Eurostat dataset code. Required when not using `customData`. */
     eurostatDatasetCode?: string
     /** Filters. */
     filters?: Record<string, any>
@@ -10,7 +26,7 @@ export interface CompositionStatConfig {
     unitText?: string
     transform?: (value: number) => number
 
-    /** Category parameter. */
+    /** Category parameter. Required when not using `customData`. */
     categoryParameter?: string
     /** Category codes. */
     categoryCodes?: string[]

package/build/types/map-types/composition/coxcomb/CoxcombStatConfig.d.ts

@@ -3,14 +3,11 @@ import { CompositionStatConfig } from '../CompositionStatConfig'
 /**
  * Statistical configuration for coxcomb maps.
  */
-export interface CoxcombStatConfig extends CompositionStatConfig {
+export interface CoxcombStatConfig extends CompositionStatConfig<Record<string, Record<string, Record<string, number>>>> {
     /** Eurostat path. */
     timeParameter?: string
     /** Times. */
     times: string[]
     /** Time labels. */
     timeLabels?: string[]
-
-    /** Custom data path. */
-    customData?: Record<string, Record<string, Record<string, number>>>
 }

package/build/types/map-types/composition/map-spark.d.ts

@@ -1,5 +1,5 @@
-import type { MapInstance } from '../../core/MapInstance'
-import type { CompositionMapConfig } from './composition-map'
-
-/** Creates a sparkline map instance */
-export function map(config?: CompositionMapConfig): MapInstance
+import type { MapInstance } from '../../core/MapInstance'
+import type { CompositionMapConfig } from './composition-map'
+
+/** Creates a sparkline map instance */
+export function map(config?: CompositionMapConfig): MapInstance

package/build/types/map-types/composition/map-stripe.d.ts

@@ -1,5 +1,5 @@
-import type { MapInstance } from '../../core/MapInstance'
-import type { CompositionMapConfig } from './composition-map'
-
-/** Creates a stripe composition map instance */
-export function map(config?: CompositionMapConfig): MapInstance
+import type { MapInstance } from '../../core/MapInstance'
+import type { CompositionMapConfig } from './composition-map'
+
+/** Creates a stripe composition map instance */
+export function map(config?: CompositionMapConfig): MapInstance

package/build/types/map-types/composition/pie/PieMap.d.ts

@@ -21,32 +21,51 @@ export interface PieMap extends MapInstance {
     noDataFillStyle(): string
     noDataFillStyle(v: string): this
 
-    pieMaxRadius(): number
-    pieMaxRadius(v: number): this
-
-    pieMinRadius(): number
-    pieMinRadius(v: number): this
-
-    pieChartInnerRadius(): number
-    pieChartInnerRadius(v: number): this
-
-    pieOtherColor(): string
-    pieOtherColor(v: string): this
-
-    pieOtherText(): string
-    pieOtherText(v: string): this
-
-    pieStrokeFill(): string
-    pieStrokeFill(v: string): this
-
-    pieStrokeWidth(): number
-    pieStrokeWidth(v: number): this
+    pieSettings(): {
+        innerRadius?: number
+    }
+    pieSettings(v: { innerRadius?: number }): this
+
+    compositionSettings(): {
+        type?: 'flag' | 'pie' | 'ring' | 'segment' | 'radar' | 'agepyramid' | 'halftone'
+        /** Radar wedge radius mode: share within symbol (default) or absolute values across map. */
+        radarValueMode?: 'share' | 'absolute'
+        minSize?: number
+        maxSize?: number
+        strokeFill?: string
+        strokeWidth?: number
+        reverseOrder?: boolean
+        /** Category code order for composition rendering. */
+        order?: string[]
+        stripesOrientation?: number
+        offsetAngle?: number
+        agePyramidHeightFactor?: number
+        otherColor?: string
+        otherText?: string
+    }
+    compositionSettings(v: {
+        type?: 'flag' | 'pie' | 'ring' | 'segment' | 'radar' | 'agepyramid' | 'halftone'
+        /** Radar wedge radius mode: share within symbol (default) or absolute values across map. */
+        radarValueMode?: 'share' | 'absolute'
+        minSize?: number
+        maxSize?: number
+        strokeFill?: string
+        strokeWidth?: number
+        reverseOrder?: boolean
+        /** Category code order for composition rendering. */
+        order?: string[]
+        stripesOrientation?: number
+        offsetAngle?: number
+        agePyramidHeightFactor?: number
+        otherColor?: string
+        otherText?: string
+    }): this
 
     dorling(): boolean
     dorling(v: boolean): this
 
-    pieTotalCode(): string | undefined
-    pieTotalCode(v: string | undefined): this
+    compositionTotalCode(): string | undefined
+    compositionTotalCode(v: string | undefined): this
 
     statCodes(): string[] | undefined
     statCodes(v: string[] | undefined): this