@gooddata/sdk-ui-geo 11.65.0-alpha.0 → 11.65.0-alpha.10

package/esm/core/geoChart/GeoChartOptionsWrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeoChartOptionsWrapper.d.ts","sourceRoot":"","sources":["../../../src/core/geoChart/GeoChartOptionsWrapper.tsx"],"names":[],"mappings":"AAgBA,OAAO,EACH,KAAK,cAAc,EACnB,KAAK,0BAA0B,EAElC,MAAM,8BAA8B,CAAC;AAMtC,OAAO,EAA6C,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AA8CzG,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,mBAAmB,kDAsEhE;AAED,wBAAgB,yBAAyB,CACrC,aAAa,EAAE,cAAc,EAC7B,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,GACzB,0BAA0B,EAAE,CAgB9B"}
+{"version":3,"file":"GeoChartOptionsWrapper.d.ts","sourceRoot":"","sources":["../../../src/core/geoChart/GeoChartOptionsWrapper.tsx"],"names":[],"mappings":"AAmBA,OAAO,EACH,KAAK,cAAc,EACnB,KAAK,0BAA0B,EAElC,MAAM,8BAA8B,CAAC;AAMtC,OAAO,EAA6C,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AA8CzG,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,mBAAmB,kDA6EhE;AAED,wBAAgB,yBAAyB,CACrC,aAAa,EAAE,cAAc,EAC7B,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,GACzB,0BAA0B,EAAE,CAmB9B"}

package/esm/core/geoChart/GeoChartOptionsWrapper.js

@@ -3,7 +3,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useCallback, useMemo } from "react";
 import { invariant } from "ts-invariant";
 import { isResultAttributeHeader } from "@gooddata/sdk-model";
-import { DataViewFacade, ErrorComponent as DefaultErrorComponent, LoadingComponent as DefaultLoadingComponent, ErrorCodes, VisualizationTypes, newErrorMapping, } from "@gooddata/sdk-ui";
+import { DataViewFacade, ErrorComponent as DefaultErrorComponent, LoadingComponent as DefaultLoadingComponent, ErrorCodes, VisualizationTypes, createNumberFormatter, formatAttributeHeaderValues, getAttributeHeaderItemName, newErrorMapping, } from "@gooddata/sdk-ui";
 import { getValidColorPalette, } from "@gooddata/sdk-ui-vis-commons";
 import { getColorStrategy } from "./colorStrategy/geoChart.js";
 import { DEFAULT_DATA_POINTS_LIMIT } from "./constants/geoChart.js";
@@ -46,13 +46,18 @@ export function GeoChartOptionsWrapper(props) {
     const nullHeaderString = useMemo(() => props.intl.formatMessage({ id: "visualization.emptyValue" }), // TODO: RAIL-4360 replace by proper null header string id when available
     [props.intl]);
     const errorMap = useMemo(() => newErrorMapping(props.intl), [props.intl]);
+    // element values of attributes with a number format get their formatted name once, here, so the
+    // location, segment, tooltip and legend texts built below all show it
+    const { dataView: rawDataView, config } = props;
+    const formattedDataView = useMemo(() => rawDataView &&
+        formatAttributeHeaderValues(rawDataView, createNumberFormatter(config?.separators)), [rawDataView, config?.separators]);
     const getCategoryLegendItems = useCallback((colorStrategy) => {
         return createCategoryLegendItems(colorStrategy, emptyHeaderString, nullHeaderString);
     }, [emptyHeaderString, nullHeaderString]);
     const buildGeoChartOptions = useCallback((geoData, props) => {
         const { segment } = geoData;
-        const { config: { colors = [], colorPalette = [], colorMapping = [] } = {}, dataView } = props;
-        const dv = DataViewFacade.for(dataView);
+        const { config: { colors = [], colorPalette = [], colorMapping = [] } = {} } = props;
+        const dv = DataViewFacade.for(formattedDataView);
         const palette = getValidColorPalette(colors, colorPalette);
         const colorStrategy = getColorStrategy(palette, colorMapping, geoData, dv);
         const categoryItems = segment ? getCategoryLegendItems(colorStrategy) : [];
@@ -62,10 +67,9 @@ export function GeoChartOptionsWrapper(props) {
             colorStrategy,
             colorPalette: palette,
         };
-    }, [getCategoryLegendItems]);
+    }, [getCategoryLegendItems, formattedDataView]);
     const renderVisualization = useCallback(() => {
-        const { dataView } = props;
-        const dv = DataViewFacade.for(dataView);
+        const dv = DataViewFacade.for(formattedDataView);
         const geoData = getGeoData(dv, emptyHeaderString, nullHeaderString);
         const validationResult = validateGeoData(geoData, props);
         if (validationResult?.isDataTooLarge) {
@@ -74,7 +78,7 @@ export function GeoChartOptionsWrapper(props) {
         }
         const geoChartOptions = buildGeoChartOptions(geoData, props);
         return _jsx(GeoChartInner, { ...props, geoChartOptions: geoChartOptions });
-    }, [buildGeoChartOptions, emptyHeaderString, nullHeaderString, props]);
+    }, [formattedDataView, buildGeoChartOptions, emptyHeaderString, nullHeaderString, props]);
     const { dataView, error, isLoading } = props;
     const ErrorComponent = resolveOptionalComponent(props.ErrorComponent, DefaultErrorComponent);
     const LoadingComponent = resolveOptionalComponent(props.LoadingComponent, DefaultLoadingComponent);
