npm - @gooddata/sdk-ui-geo - Versions diffs - 11.58.0-alpha.1 → 11.58.0-alpha.3 - Mend

@gooddata/sdk-ui-geo 11.58.0-alpha.1 → 11.58.0-alpha.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (37) hide show

package/esm/next/layers/area/adapter.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/area/adapter.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAkBjE,OAAO,EACH,KAAK,gBAAgB,EAErB,KAAK,gBAAgB,EACxB,MAAM,6BAA6B,CAAC;~~AAkIrC~~,eAAO,MAAM,WAAW,EAAE,gBAAgB,CAAC,aAAa,EAAE,gBAAgB,CAiMzE,CAAC"}
1	+ {"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/area/adapter.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAkBjE,OAAO,EACH,KAAK,gBAAgB,EAErB,KAAK,gBAAgB,EACxB,MAAM,6BAA6B,CAAC;AAqIrC,eAAO,MAAM,WAAW,EAAE,gBAAgB,CAAC,aAAa,EAAE,gBAAgB,CAiMzE,CAAC"}

package/esm/next/layers/area/adapter.js CHANGED Viewed

@@ -82,12 +82,10 @@ function buildAreaTooltipExecution(layer, context, mainDefinition) {
     if (!customTooltip?.enabled || !customTooltip.content) {
         return null;
     }
-    // idRef-only: `buildLookupTable` keys rows by the result descriptor's
-    // identifier. A uriRef-backed display form would produce a hover key the
-    // lookup can't match — skip the whole tooltip execution rather than fetch
-    // values that won't resolve at hover time.
-    const areaAttrId = getAttributeIdRefIdentifier(layer.area);
-    if (!areaAttrId) {
+    // idRef-only: the tooltip-execution backend path cannot resolve a uriRef-backed
+    // display form, so skip the whole tooltip execution rather than fetch values
+    // that won't resolve at hover time.
+    if (!getAttributeIdRefIdentifier(layer.area)) {
         return null;
     }
     // Slice by AREA only — features are deduplicated by areaUri, so a tooltip
@@ -103,6 +101,10 @@ function buildAreaTooltipExecution(layer, context, mainDefinition) {
     if (!built) {
         return null;
     }
+    // The key is built from the execution-local identifier, not the LDM id, because an LDM id
+    // is unique only within an object type — see `buildKeySegment`. It is the same localId the
+    // tooltip execution was sliced by, so the lookup side agrees.
+    const areaAttrLocalId = slicingAttributeLocalIds[0];
     const buildFeatureKey = (properties) => {
         if (!properties) {
             return null;
@@ -111,7 +113,7 @@ function buildAreaTooltipExecution(layer, context, mainDefinition) {
         if (!areaUri) {
             return null;
         }
-        return buildKeySegment(areaAttrId, areaUri);
+        return buildKeySegment(areaAttrLocalId, areaUri);
     };
     return { execution: built, buildFeatureKey };
 }

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

	@@ -1 +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;~~AAgRtF~~;;;;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"}
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"}

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

@@ -78,6 +78,7 @@ function getAttributeBucketInfo(buckets, attributeDescriptors, bucketName) {
         name: attributeDescriptors[index].attributeHeader.formOf.name,
         displayFormId: attributeDescriptors[index].attributeHeader.identifier ??
             attributeDescriptors[index].attributeHeader.uri,
+        localIdentifier: attributeDescriptors[index].attributeHeader.localIdentifier,
     };
 }
 function getMeasureBucketInfo(buckets, measureDescriptors, bucketName) {
@@ -114,6 +115,7 @@ function processAreaBucket(ctx) {
         index: areaBucket.index,
         name: areaBucket.name,
         displayFormId: areaBucket.displayFormId,
+        localIdentifier: areaBucket.localIdentifier,
         data,
         uris,
     };
@@ -133,6 +135,7 @@ function processSegmentBucket(ctx) {
         index: segmentBucket.index,
         name: segmentBucket.name,
         displayFormId: segmentBucket.displayFormId,
+        localIdentifier: segmentBucket.localIdentifier,
         data,
         uris,
     };
@@ -152,6 +155,7 @@ function processTooltipTextBucket(ctx) {
         index: tooltipTextBucket.index,
         name: tooltipTextBucket.name,
         displayFormId: tooltipTextBucket.displayFormId,
+        localIdentifier: tooltipTextBucket.localIdentifier,
         data,
         uris,
     };

package/esm/next/layers/area/source.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"source.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/area/source.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,eAAe,EAAgB,MAAM,qBAAqB,CAAC;AACzE,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAC5F,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAGzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAMxF;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACjC,aAAa,EAAE,cAAc,CAAC;IAC9B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EAAE,YAAY,CAAC;IACtB;;OAEG;IACH,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,cAAc,CAAC,EAAE;QACb,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,OAAO,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACL;AAED,KAAK,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAC3F,MAAM,MAAM,uBAAuB,GAAG,sBAAsB,EAAE,CAAC;~~AAkN~~/D;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACjC,MAAM,EAAE,0BAA0B,EAClC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,0BAA0B,CA6B5B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oCAAoC,CAChD,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,kBAAkB,GAC5B,0BAA0B,CA0B5B;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CACtC,MAAM,EAAE,0BAA0B,EAClC,cAAc,EAAE,8BAA8B,EAAE,EAAE,GAAG,SAAS,GAC/D,0BAA0B,CAiB5B;~~AAgGD~~;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,oBAAoB,GAAG,0BAA0B,CAUtG"}
1	+ {"version":3,"file":"source.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/area/source.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,eAAe,EAAgB,MAAM,qBAAqB,CAAC;AACzE,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAC5F,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAGzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAMxF;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACjC,aAAa,EAAE,cAAc,CAAC;IAC9B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EAAE,YAAY,CAAC;IACtB;;OAEG;IACH,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,cAAc,CAAC,EAAE;QACb,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,OAAO,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACL;AAED,KAAK,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAC3F,MAAM,MAAM,uBAAuB,GAAG,sBAAsB,EAAE,CAAC;AAwN/D;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACjC,MAAM,EAAE,0BAA0B,EAClC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,0BAA0B,CA6B5B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oCAAoC,CAChD,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,kBAAkB,GAC5B,0BAA0B,CA0B5B;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CACtC,MAAM,EAAE,0BAA0B,EAClC,cAAc,EAAE,8BAA8B,EAAE,EAAE,GAAG,SAAS,GAC/D,0BAA0B,CAiB5B;AAkGD;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,oBAAoB,GAAG,0BAA0B,CAUtG"}

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

@@ -44,7 +44,7 @@ function createPlaceholderGeometry() {
     };
 }
 function buildAreaProperties(args) {
-    const { index, areaIdentifier, areaUri, areaNameTitle, tooltipValue, tooltipUri, tooltipTitle, tooltipAttrId, colorTitle, colorValue, colorFormat, colorLocalId, areaColorFill, segmentTitle, segmentValue, segmentAttrId, segmentUris, } = args;
+    const { index, areaIdentifier, areaUri, areaNameTitle, tooltipValue, tooltipUri, tooltipTitle, tooltipAttrId, tooltipAttrLocalId, colorTitle, colorValue, colorFormat, colorLocalId, areaColorFill, segmentTitle, segmentValue, segmentAttrId, segmentAttrLocalId, segmentUris, } = args;
     const properties = {
         areaId: areaIdentifier,
         areaUri,
@@ -53,6 +53,7 @@ function buildAreaProperties(args) {
             title: tooltipTitle ?? areaNameTitle,
             value: tooltipValue ?? areaIdentifier,
             attrId: tooltipAttrId,
+            attrLocalId: tooltipAttrLocalId,
             uri: tooltipUri ?? areaUri,
         },
         locationIndex: index,
@@ -74,6 +75,7 @@ function buildAreaProperties(args) {
             uri: segmentUris?.[0],
             uris: segmentUris,
             attrId: segmentAttrId,
+            attrLocalId: segmentAttrLocalId,
         };
     }
     return properties;
@@ -263,6 +265,7 @@ function createAreaFeatures({ geoData, colorStrategy, features, tooltipAttrIds,
             tooltipUri: areaData.tooltipUri,
             tooltipTitle: tooltipTextTitle,
             tooltipAttrId: tooltipText?.displayFormId ?? area.displayFormId ?? tooltipAttrIds?.locationName,
+            tooltipAttrLocalId: tooltipText?.localIdentifier ?? area.localIdentifier,
             colorTitle,
             colorValue: areaData.colorValue,
             colorFormat,
@@ -271,6 +274,7 @@ function createAreaFeatures({ geoData, colorStrategy, features, tooltipAttrIds,
             segmentTitle: areaData.segmentTitle,
             segmentValue: areaData.segmentValue,
             segmentAttrId: segment?.displayFormId ?? tooltipAttrIds?.segment,
+            segmentAttrLocalId: segment?.localIdentifier,
             segmentUris: areaData.segmentUris,
         });
         const mergedProperties = toMaplibreProperties(baseFeature?.properties, properties);

package/esm/next/layers/area/tooltip/tooltipManagement.js CHANGED Viewed

@@ -2,7 +2,7 @@
 import { buildTooltipLocalizedStrings } from "@gooddata/sdk-ui-vis-commons";
 import { buildCustomTooltipPieces, composeTooltipBody } from "../../common/customTooltipSection.js";
 import { presentTooltip } from "../../common/tooltipPlacement.js";
-import { dedupeAttributePayloadsByAttrId, formatAttributeHtml, formatMeasureHtml, getTooltipProperties, parseTooltipPayload, } from "../../common/tooltipUtils.js";
+import { dedupeAttributePayloads, formatAttributeHtml, formatMeasureHtml, getTooltipProperties, parseTooltipPayload, } from "../../common/tooltipUtils.js";
 function escapeHtml(str) {
     return str
         .replace(/&/g, "&amp;")
@@ -16,7 +16,7 @@ const tooltipFormatConfig = {
     escape: escapeHtml,
 };
 function buildAreaTooltipHtml(rawProperties, locationName, color, segment, strokeColor, separators, customConfig, referenceMaps, intl, tooltipLookup) {
-    const attributeItems = dedupeAttributePayloadsByAttrId([locationName, segment])
+    const attributeItems = dedupeAttributePayloads([locationName, segment], referenceMaps)
         .map((payload) => formatAttributeHtml(payload, tooltipFormatConfig))
         .filter((item) => item !== null);
     const measureItem = formatMeasureHtml(color, separators, tooltipFormatConfig);

package/esm/next/layers/common/customTooltipExecution.d.ts CHANGED Viewed

@@ -38,6 +38,10 @@ export declare function getAttributeLocalIdsFromBuckets(definition: IExecutionDe
  * to its identifying fields. `attrId === undefined` signals "no stable key for
  * this feature" — callers compare against the expected layer attribute id.
  *
+ * `attrLocalId` is the execution-local identifier, which is what the tooltip lookup key is
+ * built from: an LDM id is unique only within an object type, so a label and a computed
+ * attribute can share one (see `buildKeySegment`).
+ *
  * Reuses `parseTooltipPayload` so the JSON-string-or-object handling stays in
  * one place (MapLibre stringifies complex GeoJSON property values when they
  * round-trip through `queryRenderedFeatures`).
@@ -46,6 +50,7 @@ export declare function getAttributeLocalIdsFromBuckets(definition: IExecutionDe
  */
 export declare function readAttrIdentity(payload: JsonValue | undefined): {
     attrId?: string;
+    attrLocalId?: string;
     uri: string;
 };
 /**

package/esm/next/layers/common/customTooltipExecution.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"customTooltipExecution.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/common/customTooltipExecution.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,UAAU,EACf,KAAK,oBAAoB,EAM5B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAErG,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIvD;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,iBAAiB,KAAK,MAAM,GAAG,IAAI,CAAC;AAEvF;;GAEG;AACH,MAAM,WAAW,+BAA+B;IAC5C,SAAS,EAAE,iBAAiB,CAAC;IAC7B,eAAe,EAAE,eAAe,CAAC;CACpC;AAED;;;;;GAKG;AACH,MAAM,WAAW,sBAAsB;IACnC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IAC9C,eAAe,EAAE,eAAe,CAAC;CACpC;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC3C,UAAU,EAAE,oBAAoB,EAChC,WAAW,EAAE,SAAS,MAAM,EAAE,GAC/B,MAAM,EAAE,CAcV;AAED~~;;;;;;;;;;GAUG~~;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS,GAAG;~~IAAE~~,MAAM,CAAC,EAAE,MAAM,CAAC;~~IAAC~~,GAAG,EAAE,MAAM,~~CAAA~~;~~CAAE~~,~~CAUjG~~;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,UAAU,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CASjG;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,UAAU,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAYvF;AAED;;;;;;GAMG;AACH,wBAAgB,iCAAiC,CAC7C,UAAU,EAAE,oBAAoB,EAChC,UAAU,EAAE,MAAM,GACnB,MAAM,GAAG,SAAS,CAMpB"}
1	+ {"version":3,"file":"customTooltipExecution.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/common/customTooltipExecution.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,UAAU,EACf,KAAK,oBAAoB,EAM5B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAErG,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIvD;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,iBAAiB,KAAK,MAAM,GAAG,IAAI,CAAC;AAEvF;;GAEG;AACH,MAAM,WAAW,+BAA+B;IAC5C,SAAS,EAAE,iBAAiB,CAAC;IAC7B,eAAe,EAAE,eAAe,CAAC;CACpC;AAED;;;;;GAKG;AACH,MAAM,WAAW,sBAAsB;IACnC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IAC9C,eAAe,EAAE,eAAe,CAAC;CACpC;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC3C,UAAU,EAAE,oBAAoB,EAChC,WAAW,EAAE,SAAS,MAAM,EAAE,GAC/B,MAAM,EAAE,CAcV;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS,GAAG;IAC9D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;CACf,CAUA;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,UAAU,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CASjG;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,UAAU,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAYvF;AAED;;;;;;GAMG;AACH,wBAAgB,iCAAiC,CAC7C,UAAU,EAAE,oBAAoB,EAChC,UAAU,EAAE,MAAM,GACnB,MAAM,GAAG,SAAS,CAMpB"}

package/esm/next/layers/common/customTooltipExecution.js CHANGED Viewed

@@ -27,6 +27,10 @@ export function getAttributeLocalIdsFromBuckets(definition, bucketNames) {
  * to its identifying fields. `attrId === undefined` signals "no stable key for
  * this feature" — callers compare against the expected layer attribute id.
  *
+ * `attrLocalId` is the execution-local identifier, which is what the tooltip lookup key is
+ * built from: an LDM id is unique only within an object type, so a label and a computed
+ * attribute can share one (see `buildKeySegment`).
+ *
  * Reuses `parseTooltipPayload` so the JSON-string-or-object handling stays in
  * one place (MapLibre stringifies complex GeoJSON property values when they
  * round-trip through `queryRenderedFeatures`).
@@ -42,7 +46,7 @@ export function readAttrIdentity(payload) {
         return { uri: "" };
     }
     const parsed = parseTooltipPayload(payload);
-    return { attrId: parsed?.attrId, uri: parsed?.uri ?? "" };
+    return { attrId: parsed?.attrId, attrLocalId: parsed?.attrLocalId, uri: parsed?.uri ?? "" };
 }
 /**
  * URI refs return `undefined` — the tooltip-execution backend path can't

package/esm/next/layers/common/mapFacade.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { AddProtocolAction as MapLibreAddProtocolAction, CircleLayerSpecification as MapLibreCircleLayerSpecification, ExpressionSpecification as MapLibreExpressionSpecification, FillLayerSpecification as MapLibreFillLayerSpecification, FilterSpecification as MapLibreFilterSpecification, GeoJSONSourceSpecification as MapLibreGeoJSONSourceSpecification, LineLayerSpecification as MapLibreLineLayerSpecification, LngLatBoundsLike as MapLibreLngLatBoundsLike, LngLatLike as MapLibreLngLatLike, Map as MapLibreMap, MapEventType as MapLibreMapEventType, MapMouseEvent as MapLibreMapMouseEvent, MapOptions as MapLibreMapOptions, Popup as MapLibrePopup, PopupOptions as MapLibrePopupOptions, StyleSpecification as MapLibreStyleSpecification, SymbolLayerSpecification as MapLibreSymbolLayerSpecification } from "maplibre-gl";
+import type { AddProtocolAction as MapLibreAddProtocolAction, CircleLayerSpecification as MapLibreCircleLayerSpecification, ExpressionSpecification as MapLibreExpressionSpecification, FillLayerSpecification as MapLibreFillLayerSpecification, FilterSpecification as MapLibreFilterSpecification, GeoJSONSourceSpecification as MapLibreGeoJSONSourceSpecification, LineLayerSpecification as MapLibreLineLayerSpecification, LngLatBoundsLike as MapLibreLngLatBoundsLike, LngLatLike as MapLibreLngLatLike, Map as MapLibreMap, MapEventType as MapLibreMapEventType, MapMouseEvent as MapLibreMapMouseEvent, MapOptions as MapLibreMapOptions, Popup as MapLibrePopup, PopupOptions as MapLibrePopupOptions, ProjectionSpecification as MapLibreProjectionSpecification, StyleSpecification as MapLibreStyleSpecification, SymbolLayerSpecification as MapLibreSymbolLayerSpecification } from "maplibre-gl";
 import type { IGeoLngLatBounds } from "../../types/common/coordinates.js";
 export type Map = MapLibreMap;
 export type Popup = MapLibrePopup;
@@ -8,6 +8,7 @@ export type Popup = MapLibrePopup;
  * @public
  */
 export type StyleSpecification = MapLibreStyleSpecification;
+export type ProjectionSpecification = MapLibreProjectionSpecification;
 export type GeoJSONSourceSpecification = MapLibreGeoJSONSourceSpecification;
 export type FilterSpecification = MapLibreFilterSpecification;
 export type ExpressionSpecification = MapLibreExpressionSpecification;

package/esm/next/layers/common/mapFacade.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mapFacade.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/common/mapFacade.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"mapFacade.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/common/mapFacade.ts"],"names":[],"mappings":"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"}

package/esm/next/layers/common/resolveReferencesFromGeoFeature.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"resolveReferencesFromGeoFeature.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/common/resolveReferencesFromGeoFeature.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EACH,KAAK,wBAAwB,~~EAMhC~~,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAIzE;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,+BAA+B,CAC3C,UAAU,EAAE,OAAO,CAAC,iBAAiB,EACrC,aAAa,EAAE,qBAAqB,GAAG,SAAS,EAChD,UAAU,EAAE,WAAW,GAAG,SAAS,GACpC,wBAAwB,~~CAwE1B~~"}
1	+ {"version":3,"file":"resolveReferencesFromGeoFeature.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/common/resolveReferencesFromGeoFeature.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EACH,KAAK,wBAAwB,EAKhC,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAIzE;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,+BAA+B,CAC3C,UAAU,EAAE,OAAO,CAAC,iBAAiB,EACrC,aAAa,EAAE,qBAAqB,GAAG,SAAS,EAChD,UAAU,EAAE,WAAW,GAAG,SAAS,GACpC,wBAAwB,CAsE1B"}

package/esm/next/layers/common/resolveReferencesFromGeoFeature.js CHANGED Viewed

@@ -1,5 +1,5 @@
 // (C) 2026 GoodData Corporation
-import { computedAttributeKey, labelKey, labelReference, measureReference, metricKey, } from "@gooddata/sdk-ui-vis-commons";
+import { labelKey, labelReference, measureReference, metricKey, } from "@gooddata/sdk-ui-vis-commons";
 import { getTooltipProperties, parseTooltipPayload } from "./tooltipUtils.js";
 /**
  * Builds the resolver lookup table for a hovered GeoJSON feature.
@@ -24,29 +24,27 @@ export function resolveReferencesFromGeoFeature(properties, referenceMaps, separ
     }
     const props = getTooltipProperties(properties);
     const measureLdmByLocalId = referenceMaps?.measures ?? {};
-    const attributeIdByDisplayFormId = referenceMaps?.attributes ?? {};
-    const computedAttributeIds = new Set(referenceMaps?.computedAttributeIds ?? []);
+    const attributeKeysByLocalId = referenceMaps?.attributes ?? {};
     const registerAttribute = (payload) => {
         if (!payload?.attrId || payload.value === undefined) {
             return;
         }
         const status = labelReference(String(payload.value));
-        // A computed attribute publishes under its own namespace, so it cannot be answered by -
-        // or answer - a label that happens to share its identifier.
-        const buildKey = computedAttributeIds.has(payload.attrId) ? computedAttributeKey : labelKey;
-        const displayFormKey = buildKey(payload.attrId);
+        // The reference keys come from the maps, looked up by the attribute's localIdentifier -
+        // exactly how a measure resolves its LDM id. They carry the object type, which the
+        // payload's `attrId` cannot: an LDM id is unique only within a type, so a label and a
+        // computed attribute may share one. A payload with no localIdentifier predates this and
+        // is treated as a label, which is what it would have resolved as before.
+        const keys = payload.attrLocalId ? attributeKeysByLocalId[payload.attrLocalId] : undefined;
+        const displayFormKey = keys?.displayFormKey ?? labelKey(payload.attrId);
         if (values[displayFormKey] === undefined) {
             values[displayFormKey] = status;
         }
-        // When `attrId` and the parent attribute id are equal, `attributeKey`
+        // When the display form and the parent attribute ids coincide, `attributeKey`
         // collapses onto `displayFormKey` and the second write is a no-op
         // under first-wins — no self-equality check needed.
-        const attributeId = attributeIdByDisplayFormId[payload.attrId];
-        if (attributeId) {
-            const attributeKey = buildKey(attributeId);
-            if (values[attributeKey] === undefined) {
-                values[attributeKey] = status;
-            }
+        if (keys && values[keys.attributeKey] === undefined) {
+            values[keys.attributeKey] = status;
         }
     };
     const registerMeasure = (payload) => {

package/esm/next/layers/common/tooltipReferenceMaps.d.ts CHANGED Viewed

@@ -5,14 +5,11 @@ import { type ITooltipReferenceMaps } from "../registry/adapterTypes.js";
  *
  * - `measures`: `localIdentifier` → LDM measure id (skipping measures whose
  *   identifier ref can't be resolved, e.g. arithmetic measures).
- * - `attributes`: display-form id → attribute id, sourced from each attribute
- *   descriptor's `identifier` (the display-form id surfaced on tooltip
- *   payloads as `attrId`) paired with `formOf.identifier` (the parent
- *   attribute id). Entries where both ids are equal are still emitted so
- *   callers can do a single lookup without a self-equality check.
- * - `computedAttributeIds`: which of those ids name a computed attribute, read from the
- *   descriptor ref the backend types honestly, so the resolver can publish them under their own
- *   key namespace instead of the label one.
+ * - `attributes`: attribute localIdentifier (surfaced on tooltip payloads as `attrLocalId`)
+ *   → the typed reference keys for its display form and its parent attribute. The type comes
+ *   from the descriptor's ref, which the backend types honestly, and is what separates a
+ *   computed attribute from a label of the same id. Entries where both keys are equal are
+ *   still emitted so callers can do a single lookup without a self-equality check.
  *
  * @internal
  */

package/esm/next/layers/common/tooltipReferenceMaps.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tooltipReferenceMaps.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/common/tooltipReferenceMaps.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,~~EAAE~~,KAAK,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;~~AAEzE;;;;;;;;;;;;;;;GAeG~~;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,cAAc,GAAG,qBAAqB,~~CA6BzF~~"}
1	+ {"version":3,"file":"tooltipReferenceMaps.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/common/tooltipReferenceMaps.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAA8B,KAAK,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAErG;;;;;;;;;;;;GAYG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,cAAc,GAAG,qBAAqB,CA4BzF"}

package/esm/next/layers/common/tooltipReferenceMaps.js CHANGED Viewed

@@ -1,19 +1,16 @@
 // (C) 2026 GoodData Corporation
 import { isComputedAttributeRef, measureLocalId } from "@gooddata/sdk-model";
-import { resolveMeasureLdmIdentifier } from "@gooddata/sdk-ui-vis-commons";
+import { computedAttributeKey, labelKey, resolveMeasureLdmIdentifier } from "@gooddata/sdk-ui-vis-commons";
 /**
  * Builds the per-layer reference maps the custom-tooltip resolver needs.
  *
  * - `measures`: `localIdentifier` → LDM measure id (skipping measures whose
  *   identifier ref can't be resolved, e.g. arithmetic measures).
- * - `attributes`: display-form id → attribute id, sourced from each attribute
- *   descriptor's `identifier` (the display-form id surfaced on tooltip
- *   payloads as `attrId`) paired with `formOf.identifier` (the parent
- *   attribute id). Entries where both ids are equal are still emitted so
- *   callers can do a single lookup without a self-equality check.
- * - `computedAttributeIds`: which of those ids name a computed attribute, read from the
- *   descriptor ref the backend types honestly, so the resolver can publish them under their own
- *   key namespace instead of the label one.
+ * - `attributes`: attribute localIdentifier (surfaced on tooltip payloads as `attrLocalId`)
+ *   → the typed reference keys for its display form and its parent attribute. The type comes
+ *   from the descriptor's ref, which the backend types honestly, and is what separates a
+ *   computed attribute from a label of the same id. Entries where both keys are equal are
+ *   still emitted so callers can do a single lookup without a self-equality check.
  *
  * @internal
  */
@@ -27,20 +24,19 @@ export function buildTooltipReferenceMaps(dataView) {
         }
     }
     const attributes = {};
-    const computedAttributeIds = [];
     for (const descriptor of dataView.meta().attributeDescriptors()) {
         const header = descriptor.attributeHeader;
         // `identifier` is the display-form id (URI-typed display forms fall
         // back to `uri` since `identifier` is undefined for them).
         const displayFormId = header.identifier ?? header.uri;
         const attributeId = header.formOf?.identifier;
-        if (displayFormId && attributeId) {
-            attributes[displayFormId] = attributeId;
-            if (isComputedAttributeRef(header.ref)) {
-                // For a computed attribute both ids are its own, so one entry covers both.
-                computedAttributeIds.push(displayFormId);
-            }
+        if (displayFormId && attributeId && header.localIdentifier) {
+            const buildKey = isComputedAttributeRef(header.ref) ? computedAttributeKey : labelKey;
+            attributes[header.localIdentifier] = {
+                displayFormKey: buildKey(displayFormId),
+                attributeKey: buildKey(attributeId),
+            };
         }
     }
-    return { measures, attributes, computedAttributeIds };
+    return { measures, attributes };
 }

package/esm/next/layers/common/tooltipUtils.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { type ISeparators } from "@gooddata/sdk-model";
 import { type JsonValue } from "../../utils/guards.js";
+import { type ITooltipReferenceMaps } from "../registry/adapterTypes.js";
 export type TooltipPayload = {
     title: string;
     value?: string | number;
@@ -11,6 +12,20 @@ export type TooltipPayload = {
      * execution path to build per-feature lookup keys.
      */
     uri?: string;
+    /**
+     * Bucket `localIdentifier` of the underlying attribute. By convention only set by
+     * attribute payload writers (locationName, segment, tooltipText) — the mirror of
+     * {@link TooltipPayload.localId} for measures, and used the same way: as the lookup key
+     * into `ITooltipReferenceMaps.attributes`, which yields the reference keys the value is
+     * published under.
+     *
+     * Separate from {@link TooltipPayload.attrId} because that one is the LDM identifier
+     * saying WHICH attribute a slot holds, and an LDM identifier is unique only within an
+     * object type: a label and a computed attribute may share one, so the identifier alone
+     * cannot say which of the two a value belongs to. A localIdentifier is unique within the
+     * execution.
+     */
+    attrLocalId?: string;
     fill?: string;
     /**
      * Bucket `localIdentifier` of the underlying measure. By convention only
@@ -24,7 +39,19 @@ export type TooltipPayload = {
 export declare function getTooltipProperties(properties: GeoJSON.GeoJsonProperties | undefined): Record<string, JsonValue>;
 export declare function parseTooltipPayload(item: JsonValue): TooltipPayload | undefined;
 export declare function isTooltipPayloadValid(item: JsonValue): boolean;
-export declare function dedupeAttributePayloadsByAttrId(payloads: Array<TooltipPayload | undefined>): Array<TooltipPayload | undefined>;
+/**
+ * Drops the later of two attribute payloads that show the same display form, so a label used
+ * both as location/area and as segment-by appears once in the tooltip.
+ *
+ * The identity is the typed reference key of the display form, not the bare LDM identifier: an
+ * LDM identifier is unique only within an object type, so a label and a computed attribute may
+ * share one, and those are two different objects that both belong in the tooltip. The key comes
+ * from the reference maps, looked up by the payload's localIdentifier; a payload the maps cannot
+ * place is treated as a label, which is what it would have resolved as before.
+ *
+ * @internal
+ */
+export declare function dedupeAttributePayloads(payloads: Array<TooltipPayload | undefined>, referenceMaps: ITooltipReferenceMaps | undefined): Array<TooltipPayload | undefined>;
 export type TooltipFormatConfig = {
     emptyValue: string;
     escape: (value: string) => string;

package/esm/next/layers/common/tooltipUtils.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tooltipUtils.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/common/tooltipUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAC;~~AAGvD~~,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAC;~~AAEvD~~,MAAM,MAAM,cAAc,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAMF,wBAAgB,oBAAoB,CAChC,UAAU,EAAE,OAAO,CAAC,iBAAiB,GAAG,SAAS,GAClD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAK3B;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,GAAG,cAAc,GAAG,SAAS,~~CAoC~~/E;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAE9D;AAED,wBAAgB~~,+BAA+B~~,~~CAC3C~~,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,SAAS,CAAC,~~GAC5C~~,KAAK,CAAC,cAAc,GAAG,SAAS,CAAC,~~CAYnC~~;AAED,MAAM,MAAM,mBAAmB,GAAG;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;CACrC,CAAC;AAEF,wBAAgB,oBAAoB,CAChC,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GACvC,MAAM,CAOR;AAED,wBAAgB,mBAAmB,CAC/B,OAAO,EAAE,cAAc,GAAG,SAAS,EACnC,MAAM,EAAE,mBAAmB,GAC5B,MAAM,GAAG,IAAI,CAQf;AAED,wBAAgB,iBAAiB,CAC7B,OAAO,EAAE,cAAc,GAAG,SAAS,EACnC,UAAU,EAAE,WAAW,GAAG,SAAS,EACnC,MAAM,EAAE,mBAAmB,GAC5B,MAAM,GAAG,IAAI,CAYf"}
1	+ {"version":3,"file":"tooltipUtils.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/common/tooltipUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAIvD,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEzE,MAAM,MAAM,cAAc,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;;;;;;;;;OAYG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAMF,wBAAgB,oBAAoB,CAChC,UAAU,EAAE,OAAO,CAAC,iBAAiB,GAAG,SAAS,GAClD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAK3B;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,GAAG,cAAc,GAAG,SAAS,CAsC/E;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAE9D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CACnC,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,SAAS,CAAC,EAC3C,aAAa,EAAE,qBAAqB,GAAG,SAAS,GACjD,KAAK,CAAC,cAAc,GAAG,SAAS,CAAC,CAenC;AAED,MAAM,MAAM,mBAAmB,GAAG;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;CACrC,CAAC;AAEF,wBAAgB,oBAAoB,CAChC,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GACvC,MAAM,CAOR;AAED,wBAAgB,mBAAmB,CAC/B,OAAO,EAAE,cAAc,GAAG,SAAS,EACnC,MAAM,EAAE,mBAAmB,GAC5B,MAAM,GAAG,IAAI,CAQf;AAED,wBAAgB,iBAAiB,CAC7B,OAAO,EAAE,cAAc,GAAG,SAAS,EACnC,UAAU,EAAE,WAAW,GAAG,SAAS,EACnC,MAAM,EAAE,mBAAmB,GAC5B,MAAM,GAAG,IAAI,CAYf"}

package/esm/next/layers/common/tooltipUtils.js CHANGED Viewed

@@ -1,4 +1,5 @@
 // (C) 2025-2026 GoodData Corporation
+import { labelKey } from "@gooddata/sdk-ui-vis-commons";
 import { formatValueForTooltip } from "../../map/style/tooltipFormatting.js";
 function isPayloadRecord(value) {
     return value !== null && typeof value === "object";
@@ -31,6 +32,7 @@ export function parseTooltipPayload(item) {
     const format = typeof parsed["format"] === "string" ? parsed["format"] : undefined;
     const attrId = typeof parsed["attrId"] === "string" ? parsed["attrId"] : undefined;
     const uri = typeof parsed["uri"] === "string" ? parsed["uri"] : undefined;
+    const attrLocalId = typeof parsed["attrLocalId"] === "string" ? parsed["attrLocalId"] : undefined;
     const fill = typeof parsed["fill"] === "string" ? parsed["fill"] : undefined;
     const localId = typeof parsed["localId"] === "string" ? parsed["localId"] : undefined;
     return {
@@ -38,6 +40,7 @@ export function parseTooltipPayload(item) {
         value,
         format,
         attrId,
+        attrLocalId,
         uri,
         fill,
         localId,
@@ -46,16 +49,31 @@ export function parseTooltipPayload(item) {
 export function isTooltipPayloadValid(item) {
     return Boolean(parseTooltipPayload(item));
 }
-export function dedupeAttributePayloadsByAttrId(payloads) {
-    const seenAttrIds = new Set();
+/**
+ * Drops the later of two attribute payloads that show the same display form, so a label used
+ * both as location/area and as segment-by appears once in the tooltip.
+ *
+ * The identity is the typed reference key of the display form, not the bare LDM identifier: an
+ * LDM identifier is unique only within an object type, so a label and a computed attribute may
+ * share one, and those are two different objects that both belong in the tooltip. The key comes
+ * from the reference maps, looked up by the payload's localIdentifier; a payload the maps cannot
+ * place is treated as a label, which is what it would have resolved as before.
+ *
+ * @internal
+ */
+export function dedupeAttributePayloads(payloads, referenceMaps) {
+    const attributeKeysByLocalId = referenceMaps?.attributes ?? {};
+    const seen = new Set();
     return payloads.map((payload) => {
         if (!payload?.attrId) {
             return payload;
         }
-        if (seenAttrIds.has(payload.attrId)) {
+        const keys = payload.attrLocalId ? attributeKeysByLocalId[payload.attrLocalId] : undefined;
+        const identity = keys?.displayFormKey ?? labelKey(payload.attrId);
+        if (seen.has(identity)) {
             return undefined;
         }
-        seenAttrIds.add(payload.attrId);
+        seen.add(identity);
         return payload;
     });
 }

package/esm/next/layers/pushpin/adapter.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/pushpin/adapter.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAqBpE,OAAO,KAAK,EAAsB,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAqB7G,wBAAgB,sCAAsC,CAAC,OAAO,EAAE,eAAe,GAAG,eAAe,CAuEhG;~~AA2LD~~,eAAO,MAAM,cAAc,EAAE,gBAAgB,CAAC,gBAAgB,EAAE,mBAAmB,CA0LlF,CAAC"}
1	+ {"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/pushpin/adapter.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAqBpE,OAAO,KAAK,EAAsB,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAqB7G,wBAAgB,sCAAsC,CAAC,OAAO,EAAE,eAAe,GAAG,eAAe,CAuEhG;AAmMD,eAAO,MAAM,cAAc,EAAE,gBAAgB,CAAC,gBAAgB,EAAE,mBAAmB,CA0LlF,CAAC"}

package/esm/next/layers/pushpin/adapter.js CHANGED Viewed

@@ -212,18 +212,25 @@ function buildPushpinTooltipExecution(layer, context, mainDefinition) {
     if (!built) {
         return null;
     }
+    // The key is built from execution-local identifiers, not LDM ids, because an LDM id is
+    // unique only within an object type — see `buildKeySegment`. The guards still compare the
+    // LDM id, which is what identifies WHICH attribute this feature slot holds.
+    const tooltipAttrLocalId = getAttributeLocalIdsFromBuckets(mainDefinition, [BucketNames.TOOLTIP_TEXT])[0];
+    const segmentAttrLocalId = segmentAttrId
+        ? getAttributeLocalIdsFromBuckets(mainDefinition, [BucketNames.SEGMENT])[0]
+        : undefined;
     const buildFeatureKey = (properties) => {
         if (!properties) {
             return null;
         }
         const locationName = readAttrIdentity(properties["locationName"]);
-        if (locationName.attrId !== tooltipAttrId) {
+        if (locationName.attrId !== tooltipAttrId || !tooltipAttrLocalId) {
             return null;
         }
-        const parts = [buildKeySegment(locationName.attrId, locationName.uri)];
+        const parts = [buildKeySegment(tooltipAttrLocalId, locationName.uri)];
         if (segmentAttrId) {
             const segment = readAttrIdentity(properties["segment"]);
-            if (segment.attrId !== segmentAttrId) {
+            if (segment.attrId !== segmentAttrId || !segmentAttrLocalId) {
                 return null;
             }
             // Pushpin payload writer substitutes EMPTY_SEGMENT_VALUE for null
@@ -231,7 +238,7 @@ function buildPushpinTooltipExecution(layer, context, mainDefinition) {
             // execution result preserves the original null/empty URI, so
             // normalize back here or the key never matches.
             const segmentUri = segment.uri === EMPTY_SEGMENT_VALUE ? "" : segment.uri;
-            parts.push(buildKeySegment(segment.attrId, segmentUri));
+            parts.push(buildKeySegment(segmentAttrLocalId, segmentUri));
         }
         return joinKeySegments(parts);
     };

package/esm/next/layers/pushpin/data/transformation.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transformation.d.ts","sourceRoot":"","sources":["../../../../../src/next/layers/pushpin/data/transformation.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,oBAAoB,EAGzB,KAAK,aAAa,EAUrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIpE,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAM/F,OAAO,EAAE,KAAK,eAAe,EAA6B,MAAM,mCAAmC,CAAC;~~AAqbpG~~;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAChC,EAAE,EAAE,cAAc,EAClB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,GACzB,eAAe,CAmDjB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,CACtC,aAAa,EAAE,cAAc,EAAE,EAC/B,OAAO,EAAE,eAAe,GACzB,iBAAiB,CAenB;AAsCD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CA2B1G;AAED;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,GAAG;IAC1E,KAAK,EAAE,aAAa,EAAE,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC1C,iBAAiB,EAAE,qBAAqB,CAAC;IACzC,kBAAkB,EAAE,qBAAqB,GAAG,SAAS,CAAC;IACtD,oBAAoB,EAAE,qBAAqB,GAAG,SAAS,CAAC;CAC3D;AAED;;;;;;;;GAQG;AACH,wBAAgB,gCAAgC,CAC5C,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,eAAe,GACzB,6BAA6B,CAkC/B"}
1	+ {"version":3,"file":"transformation.d.ts","sourceRoot":"","sources":["../../../../../src/next/layers/pushpin/data/transformation.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,oBAAoB,EAGzB,KAAK,aAAa,EAUrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIpE,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAM/F,OAAO,EAAE,KAAK,eAAe,EAA6B,MAAM,mCAAmC,CAAC;AA0bpG;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAChC,EAAE,EAAE,cAAc,EAClB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,GACzB,eAAe,CAmDjB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,CACtC,aAAa,EAAE,cAAc,EAAE,EAC/B,OAAO,EAAE,eAAe,GACzB,iBAAiB,CAenB;AAsCD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CA2B1G;AAED;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,GAAG;IAC1E,KAAK,EAAE,aAAa,EAAE,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC1C,iBAAiB,EAAE,qBAAqB,CAAC;IACzC,kBAAkB,EAAE,qBAAqB,GAAG,SAAS,CAAC;IACtD,oBAAoB,EAAE,qBAAqB,GAAG,SAAS,CAAC;CAC3D;AAED;;;;;;;;GAQG;AACH,wBAAgB,gCAAgC,CAC5C,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,eAAe,GACzB,6BAA6B,CAkC/B"}

package/esm/next/layers/pushpin/data/transformation.js CHANGED Viewed

@@ -125,6 +125,7 @@ function getBucketItemNameAndDataIndex(dv) {
                 name,
                 displayFormId: attributeDescriptors[index].attributeHeader.identifier ??
                     attributeDescriptors[index].attributeHeader.uri,
+                localIdentifier: attributeDescriptors[index].attributeHeader.localIdentifier,
             };
         }
     });
@@ -191,6 +192,7 @@ function processSegmentBucket(ctx) {
         index: segmentBucket.index,
         name: segmentBucket.name,
         displayFormId: segmentBucket.displayFormId,
+        localIdentifier: segmentBucket.localIdentifier,
         data,
         uris,
     };
@@ -210,6 +212,7 @@ function processTooltipTextBucket(ctx) {
         index: tooltipTextBucket.index,
         name: tooltipTextBucket.name,
         displayFormId: tooltipTextBucket.displayFormId,
+        localIdentifier: tooltipTextBucket.localIdentifier,
         data,
         uris,
     };
@@ -229,6 +232,7 @@ function processGeoIconBucket(ctx) {
         index: geoIconBucket.index,
         name: geoIconBucket.name,
         displayFormId: geoIconBucket.displayFormId,
+        localIdentifier: geoIconBucket.localIdentifier,
         data,
     };
 }

package/esm/next/layers/pushpin/source.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"source.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/pushpin/source.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAInE,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAE1F,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAazE;;;;GAIG;AACH,MAAM,WAAW,uBAAuB;IACpC,aAAa,EAAE,cAAc,CAAC;IAC9B,MAAM,EAAE,sBAAsB,CAAC;IAC/B,OAAO,EAAE,eAAe,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE;QACb,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,OAAO,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACL;AAED,KAAK,yBAAyB,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAC3F,MAAM,MAAM,0BAA0B,GAAG,yBAAyB,EAAE,CAAC;~~AA6OrE~~;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CACnC,eAAe,EAAE,uBAAuB,GACzC,0BAA0B,CAoB5B"}
1	+ {"version":3,"file":"source.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/pushpin/source.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAInE,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAE1F,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAazE;;;;GAIG;AACH,MAAM,WAAW,uBAAuB;IACpC,aAAa,EAAE,cAAc,CAAC;IAC9B,MAAM,EAAE,sBAAsB,CAAC;IAC/B,OAAO,EAAE,eAAe,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE;QACb,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,OAAO,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACL;AAED,KAAK,yBAAyB,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAC3F,MAAM,MAAM,0BAA0B,GAAG,yBAAyB,EAAE,CAAC;AAqPrE;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CACnC,eAAe,EAAE,uBAAuB,GACzC,0BAA0B,CAoB5B"}

package/esm/next/layers/pushpin/source.js CHANGED Viewed

@@ -23,7 +23,7 @@ function buildFallbackLocationLabels(locations) {
  * Builds GeoJSON properties for a single pushpin feature
  */
 function buildPushpinFeatureProperties(ctx, index) {
-    const { locationNameTitle, locationNameUris, colorTitle, sizeTitle, segmentTitle, sizeFormat, colorFormat, sizeLocalId, colorLocalId, locationNameData, segmentData, segmentUris, sizeData, colorData, geoIconData, pushpinColors, geoPointsConfig, minSizeFromData, maxSizeFromData, hasSize, locationNameAttrId, segmentAttrId, } = ctx;
+    const { locationNameTitle, locationNameUris, colorTitle, sizeTitle, segmentTitle, sizeFormat, colorFormat, sizeLocalId, colorLocalId, locationNameData, segmentData, segmentUris, sizeData, colorData, geoIconData, pushpinColors, geoPointsConfig, minSizeFromData, maxSizeFromData, hasSize, locationNameAttrId, locationNameAttrLocalId, segmentAttrId, segmentAttrLocalId, } = ctx;
     const canCalculateSize = hasSize && minSizeFromData !== undefined && maxSizeFromData !== undefined;
     const pushpinSize = canCalculateSize
         ? calculateSizeInPixel(sizeData[index], minSizeFromData, maxSizeFromData, geoPointsConfig)
@@ -37,6 +37,7 @@ function buildPushpinFeatureProperties(ctx, index) {
             title: locationNameTitle,
             value: locationNameData[index],
             attrId: locationNameAttrId,
+            attrLocalId: locationNameAttrLocalId,
             uri: locationNameUris[index],
         },
         locationIndex: index,
@@ -58,6 +59,7 @@ function buildPushpinFeatureProperties(ctx, index) {
             value: segmentData[index],
             uri: segmentUris[index] ?? EMPTY_SEGMENT_VALUE,
             attrId: segmentAttrId,
+            attrLocalId: segmentAttrLocalId,
         },
     };
     if (ctx.measures.length > 0) {
@@ -120,7 +122,9 @@ function createPushpinFeatures({ config, geoData, colorStrategy, tooltipAttrIds,
         maxSizeFromData,
         hasSize: size !== undefined,
         locationNameAttrId: tooltipText?.displayFormId ?? tooltipAttrIds?.locationName,
+        locationNameAttrLocalId: tooltipText?.localIdentifier,
         segmentAttrId: segment?.displayFormId ?? tooltipAttrIds?.segment,
+        segmentAttrLocalId: segment?.localIdentifier,
     };
     return location.data.reduce((result, coordinates, index) => {
         if (!coordinates || !Number.isFinite(coordinates.lat) || !Number.isFinite(coordinates.lng)) {

package/esm/next/layers/pushpin/tooltip/tooltipManagement.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tooltipManagement.d.ts","sourceRoot":"","sources":["../../../../../src/next/layers/pushpin/tooltip/tooltipManagement.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,KAAK,oBAAoB,EAAgC,MAAM,8BAA8B,CAAC;AAGvG,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAQpF,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAErF,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAY9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAS/F,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAuErC;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,OAAO,CAAC,iBAAiB,GAAG,SAAS,GAAG,OAAO,CAe/F;AAQD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,cAAc,CAC1B,aAAa,EAAE,OAAO,CAAC,iBAAiB,EACxC,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,WAAW,GAAG,SAAS,EACnC,cAAc,EAAE,gBAAgB,EAAE,GAAG,SAAS,EAC9C,IAAI,EAAE,SAAS,EACf,UAAU,GAAE,OAAc,EAC1B,YAAY,CAAC,EAAE,oBAAoB,EACnC,aAAa,CAAC,EAAE,qBAAqB,EACrC,aAAa,CAAC,EAAE,sBAAsB,GACvC,MAAM,~~CA6CR~~;AAcD;;;;;;;;;;;GAWG;AACH,wBAAgB,0BAA0B,CACtC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,sBAAsB,EAC9B,cAAc,EAAE,gBAAgB,EAAE,GAAG,SAAS,EAC9C,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,MAAM,EAAE,EAClB,aAAa,CAAC,EAAE,qBAAqB,EACrC,aAAa,CAAC,EAAE,sBAAsB,GACvC,iBAAiB,CAuEnB"}
1	+ {"version":3,"file":"tooltipManagement.d.ts","sourceRoot":"","sources":["../../../../../src/next/layers/pushpin/tooltip/tooltipManagement.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,KAAK,oBAAoB,EAAgC,MAAM,8BAA8B,CAAC;AAGvG,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAQpF,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAErF,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAY9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAS/F,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAuErC;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,OAAO,CAAC,iBAAiB,GAAG,SAAS,GAAG,OAAO,CAe/F;AAQD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,cAAc,CAC1B,aAAa,EAAE,OAAO,CAAC,iBAAiB,EACxC,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,WAAW,GAAG,SAAS,EACnC,cAAc,EAAE,gBAAgB,EAAE,GAAG,SAAS,EAC9C,IAAI,EAAE,SAAS,EACf,UAAU,GAAE,OAAc,EAC1B,YAAY,CAAC,EAAE,oBAAoB,EACnC,aAAa,CAAC,EAAE,qBAAqB,EACrC,aAAa,CAAC,EAAE,sBAAsB,GACvC,MAAM,CA4CR;AAcD;;;;;;;;;;;GAWG;AACH,wBAAgB,0BAA0B,CACtC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,sBAAsB,EAC9B,cAAc,EAAE,gBAAgB,EAAE,GAAG,SAAS,EAC9C,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,MAAM,EAAE,EAClB,aAAa,CAAC,EAAE,qBAAqB,EACrC,aAAa,CAAC,EAAE,sBAAsB,GACvC,iBAAiB,CAuEnB"}

package/esm/next/layers/pushpin/tooltip/tooltipManagement.js CHANGED Viewed

@@ -5,7 +5,7 @@ import { getTooltipContentWidth } from "../../../map/style/tooltipFormatting.js"
 import { isGeoJsonPoint, isLngLatTuple, isRecord, } from "../../../utils/guards.js";
 import { buildCustomTooltipPieces, composeTooltipBody } from "../../common/customTooltipSection.js";
 import { presentTooltip } from "../../common/tooltipPlacement.js";
-import { dedupeAttributePayloadsByAttrId, formatAttributeHtml, formatMeasureHtml, getTooltipProperties, isTooltipPayloadValid, parseTooltipPayload, } from "../../common/tooltipUtils.js";
+import { dedupeAttributePayloads, formatAttributeHtml, formatMeasureHtml, getTooltipProperties, isTooltipPayloadValid, parseTooltipPayload, } from "../../common/tooltipUtils.js";
 import { DEFAULT_PUSHPIN_COLOR_VALUE, NULL_TOOLTIP_VALUE, PUSHPIN_STYLE_FEATURE_PROPERTIES, } from "../constants.js";
 import { parsePushpinGeoProperties } from "../data/transformation.js";
 const TOOLTIP_FULLSCREEN_THRESHOLD = 480;
@@ -111,11 +111,7 @@ export function getTooltipHtml(geoProperties, tooltipStroke, maxWidth, separator
     const measuresPayloads = Array.isArray(rawMeasures) ? rawMeasures.map(parseTooltipPayload) : [];
     const segmentPayload = parseTooltipPayload(properties["segment"]);
     const tooltipTextPayload = parseTooltipPayload(properties["tooltipText"]);
-    const [locationAttribute, segmentAttribute, tooltipTextAttribute] = dedupeAttributePayloadsByAttrId([
-        locationPayload,
-        segmentPayload,
-        tooltipTextPayload,
-    ]);
+    const [locationAttribute, segmentAttribute, tooltipTextAttribute] = dedupeAttributePayloads([locationPayload, segmentPayload, tooltipTextPayload], referenceMaps);
     const tooltipItems = [
         formatAttributeHtml(locationAttribute, tooltipFormatConfig),
         formatMeasureHtml(sizePayload, separators, tooltipFormatConfig),

package/esm/next/layers/registry/adapterTypes.d.ts CHANGED Viewed

@@ -101,18 +101,26 @@ export interface ITooltipReferenceMaps {
      */
     measures: Record<string, string>;
     /**
-     * Display-form identifier → attribute identifier. Lets the resolver register
-     * `{label/<displayFormId>}` AND `{label/<attributeId>}` against the same value
-     * so users may reference an attribute by either id, mirroring Highcharts.
-     */
-    attributes: Record<string, string>;
-    /**
-     * The ids among {@link ITooltipReferenceMaps.attributes} that name a computed attribute rather
-     * than a label. Their values are published under the `computed_attribute/` key namespace: an
-     * id is unique only within its object type, so a label and a computed attribute may both be
-     * called `tier` and must not answer each other's reference.
+     * Attribute `localIdentifier` → the reference keys its values are published under.
+     *
+     * Keyed by localIdentifier, not by display-form id, for the same reason measures are:
+     * an LDM identifier is unique only within an object type, so a label and a computed
+     * attribute may share one, while a localIdentifier is unique within the execution.
+     * The keys themselves carry the object type, which is what a reference names.
      */
-    computedAttributeIds: string[];
+    attributes: Record<string, ITooltipAttributeKeys>;
+}
+/**
+ * The reference keys one attribute's values are published under: its display form, and its
+ * parent attribute, so a user may reference it by either id — mirroring Highcharts.
+ *
+ * @internal
+ */
+export interface ITooltipAttributeKeys {
+    /** `<type>/<displayFormId>`, where the type is the label or computed attribute namespace. */
+    displayFormKey: string;
+    /** `<type>/<attributeId>`. Equal to {@link displayFormKey} when the ids coincide. */
+    attributeKey: string;
 }
 /**
  * Legend computation result.

package/esm/next/layers/registry/adapterTypes.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"adapterTypes.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/registry/adapterTypes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC3G,OAAO,KAAK,EACR,aAAa,EACb,gBAAgB,EAChB,oBAAoB,EACpB,eAAe,EAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAElF,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC5G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EACR,+BAA+B,EAC/B,sBAAsB,EACzB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EACR,mBAAmB,EACnB,0BAA0B,EAC1B,UAAU,EACV,YAAY,EACf,MAAM,wBAAwB,CAAC;AAEhC;;;;;;;;GAQG;AACH,MAAM,WAAW,kBAAkB;IAC/B;;OAEG;IACH,OAAO,EAAE,kBAAkB,CAAC;IAE5B;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,MAAM,CAAC,EAAE,eAAe,CAAC;IAEzB;;OAEG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAE9B;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,eAAe,EAAE,CAAC;IAElC;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IAErC;;;;;OAKG;IACH,YAAY,CAAC,EAAE,aAAa,CAAC;IAE7B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,aAAa,EAAE,CAAC;IAE/B;;;;;OAKG;IACH,IAAI,CAAC,EAAE,SAAS,CAAC;CACpB;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,qBAAqB;IAClC;;;;;;;OAOG;IACH,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEjC~~;;;;OAIG~~;IACH,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,~~MAAM~~,CAAC,CAAC;~~IAEnC~~;;;;;~~OAKG~~;~~IACH~~,~~oBAAoB~~,EAAE,MAAM,EAAE,CAAC;~~CAClC~~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"}
1	+ {"version":3,"file":"adapterTypes.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/registry/adapterTypes.ts"],"names":[],"mappings":"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"}

package/esm/next/map/style/styleEndpoint.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"styleEndpoint.d.ts","sourceRoot":"","sources":["../../../../src/next/map/style/styleEndpoint.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,kBAAkB,EAA6B,MAAM,2BAA2B,CAAC;AAE/F,OAAO,KAAK,~~EAAE~~,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;~~AAuB3E~~;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,aAAa,CAC/B,OAAO,EAAE,kBAAkB,EAC3B,OAAO,CAAC,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAO7B"}
1	+ {"version":3,"file":"styleEndpoint.d.ts","sourceRoot":"","sources":["../../../../src/next/map/style/styleEndpoint.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,kBAAkB,EAA6B,MAAM,2BAA2B,CAAC;AAE/F,OAAO,KAAK,EAA2B,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAyBpG;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,aAAa,CAC/B,OAAO,EAAE,kBAAkB,EAC3B,OAAO,CAAC,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAO7B"}

package/esm/next/map/style/styleEndpoint.js CHANGED Viewed

@@ -18,6 +18,7 @@ const KNOWN_SOURCE_TYPES = new Set([
  * Tile-based source types that optionally define data via "tiles" or "url".
  */
 const TILE_SOURCE_TYPES = new Set(["vector", "raster", "raster-dem"]);
+const MERCATOR_PROJECTION = { type: "mercator" };
 /**
  * Fetches the MapLibre style specification from the backend.
  *
@@ -39,7 +40,13 @@ export async function fetchMapStyle(backend, basemap, language) {
         ? await backend.geo().getDefaultStyle({ language })
         : await fetchMapStyleByIdWithFallback(backend, basemap, language);
     assertValidStyle(style);
-    return style;
+    return withMercatorProjection(style);
+}
+/**
+ * Forces a flat map: the AWS basemap styles declare a globe projection, which MapLibre 6 honours.
+ */
+function withMercatorProjection(style) {
+    return { ...style, projection: MERCATOR_PROJECTION };
 }
 async function fetchMapStyleByIdWithFallback(backend, basemap, language) {
     try {

package/esm/next/types/geoData/area.d.ts CHANGED Viewed

@@ -9,6 +9,12 @@ export interface IGeoAreaItem extends IGeoDataItem {
      * Identifier or URI of the display form used to produce this area data.
      */
     displayFormId?: string;
+    /**
+     * Execution-local identifier of the attribute this data came from. Unique within the
+     * execution, unlike {@link displayFormId}, so it is what identifies a row in the custom
+     * tooltip lookup - see `buildKeySegment`.
+     */
+    localIdentifier?: string;
     /**
      * Geographic identifiers for areas (e.g., ISO country codes, region IDs)
      */

package/esm/next/types/geoData/area.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"area.d.ts","sourceRoot":"","sources":["../../../../src/next/types/geoData/area.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAErE;;;;GAIG;AACH,MAAM,WAAW,YAAa,SAAQ,YAAY;IAC9C;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,IAAI,EAAE,MAAM,EAAE,CAAC;IACf;;OAEG;IACH,IAAI,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,YAAa,SAAQ,cAAc;IAChD;;OAEG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC;CACvB"}
1	+ {"version":3,"file":"area.d.ts","sourceRoot":"","sources":["../../../../src/next/types/geoData/area.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAErE;;;;GAIG;AACH,MAAM,WAAW,YAAa,SAAQ,YAAY;IAC9C;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,IAAI,EAAE,MAAM,EAAE,CAAC;IACf;;OAEG;IACH,IAAI,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,YAAa,SAAQ,cAAc;IAChD;;OAEG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC;CACvB"}

package/esm/next/types/geoData/common.d.ts CHANGED Viewed

@@ -23,6 +23,12 @@ export interface IGeoAttributeItem extends IGeoDataItem {
      * Identifier or URI of the display form used to produce this attribute data.
      */
     displayFormId?: string;
+    /**
+     * Execution-local identifier of the attribute this data came from. Unique within the
+     * execution, unlike {@link displayFormId}, so it is what identifies a row in the custom
+     * tooltip lookup - see `buildKeySegment`.
+     */
+    localIdentifier?: string;
     /**
      * Array of string values for the attribute
      */

package/esm/next/types/geoData/common.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/next/types/geoData/common.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,WAAW,YAAY;IACzB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAkB,SAAQ,YAAY;IACnD;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,IAAI,EAAE,MAAM,EAAE,CAAC;IACf;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAgB,SAAQ,iBAAiB;IACtD;;OAEG;IACH,IAAI,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAgB,SAAQ,YAAY;IACjD;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,IAAI,EAAE,MAAM,EAAE,CAAC;IACf;;;;;;;OAOG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC3B;;OAEG;IACH,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB;;OAEG;IACH,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B;;OAEG;IACH,WAAW,CAAC,EAAE,iBAAiB,CAAC;CACnC"}
1	+ {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/next/types/geoData/common.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,WAAW,YAAY;IACzB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAkB,SAAQ,YAAY;IACnD;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,IAAI,EAAE,MAAM,EAAE,CAAC;IACf;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAgB,SAAQ,iBAAiB;IACtD;;OAEG;IACH,IAAI,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAgB,SAAQ,YAAY;IACjD;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,IAAI,EAAE,MAAM,EAAE,CAAC;IACf;;;;;;;OAOG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC3B;;OAEG;IACH,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB;;OAEG;IACH,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B;;OAEG;IACH,WAAW,CAAC,EAAE,iBAAiB,CAAC;CACnC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@gooddata/sdk-ui-geo",
-  "version": "11.58.0-alpha.1",
+  "version": "11.58.0-alpha.3",
   "description": "GoodData.UI SDK - Geo Charts",
   "license": "MIT",
   "author": "GoodData Corporation",
@@ -44,12 +44,12 @@
     "ts-invariant": "0.10.3",
     "tslib": "2.8.1",
     "uuid": "11.1.1",
-    "@gooddata/sdk-model": "11.58.0-alpha.1",
-    "@gooddata/sdk-backend-spi": "11.58.0-alpha.1",
-    "@gooddata/sdk-ui-kit": "11.58.0-alpha.1",
-    "@gooddata/sdk-ui": "11.58.0-alpha.1",
-    "@gooddata/sdk-ui-theme-provider": "11.58.0-alpha.1",
-    "@gooddata/sdk-ui-vis-commons": "11.58.0-alpha.1"
+    "@gooddata/sdk-backend-spi": "11.58.0-alpha.3",
+    "@gooddata/sdk-model": "11.58.0-alpha.3",
+    "@gooddata/sdk-ui": "11.58.0-alpha.3",
+    "@gooddata/sdk-ui-theme-provider": "11.58.0-alpha.3",
+    "@gooddata/sdk-ui-kit": "11.58.0-alpha.3",
+    "@gooddata/sdk-ui-vis-commons": "11.58.0-alpha.3"
   },
   "devDependencies": {
     "@microsoft/api-documenter": "7.30.10",
@@ -86,12 +86,12 @@
     "sass": "1.104.1",
     "stylelint": "16.26.1",
     "typescript": "7.0.2",
-    "vitest": "4.1.8",
+    "vitest": "4.1.11",
     "vitest-dom": "0.1.1",
-    "@gooddata/oxlint-config": "11.58.0-alpha.1",
-    "@gooddata/eslint-config": "11.58.0-alpha.1",
-    "@gooddata/stylelint-config": "11.58.0-alpha.1",
-    "@gooddata/sdk-backend-mockingbird": "11.58.0-alpha.1"
+    "@gooddata/eslint-config": "11.58.0-alpha.3",
+    "@gooddata/oxlint-config": "11.58.0-alpha.3",
+    "@gooddata/sdk-backend-mockingbird": "11.58.0-alpha.3",
+    "@gooddata/stylelint-config": "11.58.0-alpha.3"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0",