Merge branch 'master' into igr/duckdb-demo-branch

Author: igorDykhta

package.json

@@ -236,6 +236,7 @@
     "@loaders.gl/gis": "4.3.2",
     "@loaders.gl/schema": "4.3.2",
     "@loaders.gl/wkt": "4.3.2",
+    "@loaders.gl/wms": "4.3.2",
     "@luma.gl/constants": "8.5.21",
     "@luma.gl/core": "8.5.21",
     "@luma.gl/experimental": "8.5.21",

src/actions/src/action-types.ts

@@ -148,6 +148,7 @@ export const ActionTypes = {
   REMOVE_NOTIFICATION: `${ACTION_PREFIX}REMOVE_NOTIFICATION`,
   SET_LOCALE: `${ACTION_PREFIX}SET_LOCALE`,
   LAYER_FILTERED_ITEMS_CHANGE: `${ACTION_PREFIX}LAYER_FILTERED_ITEMS_CHANGE`,
+  WMS_FEATURE_INFO: `${ACTION_PREFIX}WMS_FEATURE_INFO`,
   SYNC_TIME_FILTER_WITH_LAYER_TIMELINE: `${ACTION_PREFIX}SYNC_TIME_FILTER_WITH_LAYER_TIMELINE`,
   SYNC_TIME_FILTER_TIMELINE_MODE: `${ACTION_PREFIX}SYNC_TIME_FILTER_TIMELINE_MODE`,
   TOGGLE_PANEL_LIST_VIEW: `${ACTION_PREFIX}TOGGLE_PANEL_LIST_VIEW`,

src/actions/src/vis-state-actions.ts

@@ -1629,6 +1629,33 @@ export function layerFilteredItemsChange(
   };
 }
 
