kepler.gl 3.1.6 → 3.1.7

package/src/reducers/dist/vis-state.d.ts

@@ -8,7 +8,7 @@ export declare const visStateReducerFactory: (initialState?: {}) => import("redu
     effects: import("@kepler.gl/types").Effect[];
     effectOrder: string[];
     filterToBeMerged: any[];
-    datasets: Datasets;
+    datasets: import("@kepler.gl/table").Datasets;
     editingDataset: string | undefined;
     interactionConfig: import("@kepler.gl/types").InteractionConfig;
     interactionToBeMerged: any;
@@ -62,7 +62,7 @@ export declare const visStateReducerFactory: (initialState?: {}) => import("redu
     effects: import("@kepler.gl/types").Effect[];
     effectOrder: string[];
     filterToBeMerged: any[];
-    datasets: Datasets;
+    datasets: import("@kepler.gl/table").Datasets;
     editingDataset: string | undefined;
     interactionConfig: import("@kepler.gl/types").InteractionConfig;
     interactionToBeMerged: any;
@@ -117,7 +117,7 @@ declare const _default: import("redux-actions").ReduxCompatibleReducer<{
     effects: import("@kepler.gl/types").Effect[];
     effectOrder: string[];
     filterToBeMerged: any[];
-    datasets: Datasets;
+    datasets: import("@kepler.gl/table").Datasets;
     editingDataset: string | undefined;
     interactionConfig: import("@kepler.gl/types").InteractionConfig;
     interactionToBeMerged: any;
@@ -171,7 +171,7 @@ declare const _default: import("redux-actions").ReduxCompatibleReducer<{
     effects: import("@kepler.gl/types").Effect[];
     effectOrder: string[];
     filterToBeMerged: any[];
-    datasets: Datasets;
+    datasets: import("@kepler.gl/table").Datasets;
     editingDataset: string | undefined;
     interactionConfig: import("@kepler.gl/types").InteractionConfig;
     interactionToBeMerged: any;

package/src/reducers/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kepler.gl/reducers",
   "author": "Shan He <shan@uber.com>",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "description": "kepler.gl constants used by kepler.gl components, actions and reducers",
   "license": "MIT",
   "main": "dist/index.js",
@@ -30,21 +30,21 @@
     "umd"
   ],
   "dependencies": {
-    "@kepler.gl/actions": "3.1.6",
-    "@kepler.gl/cloud-providers": "3.1.6",
-    "@kepler.gl/common-utils": "3.1.6",
-    "@kepler.gl/constants": "3.1.6",
-    "@kepler.gl/deckgl-arrow-layers": "3.1.6",
-    "@kepler.gl/deckgl-layers": "3.1.6",
-    "@kepler.gl/effects": "3.1.6",
-    "@kepler.gl/layers": "3.1.6",
-    "@kepler.gl/localization": "3.1.6",
-    "@kepler.gl/processors": "3.1.6",
-    "@kepler.gl/schemas": "3.1.6",
-    "@kepler.gl/table": "3.1.6",
-    "@kepler.gl/tasks": "3.1.6",
-    "@kepler.gl/types": "3.1.6",
-    "@kepler.gl/utils": "3.1.6",
+    "@kepler.gl/actions": "3.1.7",
+    "@kepler.gl/cloud-providers": "3.1.7",
+    "@kepler.gl/common-utils": "3.1.7",
+    "@kepler.gl/constants": "3.1.7",
+    "@kepler.gl/deckgl-arrow-layers": "3.1.7",
+    "@kepler.gl/deckgl-layers": "3.1.7",
+    "@kepler.gl/effects": "3.1.7",
+    "@kepler.gl/layers": "3.1.7",
+    "@kepler.gl/localization": "3.1.7",
+    "@kepler.gl/processors": "3.1.7",
+    "@kepler.gl/schemas": "3.1.7",
+    "@kepler.gl/table": "3.1.7",
+    "@kepler.gl/tasks": "3.1.7",
+    "@kepler.gl/types": "3.1.7",
+    "@kepler.gl/utils": "3.1.7",
     "@loaders.gl/loader-utils": "^4.3.2",
     "@mapbox/geo-viewport": "^0.4.1",
     "@math.gl/web-mercator": "^3.6.2",

package/src/reducers/src/index.ts

@@ -60,6 +60,7 @@ export * from './vis-state-updaters';
 
 export {INITIAL_UI_STATE} from './ui-state-updaters';
 
+export {getDefaultMapStyles} from './map-style-updaters';
 export type {MapboxStyleUrl, MapStyle} from './map-style-updaters';
 
 export * from './data-utils';

package/src/reducers/src/layer-utils.ts

@@ -3,7 +3,7 @@
 
 import Console from 'global/console';
 
-import {GEOCODER_LAYER_ID} from '@kepler.gl/constants';
+import {GEOCODER_LAYER_ID, LIGHT_AND_SHADOW_EFFECT} from '@kepler.gl/constants';
 import {Layer as DeckLayer, LayerProps as DeckLayerProps} from '@deck.gl/core/typed';
 import {
   Field,
@@ -236,7 +236,8 @@ export function renderDeckGlLayer(props: any, layerCallbacks: {[key: string]: an
     mapState,
     interactionConfig,
     animationConfig,
-    mapLayers
+    mapLayers,
+    experimentalContext
   } = props;
   const dataset = datasets[layer.config.dataId];
   const {gpuFilter} = dataset || {};
@@ -253,7 +254,8 @@ export function renderDeckGlLayer(props: any, layerCallbacks: {[key: string]: an
     animationConfig,
     objectHovered,
     visible,
-    dataset
+    dataset,
+    experimentalContext
   });
 }
 
@@ -367,6 +369,7 @@ export function computeDeckLayers(
 ): Layer[] {
   const {
     datasets,
+    effects,
     layers,
     layerOrder,
     layerData,
@@ -382,6 +385,10 @@ export function computeDeckLayers(
 
   let dataLayers: any[] = [];
 
+  const hasShadowEffect = effects.some(effect => {
+    return effect.type === LIGHT_AND_SHADOW_EFFECT.type;
+  });
+
   if (layerData && layerData.length) {
     const mapLayers = getMapLayersFromSplitMaps(splitMaps, mapIndex || 0);
 
@@ -409,7 +416,10 @@ export function computeDeckLayers(
             mapState,
             interactionConfig,
             animationConfig,
-            mapLayers
+            mapLayers,
+            experimentalContext: {
+              hasShadowEffect
+            }
           },
           bindedLayerCallbacks
         );
@@ -484,3 +494,11 @@ export function getLayerHoverPropValue(
   if (data instanceof DataRow) return data.valueAt(fieldIndex);
   return data[fieldIndex];
 }
+
+/** Checks if any Deck layers are in the process of loading. */
+export function areAnyDeckLayersLoading(layers: DeckLayer[]): boolean {
+  return layers.some(
+    // layer.isLoaded changes frequently in Deck (even on hover) so we check additional properties
+    layer => layer.internalState && !layer.isLoaded
+  );
+}

package/src/reducers/src/map-style-updaters.ts

@@ -15,7 +15,8 @@ import {
   getStyleImageIcon,
   isPlainObject,
   hexToRgb,
-  colorMaybeToRGB
+  colorMaybeToRGB,
+  getApplicationConfig
 } from '@kepler.gl/utils';
 import {generateHashId} from '@kepler.gl/common-utils';
 import {
@@ -71,6 +72,19 @@ export type MapStyle = {
   };
 };
 
+export const getDefaultMapStyles = (cdnUrl: string) => {
+  return DEFAULT_MAP_STYLES.reduce(
+    (accu, curr) => ({
+      ...accu,
+      [curr.id]: {
+        ...curr,
+        icon: `${cdnUrl}/${curr.icon}`
+      }
+    }),
+    {}
+  );
+};
+
 const getDefaultState = (): MapStyle => {
   const visibleLayerGroups = {};
   const topLayerGroups = {};
@@ -79,13 +93,7 @@ const getDefaultState = (): MapStyle => {
     styleType: DEFAULT_BASE_MAP_STYLE,
     visibleLayerGroups,
     topLayerGroups,
-    mapStyles: DEFAULT_MAP_STYLES.reduce(
-      (accu, curr) => ({
-        ...accu,
-        [curr.id]: curr
-      }),
-      {}
-    ),
+    mapStyles: getDefaultMapStyles(getApplicationConfig().cdnUrl),
     // save mapbox access token
     mapboxApiAccessToken: null,
     mapboxApiUrl: DEFAULT_MAPBOX_API_URL,

package/src/schemas/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kepler.gl/schemas",
   "author": "Shan He <shan@uber.com>",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "description": "kepler.gl schemas used by kepler.gl components, actions and reducers",
   "license": "MIT",
   "main": "dist/index.js",
@@ -30,12 +30,12 @@
     "umd"
   ],
   "dependencies": {
-    "@kepler.gl/common-utils": "3.1.6",
-    "@kepler.gl/constants": "3.1.6",
-    "@kepler.gl/layers": "3.1.6",
-    "@kepler.gl/table": "3.1.6",
-    "@kepler.gl/types": "3.1.6",
-    "@kepler.gl/utils": "3.1.6",
+    "@kepler.gl/common-utils": "3.1.7",
+    "@kepler.gl/constants": "3.1.7",
+    "@kepler.gl/layers": "3.1.7",
+    "@kepler.gl/table": "3.1.7",
+    "@kepler.gl/types": "3.1.7",
+    "@kepler.gl/utils": "3.1.7",
     "@loaders.gl/loader-utils": "^4.3.2",
     "@types/keymirror": "^0.1.1",
     "@types/lodash": "4.17.5",

package/src/styles/dist/base.d.ts

@@ -285,6 +285,7 @@ export declare const sliderInputPadding = "4px 6px";
 export declare const sliderMarginTopIsTime = -12;
 export declare const sliderMarginTop = 12;
 export declare const sliderMarginBottom = 12;
+export declare const customRangeInputWidth = 100;
 export declare const geocoderWidth = 360;
 export declare const geocoderTop = 20;
 export declare const geocoderRight = 12;
@@ -684,6 +685,7 @@ export declare const theme: {
     sliderMarginTopIsTime: number;
     sliderMarginTop: number;
     sliderMarginBottom: number;
+    customRangeInputWidth: number;
     geocoderWidth: number;
     geocoderTop: number;
     geocoderRight: number;
@@ -1128,6 +1130,7 @@ export declare const themeLT: {
     sliderMarginTopIsTime: number;
     sliderMarginTop: number;
     sliderMarginBottom: number;
+    customRangeInputWidth: number;
     geocoderWidth: number;
     geocoderTop: number;
     geocoderRight: number;
@@ -1571,6 +1574,7 @@ export declare const themeBS: {
     sliderMarginTopIsTime: number;
     sliderMarginTop: number;
     sliderMarginBottom: number;
+    customRangeInputWidth: number;
     geocoderWidth: number;
     geocoderTop: number;
     geocoderRight: number;