@gooddata/sdk-ui-geo 11.29.0-alpha.1 → 11.29.0-alpha.11
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.
- package/esm/next/hooks/layers/useLayerClickEvent.d.ts.map +1 -1
- package/esm/next/hooks/layers/useLayerClickEvent.js +28 -19
- package/esm/next/hooks/layers/useLayerClickEvent.js.map +1 -1
- package/esm/next/hooks/map/useMapResize.js +1 -1
- package/esm/next/hooks/map/useMapResize.js.map +1 -1
- package/esm/next/layers/area/adapter.d.ts.map +1 -1
- package/esm/next/layers/area/adapter.js +10 -3
- package/esm/next/layers/area/adapter.js.map +1 -1
- package/esm/next/layers/area/data/transformation.d.ts.map +1 -1
- package/esm/next/layers/area/data/transformation.js +10 -50
- package/esm/next/layers/area/data/transformation.js.map +1 -1
- package/esm/next/layers/area/layers.d.ts.map +1 -1
- package/esm/next/layers/area/layers.js +11 -3
- package/esm/next/layers/area/layers.js.map +1 -1
- package/esm/next/layers/area/source.d.ts +12 -3
- package/esm/next/layers/area/source.d.ts.map +1 -1
- package/esm/next/layers/area/source.js +39 -8
- package/esm/next/layers/area/source.js.map +1 -1
- package/esm/next/layers/common/constants.d.ts +12 -2
- package/esm/next/layers/common/constants.d.ts.map +1 -1
- package/esm/next/layers/common/constants.js +12 -5
- package/esm/next/layers/common/constants.js.map +1 -1
- package/esm/next/layers/common/headerItemUtils.d.ts +17 -0
- package/esm/next/layers/common/headerItemUtils.d.ts.map +1 -0
- package/esm/next/layers/common/headerItemUtils.js +43 -0
- package/esm/next/layers/common/headerItemUtils.js.map +1 -0
- package/esm/next/layers/common/selectionUtils.d.ts +4 -0
- package/esm/next/layers/common/selectionUtils.d.ts.map +1 -0
- package/esm/next/layers/common/selectionUtils.js +74 -0
- package/esm/next/layers/common/selectionUtils.js.map +1 -0
- package/esm/next/layers/pushpin/adapter.d.ts.map +1 -1
- package/esm/next/layers/pushpin/adapter.js +13 -3
- package/esm/next/layers/pushpin/adapter.js.map +1 -1
- package/esm/next/layers/pushpin/data/transformation.d.ts.map +1 -1
- package/esm/next/layers/pushpin/data/transformation.js +12 -22
- package/esm/next/layers/pushpin/data/transformation.js.map +1 -1
- package/esm/next/layers/pushpin/layers.d.ts.map +1 -1
- package/esm/next/layers/pushpin/layers.js +38 -17
- package/esm/next/layers/pushpin/layers.js.map +1 -1
- package/esm/next/layers/pushpin/operations.d.ts.map +1 -1
- package/esm/next/layers/pushpin/operations.js +2 -1
- package/esm/next/layers/pushpin/operations.js.map +1 -1
- package/esm/next/layers/pushpin/source.d.ts +0 -12
- package/esm/next/layers/pushpin/source.d.ts.map +1 -1
- package/esm/next/layers/pushpin/source.js +14 -64
- package/esm/next/layers/pushpin/source.js.map +1 -1
- package/esm/next/layers/pushpin/tooltip/tooltipManagement.d.ts +1 -1
- package/esm/next/layers/pushpin/tooltip/tooltipManagement.d.ts.map +1 -1
- package/esm/next/layers/pushpin/tooltip/tooltipManagement.js +8 -3
- package/esm/next/layers/pushpin/tooltip/tooltipManagement.js.map +1 -1
- package/esm/next/types/config/areaChart.d.ts +6 -1
- package/esm/next/types/config/areaChart.d.ts.map +1 -1
- package/esm/next/types/config/pushpinChart.d.ts +6 -1
- package/esm/next/types/config/pushpinChart.d.ts.map +1 -1
- package/esm/next/types/config/unified.d.ts +11 -1
- package/esm/next/types/config/unified.d.ts.map +1 -1
- package/esm/next/types/geoData/area.d.ts +4 -0
- package/esm/next/types/geoData/area.d.ts.map +1 -1
- package/esm/next/types/geoData/common.d.ts +4 -0
- package/esm/next/types/geoData/common.d.ts.map +1 -1
- package/esm/sdk-ui-geo.d.ts +21 -0
- package/package.json +15 -15
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLayerClickEvent.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayerClickEvent.ts"],"names":[],"mappings":"AAaA,OAAO,EAEH,KAAK,gBAAgB,EAErB,KAAK,iBAAiB,EAGzB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"useLayerClickEvent.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayerClickEvent.ts"],"names":[],"mappings":"AAaA,OAAO,EAEH,KAAK,gBAAgB,EAErB,KAAK,iBAAiB,EAGzB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAQvE,OAAO,KAAK,EAAE,UAAU,EAAiB,MAAM,kCAAkC,CAAC;AA+KlF;;GAEG;AACH,wBAAgB,kBAAkB,CAC9B,GAAG,EAAE,UAAU,GAAG,IAAI,EACtB,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EAClC,mBAAmB,EAAE,gBAAgB,EAAE,EACvC,OAAO,CAAC,EAAE,iBAAiB,GAC5B,IAAI,CAsEN"}
|
|
@@ -3,7 +3,7 @@ import { useEffect } from "react";
|
|
|
3
3
|
import { areObjRefsEqual, isAttributeDescriptor, isResultAttributeHeader, } from "@gooddata/sdk-model";
|
|
4
4
|
import { getDrillIntersection, isSomeHeaderPredicateMatched, } from "@gooddata/sdk-ui";
|
|
5
5
|
import { getAreaLayerIds } from "../../layers/area/operations.js";
|
|
6
|
-
import {
|
|
6
|
+
import { GEO_LAYER_DRILL_ELEMENT, GEO_LAYER_DRILL_TYPE, TOOLTIP_TEXT_ATTRIBUTE_LOCAL_ID, } from "../../layers/common/constants.js";
|
|
7
7
|
import { normalizeAttributeDescriptorLocalIdentifier } from "../../layers/common/drillUtils.js";
|
|
8
8
|
import { getTooltipProperties } from "../../layers/common/tooltipUtils.js";
|
|
9
9
|
import { getPushpinLayerIds } from "../../layers/pushpin/operations.js";
|
|
@@ -35,9 +35,6 @@ function getLocationIndexFromProperties(properties) {
|
|
|
35
35
|
/**
|
|
36
36
|
* Check if a display form type is a geo coordinate type.
|
|
37
37
|
*/
|
|
38
|
-
function isCoordinateFormType(labelType) {
|
|
39
|
-
return labelType !== undefined && COORDINATE_FORM_TYPES.includes(labelType);
|
|
40
|
-
}
|
|
41
38
|
function isGeoDisplayFormType(labelType) {
|
|
42
39
|
return typeof labelType === "string" && labelType.startsWith("GDC.geo.");
|
|
43
40
|
}
|
|
@@ -49,7 +46,12 @@ function resolveDrillIdentityDescriptor(descriptor, preferredDisplayFormRef, des
|
|
|
49
46
|
}
|
|
50
47
|
return descriptorsInGeoDimension.find((d) => isAttributeDescriptor(d) && areObjRefsEqual(d.attributeHeader.ref, candidateRef));
|
|
51
48
|
};
|
|
52
|
-
const
|
|
49
|
+
const preferredCandidate = findDescriptorByRef(preferredDisplayFormRef);
|
|
50
|
+
// Only use the preferred display form if it belongs to the same parent attribute.
|
|
51
|
+
// Otherwise a shared tooltip ref (e.g. from Customer region) would incorrectly resolve
|
|
52
|
+
// a different attribute (e.g. Customer country) to the tooltip's parent.
|
|
53
|
+
const usePreferred = preferredCandidate && preferredCandidate.attributeHeader.formOf?.identifier === formOf.identifier;
|
|
54
|
+
const resolvedDescriptor = (usePreferred ? preferredCandidate : undefined) ?? findDescriptorByRef(primaryLabel) ?? descriptor;
|
|
53
55
|
return {
|
|
54
56
|
key: formOf.identifier,
|
|
55
57
|
descriptor: {
|
|
@@ -81,9 +83,10 @@ function getDrillHeaders(dataView, locationIndex, tooltipIndex) {
|
|
|
81
83
|
? headerItems[geoAttributesDimensionIndex]?.[tooltipIndex]?.[locationIndex]
|
|
82
84
|
: undefined;
|
|
83
85
|
const resolvedTooltipRowHeader = tooltipRowHeader && isResultAttributeHeader(tooltipRowHeader) ? tooltipRowHeader : undefined;
|
|
84
|
-
// Track processed
|
|
85
|
-
// This ensures we only include one
|
|
86
|
-
|
|
86
|
+
// Track processed attributes by their parent attribute key.
|
|
87
|
+
// This ensures we only include one display form per parent attribute
|
|
88
|
+
// (e.g., City, not City lat + City lon + City icon + City default label).
|
|
89
|
+
const processedParents = new Set();
|
|
87
90
|
descriptors.forEach((descriptor, attrIndex) => {
|
|
88
91
|
if (isAttributeDescriptor(descriptor)) {
|
|
89
92
|
if (attrIndex === tooltipIndex) {
|
|
@@ -94,22 +97,28 @@ function getDrillHeaders(dataView, locationIndex, tooltipIndex) {
|
|
|
94
97
|
return;
|
|
95
98
|
}
|
|
96
99
|
const labelType = descriptor.attributeHeader.labelType;
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
+
// Only substitute the tooltip row header for geo display forms that share
|
|
101
|
+
// the same parent attribute as the tooltip. Otherwise each attribute should
|
|
102
|
+
// keep its own header value (e.g. Customer country → "CA", not "Ontario").
|
|
103
|
+
const sameParentAsTooltip = resolvedTooltipRowHeader &&
|
|
104
|
+
isGeoDisplayFormType(labelType) &&
|
|
105
|
+
isAttributeDescriptor(tooltipDescriptor) &&
|
|
106
|
+
descriptor.attributeHeader.formOf?.identifier ===
|
|
107
|
+
tooltipDescriptor.attributeHeader.formOf?.identifier;
|
|
108
|
+
const resolvedRowHeader = sameParentAsTooltip ? resolvedTooltipRowHeader : rowHeader;
|
|
100
109
|
const drillIdentity = isGeoDisplayFormType(labelType)
|
|
101
110
|
? resolveDrillIdentityDescriptor(descriptor, preferredDrillRef, descriptors)
|
|
102
111
|
: undefined;
|
|
103
112
|
const descriptorForDrill = drillIdentity ? drillIdentity.descriptor : descriptor;
|
|
104
113
|
const normalizedDescriptor = normalizeAttributeDescriptorLocalIdentifier(descriptorForDrill);
|
|
105
|
-
//
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
114
|
+
// Deduplicate by parent attribute. Geo display forms use the resolved drill
|
|
115
|
+
// identity key; non-geo display forms use formOf.identifier directly.
|
|
116
|
+
const parentKey = drillIdentity?.key ?? descriptor.attributeHeader.formOf?.identifier;
|
|
117
|
+
if (parentKey && processedParents.has(parentKey)) {
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
120
|
+
if (parentKey) {
|
|
121
|
+
processedParents.add(parentKey);
|
|
113
122
|
}
|
|
114
123
|
drillHeaders.push(resolvedRowHeader);
|
|
115
124
|
drillHeaders.push(normalizedDescriptor);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLayerClickEvent.js","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayerClickEvent.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,OAAO,EAKH,eAAe,EACf,qBAAqB,EACrB,uBAAuB,GAC1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAKH,oBAAoB,EACpB,4BAA4B,GAC/B,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EACH,
|
|
1
|
+
{"version":3,"file":"useLayerClickEvent.js","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayerClickEvent.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ export function useMapResize(map, isMapReady, chartContainerRect, viewport, data
|
|
|
43
43
|
const prev = prevContainerRect.current?.client;
|
|
44
44
|
const curr = chartContainerRect.client;
|
|
45
45
|
const { width, height } = curr;
|
|
46
|
-
const hasResized =
|
|
46
|
+
const hasResized = prev?.width !== width || prev.height !== height;
|
|
47
47
|
if (hasResized) {
|
|
48
48
|
prevContainerRect.current = chartContainerRect;
|
|
49
49
|
map.resize();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMapResize.js","sourceRoot":"","sources":["../../../../src/next/hooks/map/useMapResize.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAKnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAI1E;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,YAAY,CACxB,GAAsB,EACtB,UAAmB,EACnB,kBAAsC,EACtC,QAAsC,EACtC,YAA0C,EAC1C,MAAmC,EAC/B;IACJ,MAAM,IAAI,GAAG,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC;IACpC,MAAM,cAAc,GAAG,OAAO,CAA8B,GAAG,EAAE,CAAC;QAC9D,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,OAAO;YACH,QAAQ,EAAE,EAAE,IAAI,EAAE;SACrB,CAAC;IAAA,CACL,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,MAAM,iBAAiB,GAAG,MAAM,CAAqB,IAAI,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,MAAM,CAAoB,IAAI,CAAC,CAAC;IAEvD,SAAS,CAAC,GAAG,EAAE,CAAC;QACZ,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,IAAI,CAAC,kBAAkB,EAAE,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClE,OAAO;QACX,CAAC;QAED,IAAI,cAAc,CAAC,OAAO,KAAK,GAAG,EAAE,CAAC;YACjC,cAAc,CAAC,OAAO,GAAG,GAAG,CAAC;QACjC,CAAC;QAED,MAAM,IAAI,GAAG,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC;QAC/C,MAAM,IAAI,GAAG,kBAAkB,CAAC,MAAM,CAAC;QACvC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAC/B,MAAM,UAAU,GAAG,
|
|
1
|
+
{"version":3,"file":"useMapResize.js","sourceRoot":"","sources":["../../../../src/next/hooks/map/useMapResize.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAKnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAI1E;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,YAAY,CACxB,GAAsB,EACtB,UAAmB,EACnB,kBAAsC,EACtC,QAAsC,EACtC,YAA0C,EAC1C,MAAmC,EAC/B;IACJ,MAAM,IAAI,GAAG,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC;IACpC,MAAM,cAAc,GAAG,OAAO,CAA8B,GAAG,EAAE,CAAC;QAC9D,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,OAAO;YACH,QAAQ,EAAE,EAAE,IAAI,EAAE;SACrB,CAAC;IAAA,CACL,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,MAAM,iBAAiB,GAAG,MAAM,CAAqB,IAAI,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,MAAM,CAAoB,IAAI,CAAC,CAAC;IAEvD,SAAS,CAAC,GAAG,EAAE,CAAC;QACZ,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,IAAI,CAAC,kBAAkB,EAAE,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClE,OAAO;QACX,CAAC;QAED,IAAI,cAAc,CAAC,OAAO,KAAK,GAAG,EAAE,CAAC;YACjC,cAAc,CAAC,OAAO,GAAG,GAAG,CAAC;QACjC,CAAC;QAED,MAAM,IAAI,GAAG,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC;QAC/C,MAAM,IAAI,GAAG,kBAAkB,CAAC,MAAM,CAAC;QACvC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAC/B,MAAM,UAAU,GAAG,IAAI,EAAE,KAAK,KAAK,KAAK,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC;QAEnE,IAAI,UAAU,EAAE,CAAC;YACb,iBAAiB,CAAC,OAAO,GAAG,kBAAkB,CAAC;YAC/C,GAAG,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,eAAe,GAAG,yBAAyB,CAAC,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;YAC/F,aAAa,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC;IAAA,CACJ,EAAE,CAAC,GAAG,EAAE,UAAU,EAAE,kBAAkB,EAAE,QAAQ,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC;AAAA,CACrF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/area/adapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/area/adapter.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAUjE,OAAO,EACH,KAAK,gBAAgB,EAErB,KAAK,gBAAgB,EACxB,MAAM,6BAA6B,CAAC;AAsFrC,eAAO,MAAM,WAAW,EAAE,gBAAgB,CAAC,aAAa,EAAE,gBAAgB,CAgLzE,CAAC"}
|
|
@@ -5,7 +5,7 @@ import { deriveCollectionBoundingBox } from "./boundingBox.js";
|
|
|
5
5
|
import { getAreaColorStrategy } from "./coloring/colorStrategy.js";
|
|
6
6
|
import { transformAreaData } from "./data/transformation.js";
|
|
7
7
|
import { getAreaLayerIds, removeAreaLayer, syncAreaLayerToMap } from "./operations.js";
|
|
8
|
-
import { applyCurrentColorsToAreaOutputSource, createAreaDataSource } from "./source.js";
|
|
8
|
+
import { applyCurrentColorsToAreaOutputSource, applySelectionToAreaSource, createAreaDataSource, } from "./source.js";
|
|
9
9
|
import { createAreaTooltipConfig } from "./tooltip/tooltipManagement.js";
|
|
10
10
|
import { bboxToViewport } from "../../map/viewport/viewportCalculation.js";
|
|
11
11
|
import { getLocationCollectionMetadata } from "../../utils/geoCollection.js";
|
|
@@ -147,7 +147,8 @@ export const areaAdapter = {
|
|
|
147
147
|
}
|
|
148
148
|
const sourceWithCurrentColors = applyCurrentColorsToAreaOutputSource(output, dataView, context);
|
|
149
149
|
const config = context.config ?? {};
|
|
150
|
-
|
|
150
|
+
const sourceWithSelection = applySelectionToAreaSource(sourceWithCurrentColors, config.selectedPoints);
|
|
151
|
+
syncAreaLayerToMap(map, layer.id, sourceWithSelection, config);
|
|
151
152
|
},
|
|
152
153
|
updateOnMap(layer, map, output, dataView, context) {
|
|
153
154
|
if (!output.geoData) {
|
|
@@ -155,17 +156,21 @@ export const areaAdapter = {
|
|
|
155
156
|
return;
|
|
156
157
|
}
|
|
157
158
|
const sourceWithCurrentColors = applyCurrentColorsToAreaOutputSource(output, dataView, context);
|
|
159
|
+
const config = context.config ?? {};
|
|
160
|
+
const sourceWithSelection = applySelectionToAreaSource(sourceWithCurrentColors, config.selectedPoints);
|
|
158
161
|
// Update path: in-place GeoJSON data update (no remove+add = no flicker).
|
|
159
162
|
const ids = getAreaLayerIds(layer.id);
|
|
160
163
|
if (!canSetGeoJsonSourceData(map, ids.sourceId)) {
|
|
161
164
|
return;
|
|
162
165
|
}
|
|
163
|
-
trySetGeoJsonSourceData(map, ids.sourceId,
|
|
166
|
+
trySetGeoJsonSourceData(map, ids.sourceId, sourceWithSelection.data);
|
|
164
167
|
},
|
|
165
168
|
getMapSyncKey(layer, context) {
|
|
166
169
|
// Keep this strictly about MapLibre layer/source structure or paint properties.
|
|
167
170
|
// Segment filtering + visibility is handled outside (Effect 2/3 in useSyncLayersToMap).
|
|
168
171
|
const areas = context.config?.areas;
|
|
172
|
+
const selectedPoints = context.config?.selectedPoints;
|
|
173
|
+
const selectionKey = selectedPoints?.length ? JSON.stringify(selectedPoints) : "none";
|
|
169
174
|
return [
|
|
170
175
|
"area",
|
|
171
176
|
layer.id,
|
|
@@ -173,6 +178,8 @@ export const areaAdapter = {
|
|
|
173
178
|
String(areas?.fillOpacity),
|
|
174
179
|
String(areas?.borderColor),
|
|
175
180
|
String(areas?.borderWidth),
|
|
181
|
+
"sel",
|
|
182
|
+
selectionKey,
|
|
176
183
|
].join(":");
|
|
177
184
|
},
|
|
178
185
|
getMapUpdateKey(layer, context) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../src/next/layers/area/adapter.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAGrC,OAAO,EAGH,uBAAuB,EACvB,eAAe,EACf,QAAQ,EACR,SAAS,GACZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAuB,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACvF,OAAO,
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../src/next/layers/area/adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,
|
|
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;AA8QtF;;;;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,8 +1,8 @@
|
|
|
1
1
|
// (C) 2025-2026 GoodData Corporation
|
|
2
|
-
import { attributeLocalId, isAttribute, isMeasure,
|
|
2
|
+
import { attributeLocalId, isAttribute, isMeasure, measureLocalId, } from "@gooddata/sdk-model";
|
|
3
3
|
import { BucketNames } from "@gooddata/sdk-ui";
|
|
4
4
|
import { dataValueAsFloat } from "../../../map/style/dataTransformation.js";
|
|
5
|
-
import {
|
|
5
|
+
import { getAttributeDataAndUris, getSegmentDataAndUris } from "../../common/headerItemUtils.js";
|
|
6
6
|
import { getMinMax } from "../../pushpin/size/calculations.js";
|
|
7
7
|
/**
|
|
8
8
|
* Gets attribute header items from data view for area data
|
|
@@ -24,39 +24,6 @@ function getFormatFromExecutionResponse(dv, indexMeasure) {
|
|
|
24
24
|
const measureDescriptors = dv.meta().measureDescriptors();
|
|
25
25
|
return measureDescriptors[indexMeasure].measureHeaderItem.format;
|
|
26
26
|
}
|
|
27
|
-
/**
|
|
28
|
-
* Extracts segment data and URIs from attribute header items
|
|
29
|
-
*/
|
|
30
|
-
function getSegmentDataAndUris(attributeHeaderItems, dataIndex, emptyHeaderString, nullHeaderString) {
|
|
31
|
-
const headerItems = attributeHeaderItems[dataIndex];
|
|
32
|
-
return headerItems.reduce((result, headerItem) => {
|
|
33
|
-
if (headerItem && isResultAttributeHeader(headerItem)) {
|
|
34
|
-
const { uri, name } = headerItem.attributeHeaderItem;
|
|
35
|
-
const displayName = name ?? nullHeaderString;
|
|
36
|
-
const finalName = name === "" ? emptyHeaderString : displayName;
|
|
37
|
-
return {
|
|
38
|
-
uris: [...result.uris, uri ?? EMPTY_SEGMENT_VALUE],
|
|
39
|
-
data: [...result.data, finalName],
|
|
40
|
-
};
|
|
41
|
-
}
|
|
42
|
-
return result;
|
|
43
|
-
}, { uris: [], data: [] });
|
|
44
|
-
}
|
|
45
|
-
/**
|
|
46
|
-
* Extracts area data and URIs from attribute header items
|
|
47
|
-
*/
|
|
48
|
-
function getAreaDataAndUris(attributeHeaderItems, dataIndex, emptyHeaderString, nullHeaderString) {
|
|
49
|
-
const headerItems = attributeHeaderItems[dataIndex];
|
|
50
|
-
return headerItems.reduce((result, headerItem) => {
|
|
51
|
-
if (headerItem && isResultAttributeHeader(headerItem)) {
|
|
52
|
-
const { uri, name } = headerItem.attributeHeaderItem;
|
|
53
|
-
const displayName = name ?? nullHeaderString;
|
|
54
|
-
const finalName = name === "" ? emptyHeaderString : displayName;
|
|
55
|
-
return { uris: [...result.uris, uri], data: [...result.data, finalName] };
|
|
56
|
-
}
|
|
57
|
-
return result;
|
|
58
|
-
}, { uris: [], data: [] });
|
|
59
|
-
}
|
|
60
27
|
/**
|
|
61
28
|
* Extracts measure data from data view
|
|
62
29
|
*/
|
|
@@ -65,19 +32,6 @@ function getMeasureData(dv, dataIndex) {
|
|
|
65
32
|
const measureValues = twoDimData[dataIndex];
|
|
66
33
|
return measureValues.map(dataValueAsFloat);
|
|
67
34
|
}
|
|
68
|
-
/**
|
|
69
|
-
* Extracts attribute data from attribute header items
|
|
70
|
-
*/
|
|
71
|
-
function getAttributeData(attributeHeaderItems, dataIndex, emptyHeaderString, nullHeaderString) {
|
|
72
|
-
const headerItems = attributeHeaderItems[dataIndex];
|
|
73
|
-
return headerItems.map((i) => {
|
|
74
|
-
const name = resultHeaderName(i);
|
|
75
|
-
if (name) {
|
|
76
|
-
return name;
|
|
77
|
-
}
|
|
78
|
-
return name === "" ? emptyHeaderString : nullHeaderString;
|
|
79
|
-
});
|
|
80
|
-
}
|
|
81
35
|
/**
|
|
82
36
|
* Gets bucket item names and data indices from data view for area
|
|
83
37
|
*/
|
|
@@ -122,6 +76,8 @@ function getAttributeBucketInfo(buckets, attributeDescriptors, bucketName) {
|
|
|
122
76
|
return {
|
|
123
77
|
index,
|
|
124
78
|
name: attributeDescriptors[index].attributeHeader.formOf.name,
|
|
79
|
+
displayFormId: attributeDescriptors[index].attributeHeader.identifier ??
|
|
80
|
+
attributeDescriptors[index].attributeHeader.uri,
|
|
125
81
|
};
|
|
126
82
|
}
|
|
127
83
|
function getMeasureBucketInfo(buckets, measureDescriptors, bucketName) {
|
|
@@ -153,10 +109,11 @@ function processAreaBucket(ctx) {
|
|
|
153
109
|
if (areaIndex === undefined || !areaBucket) {
|
|
154
110
|
return undefined;
|
|
155
111
|
}
|
|
156
|
-
const { data, uris } =
|
|
112
|
+
const { data, uris } = getAttributeDataAndUris(attributeHeaderItems, areaIndex, emptyHeaderString, nullHeaderString);
|
|
157
113
|
return {
|
|
158
114
|
index: areaBucket.index,
|
|
159
115
|
name: areaBucket.name,
|
|
116
|
+
displayFormId: areaBucket.displayFormId,
|
|
160
117
|
data,
|
|
161
118
|
uris,
|
|
162
119
|
};
|
|
@@ -175,6 +132,7 @@ function processSegmentBucket(ctx) {
|
|
|
175
132
|
return {
|
|
176
133
|
index: segmentBucket.index,
|
|
177
134
|
name: segmentBucket.name,
|
|
135
|
+
displayFormId: segmentBucket.displayFormId,
|
|
178
136
|
data,
|
|
179
137
|
uris,
|
|
180
138
|
};
|
|
@@ -189,11 +147,13 @@ function processTooltipTextBucket(ctx) {
|
|
|
189
147
|
if (tooltipTextIndex === undefined || !tooltipTextBucket) {
|
|
190
148
|
return undefined;
|
|
191
149
|
}
|
|
192
|
-
const data =
|
|
150
|
+
const { data, uris } = getAttributeDataAndUris(attributeHeaderItems, tooltipTextIndex, emptyHeaderString, nullHeaderString);
|
|
193
151
|
return {
|
|
194
152
|
index: tooltipTextBucket.index,
|
|
195
153
|
name: tooltipTextBucket.name,
|
|
154
|
+
displayFormId: tooltipTextBucket.displayFormId,
|
|
196
155
|
data,
|
|
156
|
+
uris,
|
|
197
157
|
};
|
|
198
158
|
}
|
|
199
159
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformation.js","sourceRoot":"","sources":["../../../../../src/next/layers/area/data/transformation.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAKH,gBAAgB,EAChB,WAAW,EACX,SAAS,EACT,
|
|
1
|
+
{"version":3,"file":"transformation.js","sourceRoot":"","sources":["../../../../../src/next/layers/area/data/transformation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layers.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/area/layers.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"layers.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/area/layers.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAE3E,OAAO,KAAK,EAER,sBAAsB,EACtB,mBAAmB,EACnB,sBAAsB,EACzB,MAAM,wBAAwB,CAAC;AAUhC;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAAC,oBAAoB,EAAE,MAAM,EAAE,GAAG,mBAAmB,CAiBpF;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,mBAAmB,CAC/B,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,GAAE,MAAgC,GAC1C,sBAAsB,CAoBxB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CAClC,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,GAAE,MAAwC,GAClD,sBAAsB,CAoBxB"}
|
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
// (C) 2025-2026 GoodData Corporation
|
|
2
2
|
import { BucketNames } from "@gooddata/sdk-ui";
|
|
3
3
|
import { DEFAULT_AREA_LAYER_NAME, DEFAULT_AREA_OUTLINE_LAYER_NAME } from "./constants.js";
|
|
4
|
+
import { CROSS_FILTER_UNSELECTED_OPACITY, SELECTED_FEATURE_PROPERTY } from "../common/constants.js";
|
|
4
5
|
import { EMPTY_SEGMENT_VALUE } from "../pushpin/constants.js";
|
|
6
|
+
const SELECTION_OPACITY_EXPRESSION = [
|
|
7
|
+
"case",
|
|
8
|
+
["boolean", ["get", SELECTED_FEATURE_PROPERTY], false],
|
|
9
|
+
1,
|
|
10
|
+
CROSS_FILTER_UNSELECTED_OPACITY,
|
|
11
|
+
];
|
|
5
12
|
/**
|
|
6
13
|
* Creates a filter expression for geographic areas based on selected segment items.
|
|
7
14
|
*
|
|
@@ -47,7 +54,7 @@ export function createAreaFilter(selectedSegmentItems) {
|
|
|
47
54
|
* @internal
|
|
48
55
|
*/
|
|
49
56
|
export function createAreaFillLayer(dataSourceName, config, layerId = DEFAULT_AREA_LAYER_NAME) {
|
|
50
|
-
const { selectedSegmentItems = [], areas = {} } = config || {};
|
|
57
|
+
const { selectedSegmentItems = [], selectedPoints, areas = {} } = config || {};
|
|
51
58
|
const { fillOpacity = 0.7 } = areas;
|
|
52
59
|
const layer = {
|
|
53
60
|
id: layerId,
|
|
@@ -56,7 +63,7 @@ export function createAreaFillLayer(dataSourceName, config, layerId = DEFAULT_AR
|
|
|
56
63
|
paint: {
|
|
57
64
|
// Use data-driven styling from flattened feature properties
|
|
58
65
|
"fill-color": ["coalesce", ["get", "color_fill"], "#20B2E2"],
|
|
59
|
-
"fill-opacity": fillOpacity,
|
|
66
|
+
"fill-opacity": selectedPoints?.length ? SELECTION_OPACITY_EXPRESSION : fillOpacity,
|
|
60
67
|
},
|
|
61
68
|
};
|
|
62
69
|
if (selectedSegmentItems.length > 0) {
|
|
@@ -78,7 +85,7 @@ export function createAreaFillLayer(dataSourceName, config, layerId = DEFAULT_AR
|
|
|
78
85
|
* @internal
|
|
79
86
|
*/
|
|
80
87
|
export function createAreaOutlineLayer(dataSourceName, config, layerId = DEFAULT_AREA_OUTLINE_LAYER_NAME) {
|
|
81
|
-
const { selectedSegmentItems = [], areas = {} } = config || {};
|
|
88
|
+
const { selectedSegmentItems = [], selectedPoints, areas = {} } = config || {};
|
|
82
89
|
const { borderColor = "#FFFFFF", borderWidth = 1 } = areas;
|
|
83
90
|
const layer = {
|
|
84
91
|
id: layerId,
|
|
@@ -87,6 +94,7 @@ export function createAreaOutlineLayer(dataSourceName, config, layerId = DEFAULT
|
|
|
87
94
|
paint: {
|
|
88
95
|
"line-color": borderColor,
|
|
89
96
|
"line-width": borderWidth,
|
|
97
|
+
...(selectedPoints?.length ? { "line-opacity": SELECTION_OPACITY_EXPRESSION } : {}),
|
|
90
98
|
},
|
|
91
99
|
};
|
|
92
100
|
if (selectedSegmentItems.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layers.js","sourceRoot":"","sources":["../../../../src/next/layers/area/layers.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,uBAAuB,EAAE,+BAA+B,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"layers.js","sourceRoot":"","sources":["../../../../src/next/layers/area/layers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type IGeoJsonFeature } from "@gooddata/sdk-model";
|
|
2
|
-
import { type DataViewFacade } from "@gooddata/sdk-ui";
|
|
2
|
+
import { type DataViewFacade, type IDrillEventIntersectionElement } from "@gooddata/sdk-ui";
|
|
3
3
|
import { type IColorStrategy } from "@gooddata/sdk-ui-vis-commons";
|
|
4
4
|
import type { GeoJSONSourceSpecification } from "../common/mapFacade.js";
|
|
5
5
|
import { type IGeoAreaChartConfig } from "../../types/config/areaChart.js";
|
|
@@ -41,12 +41,21 @@ export declare function recolorAreaDataSource(source: GeoJSONSourceSpecification
|
|
|
41
41
|
* Area styling reads fill color from GeoJSON feature properties, so palette/mapping updates require
|
|
42
42
|
* producing a new GeoJSON payload and pushing it via `setData` (or by re-initializing the layer).
|
|
43
43
|
*
|
|
44
|
-
* This helper keeps the "apply current colors" logic colocated with other area source utilities
|
|
45
|
-
* (similar to pushpin's `applyCurrentColorsToPushpinOutputSource`).
|
|
44
|
+
* This helper keeps the "apply current colors" logic colocated with other area source utilities.
|
|
46
45
|
*
|
|
47
46
|
* @internal
|
|
48
47
|
*/
|
|
49
48
|
export declare function applyCurrentColorsToAreaOutputSource(output: IAreaLayerOutput, dataView: DataViewFacade, context: IGeoAdapterContext): GeoJSONSourceSpecification;
|
|
49
|
+
/**
|
|
50
|
+
* Stamps `__selected` on area features based on cross-filtering selectedPoints.
|
|
51
|
+
*
|
|
52
|
+
* @remarks
|
|
53
|
+
* Matches each feature's `locationName.value` against the attribute item names
|
|
54
|
+
* from the selectedPoints intersections.
|
|
55
|
+
*
|
|
56
|
+
* @internal
|
|
57
|
+
*/
|
|
58
|
+
export declare function applySelectionToAreaSource(source: GeoJSONSourceSpecification, selectedPoints: IDrillEventIntersectionElement[][] | undefined): GeoJSONSourceSpecification;
|
|
50
59
|
/**
|
|
51
60
|
* Creates a GeoJSON data source for area visualization.
|
|
52
61
|
*
|
|
@@ -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,MAAM,kBAAkB,CAAC;
|
|
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,KAAK,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAMzE,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAExF;;;;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;AA+M/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;AA+FD;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,oBAAoB,GAAG,0BAA0B,CAUtG"}
|