+export type WMSFeatureInfoAction = {
+  layer: Layer;
+  featureInfo: Array<{name: string; value: string}> | string | null;
+  coordinate?: [number, number] | null;
+};
+
+/**
+ * WMS layer feature info callback
+ * @memberof visStateActions
+ * @param layer
+ * @param featureInfo
+ * @param coordinate
+ * @return action
+ */
+export function wmsFeatureInfo(
+  layer: WMSFeatureInfoAction['layer'],
+  featureInfo: WMSFeatureInfoAction['featureInfo'],
+  coordinate?: WMSFeatureInfoAction['coordinate']
+): Merge<WMSFeatureInfoAction, {type: typeof ActionTypes.WMS_FEATURE_INFO}> {
+  return {
+    type: ActionTypes.WMS_FEATURE_INFO,
+    layer,
+    featureInfo,
+    coordinate
+  };
+}
+
 export type SyncTimeFilterWithLayerTimelineAction = {
   idx: number;
   enable: boolean;

src/ai-assistant/src/components/ai-assistant-config.tsx

@@ -16,7 +16,7 @@ import {
 } from '@kepler.gl/components';
 import {State} from '../index';
 import ApiKey from '../icons/api-key';
-import PROVIDER_MODELS from '../config/models.json';
+import {PROVIDER_MODELS} from '../config/models';
 import {useLocalStorage} from 'usehooks-ts';
 import {GetAssistantModelByProvider} from '@openassistant/core';
 import {updateAiAssistantConfig} from '../actions';

src/ai-assistant/src/config/models.json src/ai-assistant/src/config/models.tssrc/ai-assistant/src/config/models.json renamed to src/ai-assistant/src/config/models.ts

@@ -1,4 +1,4 @@
-{
+export const PROVIDER_MODELS = {
   "openai": [
     "gpt-4.1",
     "gpt-4o",
@@ -27,4 +27,4 @@
   ],
   "xai": ["grok-3", "grok-3-fast", "grok-3-mini", "grok-3-mini-fast"],
   "ollama": ["deepseek-r1", "gemma3", "llama4", "llama3.3", "mistral", "phi4", "qwen3", "qwen2.5"]
-}
+};

src/components/package.json

@@ -54,6 +54,7 @@
     "@kepler.gl/utils": "3.1.8",
     "@loaders.gl/mvt": "^4.3.2",
     "@loaders.gl/pmtiles": "^4.3.2",
+    "@loaders.gl/wms": "4.3.2",
     "@mapbox/mapbox-sdk": "^0.15.3",
     "@nebula.gl/edit-modes": "1.0.2-alpha.1",
     "@tippyjs/react": "^4.2.0",

src/components/src/common/loading-spinner.tsx

@@ -17,15 +17,14 @@ const animationName = keyframes`
 
 const Loader = styled.span`
     border-left-color: ${props => props.color || props.theme.primaryBtnBgd};
-    animation: _preloader_spin_ 500ms linear infinite;
     border-radius: 50%;
     border-top-color: transparent;
     border-bottom-color: transparent;
     border-right-color: transparent;
     cursor: wait;
     border-style: solid;
     display: block;
-    animation-name: ${animationName};
+    animation: ${animationName} 500ms linear infinite;
 }`;
 
 export type LoadingWrapperProps = BaseComponentProps & {

src/components/src/map-container.tsx

@@ -526,6 +526,20 @@ export default function MapContainerFactory(
       this.props.visStateActions.layerFilteredItemsChange(this.props.visState.layers[idx], event);
     };
 
+    _onWMSFeatureInfo = (
+      idx: number,
+      data: {
+        featureInfo: Array<{name: string; value: string}> | string | null;
+        coordinate?: [number, number] | null;
+      }
+    ) => {
+      this.props.visStateActions.wmsFeatureInfo(
+        this.props.visState.layers[idx],
+        data.featureInfo,
+        data.coordinate
+      );
+    };
+
     _handleMapToggleLayer = layerId => {
       const {index: mapIndex = 0, visStateActions} = this.props;
       visStateActions.toggleLayerForMap(mapIndex, layerId);
@@ -823,7 +837,8 @@ export default function MapContainerFactory(
         {
           onLayerHover: this._onLayerHover,
           onSetLayerDomain: this._onLayerSetDomain,
-          onFilteredItemsChange: this._onLayerFilteredItemsChange
+          onFilteredItemsChange: this._onLayerFilteredItemsChange,
+          onWMSFeatureInfo: this._onWMSFeatureInfo
         },
         deckGlProps
       );

src/components/src/map/layer-hover-info.tsx

@@ -138,22 +138,37 @@ const EntryInfoRow: React.FC<EntryInfoRowProps> = ({
   const field = fields[fieldIdx];
   const fieldValueAccessor = layer.accessVSFieldValue(field, currentTime);
   const value = fieldValueAccessor(field, data instanceof DataRow ? {index: data._rowIndex} : data);
-  const primaryValue = primaryData
-    ? fieldValueAccessor(
-        field,
-        primaryData instanceof DataRow ? {index: primaryData._rowIndex} : primaryData
-      )
-    : null;
-  const displayValue = getTooltipDisplayValue({item, field, value});
 
-  const displayDeltaValue = primaryData
-    ? getTooltipDisplayDeltaValue({
-        field,
-        value,
-        primaryValue,
-        compareType
-      })
-    : null;
+  // Handle WMS layer data in comparison mode - WMS layers don't have comparable field data
+  let primaryValue = null;
+  let displayDeltaValue: string | null = null;
+
+  if (primaryData) {
+    try {
+      // Only calculate primary value if primaryData has a compatible structure
+      if (
+        primaryData instanceof DataRow ||
+        (primaryData && typeof primaryData === 'object' && 'index' in primaryData)
+      ) {
+        primaryValue = fieldValueAccessor(
+          field,
+          primaryData instanceof DataRow ? {index: primaryData._rowIndex} : primaryData
+        );
+
+        displayDeltaValue = getTooltipDisplayDeltaValue({
+          field,
+          value,
+          primaryValue,
+          compareType
+        });
+      }
+    } catch (error) {
+      // If there's an error accessing primaryData (e.g., WMS layer data), skip comparison
+      primaryValue = null;
+    }
+  }
+
+  const displayValue = getTooltipDisplayValue({item, field, value});
 
   return (
     <Row
@@ -236,6 +251,7 @@ const LayerHoverInfoFactory = () => {
 
     const hasFieldsToShow =
       (data.fieldValues && Object.keys(data.fieldValues).length > 0) ||
+      (data.wmsFeatureData && data.wmsFeatureData.length > 0) ||
       (props.fieldsToShow && props.fieldsToShow.length > 0);
 
     return (
@@ -246,7 +262,13 @@ const LayerHoverInfoFactory = () => {
         </StyledLayerName>
         {hasFieldsToShow && <StyledDivider />}
         <StyledTable>
-          {data.fieldValues ? (
+          {data.wmsFeatureData ? (
+            <tbody>
+              {data.wmsFeatureData.map(({name, value}, i) => (
+                <Row key={i} name={name} value={value} />
+              ))}
+            </tbody>
+          ) : data.fieldValues ? (
             <tbody>
               {data.fieldValues.map(({labelMessage, value}, i) => (
                 <Row key={i} name={intl.formatMessage({id: labelMessage})} value={value} />

src/components/src/modals/export-data-modal.tsx

@@ -94,7 +94,8 @@ const ExportDataModalFactory = () => {
       const showTiledDatasetWarning = Object.keys(datasets).some(datasetId => {
         return (
           (datasets[datasetId].type === DatasetType.VECTOR_TILE ||
-            datasets[datasetId].type === DatasetType.RASTER_TILE) &&
+            datasets[datasetId].type === DatasetType.RASTER_TILE ||
+            datasets[datasetId].type === DatasetType.WMS_TILE) &&
           (selectedDataset === datasetId || exportAllDatasets)
         );
       });