@gooddata/sdk-ui-geo 11.28.0-alpha.1 → 11.28.0-alpha.2
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/index.d.ts +2 -2
- package/esm/index.d.ts.map +1 -1
- package/esm/index.js.map +1 -1
- package/esm/internal/index.d.ts +1 -0
- package/esm/internal/index.d.ts.map +1 -1
- package/esm/internal/index.js +1 -0
- package/esm/internal/index.js.map +1 -1
- package/esm/next/components/RenderGeoChart.d.ts.map +1 -1
- package/esm/next/components/RenderGeoChart.js +1 -1
- package/esm/next/components/RenderGeoChart.js.map +1 -1
- package/esm/next/hooks/map/useApplyViewportOnConfigChange.d.ts +7 -1
- package/esm/next/hooks/map/useApplyViewportOnConfigChange.d.ts.map +1 -1
- package/esm/next/hooks/map/useApplyViewportOnConfigChange.js +22 -6
- package/esm/next/hooks/map/useApplyViewportOnConfigChange.js.map +1 -1
- package/esm/next/hooks/map/useMapCallbacks.d.ts +3 -1
- package/esm/next/hooks/map/useMapCallbacks.d.ts.map +1 -1
- package/esm/next/hooks/map/useMapCallbacks.js +13 -4
- package/esm/next/hooks/map/useMapCallbacks.js.map +1 -1
- package/esm/next/hooks/map/useMapInitialization.d.ts.map +1 -1
- package/esm/next/hooks/map/useMapInitialization.js +3 -0
- package/esm/next/hooks/map/useMapInitialization.js.map +1 -1
- package/esm/next/hooks/map/useMapResize.d.ts.map +1 -1
- package/esm/next/hooks/map/useMapResize.js +3 -25
- package/esm/next/hooks/map/useMapResize.js.map +1 -1
- package/esm/next/layers/common/mapFacade.d.ts +2 -0
- package/esm/next/layers/common/mapFacade.d.ts.map +1 -1
- package/esm/next/layers/common/mapFacade.js +7 -0
- package/esm/next/layers/common/mapFacade.js.map +1 -1
- package/esm/next/layers/pushpin/adapter.d.ts.map +1 -1
- package/esm/next/layers/pushpin/adapter.js +22 -2
- package/esm/next/layers/pushpin/adapter.js.map +1 -1
- package/esm/next/layers/pushpin/config/defaults.d.ts.map +1 -1
- package/esm/next/layers/pushpin/config/defaults.js +1 -0
- package/esm/next/layers/pushpin/config/defaults.js.map +1 -1
- package/esm/next/layers/pushpin/constants.d.ts +12 -0
- package/esm/next/layers/pushpin/constants.d.ts.map +1 -1
- package/esm/next/layers/pushpin/constants.js +13 -1
- package/esm/next/layers/pushpin/constants.js.map +1 -1
- package/esm/next/layers/pushpin/data/transformation.d.ts.map +1 -1
- package/esm/next/layers/pushpin/data/transformation.js +93 -5
- package/esm/next/layers/pushpin/data/transformation.js.map +1 -1
- package/esm/next/layers/pushpin/layers.d.ts +12 -0
- package/esm/next/layers/pushpin/layers.d.ts.map +1 -1
- package/esm/next/layers/pushpin/layers.js +44 -5
- 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 +7 -2
- package/esm/next/layers/pushpin/operations.js.map +1 -1
- package/esm/next/layers/pushpin/source.d.ts.map +1 -1
- package/esm/next/layers/pushpin/source.js +33 -10
- package/esm/next/layers/pushpin/source.js.map +1 -1
- package/esm/next/layers/pushpin/tooltip/tooltipManagement.d.ts.map +1 -1
- package/esm/next/layers/pushpin/tooltip/tooltipManagement.js +10 -5
- package/esm/next/layers/pushpin/tooltip/tooltipManagement.js.map +1 -1
- package/esm/next/map/MapController.d.ts +4 -2
- package/esm/next/map/MapController.d.ts.map +1 -1
- package/esm/next/map/MapController.js +5 -3
- package/esm/next/map/MapController.js.map +1 -1
- package/esm/next/map/runtime/mapConfig.d.ts +1 -1
- package/esm/next/map/runtime/mapConfig.d.ts.map +1 -1
- package/esm/next/map/runtime/mapConfig.js +2 -2
- package/esm/next/map/runtime/mapConfig.js.map +1 -1
- package/esm/next/map/runtime/mapInitialization.d.ts +1 -1
- package/esm/next/map/runtime/mapInitialization.d.ts.map +1 -1
- package/esm/next/map/runtime/mapInitialization.js +7 -1
- package/esm/next/map/runtime/mapInitialization.js.map +1 -1
- package/esm/next/map/viewport/viewportPresets.d.ts.map +1 -1
- package/esm/next/map/viewport/viewportPresets.js +2 -2
- package/esm/next/map/viewport/viewportPresets.js.map +1 -1
- package/esm/next/map/viewport/viewportResolution.d.ts +12 -5
- package/esm/next/map/viewport/viewportResolution.d.ts.map +1 -1
- package/esm/next/map/viewport/viewportResolution.js +22 -7
- package/esm/next/map/viewport/viewportResolution.js.map +1 -1
- package/esm/next/types/common/callbacks.d.ts +13 -1
- package/esm/next/types/common/callbacks.d.ts.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/points.d.ts +36 -0
- package/esm/next/types/config/points.d.ts.map +1 -1
- package/esm/next/types/config/points.js.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 +6 -1
- package/esm/next/types/config/unified.d.ts.map +1 -1
- package/esm/next/types/geoData/pushpin.d.ts +9 -1
- package/esm/next/types/geoData/pushpin.d.ts.map +1 -1
- package/esm/next/types/layers/index.d.ts +20 -0
- package/esm/next/types/layers/index.d.ts.map +1 -1
- package/esm/next/types/layers/index.js.map +1 -1
- package/esm/next/types/map/provider.d.ts +7 -0
- package/esm/next/types/map/provider.d.ts.map +1 -1
- package/esm/next/types/props/shared.d.ts +9 -1
- package/esm/next/types/props/shared.d.ts.map +1 -1
- package/esm/next/utils/layerConversion.d.ts.map +1 -1
- package/esm/next/utils/layerConversion.js +13 -3
- package/esm/next/utils/layerConversion.js.map +1 -1
- package/esm/publicTypes/geoCommon.d.ts +12 -0
- package/esm/publicTypes/geoCommon.d.ts.map +1 -1
- package/esm/sdk-ui-geo.d.ts +94 -0
- package/package.json +11 -11
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// (C) 2025-2026 GoodData Corporation
|
|
2
2
|
import { getPushpinColorStrategy } from "./coloring/colorStrategy.js";
|
|
3
3
|
import { getPushpinColors } from "./coloring/palette.js";
|
|
4
|
-
import { DEFAULT_CLUSTER_MAX_ZOOM, DEFAULT_CLUSTER_RADIUS, EMPTY_SEGMENT_VALUE, PUSHPIN_SIZE_OPTIONS_MAP, } from "./constants.js";
|
|
4
|
+
import { DEFAULT_CLUSTER_MAX_ZOOM, DEFAULT_CLUSTER_RADIUS, EMPTY_SEGMENT_VALUE, PUSHPIN_SIZE_OPTIONS_MAP, PUSHPIN_STYLE_FEATURE_PROPERTIES, } from "./constants.js";
|
|
5
5
|
import { getMinMax } from "./size/calculations.js";
|
|
6
6
|
const DEFAULT_LOCATION_TITLE = "Location";
|
|
7
7
|
function formatCoordinate(value) {
|
|
@@ -22,16 +22,16 @@ function buildFallbackLocationLabels(locations) {
|
|
|
22
22
|
* Builds GeoJSON properties for a single pushpin feature
|
|
23
23
|
*/
|
|
24
24
|
function buildPushpinFeatureProperties(ctx, index) {
|
|
25
|
-
const { locationNameTitle, colorTitle, sizeTitle, segmentTitle, sizeFormat, colorFormat, locationNameData, segmentData, segmentUris, sizeData, colorData, pushpinColors, geoPointsConfig, minSizeFromData, maxSizeFromData, hasSize, locationNameAttrId, segmentAttrId, } = ctx;
|
|
25
|
+
const { locationNameTitle, colorTitle, sizeTitle, segmentTitle, sizeFormat, colorFormat, locationNameData, segmentData, segmentUris, sizeData, colorData, geoIconData, pushpinColors, geoPointsConfig, minSizeFromData, maxSizeFromData, hasSize, locationNameAttrId, segmentAttrId, } = ctx;
|
|
26
26
|
const canCalculateSize = hasSize && minSizeFromData !== undefined && maxSizeFromData !== undefined;
|
|
27
27
|
const pushpinSize = canCalculateSize
|
|
28
28
|
? calculateSizeInPixel(sizeData[index], minSizeFromData, maxSizeFromData, geoPointsConfig)
|
|
29
29
|
: PUSHPIN_SIZE_OPTIONS_MAP.min.default;
|
|
30
30
|
const pushpinColor = pushpinColors[index] || pushpinColors[0] || {};
|
|
31
|
-
|
|
32
|
-
pushpinSize,
|
|
33
|
-
|
|
34
|
-
|
|
31
|
+
const properties = {
|
|
32
|
+
[PUSHPIN_STYLE_FEATURE_PROPERTIES.size]: pushpinSize,
|
|
33
|
+
[PUSHPIN_STYLE_FEATURE_PROPERTIES.colorBackground]: pushpinColor.background,
|
|
34
|
+
[PUSHPIN_STYLE_FEATURE_PROPERTIES.colorBorder]: pushpinColor.border,
|
|
35
35
|
locationName: {
|
|
36
36
|
title: locationNameTitle,
|
|
37
37
|
value: locationNameData[index],
|
|
@@ -56,15 +56,36 @@ function buildPushpinFeatureProperties(ctx, index) {
|
|
|
56
56
|
attrId: segmentAttrId,
|
|
57
57
|
},
|
|
58
58
|
};
|
|
59
|
+
if (ctx.measures.length > 0) {
|
|
60
|
+
const measuresArr = ctx.measures.map((m) => ({
|
|
61
|
+
title: m.title,
|
|
62
|
+
value: m.data[index],
|
|
63
|
+
format: m.format,
|
|
64
|
+
}));
|
|
65
|
+
// Keep backward-compatible "metric" property for single measure,
|
|
66
|
+
// and always provide "measures" array for multi-measure support.
|
|
67
|
+
properties["metric"] = measuresArr[0];
|
|
68
|
+
properties["measures"] = measuresArr;
|
|
69
|
+
}
|
|
70
|
+
if (geoIconData.length > 0) {
|
|
71
|
+
properties[PUSHPIN_STYLE_FEATURE_PROPERTIES.iconName] = geoIconData[index];
|
|
72
|
+
}
|
|
73
|
+
return properties;
|
|
59
74
|
}
|
|
60
75
|
function createPushpinFeatures({ config, geoData, colorStrategy, tooltipAttrIds, }) {
|
|
61
|
-
const { color, location, segment, size, tooltipText } = geoData;
|
|
76
|
+
const { color, location, segment, size, tooltipText, measures, geoIcon } = geoData;
|
|
62
77
|
if (!location) {
|
|
63
78
|
return [];
|
|
64
79
|
}
|
|
65
80
|
const { points: geoPointsConfig = {} } = config || {};
|
|
66
81
|
const sizeData = size?.data ?? [];
|
|
67
82
|
const colorData = color?.data ?? [];
|
|
83
|
+
const measuresCtx = (measures ?? []).map((m) => ({
|
|
84
|
+
title: m.name,
|
|
85
|
+
format: m.format,
|
|
86
|
+
data: m.data,
|
|
87
|
+
}));
|
|
88
|
+
const geoIconData = geoIcon?.data ?? [];
|
|
68
89
|
const { min: minSizeFromData, max: maxSizeFromData } = getMinMax(sizeData);
|
|
69
90
|
const fallbackLocationNameData = buildFallbackLocationLabels(location.data);
|
|
70
91
|
const locationNameData = tooltipText?.data?.length ? tooltipText.data : fallbackLocationNameData;
|
|
@@ -75,11 +96,13 @@ function createPushpinFeatures({ config, geoData, colorStrategy, tooltipAttrIds,
|
|
|
75
96
|
segmentTitle: segment?.name ?? "",
|
|
76
97
|
sizeFormat: size?.format ?? "",
|
|
77
98
|
colorFormat: color?.format ?? "",
|
|
99
|
+
measures: measuresCtx,
|
|
78
100
|
locationNameData,
|
|
79
101
|
segmentData: segment?.data ?? [],
|
|
80
102
|
segmentUris: (segment?.uris ?? []).map((uri) => uri ?? EMPTY_SEGMENT_VALUE),
|
|
81
103
|
sizeData,
|
|
82
104
|
colorData,
|
|
105
|
+
geoIconData,
|
|
83
106
|
pushpinColors: getPushpinColors(colorData, segment?.data ?? [], colorStrategy),
|
|
84
107
|
geoPointsConfig,
|
|
85
108
|
minSizeFromData,
|
|
@@ -149,7 +172,7 @@ export function createPushpinDataSource(dataSourceProps) {
|
|
|
149
172
|
* Applies current palette/mapping colors to a pushpin GeoJSON source specification.
|
|
150
173
|
*
|
|
151
174
|
* @remarks
|
|
152
|
-
* Pushpin styling reads colors from flattened GeoJSON feature properties
|
|
175
|
+
* Pushpin styling reads colors from flattened GeoJSON feature properties.
|
|
153
176
|
* To update colors in-place (via `setData`), we patch those properties according to `properties.locationIndex`.
|
|
154
177
|
*
|
|
155
178
|
* If the source data is not a FeatureCollection, the source is returned unchanged.
|
|
@@ -176,8 +199,8 @@ function recolorPushpinDataSource(source, pushpinColors) {
|
|
|
176
199
|
}
|
|
177
200
|
const nextProperties = {
|
|
178
201
|
...properties,
|
|
179
|
-
|
|
180
|
-
|
|
202
|
+
[PUSHPIN_STYLE_FEATURE_PROPERTIES.colorBackground]: pushpinColor.background,
|
|
203
|
+
[PUSHPIN_STYLE_FEATURE_PROPERTIES.colorBorder]: pushpinColor.border,
|
|
181
204
|
};
|
|
182
205
|
const previousColor = properties["color"];
|
|
183
206
|
if (previousColor && typeof previousColor === "object") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source.js","sourceRoot":"","sources":["../../../../src/next/layers/pushpin/source.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAMrC,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EACH,wBAAwB,EACxB,sBAAsB,EACtB,mBAAmB,EACnB,wBAAwB,
|
|
1
|
+
{"version":3,"file":"source.js","sourceRoot":"","sources":["../../../../src/next/layers/pushpin/source.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AAGzD,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAQpF,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAW9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;
|
|
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;AAGzD,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAQpF,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAW9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AASxE,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAuErC;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,OAAO,CAAC,iBAAiB,GAAG,SAAS,GAAG,OAAO,CAe/F;AAQD;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAC1B,aAAa,EAAE,OAAO,CAAC,iBAAiB,EACxC,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,WAAW,EACxB,cAAc,CAAC,EAAE,gBAAgB,EAAE,EACnC,IAAI,CAAC,EAAE,SAAS,GACjB,MAAM,CA+BR;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,GACnB,iBAAiB,CA8DnB"}
|
|
@@ -3,7 +3,7 @@ import { escape, isEmpty } from "lodash-es";
|
|
|
3
3
|
import { getTooltipContentWidth } from "../../../map/style/tooltipFormatting.js";
|
|
4
4
|
import { isGeoJsonPoint, isLngLatTuple, isRecord, } from "../../../utils/guards.js";
|
|
5
5
|
import { dedupeAttributePayloadsByAttrId, formatAttributeHtml, formatMeasureHtml, getTooltipProperties, isTooltipPayloadValid, parseTooltipPayload, } from "../../common/tooltipUtils.js";
|
|
6
|
-
import { DEFAULT_PUSHPIN_COLOR_VALUE, NULL_TOOLTIP_VALUE } from "../constants.js";
|
|
6
|
+
import { DEFAULT_PUSHPIN_COLOR_VALUE, NULL_TOOLTIP_VALUE, PUSHPIN_STYLE_FEATURE_PROPERTIES, } from "../constants.js";
|
|
7
7
|
import { parsePushpinGeoProperties } from "../data/transformation.js";
|
|
8
8
|
const TOOLTIP_FULLSCREEN_THRESHOLD = 480;
|
|
9
9
|
export const TOOLTIP_MAX_WIDTH = 320;
|
|
@@ -21,11 +21,11 @@ function resolveStrokeFromFeatureProperties(geoProperties) {
|
|
|
21
21
|
if (!isRecord(geoProperties)) {
|
|
22
22
|
return undefined;
|
|
23
23
|
}
|
|
24
|
-
const background = geoProperties[
|
|
24
|
+
const background = geoProperties[PUSHPIN_STYLE_FEATURE_PROPERTIES.colorBackground];
|
|
25
25
|
if (typeof background === "string") {
|
|
26
26
|
return background;
|
|
27
27
|
}
|
|
28
|
-
const border = geoProperties[
|
|
28
|
+
const border = geoProperties[PUSHPIN_STYLE_FEATURE_PROPERTIES.colorBorder];
|
|
29
29
|
return typeof border === "string" ? border : undefined;
|
|
30
30
|
}
|
|
31
31
|
function resolveTooltipStroke(colorPayload, geoProperties) {
|
|
@@ -63,12 +63,14 @@ export function shouldShowTooltip(geoProperties) {
|
|
|
63
63
|
if (isEmpty(geoProperties)) {
|
|
64
64
|
return false;
|
|
65
65
|
}
|
|
66
|
-
const { locationName, color, size, segment, tooltipText } = geoProperties ?? {};
|
|
66
|
+
const { locationName, color, size, segment, tooltipText, measures } = geoProperties ?? {};
|
|
67
|
+
const hasMeasures = Array.isArray(measures) && measures.some(isTooltipItemValid);
|
|
67
68
|
return (isTooltipItemValid(locationName) ||
|
|
68
69
|
isTooltipItemValid(size) ||
|
|
69
70
|
isTooltipItemValid(color) ||
|
|
70
71
|
isTooltipItemValid(segment) ||
|
|
71
|
-
isTooltipItemValid(tooltipText)
|
|
72
|
+
isTooltipItemValid(tooltipText) ||
|
|
73
|
+
hasMeasures);
|
|
72
74
|
}
|
|
73
75
|
function getInteractionMessage(drillableItems, intl) {
|
|
74
76
|
const message = intl ? intl.formatMessage({ id: "visualization.tooltip.interaction" }) : null;
|
|
@@ -93,6 +95,8 @@ export function getTooltipHtml(geoProperties, tooltipStroke, maxWidth, separator
|
|
|
93
95
|
const locationPayload = parseTooltipPayload(properties["locationName"]);
|
|
94
96
|
const sizePayload = parseTooltipPayload(properties["size"]);
|
|
95
97
|
const colorPayload = parseTooltipPayload(properties["color"]);
|
|
98
|
+
const rawMeasures = properties["measures"];
|
|
99
|
+
const measuresPayloads = Array.isArray(rawMeasures) ? rawMeasures.map(parseTooltipPayload) : [];
|
|
96
100
|
const segmentPayload = parseTooltipPayload(properties["segment"]);
|
|
97
101
|
const tooltipTextPayload = parseTooltipPayload(properties["tooltipText"]);
|
|
98
102
|
const [locationAttribute, segmentAttribute, tooltipTextAttribute] = dedupeAttributePayloadsByAttrId([
|
|
@@ -104,6 +108,7 @@ export function getTooltipHtml(geoProperties, tooltipStroke, maxWidth, separator
|
|
|
104
108
|
formatAttributeHtml(locationAttribute, tooltipFormatConfig),
|
|
105
109
|
formatMeasureHtml(sizePayload, separators, tooltipFormatConfig),
|
|
106
110
|
formatMeasureHtml(colorPayload, separators, tooltipFormatConfig),
|
|
111
|
+
...measuresPayloads.map((p) => formatMeasureHtml(p, separators, tooltipFormatConfig)),
|
|
107
112
|
formatAttributeHtml(segmentAttribute, tooltipFormatConfig),
|
|
108
113
|
formatAttributeHtml(tooltipTextAttribute, tooltipFormatConfig),
|
|
109
114
|
]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tooltipManagement.js","sourceRoot":"","sources":["../../../../../src/next/layers/pushpin/tooltip/tooltipManagement.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAM5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAEjF,OAAO,EAGH,cAAc,EACd,aAAa,EACb,QAAQ,GACX,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAGH,+BAA+B,EAC/B,mBAAmB,EACnB,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,mBAAmB,GACtB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,
|
|
1
|
+
{"version":3,"file":"tooltipManagement.js","sourceRoot":"","sources":["../../../../../src/next/layers/pushpin/tooltip/tooltipManagement.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { type ReactElement, type RefObject } from "react";
|
|
|
2
2
|
import { type ContentRect } from "react-measure";
|
|
3
3
|
import type { IAnalyticalBackend } from "@gooddata/sdk-backend-spi";
|
|
4
4
|
import { type GoodDataSdkError, type IHeaderPredicate, type OnFiredDrillEvent } from "@gooddata/sdk-ui";
|
|
5
|
-
import { type CenterPositionChangedCallback, type ZoomChangedCallback } from "../types/common/callbacks.js";
|
|
5
|
+
import { type BoundsChangedCallback, type CenterPositionChangedCallback, type ViewportInteractionEndCallback, type ZoomChangedCallback } from "../types/common/callbacks.js";
|
|
6
6
|
import { type IGeoChartConfig } from "../types/config/unified.js";
|
|
7
7
|
import { type IMapViewport } from "../types/map/provider.js";
|
|
8
8
|
import { type ILayerExecutionRecord } from "../types/props/geoChart/internal.js";
|
|
@@ -16,6 +16,8 @@ export type MapControllerProps = {
|
|
|
16
16
|
drillablePredicates: IHeaderPredicate[];
|
|
17
17
|
onCenterPositionChanged?: CenterPositionChangedCallback;
|
|
18
18
|
onZoomChanged?: ZoomChangedCallback;
|
|
19
|
+
onBoundsChanged?: BoundsChangedCallback;
|
|
20
|
+
onViewportInteractionEnd?: ViewportInteractionEndCallback;
|
|
19
21
|
onDrill?: OnFiredDrillEvent;
|
|
20
22
|
afterRender?: () => void;
|
|
21
23
|
config: IGeoChartConfig | undefined;
|
|
@@ -29,5 +31,5 @@ export type MapControllerProps = {
|
|
|
29
31
|
* Centralized map controller that wires up map initialization, resize handling,
|
|
30
32
|
* interaction callbacks, layer synchronization, and after-render signalling.
|
|
31
33
|
*/
|
|
32
|
-
export declare function MapController({ mapContainerRef, legendPanelRef, chartContainerRect, initialViewport, dataViewport, layerExecutions, drillablePredicates, onCenterPositionChanged, onZoomChanged, onDrill, afterRender, config, backend, locale, mapInstructionsId, mapCanvasTitle, onMapError }: MapControllerProps): ReactElement | null;
|
|
34
|
+
export declare function MapController({ mapContainerRef, legendPanelRef, chartContainerRect, initialViewport, dataViewport, layerExecutions, drillablePredicates, onCenterPositionChanged, onZoomChanged, onBoundsChanged, onViewportInteractionEnd, onDrill, afterRender, config, backend, locale, mapInstructionsId, mapCanvasTitle, onMapError }: MapControllerProps): ReactElement | null;
|
|
33
35
|
//# sourceMappingURL=MapController.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MapController.d.ts","sourceRoot":"","sources":["../../../src/next/map/MapController.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,SAAS,EAAW,MAAM,OAAO,CAAC;AAEnE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EACH,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EAEzB,MAAM,kBAAkB,CAAC;AAY1B,OAAO,
|
|
1
|
+
{"version":3,"file":"MapController.d.ts","sourceRoot":"","sources":["../../../src/next/map/MapController.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,SAAS,EAAW,MAAM,OAAO,CAAC;AAEnE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EACH,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EAEzB,MAAM,kBAAkB,CAAC;AAY1B,OAAO,EACH,KAAK,qBAAqB,EAC1B,KAAK,6BAA6B,EAClC,KAAK,8BAA8B,EACnC,KAAK,mBAAmB,EAC3B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAEjF,MAAM,MAAM,kBAAkB,GAAG;IAC7B,eAAe,EAAE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAClD,cAAc,CAAC,EAAE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAClD,kBAAkB,EAAE,WAAW,GAAG,IAAI,CAAC;IACvC,eAAe,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;IAC9C,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;IAC3C,eAAe,EAAE,qBAAqB,EAAE,CAAC;IACzC,mBAAmB,EAAE,gBAAgB,EAAE,CAAC;IACxC,uBAAuB,CAAC,EAAE,6BAA6B,CAAC;IACxD,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,eAAe,CAAC,EAAE,qBAAqB,CAAC;IACxC,wBAAwB,CAAC,EAAE,8BAA8B,CAAC;IAC1D,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,MAAM,EAAE,eAAe,GAAG,SAAS,CAAC;IACpC,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI,KAAK,IAAI,CAAC;CACzD,CAAC;AAEF;;;GAGG;AACH,wBAAgB,aAAa,CAAC,EAC1B,eAAe,EACf,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,uBAAuB,EACvB,aAAa,EACb,eAAe,EACf,wBAAwB,EACxB,OAAO,EACP,WAAW,EACX,MAAM,EACN,OAAO,EACP,MAAM,EACN,iBAAiB,EACjB,cAAc,EACd,UAAU,EACb,EAAE,kBAAkB,GAAG,YAAY,GAAG,IAAI,CA2C1C"}
|
|
@@ -16,7 +16,7 @@ import { useCallbackOnChange } from "../hooks/utils/useCallbackOnChange.js";
|
|
|
16
16
|
* Centralized map controller that wires up map initialization, resize handling,
|
|
17
17
|
* interaction callbacks, layer synchronization, and after-render signalling.
|
|
18
18
|
*/
|
|
19
|
-
export function MapController({ mapContainerRef, legendPanelRef, chartContainerRect, initialViewport, dataViewport, layerExecutions, drillablePredicates, onCenterPositionChanged, onZoomChanged, onDrill, afterRender, config, backend, locale, mapInstructionsId, mapCanvasTitle, onMapError, }) {
|
|
19
|
+
export function MapController({ mapContainerRef, legendPanelRef, chartContainerRect, initialViewport, dataViewport, layerExecutions, drillablePredicates, onCenterPositionChanged, onZoomChanged, onBoundsChanged, onViewportInteractionEnd, onDrill, afterRender, config, backend, locale, mapInstructionsId, mapCanvasTitle, onMapError, }) {
|
|
20
20
|
const resolvedBackend = useBackend(backend);
|
|
21
21
|
const { map, tooltip, isMapReady, error } = useMapInitialization(mapContainerRef, config, initialViewport, resolvedBackend, locale, mapInstructionsId, mapCanvasTitle, legendPanelRef);
|
|
22
22
|
useCallbackOnChange(error, onMapError);
|
|
@@ -27,9 +27,9 @@ export function MapController({ mapContainerRef, legendPanelRef, chartContainerR
|
|
|
27
27
|
isMapReady,
|
|
28
28
|
adapterContext,
|
|
29
29
|
}), [map, tooltip, isMapReady, adapterContext]);
|
|
30
|
-
return (_jsx(MapRuntimeProvider, { value: runtimeValue, children: _jsx(MapLifecycleEffects, { chartContainerRect: chartContainerRect, initialViewport: initialViewport, dataViewport: dataViewport, config: config, layerExecutions: layerExecutions, drillablePredicates: drillablePredicates, onCenterPositionChanged: onCenterPositionChanged, onZoomChanged: onZoomChanged, onDrill: onDrill, afterRender: afterRender }) }));
|
|
30
|
+
return (_jsx(MapRuntimeProvider, { value: runtimeValue, children: _jsx(MapLifecycleEffects, { chartContainerRect: chartContainerRect, initialViewport: initialViewport, dataViewport: dataViewport, config: config, layerExecutions: layerExecutions, drillablePredicates: drillablePredicates, onCenterPositionChanged: onCenterPositionChanged, onZoomChanged: onZoomChanged, onBoundsChanged: onBoundsChanged, onViewportInteractionEnd: onViewportInteractionEnd, onDrill: onDrill, afterRender: afterRender }) }));
|
|
31
31
|
}
|
|
32
|
-
function MapLifecycleEffects({ chartContainerRect, initialViewport, dataViewport, config, layerExecutions, drillablePredicates, onCenterPositionChanged, onZoomChanged, onDrill, afterRender, }) {
|
|
32
|
+
function MapLifecycleEffects({ chartContainerRect, initialViewport, dataViewport, config, layerExecutions, drillablePredicates, onCenterPositionChanged, onZoomChanged, onBoundsChanged, onViewportInteractionEnd, onDrill, afterRender, }) {
|
|
33
33
|
const { map, isMapReady } = useMapRuntime();
|
|
34
34
|
useMapResize(map, isMapReady, chartContainerRect, initialViewport, dataViewport, config);
|
|
35
35
|
useApplyInitialViewport(map, isMapReady, config, initialViewport);
|
|
@@ -37,6 +37,8 @@ function MapLifecycleEffects({ chartContainerRect, initialViewport, dataViewport
|
|
|
37
37
|
useMapCallbacks(map, {
|
|
38
38
|
onCenterPositionChanged,
|
|
39
39
|
onZoomChanged,
|
|
40
|
+
onBoundsChanged,
|
|
41
|
+
onViewportInteractionEnd,
|
|
40
42
|
});
|
|
41
43
|
useSyncLayersToMap({
|
|
42
44
|
drillablePredicates,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MapController.js","sourceRoot":"","sources":["../../../src/next/map/MapController.tsx"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,OAAO,EAAqC,OAAO,EAAE,MAAM,OAAO,CAAC;AAKnE,OAAO,EAIH,UAAU,GACb,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,8BAA8B,EAAE,MAAM,gDAAgD,CAAC;AAChG,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"MapController.js","sourceRoot":"","sources":["../../../src/next/map/MapController.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapConfig.d.ts","sourceRoot":"","sources":["../../../../src/next/map/runtime/mapConfig.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACtG,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAUpE;;;;;;;GAOG;AACH,MAAM,MAAM,oBAAoB,GAAG,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AAErE;;;;GAIG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;CAA2E,CAAC;AAE7G;;;;GAIG;AACH,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"mapConfig.d.ts","sourceRoot":"","sources":["../../../../src/next/map/runtime/mapConfig.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACtG,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAUpE;;;;;;;GAOG;AACH,MAAM,MAAM,oBAAoB,GAAG,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AAErE;;;;GAIG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;CAA2E,CAAC;AAE7G;;;;GAIG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BiC,CAAC;AAErE;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,EAAE,mBAA4C,CAAC;AAElF;;;;GAIG;AACH,eAAO,MAAM,6BAA6B;;;;;;;;;;;CAczC,CAAC;AAIF,eAAO,MAAM,YAAY,EAAE,MAAU,CAAC;AACtC,eAAO,MAAM,sBAAsB,EAAE,MAAW,CAAC;AACjD,eAAO,MAAM,cAAc,EAAE,UAG5B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,EAAE,OAAO,CAAC,UAAU,CAexD,CAAC;AAEF;;;;GAIG;AACH,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;CAC5B;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CACxC,SAAS,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,GAC5C,sBAAsB,CAOxB;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAQxF;AAED;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,EAAE,YAIrC,CAAC"}
|
|
@@ -10,7 +10,7 @@ export const DEFAULT_WORLD_BOUNDS = { northEast: { lat: 84, lng: 180 }, southWes
|
|
|
10
10
|
*
|
|
11
11
|
* @internal
|
|
12
12
|
*/
|
|
13
|
-
export const
|
|
13
|
+
export const PRESET_VIEWPORT_BOUNDS = {
|
|
14
14
|
continent_af: [
|
|
15
15
|
{ lat: -36, lng: -20 },
|
|
16
16
|
{ lat: 38, lng: 54 },
|
|
@@ -82,7 +82,7 @@ export const DEFAULT_MAPLIBRE_OPTIONS = {
|
|
|
82
82
|
// set maxDuration: 1 will remove the animation when viewport is changed
|
|
83
83
|
fitBoundsOptions: { padding: DEFAULT_BOUNDS_PADDING, maxDuration: 1 },
|
|
84
84
|
// Disable infinite geochart scrolling
|
|
85
|
-
// maxBounds:
|
|
85
|
+
// maxBounds: PRESET_VIEWPORT_BOUNDS["world"] as LngLatBoundsLike,
|
|
86
86
|
// The maximum zoom level of the map (0-24).
|
|
87
87
|
maxZoom: 8,
|
|
88
88
|
// If false, the map's pitch (tilt) control with "drag to rotate" interaction will be disabled.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapConfig.js","sourceRoot":"","sources":["../../../../src/next/map/runtime/mapConfig.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAuBrC;;;;GAIG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC;AAE7G;;;;GAIG;AACH,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"mapConfig.js","sourceRoot":"","sources":["../../../../src/next/map/runtime/mapConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,6 @@ interface IMapInitializationOptions extends IMapOptions {
|
|
|
33
33
|
*
|
|
34
34
|
* @internal
|
|
35
35
|
*/
|
|
36
|
-
export declare function initializeMapLibreMap({ container, center, zoom, bounds, interactive, dragRotate, pitchWithRotate, touchZoomRotate, navigation, enableGeoChartsViewportConfig, preserveDrawingBuffer, cooperativeGestures, maxZoom, style, basemap, colorScheme, language }: IMapInitializationOptions, locale?: IMapLibreLocale, backend?: IAnalyticalBackend): Promise<IMapInitResult>;
|
|
36
|
+
export declare function initializeMapLibreMap({ container, center, zoom, bounds, boundsPadding, interactive, dragRotate, pitchWithRotate, touchZoomRotate, navigation, enableGeoChartsViewportConfig, preserveDrawingBuffer, cooperativeGestures, maxZoom, style, basemap, colorScheme, language }: IMapInitializationOptions, locale?: IMapLibreLocale, backend?: IAnalyticalBackend): Promise<IMapInitResult>;
|
|
37
37
|
export {};
|
|
38
38
|
//# sourceMappingURL=mapInitialization.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapInitialization.d.ts","sourceRoot":"","sources":["../../../../src/next/map/runtime/mapInitialization.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAGpE,OAAO,EAGH,KAAK,sBAAsB,EAE9B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAGR,GAAG,IAAI,WAAW,EAElB,KAAK,EACR,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAGhE;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC3B,GAAG,EAAE,WAAW,CAAC;IACjB,OAAO,EAAE,KAAK,CAAC;IAEf,UAAU,EAAE,cAAc,aAAa,CAAC,CAAC;CAC5C;AAED,UAAU,yBAA0B,SAAQ,WAAW;IACnD,UAAU,CAAC,EAAE,sBAAsB,CAAC,YAAY,CAAC,CAAC;IAClD,eAAe,CAAC,EAAE,sBAAsB,CAAC,iBAAiB,CAAC,CAAC;IAC5D,eAAe,CAAC,EAAE,sBAAsB,CAAC,iBAAiB,CAAC,CAAC;CAC/D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,qBAAqB,CACvC,EACI,SAAS,EACT,MAAM,EACN,IAAI,EACJ,MAAM,EACN,WAAkB,EAClB,UAAU,EACV,eAAe,EACf,eAAe,EACf,UAAU,EACV,6BAAoC,EACpC,qBAA6B,EAC7B,mBAA0B,EAC1B,OAAO,EACP,KAAK,EACL,OAAO,EACP,WAAW,EACX,QAAQ,EACX,EAAE,yBAAyB,EAC5B,MAAM,CAAC,EAAE,eAAe,EACxB,OAAO,CAAC,EAAE,kBAAkB,GAC7B,OAAO,CAAC,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"mapInitialization.d.ts","sourceRoot":"","sources":["../../../../src/next/map/runtime/mapInitialization.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAGpE,OAAO,EAGH,KAAK,sBAAsB,EAE9B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAGR,GAAG,IAAI,WAAW,EAElB,KAAK,EACR,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAGhE;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC3B,GAAG,EAAE,WAAW,CAAC;IACjB,OAAO,EAAE,KAAK,CAAC;IAEf,UAAU,EAAE,cAAc,aAAa,CAAC,CAAC;CAC5C;AAED,UAAU,yBAA0B,SAAQ,WAAW;IACnD,UAAU,CAAC,EAAE,sBAAsB,CAAC,YAAY,CAAC,CAAC;IAClD,eAAe,CAAC,EAAE,sBAAsB,CAAC,iBAAiB,CAAC,CAAC;IAC5D,eAAe,CAAC,EAAE,sBAAsB,CAAC,iBAAiB,CAAC,CAAC;CAC/D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,qBAAqB,CACvC,EACI,SAAS,EACT,MAAM,EACN,IAAI,EACJ,MAAM,EACN,aAAa,EACb,WAAkB,EAClB,UAAU,EACV,eAAe,EACf,eAAe,EACf,UAAU,EACV,6BAAoC,EACpC,qBAA6B,EAC7B,mBAA0B,EAC1B,OAAO,EACP,KAAK,EACL,OAAO,EACP,WAAW,EACX,QAAQ,EACX,EAAE,yBAAyB,EAC5B,MAAM,CAAC,EAAE,eAAe,EACxB,OAAO,CAAC,EAAE,kBAAkB,GAC7B,OAAO,CAAC,cAAc,CAAC,CAwGzB"}
|
|
@@ -17,7 +17,7 @@ import { fetchMapStyle } from "../style/styleEndpoint.js";
|
|
|
17
17
|
*
|
|
18
18
|
* @internal
|
|
19
19
|
*/
|
|
20
|
-
export async function initializeMapLibreMap({ container, center, zoom, bounds, interactive = true, dragRotate, pitchWithRotate, touchZoomRotate, navigation, enableGeoChartsViewportConfig = true, preserveDrawingBuffer = false, cooperativeGestures = true, maxZoom, style, basemap, colorScheme, language, }, locale, backend) {
|
|
20
|
+
export async function initializeMapLibreMap({ container, center, zoom, bounds, boundsPadding, interactive = true, dragRotate, pitchWithRotate, touchZoomRotate, navigation, enableGeoChartsViewportConfig = true, preserveDrawingBuffer = false, cooperativeGestures = true, maxZoom, style, basemap, colorScheme, language, }, locale, backend) {
|
|
21
21
|
const maplibregl = await import("maplibre-gl");
|
|
22
22
|
const styleSpecification = style ?? (backend ? await fetchMapStyle(backend, basemap, colorScheme, language) : undefined);
|
|
23
23
|
if (!styleSpecification) {
|
|
@@ -45,6 +45,12 @@ export async function initializeMapLibreMap({ container, center, zoom, bounds, i
|
|
|
45
45
|
else if (typeof maxZoom === "number") {
|
|
46
46
|
mapOptions.maxZoom = maxZoom;
|
|
47
47
|
}
|
|
48
|
+
if (typeof boundsPadding === "number") {
|
|
49
|
+
mapOptions.fitBoundsOptions = {
|
|
50
|
+
...mapOptions.fitBoundsOptions,
|
|
51
|
+
padding: boundsPadding,
|
|
52
|
+
};
|
|
53
|
+
}
|
|
48
54
|
if (bounds) {
|
|
49
55
|
const lngLatBounds = normalizeBoundsForShortestPath(bounds);
|
|
50
56
|
mapOptions.bounds = lngLatBounds;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapInitialization.js","sourceRoot":"","sources":["../../../../src/next/map/runtime/mapInitialization.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mapInitialization.js","sourceRoot":"","sources":["../../../../src/next/map/runtime/mapInitialization.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viewportPresets.d.ts","sourceRoot":"","sources":["../../../../src/next/map/viewport/viewportPresets.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC3F,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"viewportPresets.d.ts","sourceRoot":"","sources":["../../../../src/next/map/viewport/viewportPresets.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC3F,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AASjF;;;;GAIG;AACH,UAAU,YAAY;IAClB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,sBAAsB,GAAG,YAAY,CA+BnG;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,gBAAgB,GAAG,SAAS,CAMnF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// (C) 2025-2026 GoodData Corporation
|
|
2
2
|
import { isConcreteViewportPreset } from "../../types/config/viewport.js";
|
|
3
|
-
import { DEFAULT_CENTER, DEFAULT_WORLD_BOUNDS, DEFAULT_ZOOM,
|
|
3
|
+
import { DEFAULT_CENTER, DEFAULT_WORLD_BOUNDS, DEFAULT_ZOOM, PRESET_VIEWPORT_BOUNDS, } from "../runtime/mapConfig.js";
|
|
4
4
|
/**
|
|
5
5
|
* Get viewport options based on data and configuration
|
|
6
6
|
*
|
|
@@ -16,7 +16,7 @@ export function getViewportOptions(data, config) {
|
|
|
16
16
|
const { area } = config?.viewport ?? {};
|
|
17
17
|
if (!center) {
|
|
18
18
|
if (isConcreteViewportPreset(area)) {
|
|
19
|
-
const [southWest, northEast] =
|
|
19
|
+
const [southWest, northEast] = PRESET_VIEWPORT_BOUNDS[area];
|
|
20
20
|
const bounds = [southWest, northEast];
|
|
21
21
|
return { bounds };
|
|
22
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viewportPresets.js","sourceRoot":"","sources":["../../../../src/next/map/viewport/viewportPresets.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAKrC,OAAO,EAA0B,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAClG,OAAO,
|
|
1
|
+
{"version":3,"file":"viewportPresets.js","sourceRoot":"","sources":["../../../../src/next/map/viewport/viewportPresets.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAKrC,OAAO,EAA0B,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAClG,OAAO,EACH,cAAc,EACd,oBAAoB,EACpB,YAAY,EACZ,sBAAsB,GACzB,MAAM,yBAAyB,CAAC;AAajC;;;;;;;;GAQG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAkB,EAAE,MAA8B,EAAgB;IACjG,MAAM,MAAM,GAA2B,MAAM,EAAE,MAAM,CAAC;IACtD,MAAM,IAAI,GAAW,MAAM,EAAE,IAAI,IAAI,YAAY,CAAC;IAClD,MAAM,EAAE,IAAI,EAAE,GAAsB,MAAM,EAAE,QAAQ,IAAI,EAAE,CAAC;IAE3D,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,IAAI,wBAAwB,CAAC,IAAI,CAAC,EAAE,CAAC;YACjC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;YAC5D,MAAM,MAAM,GAAqB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YACxD,OAAO,EAAE,MAAM,EAAE,CAAC;QACtB,CAAC;aAAM,CAAC;YACJ,MAAM,YAAY,GAAiC,eAAe,CAAC,IAAI,CAAC,CAAC;YACzE,IAAI,YAAY,EAAE,CAAC;gBACf,MAAM,MAAM,GAAqB;oBAC7B,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,EAAE,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC;oBACxD,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,EAAE,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC;iBAC3D,CAAC;gBACF,OAAO,EAAE,MAAM,EAAE,CAAC;YACtB,CAAC;YAED,OAAO;gBACH,MAAM,EAAE,cAAc;gBACtB,IAAI;aACP,CAAC;QACN,CAAC;IACL,CAAC;IAED,OAAO;QACH,MAAM;QACN,IAAI;KACP,CAAC;AAAA,CACL;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,eAAe,CAAC,OAAqB,EAAgC;IACjF,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QACnB,OAAO;IACX,CAAC;IAED,OAAO,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,SAAS,CAAC,IAAI,oBAAoB,CAAC;AAAA,CAChF;AAED,SAAS,kBAAkB,CAAC,MAAoC,EAAE,MAAkB,EAAoB;IACpG,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,MAAM,IAAI,oBAAoB,CAAC;IAC1C,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO;YACH,SAAS,EAAE,MAAM;YACjB,SAAS,EAAE,MAAM;SACpB,CAAC;IACN,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IACxC,OAAO;QACH,SAAS,EAAE;YACP,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC;YACxC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC;SAC3C;QACD,SAAS,EAAE;YACP,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC;YACxC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC;SAC3C;KACJ,CAAC;AAAA,CACL"}
|
|
@@ -6,16 +6,22 @@ import type { IMapViewport } from "../../types/map/provider.js";
|
|
|
6
6
|
* Priority order (highest wins):
|
|
7
7
|
* 1. Advanced viewport config: `config.viewport.area` (including `"auto"`) when explicitly set
|
|
8
8
|
* 2. AD-only legacy override: preset `config.viewport.area` (when `applyViewportNavigation === false`)
|
|
9
|
-
* 3. `config.
|
|
10
|
-
* 4. `config.
|
|
11
|
-
* 5. `
|
|
12
|
-
* 6.
|
|
9
|
+
* 3. `config.bounds`
|
|
10
|
+
* 4. `config.center` + `config.zoom` (backward-compatible fallback when bounds are unavailable)
|
|
11
|
+
* 5. `config.viewport.area` (preset area like "continent_eu")
|
|
12
|
+
* 6. `dataViewport` (computed from layer data; used for `"auto"`)
|
|
13
|
+
* 7. Default fallback
|
|
13
14
|
*
|
|
14
15
|
* @remarks
|
|
15
16
|
* This function is intentionally pure and cycle-free so it can be reused both:
|
|
16
17
|
* - when selecting the initial viewport for map initialization, and
|
|
17
18
|
* - when applying viewport changes (e.g. in Analytical Designer).
|
|
18
19
|
*
|
|
20
|
+
* Contract for custom viewport:
|
|
21
|
+
* - persist `bounds` whenever they are available
|
|
22
|
+
* - prefer `bounds` over `center`/`zoom`
|
|
23
|
+
* - keep `center`/`zoom` only as a backward-compatible fallback for older insights
|
|
24
|
+
*
|
|
19
25
|
* @internal
|
|
20
26
|
*/
|
|
21
27
|
export declare function computeViewportFromConfig(config: IGeoChartConfig | undefined, dataViewport?: Partial<IMapViewport> | null): Partial<IMapViewport> | null;
|
|
@@ -24,7 +30,8 @@ export declare function computeViewportFromConfig(config: IGeoChartConfig | unde
|
|
|
24
30
|
*
|
|
25
31
|
* @remarks
|
|
26
32
|
* We deliberately key only on values that should trigger viewport re-application:
|
|
27
|
-
* - `
|
|
33
|
+
* - `bounds`, or
|
|
34
|
+
* - `center`/`zoom` as fallback, or
|
|
28
35
|
* - `viewport.area`
|
|
29
36
|
*
|
|
30
37
|
* @internal
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viewportResolution.d.ts","sourceRoot":"","sources":["../../../../src/next/map/viewport/viewportResolution.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAsBhE
|
|
1
|
+
{"version":3,"file":"viewportResolution.d.ts","sourceRoot":"","sources":["../../../../src/next/map/viewport/viewportResolution.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAsBhE;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,yBAAyB,CACrC,MAAM,EAAE,eAAe,GAAG,SAAS,EACnC,YAAY,GAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAW,GAClD,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CA+B9B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,GAAG,SAAS,GAAG,MAAM,CAyBhF"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
// (C) 2025-2026 GoodData Corporation
|
|
2
2
|
import { isConcreteViewportPreset } from "../../types/config/viewport.js";
|
|
3
|
-
import { DEFAULT_CENTER, DEFAULT_ZOOM,
|
|
3
|
+
import { DEFAULT_CENTER, DEFAULT_ZOOM, PRESET_VIEWPORT_BOUNDS } from "../runtime/mapConfig.js";
|
|
4
4
|
function resolveAreaViewport(area, dataViewport) {
|
|
5
5
|
if (isConcreteViewportPreset(area)) {
|
|
6
|
-
const [southWest, northEast] =
|
|
6
|
+
const [southWest, northEast] = PRESET_VIEWPORT_BOUNDS[area];
|
|
7
7
|
return {
|
|
8
8
|
bounds: { southWest, northEast },
|
|
9
9
|
};
|
|
@@ -19,16 +19,22 @@ function resolveAreaViewport(area, dataViewport) {
|
|
|
19
19
|
* Priority order (highest wins):
|
|
20
20
|
* 1. Advanced viewport config: `config.viewport.area` (including `"auto"`) when explicitly set
|
|
21
21
|
* 2. AD-only legacy override: preset `config.viewport.area` (when `applyViewportNavigation === false`)
|
|
22
|
-
* 3. `config.
|
|
23
|
-
* 4. `config.
|
|
24
|
-
* 5. `
|
|
25
|
-
* 6.
|
|
22
|
+
* 3. `config.bounds`
|
|
23
|
+
* 4. `config.center` + `config.zoom` (backward-compatible fallback when bounds are unavailable)
|
|
24
|
+
* 5. `config.viewport.area` (preset area like "continent_eu")
|
|
25
|
+
* 6. `dataViewport` (computed from layer data; used for `"auto"`)
|
|
26
|
+
* 7. Default fallback
|
|
26
27
|
*
|
|
27
28
|
* @remarks
|
|
28
29
|
* This function is intentionally pure and cycle-free so it can be reused both:
|
|
29
30
|
* - when selecting the initial viewport for map initialization, and
|
|
30
31
|
* - when applying viewport changes (e.g. in Analytical Designer).
|
|
31
32
|
*
|
|
33
|
+
* Contract for custom viewport:
|
|
34
|
+
* - persist `bounds` whenever they are available
|
|
35
|
+
* - prefer `bounds` over `center`/`zoom`
|
|
36
|
+
* - keep `center`/`zoom` only as a backward-compatible fallback for older insights
|
|
37
|
+
*
|
|
32
38
|
* @internal
|
|
33
39
|
*/
|
|
34
40
|
export function computeViewportFromConfig(config, dataViewport = null) {
|
|
@@ -44,6 +50,10 @@ export function computeViewportFromConfig(config, dataViewport = null) {
|
|
|
44
50
|
if (config.applyViewportNavigation === false && isConcreteViewportPreset(area)) {
|
|
45
51
|
return resolveAreaViewport(area, dataViewport);
|
|
46
52
|
}
|
|
53
|
+
// Bounding box takes priority over center+zoom (container-size-independent).
|
|
54
|
+
if (config.bounds) {
|
|
55
|
+
return { bounds: config.bounds };
|
|
56
|
+
}
|
|
47
57
|
if (config.center) {
|
|
48
58
|
return {
|
|
49
59
|
center: config.center,
|
|
@@ -57,7 +67,8 @@ export function computeViewportFromConfig(config, dataViewport = null) {
|
|
|
57
67
|
*
|
|
58
68
|
* @remarks
|
|
59
69
|
* We deliberately key only on values that should trigger viewport re-application:
|
|
60
|
-
* - `
|
|
70
|
+
* - `bounds`, or
|
|
71
|
+
* - `center`/`zoom` as fallback, or
|
|
61
72
|
* - `viewport.area`
|
|
62
73
|
*
|
|
63
74
|
* @internal
|
|
@@ -72,6 +83,10 @@ export function getViewportConfigKey(config) {
|
|
|
72
83
|
if (config?.applyViewportNavigation === false && isConcreteViewportPreset(area)) {
|
|
73
84
|
return `area:${area}`;
|
|
74
85
|
}
|
|
86
|
+
if (config?.bounds) {
|
|
87
|
+
const { northEast: ne, southWest: sw } = config.bounds;
|
|
88
|
+
return `bounds:${sw.lat}:${sw.lng}:${ne.lat}:${ne.lng}`;
|
|
89
|
+
}
|
|
75
90
|
if (config?.center) {
|
|
76
91
|
const zoom = config.zoom ?? DEFAULT_ZOOM;
|
|
77
92
|
return `center:${config.center.lat}:${config.center.lng}:${zoom}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viewportResolution.js","sourceRoot":"","sources":["../../../../src/next/map/viewport/viewportResolution.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAGrC,OAAO,EAA8B,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAEtG,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"viewportResolution.js","sourceRoot":"","sources":["../../../../src/next/map/viewport/viewportResolution.ts"],"names":[],"mappings":"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"}
|