@dynatrace/strato-geo 3.5.2 → 3.7.0

package/map/types/tooltip.d.ts

@@ -38,6 +38,10 @@ export interface DotLayerTooltipHandlerProps {
     children?: DotLayerTooltipHandler | null;
     /** Series actions callback for the default tooltip */
     seriesActions?: (data: Location) => SeriesActionsTemplate;
+    /** Whether the tooltip is hidden */
+    hidden?: boolean;
+    /** Overrides the horizontal alignment of series symbols */
+    symbolAlignment?: 'left' | 'right';
 }
 /**
  * Bubble Tooltip data payload for the tooltip handler callback
@@ -67,6 +71,10 @@ export interface BubbleLayerTooltipHandlerProps {
     children?: BubbleLayerTooltipHandler | null;
     /** Series actions callback for the default tooltip */
     seriesActions?: (location: Location) => SeriesActionsTemplate;
+    /** Whether the tooltip is hidden */
+    hidden?: boolean;
+    /** Overrides the horizontal alignment of series symbols */
+    symbolAlignment?: 'left' | 'right';
 }
 /**
  * Connection Tooltip data payload for the tooltip handler callback
@@ -95,6 +103,10 @@ export interface ConnectionLayerTooltipHandlerProps {
     children?: ConnectionLayerTooltipHandler | null;
     /** Series actions callback for the default tooltip */
     seriesActions?: (data: Location) => SeriesActionsTemplate;
+    /** Whether the tooltip is hidden */
+    hidden?: boolean;
+    /** Overrides the horizontal alignment of series symbols */
+    symbolAlignment?: 'left' | 'right';
 }
 /**
  * Choropleth Tooltip data payload for the tooltip handler callback
@@ -125,9 +137,14 @@ export interface ChoroplethLayerTooltipHandlerProps {
     children?: ChoroplethLayerTooltipHandler | null;
     /** Series actions callback for the default tooltip */
     seriesActions?: (data: ChoroplethLayerTooltipData) => SeriesActionsTemplate;
+    /** Whether the tooltip is hidden */
+    hidden?: boolean;
+    /** Overrides the horizontal alignment of series symbols */
+    symbolAlignment?: 'left' | 'right';
 }
 /**
  * Map Geo Tooltip Props
  * @public
+ * @deprecated Use `ChartTooltip` from `@dynatrace/strato-components/charts` instead. Removal: APPDEV-17834
  */
 export type ChartTooltip = ChartTooltipSlotsType & ChartTooltipTemplateType;

package/map/utils/attach-image-from-shape.js

@@ -25,20 +25,22 @@ var import_attach_image_to_map = require("./attach-image-to-map.js");
 var import_create_bitmap_config_options = require("./create-bitmap-config-options.js");
 var import_get_data_uri = require("./get-data-uri.js");
 var import_constants = require("../constants.js");
