[ADD] Catching up to Kepler master

CodeLabs-Hubble-gl · Aug 14, 2020 · 4d50602 · 4d50602
2 parents 9cc32fd + 3d72066
commit 4d50602
Show file tree

Hide file tree

Showing 81 changed files with 1,368 additions and 877 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,29 +14,58 @@ Each version should:
   Security to invite users to upgrade in case of vulnerabilities.
 Ref: http://keepachangelog.com/en/0.3.0/
 -->
+
+## [2.3.1] - Aug 4 2020
+
+- [Bug] fix tooltip config, add boolean formatter (#1216)
+- [Enhancement] Geocoder interaction improvements (#1214)
+- [Enhancement] add options.autoCreateLayers to addDataToMap (#1215)
+- [Bug] Hide BottomWidgetContainer nothing to render (#1213)
+- [Enhancement] Cleanup unused babel plugins (#1211)
+- [Bug] fix file handler row parsing to support single geojson feature (#1212)
+- [Enhancement] Add KeplerGl.onDeckInitialized callback (#1193)
+- [Enhancement] Render geocode in readOnly mode (#1177)
+- [Feat] pass initialUiState to prop (#1187)
+- [Docs] Fix `replace-component` Readme (#1207)
+- [Jupyter] Convert to gdf to a dataframe instead of a copy (#1201)
+- New image export approach (#1199)
+- Add prop to disable file extension checking (#1195)
+- Load: extract extensions from loader objects (#1194)
+- Add `visState.loaders` to let app inject a list of loaders.gl loaders. (#1192)
+- Enable modal prop types (#1190)
+- Enable modal types (#1189)
+- Add types to top-level KeplerGl component (#1188)
+- Add typescript types for upload modal and components (#1185)
+- Add types for composer helpers (#1186)
+- [Feat] add zoom to coordinate tooltip (#1179)
+- [Enhancement] export more layer configurator components (#1176)
+- [Bug/Enhancement] Pass PanelHeader props to the onClick handler of action items (#1181)
+- [Bug] Fix import of the user guide link (#1182)
+- [examples] update example version to 2.3.0
+
 ## [2.3.0] - July 6 2020
-[Enhancement] Improve animation sliders (#1157)
-[Enhancement] speed control step to 0.001 (#1155)
-[website] remove unused env, relax on  package engines requirement (#1173)
-[Feat] Pinned tooltip + Compare (#1132)
-[Feat] Integration with loaders.gl 2.2 (#1156)
-[Feat] Bump deck.gl and luma.gl to v8.2 (#1166)
-[Chore] Bump websocket-extensions from 0.1.3 to 0.1.4 (#1138)
-[Website] Add 2020 Survey (#1154)
-[Bug] Tooltip formatting (#1129)
-[Jupyter] Default centerMap to False so that zoom map state configurations are not  (#1142)
-[Enhancement] close modal when press escape key (#1134)
-[Enhancement] Export time widget factories (#1133)
-[Enhancement] filter invalid value when calculate trip layer domain (#1131)
-[Feat] enable tooltip formatting in interaction config  (#1102)
-[Feat] Add type definition  (#1116)
-[RFC] table class RFC (#1109)
-[Docs] adding missing bracket (#1094)
-add side-panel inner class (#1113)
-[Bug] add hexagon layer translation (#1114)
-[Jupyter] fix gitignore add missing files (#1118)
-[Jupyter] Publish keplergl jupyter 0.2.0 (#1110)
-[Enhancement] fix attribution color, add kepler smaller font (#1092)
+- [Enhancement] Improve animation sliders (#1157)
+- [Enhancement] speed control step to 0.001 (#1155)
+- [website] remove unused env, relax on  package engines requirement (#1173)
+- [Feat] Pinned tooltip + Compare (#1132)
+- [Feat] Integration with loaders.gl 2.2 (#1156)
+- [Feat] Bump deck.gl and luma.gl to v8.2 (#1166)
+- [Chore] Bump websocket-extensions from 0.1.3 to 0.1.4 (#1138)
+- [Website] Add 2020 Survey (#1154)
+- [Bug] Tooltip formatting (#1129)
+- [Jupyter] Default centerMap to False so that zoom map state configurations are not  (#1142)
+- [Enhancement] close modal when press escape key (#1134)
+- [Enhancement] Export time widget factories (#1133)
+- [Enhancement] filter invalid value when calculate trip layer domain (#1131)
+- [Feat] enable tooltip formatting in interaction config  (#1102)
+- [Feat] Add type definition  (#1116)
+- [RFC] table class RFC (#1109)
+- [Docs] adding missing bracket (#1094)
+- add side-panel inner class (#1113)
+- [Bug] add hexagon layer translation (#1114)
+- [Jupyter] fix gitignore add missing files (#1118)
+- [Jupyter] Publish keplergl jupyter 0.2.0 (#1110)
+- [Enhancement] fix attribution color, add kepler smaller font (#1092)
 
 ## [2.2.0] - May 10 2020
 - [Enhancement] Added Editor and FeatureActionPanel factories (#1093)

diff --git a/README.md b/README.md
@@ -296,6 +296,12 @@ const mapStyles = [
 ];
 ```
 
+#### `initialUiState` (object, optional)
+
+- Default: `undefined`
+
+Intial UI State applied to uiState reducer, value will be shallow merged with default [`INITIAL_UI_STATE`](https://docs.kepler.gl/docs/api-reference/reducers/ui-state#initial_ui_state)
+
 ### 3. Dispatch custom actions to `keplerGl` reducer.
 
 One advantage of using the reducer over React component state to handle keplerGl state is the flexibility

diff --git a/babel.config.js b/babel.config.js
@@ -23,7 +23,6 @@ const KeplerPackage = require('./package');
 const PRESETS = ['@babel/preset-env', '@babel/preset-react'];
 const PLUGINS = [
   '@babel/plugin-transform-modules-commonjs',
-  ['@babel/plugin-proposal-decorators', {legacy: true}],
   '@babel/plugin-proposal-class-properties',
   '@babel/plugin-proposal-export-namespace-from',
   [

diff --git a/bindings/kepler.gl-jupyter/keplergl/keplergl.py b/bindings/kepler.gl-jupyter/keplergl/keplergl.py
@@ -34,11 +34,12 @@ def _gdf_to_dict(gdf):
     # will cause error if data frame has no geometry column
     name = gdf.geometry.name
 
-    copy = gdf.copy()
-    # convert it to wkt
-    copy[name] = copy.geometry.apply(lambda x: shapely.wkt.dumps(x))
+    # convert geodataframe to dataframe
+    df = pd.DataFrame(gdf)
+    # convert geometry to wkt
+    df[name] = df.geometry.apply(lambda x: shapely.wkt.dumps(x))
 
-    return _df_to_dict(copy)
+    return _df_to_dict(df)
 
 def _normalize_data(data):
     if isinstance(data, pd.DataFrame):

diff --git a/examples/custom-reducer/.babelrc b/examples/custom-reducer/.babelrc
@@ -4,30 +4,6 @@
     "@babel/preset-react"
   ],
   "plugins": [
-    ["@babel/plugin-proposal-decorators", { "legacy": true }],
-    "@babel/plugin-proposal-class-properties",
-    ["@babel/transform-runtime", {
-      "regenerator": true
-    }],
-    "@babel/plugin-syntax-dynamic-import",
-    "@babel/plugin-syntax-import-meta",
-    "@babel/plugin-proposal-json-strings",
-    "@babel/plugin-proposal-function-sent",
-    "@babel/plugin-proposal-export-namespace-from",
-    "@babel/plugin-proposal-numeric-separator",
-    "@babel/plugin-proposal-throw-expressions",
-    "@babel/plugin-proposal-export-default-from",
-    "@babel/plugin-proposal-logical-assignment-operators",
-    "@babel/plugin-proposal-optional-chaining",
-    [
-      "@babel/plugin-proposal-pipeline-operator",
-      {
-        "proposal": "minimal"
-      }
-    ],
-    "@babel/plugin-proposal-nullish-coalescing-operator",
-    "@babel/plugin-proposal-do-expressions",
-    "@babel/plugin-proposal-function-bind",
-    "@babel/plugin-transform-modules-commonjs"
+    "@babel/plugin-proposal-class-properties"
   ]
 }
diff --git a/examples/custom-reducer/package.json b/examples/custom-reducer/package.json
@@ -5,7 +5,7 @@
   },
   "dependencies": {
     "global": "^4.3.0",
-    "kepler.gl": "^2.3.0",
+    "kepler.gl": "^2.3.1",
     "react": "^16.8.4",
     "react-dom": "^16.8.4",
     "react-palm": "^3.1.2",
@@ -17,33 +17,13 @@
   "devDependencies": {
     "@babel/core": "^7.0.0",
     "@babel/plugin-proposal-class-properties": "^7.3.0",
-    "@babel/plugin-proposal-decorators": "^7.3.0",
-    "@babel/plugin-proposal-do-expressions": "^7.0.0",
-    "@babel/plugin-proposal-export-default-from": "^7.0.0",
-    "@babel/plugin-proposal-export-namespace-from": "^7.2.0",
-    "@babel/plugin-proposal-function-bind": "^7.0.0",
-    "@babel/plugin-proposal-function-sent": "^7.0.0",
-    "@babel/plugin-proposal-json-strings": "^7.0.0",
-    "@babel/plugin-proposal-logical-assignment-operators": "^7.0.0",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
-    "@babel/plugin-proposal-numeric-separator": "^7.0.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.0.0",
-    "@babel/plugin-proposal-pipeline-operator": "^7.0.0",
-    "@babel/plugin-proposal-throw-expressions": "^7.0.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
-    "@babel/plugin-syntax-import-meta": "^7.0.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.2.0",
-    "@babel/plugin-transform-runtime": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
     "babel-loader": "^8.0.0",
-    "babel-plugin-module-resolver": "^3.0.0",
-    "babel-plugin-transform-builtin-extend": "^1.1.0",
     "webpack": "^4.29.0",
     "webpack-cli": "^3.2.1",
     "webpack-dev-middleware": "^3.5.1",
     "webpack-dev-server": "^3.1.14",
-    "webpack-hot-middleware": "^2.24.3",
-    "webpack-stats-plugin": "^0.2.1"
+    "webpack-hot-middleware": "^2.24.3"
   }
 }
diff --git a/examples/custom-reducer/src/store.js b/examples/custom-reducer/src/store.js
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 import {createStore, combineReducers, applyMiddleware, compose} from 'redux';
-import keplerGlReducer from 'kepler.gl/reducers';
+import keplerGlReducer, {uiStateUpdaters} from 'kepler.gl/reducers';
 import {enhanceReduxMiddleware} from 'kepler.gl/middleware';
 import appReducer from './app-reducer';
 import window from 'global/window';
@@ -32,6 +32,7 @@ const customizedKeplerGlReducer = keplerGlReducer
 
       // customize which map control button to show
       mapControls: {
+        ...uiStateUpdaters.DEFAULT_MAP_CONTROLS,
         visibleLayers: {
           show: false
         },

diff --git a/examples/custom-reducer/webpack.config.js b/examples/custom-reducer/webpack.config.js
@@ -46,12 +46,6 @@ const CONFIG = {
         loader: 'babel-loader',
         include: join(__dirname, 'src'),
         exclude: [/node_modules/]
-      },
-      {
-        // The example has some JSON data
-        test: /\.json$/,
-        loader: 'json-loader',
-        exclude: [/node_modules/]
       }
     ]
   },

diff --git a/examples/custom-theme/.babelrc b/examples/custom-theme/.babelrc
@@ -2,32 +2,5 @@
   "presets": [
     "@babel/preset-env",
     "@babel/preset-react"
-  ],
-  "plugins": [
-    ["@babel/plugin-proposal-decorators", { "legacy": true }],
-    "@babel/plugin-proposal-class-properties",
-    ["@babel/transform-runtime", {
-      "regenerator": true
-    }],
-    "@babel/plugin-syntax-dynamic-import",
-    "@babel/plugin-syntax-import-meta",
-    "@babel/plugin-proposal-json-strings",
-    "@babel/plugin-proposal-function-sent",
-    "@babel/plugin-proposal-export-namespace-from",
-    "@babel/plugin-proposal-numeric-separator",
-    "@babel/plugin-proposal-throw-expressions",
-    "@babel/plugin-proposal-export-default-from",
-    "@babel/plugin-proposal-logical-assignment-operators",
-    "@babel/plugin-proposal-optional-chaining",
-    [
-      "@babel/plugin-proposal-pipeline-operator",
-      {
-        "proposal": "minimal"
-      }
-    ],
-    "@babel/plugin-proposal-nullish-coalescing-operator",
-    "@babel/plugin-proposal-do-expressions",
-    "@babel/plugin-proposal-function-bind",
-    "@babel/plugin-transform-modules-commonjs"
   ]
 }
diff --git a/examples/custom-theme/package.json b/examples/custom-theme/package.json
@@ -5,7 +5,7 @@
   },
   "dependencies": {
     "global": "^4.3.0",
-    "kepler.gl": "^2.3.0",
+    "kepler.gl": "^2.3.1",
     "react": "^16.8.4",
     "react-dom": "^16.8.4",
     "react-palm": "^3.1.2",
@@ -17,34 +17,13 @@
   "devDependencies": {
     "@babel/core": "^7.0.0",
     "@babel/plugin-proposal-class-properties": "^7.3.0",
-    "@babel/plugin-proposal-decorators": "^7.3.0",
-    "@babel/plugin-proposal-do-expressions": "^7.0.0",
-    "@babel/plugin-proposal-export-default-from": "^7.0.0",
-    "@babel/plugin-proposal-export-namespace-from": "^7.2.0",
-    "@babel/plugin-proposal-function-bind": "^7.0.0",
-    "@babel/plugin-proposal-function-sent": "^7.0.0",
-    "@babel/plugin-proposal-json-strings": "^7.0.0",
-    "@babel/plugin-proposal-logical-assignment-operators": "^7.0.0",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
-    "@babel/plugin-proposal-numeric-separator": "^7.0.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.0.0",
-    "@babel/plugin-proposal-pipeline-operator": "^7.0.0",
-    "@babel/plugin-proposal-throw-expressions": "^7.0.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
-    "@babel/plugin-syntax-import-meta": "^7.0.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.2.0",
-    "@babel/plugin-transform-runtime": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
     "babel-loader": "^8.0.0",
-    "babel-plugin-inline-json-import": "^0.2.1",
-    "babel-plugin-module-resolver": "^3.0.0",
-    "babel-plugin-transform-builtin-extend": "^1.1.0",
     "webpack": "^4.29.0",
     "webpack-cli": "^3.2.1",
     "webpack-dev-middleware": "^3.5.1",
     "webpack-dev-server": "^3.1.14",
-    "webpack-hot-middleware": "^2.24.3",
-    "webpack-stats-plugin": "^0.2.1"
+    "webpack-hot-middleware": "^2.24.3"
   }
 }
diff --git a/examples/custom-theme/webpack.config.js b/examples/custom-theme/webpack.config.js
@@ -46,12 +46,6 @@ const CONFIG = {
         loader: 'babel-loader',
         include: join(__dirname, 'src'),
         exclude: [/node_modules/]
-      },
-      {
-        // The example has some JSON data
-        test: /\.json$/,
-        loader: 'json-loader',
-        exclude: [/node_modules/]
       }
     ]
   },
@@ -60,13 +54,8 @@ const CONFIG = {
     fs: 'empty'
   },
 
-  // to support browser history api and remove the '#' sign
-  devServer: {
-    historyApiFallback: true
-  },
-
   // Optional: Enables reading mapbox and dropbox client token from environment variable
-  plugins: [new webpack.EnvironmentPlugin(['MapboxAccessToken', 'DropboxClientId'])]
+  plugins: [new webpack.EnvironmentPlugin(['MapboxAccessToken'])]
 };
 
 // This line enables bundling against src in this repo rather than installed deck.gl module

diff --git a/examples/demo-app/.babelrc b/examples/demo-app/.babelrc
@@ -4,30 +4,6 @@
     "@babel/preset-react"
   ],
   "plugins": [
-    ["@babel/plugin-proposal-decorators", { "legacy": true }],
-    "@babel/plugin-proposal-class-properties",
-    ["@babel/transform-runtime", {
-      "regenerator": true
-    }],
-    "@babel/plugin-syntax-dynamic-import",
-    "@babel/plugin-syntax-import-meta",
-    "@babel/plugin-proposal-json-strings",
-    "@babel/plugin-proposal-function-sent",
-    "@babel/plugin-proposal-export-namespace-from",
-    "@babel/plugin-proposal-numeric-separator",
-    "@babel/plugin-proposal-throw-expressions",
-    "@babel/plugin-proposal-export-default-from",
-    "@babel/plugin-proposal-logical-assignment-operators",
-    "@babel/plugin-proposal-optional-chaining",
-    [
-      "@babel/plugin-proposal-pipeline-operator",
-      {
-        "proposal": "minimal"
-      }
-    ],
-    "@babel/plugin-proposal-nullish-coalescing-operator",
-    "@babel/plugin-proposal-do-expressions",
-    "@babel/plugin-proposal-function-bind",
-    "@babel/plugin-transform-modules-commonjs",
+    "@babel/plugin-proposal-class-properties"
   ]
 }