@@ -91,7 +95,10 @@ export function createCategoryLegendItems(colorStrategy, emptyHeaderString, null
     const colorAssignment = colorStrategy.getColorAssignment();
     return colorAssignment.map((item, legendIndex) => {
         const { name, uri } = isResultAttributeHeader(item.headerItem)
-            ? item.headerItem.attributeHeaderItem
+            ? {
+                name: getAttributeHeaderItemName(item.headerItem.attributeHeaderItem),
+                uri: item.headerItem.attributeHeaderItem.uri,
+            }
             : { name: emptyHeaderString, uri: emptyHeaderString };
         const color = colorStrategy.getColorByIndex(legendIndex);
         return {

package/esm/core/geoChart/geoChartColor.d.ts

@@ -6,7 +6,7 @@ type ColorPaletteMapping = {
 };
 export declare function getColorPaletteMapping(colorStrategy: IColorStrategy): ColorPaletteMapping;
 /**
- * Return RGB border and background colors base on color and segment values
+ * Return RGB border and background colors base on color and segment element URIs
  *
  * Example:
  * ```
@@ -16,7 +16,7 @@ export declare function getColorPaletteMapping(colorStrategy: IColorStrategy): C
  *  }]
  * ```
  */
-export declare function getPushpinColors(colorValues: Array<number | null>, segmentValues: string[] | undefined, colorStrategy: IColorStrategy): IPushpinColor[];
+export declare function getPushpinColors(colorValues: Array<number | null>, segmentValues: Array<string | null> | undefined, colorStrategy: IColorStrategy): IPushpinColor[];
 export declare function generateLegendColorData(colorSeries: number[], colorString: string): IColorLegendItem[];
 export {};
 //# sourceMappingURL=geoChartColor.d.ts.map

package/esm/core/geoChart/geoChartColor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geoChartColor.d.ts","sourceRoot":"","sources":["../../../src/core/geoChart/geoChartColor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE1F,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAavD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAiB7F;AAED,KAAK,mBAAmB,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAC;AAE5D,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,cAAc,GAAG,mBAAmB,CAoBzF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAC5B,WAAW,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,EACjC,aAAa,EAAE,MAAM,EAAE,YAAK,EAC5B,aAAa,EAAE,cAAc,GAC9B,aAAa,EAAE,CAkDjB;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,gBAAgB,EAAE,CA0BtG"}
+{"version":3,"file":"geoChartColor.d.ts","sourceRoot":"","sources":["../../../src/core/geoChart/geoChartColor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE1F,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAavD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAiB7F;AAED,KAAK,mBAAmB,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAC;AAE5D,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,cAAc,GAAG,mBAAmB,CAqBzF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAC5B,WAAW,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,EACjC,aAAa,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,YAAK,EACxC,aAAa,EAAE,cAAc,GAC9B,aAAa,EAAE,CAkDjB;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,gBAAgB,EAAE,CA0BtG"}

package/esm/core/geoChart/geoChartColor.js

@@ -32,16 +32,17 @@ export function getColorPaletteMapping(colorStrategy) {
                 [DEFAULT_SEGMENT_ITEM]: colorPalette,
             };
         }
-        // color base on SegmentBy
-        const name = isResultAttributeHeader(item.headerItem)
-            ? item.headerItem.attributeHeaderItem.name
+        // color base on SegmentBy, keyed by the raw element identity: formatted names of distinct
+        // elements can be equal (e.g. two numbers rounded by the number format)
+        const key = isResultAttributeHeader(item.headerItem)
+            ? (item.headerItem.attributeHeaderItem.uri ?? DEFAULT_SEGMENT_ITEM)
             : DEFAULT_SEGMENT_ITEM;
-        result[name ?? DEFAULT_SEGMENT_ITEM] = colorPalette;
+        result[key] = colorPalette;
         return result;
     }, {});
 }
 /**
- * Return RGB border and background colors base on color and segment values
+ * Return RGB border and background colors base on color and segment element URIs
  *
  * Example:
  * ```
@@ -66,7 +67,7 @@ export function getPushpinColors(colorValues, segmentValues = [], colorStrategy)
     const colorPaletteMapping = getColorPaletteMapping(colorStrategy);
     if (!colorValues.length) {
         return segmentNames.map((name) => {
-            const palette = colorPaletteMapping[name];
+            const palette = colorPaletteMapping[name ?? DEFAULT_SEGMENT_ITEM];
             return {
                 border: DEFAULT_PUSHPIN_BORDER_COLOR_VALUE,
                 background: palette[DEFAULT_COLOR_INDEX_IN_PALETTE],

package/esm/core/geoChart/geoChartDataSource.js

@@ -26,7 +26,7 @@ function transformPushpinDataSource({ config, geoData, colorStrategy, }) {
     const colorData = color?.data ?? [];
     const sizeFormat = size?.format ?? "";
     const colorFormat = color?.format ?? "";
-    const pushpinColors = getPushpinColors(colorData, segmentData, colorStrategy);
+    const pushpinColors = getPushpinColors(colorData, segmentUris, colorStrategy);
     return locationData.reduce((result, coordinates, index) => {
         if (!coordinates || !Number.isFinite(coordinates.lat) || !Number.isFinite(coordinates.lng)) {
             return result;

package/esm/core/geoChart/helpers/geoChart/data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../../../src/core/geoChart/helpers/geoChart/data.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,oBAAoB,EAGzB,KAAK,aAAa,EAWrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAE/E,OAAO,EACH,KAAK,iBAAiB,EAEtB,KAAK,QAAQ,EAIhB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAoBvE,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,CAepE;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAexE;AAYD,wBAAgB,UAAU,CACtB,EAAE,EAAE,cAAc,EAClB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,GACzB,QAAQ,CAuEV;AAkKD,wBAAgB,mBAAmB,CAC/B,aAAa,EAAE,0BAA0B,EAAE,EAC3C,OAAO,EAAE,QAAQ,GAClB,iBAAiB,CAenB;AAUD,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAQnG;AAED,MAAM,MAAM,aAAa,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,GAAG;IAClE,KAAK,EAAE,aAAa,EAAE,CAAC;CAC1B,CAAC;AACF,MAAM,WAAW,yBAAyB;IACtC,iBAAiB,EAAE,aAAa,CAAC;IACjC,kBAAkB,EAAE,aAAa,GAAG,SAAS,CAAC;IAC9C,oBAAoB,EAAE,aAAa,GAAG,SAAS,CAAC;CACnD;AAED,wBAAgB,4BAA4B,CACxC,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,QAAQ,GAClB,yBAAyB,CAkC3B"}
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../../../src/core/geoChart/helpers/geoChart/data.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,oBAAoB,EAGzB,KAAK,aAAa,EAWrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAe,KAAK,cAAc,EAA8B,MAAM,kBAAkB,CAAC;AAChG,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAE/E,OAAO,EACH,KAAK,iBAAiB,EAEtB,KAAK,QAAQ,EAIhB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAoBvE,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,CAepE;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAexE;AAYD,wBAAgB,UAAU,CACtB,EAAE,EAAE,cAAc,EAClB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,GACzB,QAAQ,CAwEV;AA2KD,wBAAgB,mBAAmB,CAC/B,aAAa,EAAE,0BAA0B,EAAE,EAC3C,OAAO,EAAE,QAAQ,GAClB,iBAAiB,CAenB;AAUD,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAQnG;AAED,MAAM,MAAM,aAAa,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,GAAG;IAClE,KAAK,EAAE,aAAa,EAAE,CAAC;CAC1B,CAAC;AACF,MAAM,WAAW,yBAAyB;IACtC,iBAAiB,EAAE,aAAa,CAAC;IACjC,kBAAkB,EAAE,aAAa,GAAG,SAAS,CAAC;IAC9C,oBAAoB,EAAE,aAAa,GAAG,SAAS,CAAC;CACnD;AAED,wBAAgB,4BAA4B,CACxC,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,QAAQ,GAClB,yBAAyB,CAkC3B"}

package/esm/core/geoChart/helpers/geoChart/data.js

@@ -1,6 +1,6 @@
 // (C) 2020-2026 GoodData Corporation
 import { attributeDisplayFormRef, attributeLocalId, isAttribute, isIdentifierRef, isResultAttributeHeader, measureItem, measureLocalId, resultHeaderName, } from "@gooddata/sdk-model";
-import { BucketNames } from "@gooddata/sdk-ui";
+import { BucketNames, getAttributeHeaderItemName } from "@gooddata/sdk-ui";
 import { dataValueAsFloat, getFormatFromExecutionResponse, getGeoAttributeHeaderItems, getMinMax, } from "./common.js";
 export function getLocation(latlng) {
     if (!latlng) {
@@ -58,7 +58,7 @@ export function getGeoData(dv, emptyHeaderString, nullHeaderString) {
         geoData[BucketNames.SEGMENT].uris = uris;
     }
     if (tooltipTextIndex !== undefined) {
-        geoData[BucketNames.TOOLTIP_TEXT].data = getAttributeData(attributeHeaderItems, tooltipTextIndex, emptyHeaderString, nullHeaderString);
+        geoData[BucketNames.TOOLTIP_TEXT].data = getAttributeData(attributeHeaderItems, tooltipTextIndex, emptyHeaderString, nullHeaderString, true);
     }
     if (sizeIndex !== undefined) {
         geoData[BucketNames.SIZE].data = getMeasureData(dv, sizeIndex);
@@ -74,7 +74,8 @@ function getSegmentDataAndUris(attributeHeaderItems, dataIndex, nullHeaderString
     const headerItems = attributeHeaderItems[dataIndex];
     return headerItems.reduce((result, headerItem) => {
         if (headerItem && isResultAttributeHeader(headerItem)) {
-            const { uri, name } = headerItem.attributeHeaderItem;
+            const { uri } = headerItem.attributeHeaderItem;
+            const name = getAttributeHeaderItemName(headerItem.attributeHeaderItem);
             return { uris: [...result.uris, uri], data: [...result.data, name ?? nullHeaderString] };
         }
         return result;
@@ -85,10 +86,16 @@ function getMeasureData(dv, dataIndex) {
     const measureValues = twoDimData[dataIndex];
     return measureValues.map(dataValueAsFloat);
 }
-function getAttributeData(attributeHeaderItems, dataIndex, emptyHeaderString, nullHeaderString) {
+/**
+ * @param useFormattedName - read the formatted element value (for values shown to the user); pass false
+ *  for values that get parsed, e.g. coordinates
+ */
+function getAttributeData(attributeHeaderItems, dataIndex, emptyHeaderString, nullHeaderString, useFormattedName = false) {
     const headerItems = attributeHeaderItems[dataIndex];
     return headerItems.map((i) => {
-        const name = resultHeaderName(i);
+        const name = useFormattedName && isResultAttributeHeader(i)
+            ? getAttributeHeaderItemName(i.attributeHeaderItem)
+            : resultHeaderName(i);
         if (name) {
             return name;
         }

package/esm/core/geoChart/helpers/geoChart/drilling.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drilling.d.ts","sourceRoot":"","sources":["../../../../../src/core/geoChart/helpers/geoChart/drilling.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,KAAK,cAAc,EACnB,KAAK,YAAY,EAGjB,KAAK,gBAAgB,EAIxB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,KAAK,QAAQ,EAAuB,MAAM,yBAAyB,CAAC;AA8E7E,wBAAgB,0BAA0B,CACtC,cAAc,EAAE,gBAAgB,EAAE,EAClC,WAAW,EAAE,YAAY,EACzB,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,QAAQ,EACjB,aAAa,EAAE,OAAO,CAAC,iBAAiB,EACxC,cAAc,EAAE,MAAM,EAAE,EACxB,MAAM,EAAE,WAAW,EACnB,UAAU,CAAC,EAAE,UAAU,GACxB,IAAI,CAmDN"}
+{"version":3,"file":"drilling.d.ts","sourceRoot":"","sources":["../../../../../src/core/geoChart/helpers/geoChart/drilling.ts"],"names":[],"mappings":"AASA,OAAO,EACH,KAAK,cAAc,EACnB,KAAK,YAAY,EAGjB,KAAK,gBAAgB,EAIxB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,KAAK,QAAQ,EAAuB,MAAM,yBAAyB,CAAC;AA4F7E,wBAAgB,0BAA0B,CACtC,cAAc,EAAE,gBAAgB,EAAE,EAClC,WAAW,EAAE,YAAY,EACzB,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,QAAQ,EACjB,aAAa,EAAE,OAAO,CAAC,iBAAiB,EACxC,cAAc,EAAE,MAAM,EAAE,EACxB,MAAM,EAAE,WAAW,EACnB,UAAU,CAAC,EAAE,UAAU,GACxB,IAAI,CAoDN"}

package/esm/core/geoChart/helpers/geoChart/drilling.js

@@ -1,5 +1,6 @@
 // (C) 2020-2026 GoodData Corporation
 import { omit, without } from "lodash-es";
+import { isResultAttributeHeader, } from "@gooddata/sdk-model";
 import { getDrillIntersection, isSomeHeaderPredicateMatched, } from "@gooddata/sdk-ui";
 import { findGeoAttributesInDimension, parseGeoProperties } from "./data.js";
 function getDrillIntersectionForGeoChart(drillableItems, dv, geoData, locationIndex) {
@@ -44,6 +45,15 @@ function getAttributeHeader(attribute, dataIndex) {
         attributeHeaderItem: undefined,
     };
 }
+/**
+ * The drill event carries the raw element value, while the pin properties hold the value shown in the
+ * tooltip, which can be number-formatted. Empty and null elements keep the placeholder from the properties.
+ */
+function getRawDrillValue(attribute, dataIndex, shownValue) {
+    const item = attribute?.items[dataIndex];
+    const rawValue = item && isResultAttributeHeader(item) ? item.attributeHeaderItem.name : undefined;
+    return rawValue || shownValue;
+}
 export function handleGeoPushpinDrillEvent(drillableItems, drillConfig, dv, geoData, pinProperties, pinCoordinates, target, clickEvent) {
     const { locationIndex } = pinProperties || {};
     const drillIntersection = getDrillIntersectionForGeoChart(drillableItems, dv, geoData, locationIndex);
@@ -53,14 +63,15 @@ export function handleGeoPushpinDrillEvent(drillableItems, drillConfig, dv, geoD
     const { onDrill } = drillConfig;
     const [lng, lat] = pinCoordinates;
     const { locationName: { value: locationNameValue }, color: { value: colorValue }, segment: { value: segmentByValue }, size: { value: sizeValue }, } = parseGeoProperties(pinProperties) || {};
+    const { segmentByAttribute, tooltipTextAttribute } = findGeoAttributesInDimension(dv, geoData);
     const drillContext = {
         element: "pushpin",
         intersection: drillIntersection,
         type: "pushpin",
         color: colorValue,
         location: { lat, lng },
-        locationName: locationNameValue,
-        segmentBy: segmentByValue,
+        locationName: getRawDrillValue(tooltipTextAttribute, locationIndex, locationNameValue),
+        segmentBy: getRawDrillValue(segmentByAttribute, locationIndex, segmentByValue),
         size: sizeValue,
     };
     const drillEventExtended = {

package/esm/next/hooks/layers/useLayersPrepare.d.ts

@@ -2,7 +2,7 @@ import type { IntlShape } from "react-intl";
 import type { IAnalyticalBackend } from "@gooddata/sdk-backend-spi";
 import type { IExecutionConfig } from "@gooddata/sdk-model";
 import { type DataViewFacade, type GoodDataSdkError, type UseCancelablePromiseStatus } from "@gooddata/sdk-ui";
-import type { IGeoLayerOutput } from "../../layers/registry/adapterTypes.js";
+import type { IGeoAdapterContext, IGeoLayerOutput } from "../../layers/registry/adapterTypes.js";
 import type { IGeoChartConfig } from "../../types/config/unified.js";
 import type { ILayerExecutionRecord } from "../../types/props/geoChart/internal.js";
 /**
@@ -61,6 +61,12 @@ export interface ILayersPrepareContext {
     execConfig?: IExecutionConfig;
     intl: IntlShape;
 }
+/**
+ * Prepares a single layer using its adapter.
+ *
+ * @internal
+ */
+export declare function prepareSingleLayer(layerExecution: ILayerExecutionRecord, layerDataViews: Map<string, DataViewFacade>, adapterContext: IGeoAdapterContext): Promise<ILayerPreparedData>;
 /**
  * Hook that prepares all layer outputs in parallel once dataViews are available.
  *

package/esm/next/hooks/layers/useLayersPrepare.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLayersPrepare.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayersPrepare.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EACH,KAAK,cAAc,EACnB,KAAK,gBAAgB,EAErB,KAAK,0BAA0B,EAElC,MAAM,kBAAkB,CAAC;AAG1B,OAAO,KAAK,EAAsB,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAMpF;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IAC/B;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,QAAQ,EAAE,cAAc,CAAC;IAEzB;;;OAGG;IACH,MAAM,EAAE,eAAe,GAAG,IAAI,CAAC;CAClC;AAOD;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACjC;;;OAGG;IACH,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAE9C;;;;;;OAMG;IACH,MAAM,EAAE,0BAA0B,CAAC;IAEnC;;OAEG;IACH,KAAK,CAAC,EAAE,gBAAgB,CAAC;CAC5B;AAED;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IAClC,OAAO,EAAE,kBAAkB,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,IAAI,EAAE,SAAS,CAAC;CACnB;AAuDD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAC5B,eAAe,EAAE,qBAAqB,EAAE,EACxC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,EAC3C,UAAU,EAAE,0BAA0B,EACtC,OAAO,EAAE,qBAAqB,GAC/B,oBAAoB,CAiFtB"}
+{"version":3,"file":"useLayersPrepare.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayersPrepare.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EACH,KAAK,cAAc,EACnB,KAAK,gBAAgB,EAErB,KAAK,0BAA0B,EAElC,MAAM,kBAAkB,CAAC;AAI1B,OAAO,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAMpF;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IAC/B;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,QAAQ,EAAE,cAAc,CAAC;IAEzB;;;OAGG;IACH,MAAM,EAAE,eAAe,GAAG,IAAI,CAAC;CAClC;AAOD;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACjC;;;OAGG;IACH,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAE9C;;;;;;OAMG;IACH,MAAM,EAAE,0BAA0B,CAAC;IAEnC;;OAEG;IACH,KAAK,CAAC,EAAE,gBAAgB,CAAC;CAC5B;AAED;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IAClC,OAAO,EAAE,kBAAkB,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,IAAI,EAAE,SAAS,CAAC;CACnB;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACpC,cAAc,EAAE,qBAAqB,EACrC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,EAC3C,cAAc,EAAE,kBAAkB,GACnC,OAAO,CAAC,kBAAkB,CAAC,CAiB7B;AAgCD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAC5B,eAAe,EAAE,qBAAqB,EAAE,EACxC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,EAC3C,UAAU,EAAE,0BAA0B,EACtC,OAAO,EAAE,qBAAqB,GAC/B,oBAAoB,CA0FtB"}

package/esm/next/hooks/layers/useLayersPrepare.js

@@ -1,6 +1,7 @@
 // (C) 2025-2026 GoodData Corporation
 import { useCallback, useMemo } from "react";
 import { UnexpectedSdkError, useCancelablePromise, } from "@gooddata/sdk-ui";
+import { formatAttributeValues } from "../../layers/common/formatAttributeValues.js";
 import { getLayerAdapter } from "../../layers/registry/adapterRegistry.js";
 import { resolveLayerColorConfig } from "../../utils/color/resolveLayerColorConfig.js";
 import { createDataViewsFingerprint, createLayersStructureFingerprint } from "../../utils/fingerprint.js";
@@ -10,12 +11,17 @@ import { processSettledLayerResults } from "./processSettledLayerResults.js";
  *
  * @internal
  */
-async function prepareSingleLayer(layerExecution, layerDataViews, adapterContext) {
+export async function prepareSingleLayer(layerExecution, layerDataViews, adapterContext) {
     const { layerId, layer } = layerExecution;
-    const dataView = layerDataViews.get(layerId);
-    if (!dataView) {
+    const rawDataView = layerDataViews.get(layerId);
+    if (!rawDataView) {
         throw new UnexpectedSdkError(`No dataView found for layer ${layerId}`);
     }
+    // Element values of attributes with a number format get their formatted name here, once, and the
+    // formatted view is the one every later step reads (geo data, color strategy, legend, pushed color
+    // assignments, map sync and click handling), so all of them display the same formatted text. Segments
+    // are still keyed, sorted and drilled by their raw name and uri, which the formatted view keeps.
+    const dataView = formatAttributeValues(rawDataView, adapterContext);
     const adapter = getLayerAdapter(layer);
     const output = await adapter.prepareLayer(layer, dataView, adapterContext);
     return { layerId, dataView, output };
@@ -84,7 +90,16 @@ export function useLayersPrepare(layerExecutions, layerDataViews, dataStatus, co
         promise: dataStatus === "success" && layerExecutionsWithDataViews.length > 0
             ? () => prepareAllLayers(layerExecutionsWithDataViews, layerDataViews, createAdapterContext)
             : undefined,
-    }, [backend, workspace, dataViewsFingerprint, layersStructureFingerprint, intl]);
+    }, [
+        backend,
+        workspace,
+        dataViewsFingerprint,
+        layersStructureFingerprint,
+        intl,
+        // element values are number-formatted with the separators while preparing
+        config?.separators?.thousand,
+        config?.separators?.decimal,
+    ]);
     const layerOutputs = useMemo(() => {
         const map = new Map();
         if (result) {

package/esm/next/hooks/pushData/useGeoPushData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useGeoPushData.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/pushData/useGeoPushData.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiC,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,EAEH,KAAK,gBAAgB,EACrB,KAAK,SAAS,EAGjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAKnE,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAKhE,UAAU,cAAc;IACpB,gBAAgB,EAAE,iBAAiB,CAAC;IACpC,sBAAsB,CAAC,EAAE,OAAO,CAAC;CACpC;AAED;;;;GAIG;AACH,UAAU,cAAc;IACpB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;CACxC;AAED,UAAU,qBAAqB,CAAC,MAAM,SAAS,cAAc,EAAE,cAAc,SAAS,cAAc;IAChG,QAAQ,EAAE,MAAM,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,cAAc,CAAC;IACvC,YAAY,EAAE,YAAY,CAAC;CAC9B;AAOD,wBAAgB,kCAAkC,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,EAAE,CAgB3G;AA+BD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,SAAS,cAAc,EAAE,cAAc,SAAS,cAAc,EAC/F,aAAa,EAAE,cAAc,GAAG,IAAI,EACpC,YAAY,EAAE,aAAa,EAC3B,EAAE,QAAQ,EAAE,gBAAgB,EAAE,YAAY,EAAE,EAAE,qBAAqB,CAAC,MAAM,EAAE,cAAc,CAAC,GAC5F,IAAI,CA2EN"}
+{"version":3,"file":"useGeoPushData.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/pushData/useGeoPushData.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiC,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,EAEH,KAAK,gBAAgB,EACrB,KAAK,SAAS,EAGjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAKnE,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAKhE,UAAU,cAAc;IACpB,gBAAgB,EAAE,iBAAiB,CAAC;IACpC,sBAAsB,CAAC,EAAE,OAAO,CAAC;CACpC;AAED;;;;GAIG;AACH,UAAU,cAAc;IACpB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;CACxC;AAED,UAAU,qBAAqB,CAAC,MAAM,SAAS,cAAc,EAAE,cAAc,SAAS,cAAc;IAChG,QAAQ,EAAE,MAAM,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,cAAc,CAAC;IACvC,YAAY,EAAE,YAAY,CAAC;CAC9B;AAOD,wBAAgB,kCAAkC,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,EAAE,CAiB3G;AA+BD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,SAAS,cAAc,EAAE,cAAc,SAAS,cAAc,EAC/F,aAAa,EAAE,cAAc,GAAG,IAAI,EACpC,YAAY,EAAE,aAAa,EAC3B,EAAE,QAAQ,EAAE,gBAAgB,EAAE,YAAY,EAAE,EAAE,qBAAqB,CAAC,MAAM,EAAE,cAAc,CAAC,GAC5F,IAAI,CA2EN"}

package/esm/next/hooks/pushData/useGeoPushData.js

@@ -15,6 +15,7 @@ export function sortColorAssignmentsAlphabetically(colorAssignments) {
         .map((assignment, index) => ({
         assignment,
         index,
+        // sorted by the raw element value, number-formatted values do not sort as numbers
         name: getMappingHeaderName(assignment.headerItem) ?? "",
     }))
         .sort((left, right) => {

package/esm/next/layers/area/coloring/palette.d.ts

@@ -18,11 +18,11 @@ export interface IAreaAreaColor {
  * If segments exist, uses segment-based coloring. Otherwise, uses color measure values for gradients.
  *
  * @param colorData - Array of color measure values
- * @param segmentData - Array of segment values
+ * @param segmentUris - Array of segment element URIs
  * @param colorStrategy - Color strategy to use
  * @returns Array of area colors matching the data
  *
  * @internal
  */
-export declare function getAreaAreaColors(colorData: number[], segmentData: string[], colorStrategy: IColorStrategy | null): IAreaAreaColor[];
+export declare function getAreaAreaColors(colorData: number[], segmentUris: string[], colorStrategy: IColorStrategy | null): IAreaAreaColor[];
 //# sourceMappingURL=palette.d.ts.map

package/esm/next/layers/area/coloring/palette.js

@@ -17,19 +17,19 @@ function mapPushpinColorsToAreas(pushpinColors) {
  * If segments exist, uses segment-based coloring. Otherwise, uses color measure values for gradients.
  *
  * @param colorData - Array of color measure values
- * @param segmentData - Array of segment values
+ * @param segmentUris - Array of segment element URIs
  * @param colorStrategy - Color strategy to use
  * @returns Array of area colors matching the data
  *
  * @internal
  */
-export function getAreaAreaColors(colorData, segmentData, colorStrategy) {
+export function getAreaAreaColors(colorData, segmentUris, colorStrategy) {
     if (!colorStrategy) {
         return [{ fill: DEFAULT_AREA_FILL_COLOR }];
     }
-    if (segmentData.length > 0) {
+    if (segmentUris.length > 0) {
         // Segment-based coloring should provide a stable color per category.
-        const pushpinColors = getPushpinColors([], segmentData, colorStrategy);
+        const pushpinColors = getPushpinColors([], segmentUris, colorStrategy);
         return mapPushpinColorsToAreas(pushpinColors);
     }
     if (colorData.length > 0) {

package/esm/next/layers/area/data/transformation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transformation.d.ts","sourceRoot":"","sources":["../../../../../src/next/layers/area/data/transformation.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,oBAAoB,EAGzB,KAAK,aAAa,EAKrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGpE,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAC/F,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,gCAAgC,CAAC;AAqRtF;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC7B,EAAE,EAAE,cAAc,EAClB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,GACzB,YAAY,CAmCd;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACnC,aAAa,EAAE,cAAc,EAAE,EAC/B,OAAO,EAAE,YAAY,GACtB,iBAAiB,CAWnB;AAED;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,GAAG;IACvE,KAAK,EAAE,aAAa,EAAE,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACvC,aAAa,EAAE,kBAAkB,CAAC;IAClC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,oBAAoB,EAAE,kBAAkB,GAAG,SAAS,CAAC;CACxD;AAED;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CACzC,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,YAAY,GACtB,0BAA0B,CAkC5B"}
+{"version":3,"file":"transformation.d.ts","sourceRoot":"","sources":["../../../../../src/next/layers/area/data/transformation.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,oBAAoB,EAGzB,KAAK,aAAa,EAKrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGpE,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAC/F,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,gCAAgC,CAAC;AAuRtF;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC7B,EAAE,EAAE,cAAc,EAClB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,GACzB,YAAY,CAmCd;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACnC,aAAa,EAAE,cAAc,EAAE,EAC/B,OAAO,EAAE,YAAY,GACtB,iBAAiB,CAWnB;AAED;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,GAAG;IACvE,KAAK,EAAE,aAAa,EAAE,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACvC,aAAa,EAAE,kBAAkB,CAAC;IAClC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,oBAAoB,EAAE,kBAAkB,GAAG,SAAS,CAAC;CACxD;AAED;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CACzC,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,YAAY,GACtB,0BAA0B,CAkC5B"}

package/esm/next/layers/area/data/transformation.js

@@ -110,7 +110,8 @@ function processAreaBucket(ctx) {
     if (areaIndex === undefined || !areaBucket) {
         return undefined;
     }
-    const { data, uris } = getAttributeDataAndUris(attributeHeaderItems, areaIndex, emptyHeaderString, nullHeaderString);
+    // area identifiers are matched against map features, so they keep the raw element value
+    const { data, uris } = getAttributeDataAndUris(attributeHeaderItems, areaIndex, emptyHeaderString, nullHeaderString, false);
     return {
         index: areaBucket.index,
         name: areaBucket.name,

package/esm/next/layers/area/source.js

@@ -175,9 +175,9 @@ export function applyCurrentColorsToAreaOutputSource(output, dataView, context)
     const colorStrategy = getAreaColorStrategy(colorPalette, colorMapping, output.geoData, dataView);
     const areaIdentifiers = output.geoData.area?.data ?? [];
     const areaUris = output.geoData.area?.uris ?? [];
-    const segmentData = output.geoData.segment?.data ?? [];
+    const segmentUris = (output.geoData.segment?.uris ?? []).map((uri) => uri ?? EMPTY_SEGMENT_VALUE);
     const colorData = output.geoData.color?.data ?? [];
-    const areaColors = getAreaAreaColors(colorData, segmentData, colorStrategy);
+    const areaColors = getAreaAreaColors(colorData, segmentUris, colorStrategy);
     const fillByKey = new Map();
     for (let i = 0; i < areaIdentifiers.length; i++) {
         const areaIdentifier = areaIdentifiers[i];
@@ -245,7 +245,7 @@ function createAreaFeatures({ geoData, colorStrategy, features, tooltipAttrIds,
     const segmentUris = (segment?.uris ?? []).map((uri) => uri ?? EMPTY_SEGMENT_VALUE);
     const colorData = color?.data ?? [];
     const colorFormat = color?.format ?? "";
-    const areaColors = getAreaAreaColors(colorData, segmentData, colorStrategy);
+    const areaColors = getAreaAreaColors(colorData, segmentUris, colorStrategy);
     const featureIndex = buildFeatureIndex(features);
     // Aggregate by unique area to prevent geometry duplication
     const aggregatedAreas = aggregateByUniqueArea(areaIdentifiers, areaUris, segmentData, segmentUris, colorData, tooltipTextData, tooltipTextUris, areaColors, segmentTitle);

package/esm/next/layers/common/computeLegend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"computeLegend.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/common/computeLegend.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAEpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAkBpE;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IAClC;;OAEG;IACH,SAAS,EAAE,SAAS,GAAG,MAAM,CAAC;IAE9B;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,aAAa,CACzB,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,cAAc,EAC7B,OAAO,EAAE,qBAAqB,GAC/B,gBAAgB,CA2ClB"}
+{"version":3,"file":"computeLegend.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/common/computeLegend.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAEpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AA4BpE;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IAClC;;OAEG;IACH,SAAS,EAAE,SAAS,GAAG,MAAM,CAAC;IAE9B;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,aAAa,CACzB,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,cAAc,EAC7B,OAAO,EAAE,qBAAqB,GAC/B,gBAAgB,CA6ClB"}

package/esm/next/layers/common/computeLegend.js

@@ -1,9 +1,15 @@
 // (C) 2025-2026 GoodData Corporation
 import { isResultAttributeHeader } from "@gooddata/sdk-model";
 import { compareAlphabetically, compareLexicographically } from "../../utils/alphabeticalSorting.js";
-function sortLegendItemsAlphabetically(items) {
+/**
+ * Sorts legend items by their raw element value: the displayed name can be number-formatted, and such
+ * values do not sort as numbers ("1,000" would go before "200").
+ */
+function sortLegendItemsAlphabetically(items, rawNameByUri) {
+    // empty and null elements have no raw value to sort by, they sort by their displayed placeholder
+    const sortName = (item) => rawNameByUri.get(item.uri) || item.name;
     return [...items].sort((left, right) => {
-        const nameComparison = compareAlphabetically(left.name, right.name);
+        const nameComparison = compareAlphabetically(sortName(left), sortName(right));
         if (nameComparison !== 0) {
             return nameComparison;
         }
@@ -33,11 +39,13 @@ export function computeLegend(geoData, colorStrategy, options) {
     let items = [];
     if (geoData.segment) {
         const assignmentIndexByUri = new Map();
+        const rawNameByUri = new Map();
         colorStrategy.getColorAssignment().forEach((assignment, assignmentIndex) => {
             if (isResultAttributeHeader(assignment.headerItem)) {
-                const uri = assignment.headerItem.attributeHeaderItem.uri;
+                const { uri, name } = assignment.headerItem.attributeHeaderItem;
                 if (uri && !assignmentIndexByUri.has(uri)) {
                     assignmentIndexByUri.set(uri, assignmentIndex);
+                    rawNameByUri.set(uri, name);
                 }
             }
         });
@@ -59,7 +67,7 @@ export function computeLegend(geoData, colorStrategy, options) {
                 isVisible: true,
             };
         });
-        items = sortLegendItemsAlphabetically(items);
+        items = sortLegendItemsAlphabetically(items, rawNameByUri);
     }
     const available = {
         hasCategoryLegend: items.length > 0,

package/esm/next/layers/common/formatAttributeValues.d.ts

@@ -0,0 +1,8 @@
+import { DataViewFacade } from "@gooddata/sdk-ui";
+import { type IGeoAdapterContext } from "../registry/adapterTypes.js";
+/**
+ * Gives element values of attributes with a number format (numeric computed attributes) their formatted
+ * name, so that location, segment, tooltip and legend texts derived from the data view show it.
+ */
+export declare function formatAttributeValues(dataView: DataViewFacade, context: IGeoAdapterContext): DataViewFacade;
+//# sourceMappingURL=formatAttributeValues.d.ts.map

package/esm/next/layers/common/formatAttributeValues.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"formatAttributeValues.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/common/formatAttributeValues.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAsD,MAAM,kBAAkB,CAAC;AAEtG,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEtE;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,kBAAkB,GAAG,cAAc,CAI3G"}

package/esm/next/layers/common/formatAttributeValues.js

@@ -0,0 +1,9 @@
+// (C) 2026 GoodData Corporation
+import { DataViewFacade, createNumberFormatter, formatAttributeHeaderValues } from "@gooddata/sdk-ui";
+/**
+ * Gives element values of attributes with a number format (numeric computed attributes) their formatted
+ * name, so that location, segment, tooltip and legend texts derived from the data view show it.
+ */
+export function formatAttributeValues(dataView, context) {
+    return DataViewFacade.for(formatAttributeHeaderValues(dataView.dataView, createNumberFormatter(context.config?.separators)));
+}

package/esm/next/layers/common/headerItemUtils.d.ts

@@ -12,6 +12,9 @@ export declare function getSegmentDataAndUris(attributeHeaderItems: IResultHeade
  * Extracts attribute data and raw URIs from attribute header items.
  * Unlike `getSegmentDataAndUris`, this preserves raw URI values without
  * substituting `EMPTY_SEGMENT_VALUE` for nulls.
+ *
+ * @param useFormattedName - read the formatted element value (for values shown to the user); pass false
+ *  for values used to identify something, e.g. area identifiers matched against map features
  */
-export declare function getAttributeDataAndUris(attributeHeaderItems: IResultHeader[][], dataIndex: number, emptyHeaderString: string, nullHeaderString: string): ISegmentData;
+export declare function getAttributeDataAndUris(attributeHeaderItems: IResultHeader[][], dataIndex: number, emptyHeaderString: string, nullHeaderString: string, useFormattedName?: boolean): ISegmentData;
 //# sourceMappingURL=headerItemUtils.d.ts.map

package/esm/next/layers/common/headerItemUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"headerItemUtils.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/common/headerItemUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAA2B,MAAM,qBAAqB,CAAC;AAIlF,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACjC,oBAAoB,EAAE,aAAa,EAAE,EAAE,EACvC,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,GACzB,YAAY,CAiBd;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACnC,oBAAoB,EAAE,aAAa,EAAE,EAAE,EACvC,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,GACzB,YAAY,CAiBd"}
+{"version":3,"file":"headerItemUtils.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/common/headerItemUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAA2B,MAAM,qBAAqB,CAAC;AAKlF,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACjC,oBAAoB,EAAE,aAAa,EAAE,EAAE,EACvC,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,GACzB,YAAY,CAkBd;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACnC,oBAAoB,EAAE,aAAa,EAAE,EAAE,EACvC,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,UAAO,GACxB,YAAY,CAoBd"}

package/esm/next/layers/common/headerItemUtils.js

@@ -1,5 +1,6 @@
 // (C) 2025-2026 GoodData Corporation
 import { isResultAttributeHeader } from "@gooddata/sdk-model";
+import { getAttributeHeaderItemName } from "@gooddata/sdk-ui";
 import { EMPTY_SEGMENT_VALUE } from "../pushpin/constants.js";
 /**
  * Extracts segment data and URIs from attribute header items.
@@ -9,7 +10,8 @@ export function getSegmentDataAndUris(attributeHeaderItems, dataIndex, emptyHead
     const headerItems = attributeHeaderItems[dataIndex];
     return headerItems.reduce((result, headerItem) => {
         if (headerItem && isResultAttributeHeader(headerItem)) {
-            const { uri, name } = headerItem.attributeHeaderItem;
+            const { uri } = headerItem.attributeHeaderItem;
+            const name = getAttributeHeaderItemName(headerItem.attributeHeaderItem);
             const displayName = name ?? nullHeaderString;
             const finalName = name === "" ? emptyHeaderString : displayName;
             return {
@@ -24,12 +26,18 @@ export function getSegmentDataAndUris(attributeHeaderItems, dataIndex, emptyHead
  * Extracts attribute data and raw URIs from attribute header items.
  * Unlike `getSegmentDataAndUris`, this preserves raw URI values without
  * substituting `EMPTY_SEGMENT_VALUE` for nulls.
+ *
+ * @param useFormattedName - read the formatted element value (for values shown to the user); pass false
+ *  for values used to identify something, e.g. area identifiers matched against map features
  */
-export function getAttributeDataAndUris(attributeHeaderItems, dataIndex, emptyHeaderString, nullHeaderString) {
+export function getAttributeDataAndUris(attributeHeaderItems, dataIndex, emptyHeaderString, nullHeaderString, useFormattedName = true) {
     const headerItems = attributeHeaderItems[dataIndex];
     return headerItems.reduce((result, headerItem) => {
         if (headerItem && isResultAttributeHeader(headerItem)) {
-            const { uri, name } = headerItem.attributeHeaderItem;
+            const { uri } = headerItem.attributeHeaderItem;
+            const name = useFormattedName
+                ? getAttributeHeaderItemName(headerItem.attributeHeaderItem)
+                : headerItem.attributeHeaderItem.name;
             const displayName = name ?? nullHeaderString;
             const finalName = name === "" ? emptyHeaderString : displayName;
             return {

package/esm/next/layers/pushpin/coloring/palette.d.ts

@@ -42,10 +42,10 @@ type ColorPaletteMapping = {
     [itemName: string]: string[];
 };
 /**
- * Creates a mapping of segment names to color palettes
+ * Creates a mapping of segment element URIs to color palettes
  *
  * @param colorStrategy - Color strategy from visualization
- * @returns Map of segment names to color palettes
+ * @returns Map of segment element URIs to color palettes
  *
  * @internal
  */
@@ -60,7 +60,7 @@ export declare function getColorPaletteMapping(colorStrategy: IColorStrategy): C
  * - Color strategy
  *
  * @param colorValues - Array of color measure values (can be null)
- * @param segmentValues - Array of segment names
+ * @param segmentValues - Array of segment element URIs
  * @param colorStrategy - Color strategy for palette generation
  * @returns Array of pushpin color configurations
  *

package/esm/next/layers/pushpin/coloring/palette.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"palette.d.ts","sourceRoot":"","sources":["../../../../../src/next/layers/pushpin/coloring/palette.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,cAAc,EAAkD,MAAM,qBAAqB,CAAC;AAC1G,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE1F,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAuEvE;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc,EAAE,OAAO,SAAI,GAAG,MAAM,EAAE,CAOzF;AAED;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,SAAI,GAAG,MAAM,CAG5D;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAiB7F;AAED;;GAEG;AACH,KAAK,mBAAmB,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAC;AAE5D;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,cAAc,GAAG,mBAAmB,CAsBzF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAC5B,WAAW,EAAE,aAAa,CAAC,MAAM,GAAG,IAAI,CAAC,EACzC,aAAa,EAAE,MAAM,EAAE,YAAK,EAC5B,aAAa,EAAE,cAAc,GAC9B,aAAa,EAAE,CA8DjB;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAwBtG"}
+{"version":3,"file":"palette.d.ts","sourceRoot":"","sources":["../../../../../src/next/layers/pushpin/coloring/palette.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,cAAc,EAAkD,MAAM,qBAAqB,CAAC;AAC1G,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE1F,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAuEvE;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc,EAAE,OAAO,SAAI,GAAG,MAAM,EAAE,CAOzF;AAED;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,SAAI,GAAG,MAAM,CAG5D;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAiB7F;AAED;;GAEG;AACH,KAAK,mBAAmB,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAC;AAE5D;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,cAAc,GAAG,mBAAmB,CAwBzF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAC5B,WAAW,EAAE,aAAa,CAAC,MAAM,GAAG,IAAI,CAAC,EACzC,aAAa,EAAE,MAAM,EAAE,YAAK,EAC5B,aAAa,EAAE,cAAc,GAC9B,aAAa,EAAE,CA8DjB;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAwBtG"}