+var import_is_browser_firefox = require("./is-browser-firefox.js");
 var import_shape_picker = require("../shapes/shape-picker.js");
 const attachImageFromShape = (map, shape, name, outputSize) => {
   const pickedShape = (0, import_shape_picker.getShape)(shape);
   const stringUrl = (0, import_get_data_uri.getDataUri)(encodeURIComponent(pickedShape));
   const img = new Image(import_constants.DEFAULT_INPUT_ICON_SIZE, import_constants.DEFAULT_INPUT_ICON_SIZE);
   img.addEventListener("load", () => {
-    createImageBitmap(
+    const bitmapPromise = (0, import_is_browser_firefox.isFirefox)() ? createImageBitmap(img, (0, import_create_bitmap_config_options.createBitmapConfigOptions)(outputSize)) : createImageBitmap(
       img,
       0,
       0,
       import_constants.DEFAULT_INPUT_ICON_SIZE,
       import_constants.DEFAULT_INPUT_ICON_SIZE,
       (0, import_create_bitmap_config_options.createBitmapConfigOptions)(outputSize)
-    ).then((bitmap) => {
+    );
+    bitmapPromise.then((bitmap) => {
       if (!map) {
         return;
       }

package/map/utils/extract-layers-data.d.ts

@@ -1,4 +1,5 @@
 import { type ReactNode } from 'react';
+import type { GeoDataLookupRegistry } from '../contexts/geo-data-lookup.context.js';
 /**
  * Extract layers data
  * @param children - MapView children
@@ -9,4 +10,5 @@ export declare const extractLayersData: (children: ReactNode, valueAccessors: Ma
     flattenData: Record<string, unknown>[];
     categories: string[];
     legendDomain: [number, number];
+    dataLookupRegistry: GeoDataLookupRegistry;
 };

package/map/utils/extract-layers-data.js

@@ -47,17 +47,20 @@ const extractLayersData = (children, valueAccessors) => {
   let flattenData = [];
   const categoriesSet = /* @__PURE__ */ new Set();
   let legendDomain = [Infinity, -Infinity];
+  const dataLookupRegistry = /* @__PURE__ */ new Map();
   import_react.Children.forEach(children, (child) => {
     if ((0, import_is_component.isComponent)(child, import_BubbleLayer.BubbleLayer) || (0, import_is_component.isComponent)(child, import_DotLayer.DotLayer)) {
-      const { data } = child.props;
-      data.forEach((dataPoint) => {
+      const { data, layerId } = child.props;
+      const lookup = /* @__PURE__ */ new Map();
+      data.forEach((dataPoint, index) => {
+        lookup.set(index, dataPoint);
         const extendedDataPoint = {
           ...dataPoint,
-          "layer-name": child.props.layerId
+          "layer-name": layerId
         };
         const category = addCategory(
           extendedDataPoint,
-          valueAccessors.get(child.props.layerId)
+          valueAccessors.get(layerId)
         );
         category && categoriesSet.add(category);
         if (typeof category === "number") {
@@ -65,14 +68,14 @@ const extractLayersData = (children, valueAccessors) => {
         }
         flattenData = flattenData.concat(extendedDataPoint);
       });
+      dataLookupRegistry.set(`source-${layerId}`, lookup);
     } else if ((0, import_is_component.isComponent)(child, import_ConnectionLayer.ConnectionLayer)) {
-      const { data } = child.props;
+      const { data, layerId } = child.props;
+      const lookup = /* @__PURE__ */ new Map();
       data.forEach((connection, connectionIndex) => {
+        lookup.set(connectionIndex, connection);
         if (connection.path.length >= 2) {
-          const category = addCategory(
-            connection,
-            valueAccessors.get(child.props.layerId)
-          );
+          const category = addCategory(connection, valueAccessors.get(layerId));
           category && categoriesSet.add(category);
           if (typeof category === "number") {
             legendDomain = updateDomain(legendDomain, category);
@@ -82,24 +85,28 @@ const extractLayersData = (children, valueAccessors) => {
               ...path,
               "connection-name": `connection-${connectionIndex + 1}`,
               "connection-item-index": pathIndex,
-              "layer-name": child.props.layerId
+              "layer-name": layerId
             };
             flattenData.push(parsedPath);
           });
         }
       });
+      dataLookupRegistry.set(`source-${layerId}`, lookup);
     } else if ((0, import_is_component.isComponent)(child, import_ChoroplethLayer.ChoroplethLayer)) {
-      const { data, regionAccessor } = child.props;
-      data.forEach((dataEntry) => {
+      const { data, regionAccessor, layerId } = child.props;
+      const sourceId = layerId.replace("layer", "source");
+      const lookup = /* @__PURE__ */ new Map();
+      data.forEach((dataEntry, index) => {
+        lookup.set(index, dataEntry);
         const region = (0, import_lodash_es.isString)(regionAccessor) ? dataEntry[regionAccessor] : regionAccessor(dataEntry);
         const choroplethLayerData = {
           ...dataEntry,
           region,
-          "layer-name": child.props.layerId
+          "layer-name": layerId
         };
         const category = addCategory(
           choroplethLayerData,
-          valueAccessors.get(child.props.layerId)
+          valueAccessors.get(layerId)
         );
         category && categoriesSet.add(category);
         if (typeof category === "number") {
@@ -107,11 +114,13 @@ const extractLayersData = (children, valueAccessors) => {
         }
         flattenData.push(choroplethLayerData);
       });
+      dataLookupRegistry.set(sourceId, lookup);
     }
   });
   return {
     flattenData,
     categories: [...categoriesSet],
-    legendDomain
+    legendDomain,
+    dataLookupRegistry
   };
 };

package/map/utils/fetch-base-layer-features.js

@@ -26,7 +26,7 @@ module.exports = __toCommonJS(fetch_base_layer_features_exports);
 var import_lodash_es = require("lodash");
 var import_constants = require("../constants.js");
 const cache = /* @__PURE__ */ new Map();
-const MAPS_WITH_DISPUTED_BORDERS = ["IN", "IL", "CN"];
+const MAPS_WITH_DISPUTED_BORDERS = ["IN", "IL", "CN", "MA"];
 const getWorldViewParam = (countryCode) => MAPS_WITH_DISPUTED_BORDERS.includes(countryCode) ? `${countryCode}/` : "";
 const fetchWorldViewFeatures = async (tenantCountryCode) => {
   const worldViewParam = getWorldViewParam(tenantCountryCode);

package/map/utils/is-browser-firefox.d.ts

@@ -0,0 +1,5 @@
+/**
+ * @returns true if is firefox browser, false otherwise
+ * @internal
+ */
+export declare function isFirefox(): boolean;

package/map/utils/is-browser-firefox.js

@@ -0,0 +1,26 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var is_browser_firefox_exports = {};
+__export(is_browser_firefox_exports, {
+  isFirefox: () => isFirefox
+});
+module.exports = __toCommonJS(is_browser_firefox_exports);
+function isFirefox() {
+  return typeof navigator !== "undefined" && navigator.userAgent.toLowerCase().includes("firefox");
+}

package/map/utils/parse-tooltip-data.d.ts

@@ -1,10 +1,18 @@
 import type { MapGeoJSONFeature, MapLayerMouseEvent } from 'maplibre-gl';
+import type { GeoDataLookupRegistry } from '../contexts/geo-data-lookup.context.js';
 /**
- * Extracts useful map features data for the tooltip
+ * Extracts useful map features data for the tooltip.
+ *
+ * When a data lookup registry is provided, the full original data
+ * is restored from the `__dataIndex` stored in GeoJSON properties.
+ * This allows GeoJSON features to carry only rendering-relevant
+ * fields while still providing full data for tooltips.
+ *
  * @param features - map features
+ * @param registry - optional data lookup registry for restoring full data
  */
-export declare const parseTooltipData: (features: MapGeoJSONFeature[]) => unknown[];
-export declare const extractDataFromEvent: (event: MapLayerMouseEvent) => {
+export declare const parseTooltipData: (features: MapGeoJSONFeature[], registry?: GeoDataLookupRegistry) => unknown[];
+export declare const extractDataFromEvent: (event: MapLayerMouseEvent, registry?: GeoDataLookupRegistry) => {
     featureId?: undefined;
     hoveredLayerId?: undefined;
     data?: undefined;

package/map/utils/parse-tooltip-data.js

@@ -40,20 +40,35 @@ const parseFeatureProperties = (featureProperties) => {
   }
   return properties;
 };
-const parseTooltipData = (features) => {
+const resolveSourceId = (feature) => feature.source ?? feature.layer?.source;
+const restoreDataFromLookup = (sourceId, dataIndex, registry) => {
+  if (registry === void 0 || sourceId === void 0 || dataIndex === void 0) {
+    return void 0;
+  }
+  const lookup = registry.get(sourceId);
+  return lookup?.get(dataIndex);
+};
+const parseTooltipData = (features, registry) => {
   const data = [];
   for (const feature of features) {
     const properties = parseFeatureProperties(feature.properties);
-    const [latitude, longitude] = feature.geometry.coordinates;
+    const sourceId = resolveSourceId(feature);
+    const { __dataIndex, ...visibleProperties } = properties;
+    const dataIndex = typeof __dataIndex === "number" ? __dataIndex : void 0;
+    const originalData = restoreDataFromLookup(sourceId, dataIndex, registry);
+    const coordinates = feature.geometry.type === "Point" ? {
+      longitude: feature.geometry.coordinates[0],
+      latitude: feature.geometry.coordinates[1]
+    } : {};
     data.push({
-      ...properties,
-      latitude,
-      longitude
+      ...visibleProperties,
+      ...originalData !== void 0 ? { data: originalData } : {},
+      ...coordinates
     });
   }
   return data;
 };
-const extractDataFromEvent = (event) => {
+const extractDataFromEvent = (event, registry) => {
   if (!event.features?.length) {
     return {};
   }
@@ -62,7 +77,7 @@ const extractDataFromEvent = (event) => {
   const hoveredFeatures = event.features.filter(
     (feature2) => feature2.layer.id === hoveredLayerId
   );
-  const data = parseTooltipData(hoveredFeatures);
+  const data = parseTooltipData(hoveredFeatures, registry);
   return {
     featureId: `${hoveredLayerId}-${feature.id}`,
     hoveredLayerId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynatrace/strato-geo",
-  "version": "3.5.2",
+  "version": "3.7.0",
   "private": false,
   "license": "Apache-2.0",
   "keywords": [
@@ -54,7 +54,7 @@
     "@dynatrace-sdk/client-classic-environment-v2": "^5.1.0",
     "@dynatrace-sdk/client-platform-management-service": "^1.7.0",
     "@dynatrace-sdk/units": "^1.5.0",
-    "@dynatrace/strato-components": "^3.5.2",
+    "@dynatrace/strato-components": "^3.7.0",
     "@dynatrace/strato-design-tokens": "^1.5.0",
     "@dynatrace/strato-icons": "^2.3.0",
     "react": "^18.0.0",

package/esm/map/components/ConnectionLayer/utils/restore-null-props.js

@@ -1,9 +0,0 @@
-import { merge } from "lodash-es";
-const restoreNullProps = (data) => data?.map(({ __nullValues, ...rest }) => {
-  const nullProps = __nullValues?.map((prop) => ({ [prop]: null })) || [];
-  return merge(rest, ...nullProps);
-});
-export {
-  restoreNullProps
-};
-//# sourceMappingURL=restore-null-props.js.map

package/esm/map/components/ConnectionLayer/utils/restore-null-props.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../../../src/map/components/ConnectionLayer/utils/restore-null-props.ts"],
-  "sourcesContent": ["import { merge } from 'lodash-es';\n\nimport type { ConnectionTooltipStatePayload } from '../../../types/connection-layer.js';\n\nexport const restoreNullProps = (\n  data: ConnectionTooltipStatePayload[] | undefined,\n): Omit<ConnectionTooltipStatePayload, '__nullValues'>[] | undefined =>\n  data?.map(({ __nullValues, ...rest }) => {\n    const nullProps = __nullValues?.map((prop) => ({ [prop]: null })) || [];\n    return merge(rest, ...nullProps);\n  });\n"],
-  "mappings": "AAAA,SAAS,aAAa;AAIf,MAAM,mBAAmB,CAC9B,SAEA,MAAM,IAAI,CAAC,EAAE,cAAc,GAAG,KAAK,MAAM;AACvC,QAAM,YAAY,cAAc,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,GAAG,KAAK,EAAE,KAAK,CAAC;AACtE,SAAO,MAAM,MAAM,GAAG,SAAS;AACjC,CAAC;",
-  "names": []
-}

package/esm/map/hooks/use-map-mouse-move.js

@@ -1,19 +0,0 @@
-import { useMap } from "@vis.gl/react-maplibre";
-import { useEffect } from "react";
-const useMapMouseMove = (layerIds, callback) => {
-  const { current: map } = useMap();
-  useEffect(() => {
-    layerIds.forEach((layerId) => {
-      map?.on("mousemove", layerId, callback);
-    });
-    return () => {
-      layerIds.forEach((layerId) => {
-        map?.off("mousemove", layerId, callback);
-      });
-    };
-  });
-};
-export {
-  useMapMouseMove
-};
-//# sourceMappingURL=use-map-mouse-move.js.map

package/esm/map/hooks/use-map-mouse-move.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../src/map/hooks/use-map-mouse-move.ts"],
-  "sourcesContent": ["import { useMap } from '@vis.gl/react-maplibre';\nimport type { MapLayerMouseEvent } from 'maplibre-gl';\nimport { useEffect } from 'react';\n\nexport const useMapMouseMove = (\n  layerIds: string[],\n  callback: (event: MapLayerMouseEvent) => void,\n) => {\n  const { current: map } = useMap();\n\n  useEffect(() => {\n    layerIds.forEach((layerId) => {\n      map?.on('mousemove', layerId, callback);\n    });\n\n    return () => {\n      layerIds.forEach((layerId) => {\n        map?.off('mousemove', layerId, callback);\n      });\n    };\n  });\n};\n"],
-  "mappings": "AAAA,SAAS,cAAc;AAEvB,SAAS,iBAAiB;AAEnB,MAAM,kBAAkB,CAC7B,UACA,aACG;AACH,QAAM,EAAE,SAAS,IAAI,IAAI,OAAO;AAEhC,YAAU,MAAM;AACd,aAAS,QAAQ,CAAC,YAAY;AAC5B,WAAK,GAAG,aAAa,SAAS,QAAQ;AAAA,IACxC,CAAC;AAED,WAAO,MAAM;AACX,eAAS,QAAQ,CAAC,YAAY;AAC5B,aAAK,IAAI,aAAa,SAAS,QAAQ;AAAA,MACzC,CAAC;AAAA,IACH;AAAA,EACF,CAAC;AACH;",
-  "names": []
-}

package/map/components/ConnectionLayer/utils/restore-null-props.d.ts

@@ -1,2 +0,0 @@
-import type { ConnectionTooltipStatePayload } from '../../../types/connection-layer.js';
-export declare const restoreNullProps: (data: ConnectionTooltipStatePayload[] | undefined) => Omit<ConnectionTooltipStatePayload, "__nullValues">[] | undefined;

package/map/hooks/use-map-mouse-move.d.ts

@@ -1,2 +0,0 @@
-import type { MapLayerMouseEvent } from 'maplibre-gl';
-export declare const useMapMouseMove: (layerIds: string[], callback: (event: MapLayerMouseEvent) => void) => void;