Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 6e1b782c99f55dc0453eb5edd0cf1143e55691a5
Merge: 0c3503b 8b8219b
Author: Xun Li <[email protected]>
Date:   Wed Jan 22 10:54:33 2025 -0700

    Merge branch 'master' into xli-assistant-data-analysis

commit 8b8219b
Author: Xun Li <[email protected]>
Date:   Wed Jan 22 10:51:14 2025 -0700

    [Chore] esbuild website to speedup netlify build (#2904)

commit 0c3503b
Author: Xun Li <[email protected]>
Date:   Wed Jan 22 10:14:58 2025 -0700

    fix netlify build

commit bcf339d
Author: Xun Li <[email protected]>
Date:   Wed Jan 22 10:09:34 2025 -0700

    rebase

commit f3ec7f2
Merge: 165da0b 803b2f5
Author: Xun Li <[email protected]>
Date:   Wed Jan 22 10:07:28 2025 -0700

    Merge branch 'master' into xli-assistant-data-analysis

commit 165da0b
Author: Xun Li <[email protected]>
Date:   Wed Jan 22 09:59:08 2025 -0700

    fix netlify build

commit 803b2f5
Author: Igor Dykhta <[email protected]>
Date:   Wed Jan 22 13:54:34 2025 +0200

    [fix] remove dependencies from useEffect (componentDidMount) (#2930)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 5792644
Author: Igor Dykhta <[email protected]>
Date:   Wed Jan 22 13:54:21 2025 +0200

    [fix] use saved map config for saved maps instead of zoom in to data (#2929)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 4af6092
Author: Igor Dykhta <[email protected]>
Date:   Wed Jan 22 13:33:03 2025 +0200

    [chore] add dot.env, updates to demo-app build, update gitignore (#2928)

    - add dot.env plugin for demo-app
    - updates to demo-app build
    - update gitignore

    Signed-off-by: Ihor Dykhta <[email protected]>

commit dd01051
Author: Xun Li <[email protected]>
Date:   Tue Jan 21 23:53:28 2025 -0700

    update yarn.lock

commit 74c0f60
Author: Xun Li <[email protected]>
Date:   Tue Jan 21 23:49:24 2025 -0700

    use openassistant to replace react-ai-assist

commit 34f5d1a
Merge: 6891175 ce23c76
Author: Xun Li <[email protected]>
Date:   Tue Jan 21 22:21:21 2025 -0700

    Merge branch 'master' into xli-assistant-data-analysis

commit ce23c76
Author: Igor Dykhta <[email protected]>
Date:   Wed Jan 22 01:49:31 2025 +0200

    [feat] duckdb module updates (#2927)

    - UI for SQL Query plugin
    - DuckDb logic to ingest and generate datasets

    Signed-off-by: Ihor Dykhta <[email protected]>

commit fc974d8
Author: Igor Dykhta <[email protected]>
Date:   Tue Jan 21 17:53:47 2025 +0200

    [feat] duckdb module placeholder (#2926)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit d1b3c97
Author: Igor Dykhta <[email protected]>
Date:   Tue Jan 21 16:06:21 2025 +0200

    [fix] demo-app resolve to proper node_modules (#2925)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 594250b
Author: Igor Dykhta <[email protected]>
Date:   Tue Jan 21 15:00:34 2025 +0200

    [fix] fix demo-app yarn start (#2924)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 913ba1c
Author: Igor Dykhta <[email protected]>
Date:   Tue Jan 21 12:29:31 2025 +0200

    [feat] support for table plugin in demo examples and privately stored datasets (#2923)

    - support for custom table plugin + demo examples
    - support for custom table plugin + privately stored datasets
    - isAppleDevice util

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 6307281
Author: Igor Dykhta <[email protected]>
Date:   Mon Jan 20 17:14:55 2025 +0200

    [fix] fixes for style editor preview and error (#2919)

    - fix style preview
    - take into account basemap library switching in add-map-style-modal
    - trigger new Map components with url, token or library change in order to clear cache of loaded styles. Otherwise 'style.load' events aren't triggered when input changes from correct > wrong > correct config.

    Signed-off-by: Ihor Dykhta <[email protected]>

commit d6aa275
Author: Igor Dykhta <[email protected]>
Date:   Mon Jan 20 16:45:49 2025 +0200

    [fix] fix neighbor mode hovering crash in arc/line layers (#2920)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit e2bd71d
Author: Igor Dykhta <[email protected]>
Date:   Mon Jan 20 16:44:14 2025 +0200

    [fix] fix csv table examples for layers (#2921)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit a6e151a
Author: Igor Dykhta <[email protected]>
Date:   Fri Jan 17 21:44:05 2025 +0200

    [fix] vector tile layer fixes (#2911)

    - dataset type change: vectorTile to vector-tile
    - vector tile dataset metadata: type to remoteTileFormat
    - support for remote examples

    Signed-off-by: Ihor Dykhta <[email protected]>

commit a207ae5
Author: Igor Dykhta <[email protected]>
Date:   Wed Jan 15 20:19:20 2025 +0200

    [fix] fix exported html map (#2918)

    - import missing css that isn't part of the main bundle anymore.
    - replace withState custom state (demo - undefined) with lenses.
    - alpha 5 version

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 43880f1
Author: Igor Dykhta <[email protected]>
Date:   Wed Jan 15 15:47:04 2025 +0200

    [chore] retry 3.1.0-alpha.4 release (#2917)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 933a91a
Author: Igor Dykhta <[email protected]>
Date:   Tue Jan 14 16:05:49 2025 +0200

    [fix] check for geoarrow extension in geojson layer (#2916)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 0abe997
Author: Igor Dykhta <[email protected]>
Date:   Tue Jan 14 15:55:48 2025 +0200

    [fix] opening multiple examples breaks url (#2915)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 49e7956
Author: Igor Dykhta <[email protected]>
Date:   Mon Jan 13 23:54:18 2025 +0200

    [fix] Don't show 0 when description is empty (#2913)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit cb5d4ed
Author: Igor Dykhta <[email protected]>
Date:   Mon Jan 13 13:32:02 2025 +0200

    [fix] fix styled-components version in exported map (#2907)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit b1d2433
Author: Igor Dykhta <[email protected]>
Date:   Sun Jan 12 20:47:28 2025 +0200

    [fix] adjust tooltip style (#2910)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit f0c57a8
Author: Igor Dykhta <[email protected]>
Date:   Sat Jan 11 16:03:51 2025 +0200

    [fix] fix website commit section (#2908)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 31cf050
Author: Igor Dykhta <[email protected]>
Date:   Sat Jan 11 01:53:30 2025 +0200

    [chore] 3.1.0-alpha.4 (#2866)

    - bump version
    - ts fixes for npm publish
    - missing license headers

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 2753321
Author: Igor Dykhta <[email protected]>
Date:   Sat Jan 11 00:06:35 2025 +0200

    [feat] Vector Tile layer fixes (#2899)

    - show Vector Tile layer tab
    - changes to radius controls
    - fix highlighted filled polygons
    - hide show data table icon
    - display loading spinner while we are loading metadata
    - display errors metadata loading failed
    - fix for custom ordinal crash when all colors are deleted
    - collect dataset attributions from metadata and show in the lower right corner
    - refetch tile dataset metadata createNewDataEntry

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 073c585
Author: Xun Li <[email protected]>
Date:   Thu Jan 9 20:09:15 2025 -0700

    [Fix] add_data() function failed in keplergl-jupyter (#2901)

commit 6891175
Author: Xun Li <[email protected]>
Date:   Thu Jan 9 14:49:33 2025 -0700

    update build script

commit 979aa24
Author: Xun Li <[email protected]>
Date:   Thu Jan 9 00:22:01 2025 -0700

    Update src/ai-assistant/package.json

commit c37530a
Author: Xun Li <[email protected]>
Date:   Wed Jan 8 22:30:59 2025 -0700

    add SQL query using duckdb in Assistant

commit a5fef4a
Author: Xun Li <[email protected]>
Date:   Wed Jan 8 19:49:44 2025 -0700

    add phi4 llm; upgrade to openassistant 0.0.5; update yarn.lock files

commit 858f6e7
Author: Xun Li <[email protected]>
Date:   Wed Jan 8 17:04:54 2025 -0700

    Update ai-assistant-manager.tsx

commit 1b97dbb
Author: Xun Li <[email protected]>
Date:   Wed Jan 8 17:00:30 2025 -0700

    Update yarn.lock

commit 2c9a9ac
Author: Xun Li <[email protected]>
Date:   Wed Jan 8 16:56:58 2025 -0700

    fix netlify build

commit d52daee
Author: Xun Li <[email protected]>
Date:   Wed Jan 8 15:40:44 2025 -0700

    Update package.json

commit 7515094
Author: Xun Li <[email protected]>
Date:   Wed Jan 8 15:32:54 2025 -0700

    update yarn.lock

commit 577b583
Merge: 6a928ad 6e42597
Author: Xun Li <[email protected]>
Date:   Wed Jan 8 15:32:22 2025 -0700

    Merge branch 'master' into xli-assistant-data-analysis

commit 6a928ad
Author: Xun Li <[email protected]>
Date:   Wed Jan 8 15:06:16 2025 -0700

    add spatial join with  openassistant 0.0.4

commit 6e42597
Author: Igor Dykhta <[email protected]>
Date:   Tue Jan 7 13:20:32 2025 +0200

    [feat] mapbox and maplibre simultaneous support (#2897)

    - switch between basemap style libraries
    - add back mapbox styles in Basemap Style tab

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 22f9ba1
Author: Ritesh Mangdare <[email protected]>
Date:   Mon Jan 6 23:03:25 2025 +0530

    [Chore] Fix lint error for Register actions (#2896)

    Signed-off-by: Ritesh9876 <[email protected]>

commit ccfc2e2
Author: Igor Dykhta <[email protected]>
Date:   Mon Jan 6 17:59:57 2025 +0200

    [fix] Image export legend positioning (#2895)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit cf02a3c
Author: Igor Dykhta <[email protected]>
Date:   Sun Jan 5 16:12:27 2025 +0200

    [chore] Upgrade styled components to v6 (#2894)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 4c9ffe8
Author: Igor Dykhta <[email protected]>
Date:   Fri Jan 3 23:38:14 2025 +0200

    [fix] Prevent infinite useEffects loop in range-plot (#2892)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 0b67c54
Author: Igor Dykhta <[email protected]>
Date:   Fri Jan 3 23:19:44 2025 +0200

    [fix] fixed onOptionSelected handler when option is null (#2891)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 40ba839
Author: Igor Dykhta <[email protected]>
Date:   Fri Jan 3 23:16:01 2025 +0200

    [fix] Add ellipsis in LayerTypeListItem (#2890)

    - Add ellipsis in LayerTypeListItem
    - bump dndkit
    - bump caniuse-lite

    Signed-off-by: Ihor Dykhta <[email protected]>

commit d0d31bd
Author: Igor Dykhta <[email protected]>
Date:   Fri Jan 3 23:14:19 2025 +0200

    [fix] Handle selecting geojson polygon with missing properties (#2889)

    - fix crashing geojson polygon isClosed check for the editor selected feature when the feature `properties` are nullish
    - don't set the selected feature in map popover if it is effectively empty

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 79801be
Author: Igor Dykhta <[email protected]>
Date:   Fri Jan 3 23:11:04 2025 +0200

    [fix] Tippy tooltips in animation controls (#2888)

    - Replacing react-tooltip tooltips in animation controls which don't work correctly when used in programable environments

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 0ad5372
Author: Igor Dykhta <[email protected]>
Date:   Fri Jan 3 22:56:26 2025 +0200

    [feat] Adding setAnimationConfig action (#2887)

    - Added setAnimationConfig action
    - Passing filter to PlaybackControls

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 67b0019
Author: Igor Dykhta <[email protected]>
Date:   Fri Jan 3 22:54:20 2025 +0200

    [chore] export TimeFieldFilterProps (#2883)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 603fde8
Author: Igor Dykhta <[email protected]>
Date:   Fri Jan 3 22:51:25 2025 +0200

    [fix] Fixed issue when mapstate latitude or langitude are out of bounds (#2882)

    - fixed issue when mapstate latitude or langitude are out of bounds

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 92c9e6a
Author: Igor Dykhta <[email protected]>
Date:   Fri Jan 3 22:49:35 2025 +0200

    [fix] Use floating-ui to deal with closing on click outside (#2886)

    - use `floating-ui` in `AnimationSpeedSlider` and `ColorSelector` to deal with closing on click outside.
    - For both of the above components, this fixes the component from disappearing immediately in a programable environment even when clicking internally, bypassing important onClick event logic.

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 4bcf55b
Author: Igor Dykhta <[email protected]>
Date:   Fri Jan 3 22:47:01 2025 +0200

    [Feat] Custom color scale for categorical/ordinal field (#2880)

    - [feat] Implement custom color scale for categorical field
    - [fix] ColorMap is not cleared when field or scale change
    - [fix] Fix crash when custom ordinal scale does not have colorMap
    - [fix] fix custom stroke color initiation

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 884658f
Author: Xun Li <[email protected]>
Date:   Thu Jan 2 22:29:31 2025 -0700

    update to openassistant 0.0.3

commit 23f6034
Author: Ritesh Mangdare <[email protected]>
Date:   Fri Jan 3 01:14:55 2025 +0530

    [Bug] Prevent dragging legend component outside of container (#2885)

    Signed-off-by: Ritesh9876 <[email protected]>

commit d549fcd
Author: Isaac Brodsky <[email protected]>
Date:   Tue Dec 31 22:53:13 2024 -0800

    [fix] copy map config style (#2878)

    Signed-off-by: Isaac Brodsky <[email protected]>

commit 34444fa
Author: Igor Dykhta <[email protected]>
Date:   Wed Jan 1 01:39:12 2025 +0200

    [fix] check for allBins (#2876)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 8335ba4
Author: Igor Dykhta <[email protected]>
Date:   Wed Jan 1 01:33:40 2025 +0200

    [fix] Custom Color Scale fixes (#2875)

    - [Chore] add exports for scenegraph to layers/index
    - [fix] Apply custom column format on color legend
    - [feat] support custom color scale for layers using colorScale.byZoom
    - [fix] disable custom ordinal scale
    - [chore] add FSQ Cool Tone color palette

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 73f259b
Author: Xun Li <[email protected]>
Date:   Mon Dec 30 23:05:41 2024 -0700

    fix netlify build

commit 6740b0a
Author: Xun Li <[email protected]>
Date:   Mon Dec 30 22:31:24 2024 -0700

    Update yarn.lock

commit 9596b1e
Merge: ba42c6c 1412365
Author: Xun Li <[email protected]>
Date:   Mon Dec 30 22:31:01 2024 -0700

    Merge branch 'master' into xli-assistant-data-analysis

commit ba42c6c
Author: Xun Li <[email protected]>
Date:   Mon Dec 30 22:19:20 2024 -0700

    switch to openassistant library

commit 1412365
Author: Igor Dykhta <[email protected]>
Date:   Sun Dec 29 16:10:19 2024 +0200

    [chore] Add several vis state mergers combineConfigs and improve TS (#2634)

    - Adds `combineConfigs` to some vis state saved configs that are non-array complex objects:
      1. `interactionConfig`
      2. `layerBlending`
      3. `overlayBlending`
      4. `editor`

      Each of these has inline comments (and unit tests) explaining the decisions made on how to combine values in different situations. For example, `interactionConfig.brush.size` gets aggregated into keeping the single largest value among all brush sizes.

    - Improves and fixes some TS defs.

    - Adds jest unit tests for newly added `combineConfigs`.

    Signed-off-by: Ihor Dykhta <[email protected]>
    Co-authored-by: Ilya Boyandin <[email protected]>

commit 9f3f089
Author: Igor Dykhta <[email protected]>
Date:   Sat Dec 28 23:39:45 2024 +0200

    [Chore] Add composedReducerSchema to schema manager (#2633)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit e633177
Author: Igor Dykhta <[email protected]>
Date:   Sat Dec 28 19:37:02 2024 +0200

    [chore] applyFilterConfig action (#2872)

    - Introduces a new action `applyFilterConfig`
    - Changes `FilterPanelHeader` so that it accepts an array of actions in order to pass custom actions.

    Signed-off-by: Ihor Dykhta <[email protected]>

commit ceb930e
Author: Igor Dykhta <[email protected]>
Date:   Sat Dec 28 19:24:20 2024 +0200

    [Fix] incorrect multi-dataset filter domain (#2871)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 00dd002
Author: Igor Dykhta <[email protected]>
Date:   Sat Dec 28 17:59:02 2024 +0200

    [fix] show scale options for Point Count in aggregation layers (#2870)

    - show scale options for Point Count in aggregation layers

    Signed-off-by: Ihor Dykhta <[email protected]>

commit a39fcf8
Author: Igor Dykhta <[email protected]>
Date:   Sat Dec 28 17:50:31 2024 +0200

    [fix] pass strings to color palette inputs (#2873)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit b89b19c
Author: Igor Dykhta <[email protected]>
Date:   Sat Dec 28 16:39:38 2024 +0200

    [chore] Consolidate vis state tests (#2869)

    - fix for jest test ran into an issue where warnings were showing up about logging after a test was finished

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 77e7857
Author: Igor Dykhta <[email protected]>
Date:   Sat Dec 28 16:05:42 2024 +0200

    [feat] Support custom ordinal color scale on string field in layer config (#2868)

    - Support custom ordinal color scale on string field in layer config
    - histogram from ordinal
    - pass className to StyledLegend
    - fix for color palette colorWidths undefined

    Signed-off-by: Ihor Dykhta <[email protected]>

commit cccc4be
Author: Igor Dykhta <[email protected]>
Date:   Sat Dec 28 15:13:41 2024 +0200

    [feat] Free positioning of the legend (#2874)

    - Legend can be moved around
    - Position is saved as offsets to the closest corner to handle window resizes

    Signed-off-by: Ihor Dykhta <[email protected]>
    Co-authored-by: Ilya Boyandin <[email protected]>

commit 2d1d8e5
Author: Xun Li <[email protected]>
Date:   Fri Dec 27 10:23:41 2024 -0700

    [Fix] add_data() function in keplergl-jupyter (#2867)

    Publish Keplergl-jupyter 0.3.5

commit 3b46abd
Author: Igor Dykhta <[email protected]>
Date:   Fri Dec 27 12:11:11 2024 +0200

    [feat] add LayerToggleVisibility for single splitMap (#2863)

    Signed-off-by: Ihor Dykhta <[email protected]>
    Co-authored-by: Ilya Boyandin <[email protected]>

commit b2b6f10
Author: Xun Li <[email protected]>
Date:   Thu Dec 26 22:09:17 2024 -0700

    [Release] Candidate Kepler-Jupyter v0.3.4 (#2588)

commit 3bf006f
Author: Igor Dykhta <[email protected]>
Date:   Fri Dec 27 00:50:56 2024 +0200

    [fix] Remove legend layer groups height capping (#2864)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit f1245d7
Author: Igor Dykhta <[email protected]>
Date:   Fri Dec 27 00:43:12 2024 +0200

    [chore] ts refactoring (#2861)

    - move several base layer types to layer.d.ts
    - other ts changes

    Signed-off-by: Ihor Dykhta <[email protected]>

commit a897715
Author: Igor Dykhta <[email protected]>
Date:   Thu Dec 26 23:53:36 2024 +0200

    [Feat] Add custom color scale for aggregate layers (#2860)

    Signed-off-by: Ihor Dykhta <[email protected]>
    Co-authored-by: Ilya Boyandin <[email protected]>

commit 6bc5946
Author: Igor Dykhta <[email protected]>
Date:   Thu Dec 26 23:27:44 2024 +0200

    [Feat] replaceDataInMap action - save colorsByDataId (#2859)

    - changes to support replaceDataInMap action in synced filters
    - tests for replaceDataInMapUpdater with Synced syncedTimeFilter

    Signed-off-by: Ihor Dykhta <[email protected]>

commit be2f04e
Author: Igor Dykhta <[email protected]>
Date:   Thu Dec 26 23:14:09 2024 +0200

    [chore] add fsq color palettes (#2862)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit c7d3777
Author: Igor Dykhta <[email protected]>
Date:   Thu Dec 26 23:00:00 2024 +0200

    [fix] change process to globalThis.process (#2865)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 5cb8a34
Author: Chris Gervang <[email protected]>
Date:   Thu Dec 26 10:18:51 2024 -0800

    [chore] Create SECURITY.md (#2845)

commit 12b3231
Author: Igor Dykhta <[email protected]>
Date:   Wed Dec 25 01:15:51 2024 +0200

    [chore] 3.1.0-alpha.3 release (#2857)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 2cd7a85
Author: Igor Dykhta <[email protected]>
Date:   Wed Dec 25 01:02:03 2024 +0200

    [chore] fix missing dependencies in workspaces (#2856)

    - fix missing dependencies in workspaces
    - fix circular dependencies
    - fix types
    - fixes for release

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 6804129
Author: Igor Dykhta <[email protected]>
Date:   Tue Dec 24 15:12:15 2024 +0200

    [chore] 3.1.0-alpha.2 release (#2855)

    - bump version for release
    - temporarily disable vector tile layer plumbing
    - ts fixes required for npm-publish
    - prepublish to prepublishOnly script

commit f9b385a
Author: Igor Dykhta <[email protected]>
Date:   Mon Dec 23 20:13:01 2024 +0200

    [fix] Fixed time filter bug where points located at the borders of the domains were not correctly displayed (#2854)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 59abc6a
Author: Igor Dykhta <[email protected]>
Date:   Mon Dec 23 20:01:14 2024 +0200

    [fix] fix for custom color scales with tile layer (#2853)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 3a4bf66
Author: Igor Dykhta <[email protected]>
Date:   Mon Dec 23 19:31:43 2024 +0200

    [feat] histogram and point layer fixes (#2852)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit f9c52e5
Author: Igor Dykhta <[email protected]>
Date:   Mon Dec 23 15:29:16 2024 +0200

    [feat] color scale histogram (#2851)

    - color scale histogram

    Signed-off-by: Ihor Dykhta <[email protected]>
    Co-authored-by: Ilya Boyandin <[email protected]>

commit 3e7dc93
Author: Igor Dykhta <[email protected]>
Date:   Mon Dec 23 12:52:26 2024 +0200

    [fix] custom palette issues (#2850)

    * 1 update fix of custom palette issues 2 restrict custom steps to 20, hide + button if needed 3 update scale function to handle some special cases: not enough k groups
    * add name|type|category to updateCustomPalette if customBreaks
    * add test cases for redesigned color range feature
    * update test cases to increase coverage

    Signed-off-by: Ihor Dykhta <[email protected]>
    Co-authored-by: Ilya Boyandin <[email protected]>

commit d557979
Author: Ritesh Mangdare <[email protected]>
Date:   Sun Dec 22 22:15:34 2024 +0530

    [docs] Replace yarn global add with yarn dlx for puppeteer installation (#2849)

    Signed-off-by: Ritesh9876 <[email protected]>

commit e106c19
Author: Igor Dykhta <[email protected]>
Date:   Sun Dec 22 18:18:25 2024 +0200

    [feat] vector tile layer (#2839)

    - This PR adds Vector Tile layer to Kepler with support initial support of mapbox vector tiles and remote .pmtiles (with mimeType application/vnd.mapbox-vector-tile)

commit a2abbf7
Author: Igor Dykhta <[email protected]>
Date:   Fri Dec 20 13:21:28 2024 +0200

    [fix] fix yarn cover regression (#2846)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 6925bd4
Author: Ikko Eltociear Ashimine <[email protected]>
Date:   Fri Dec 20 19:47:10 2024 +0900

    [docs] update demo-app/README.md (#2847)

    typo enviroment -> environment

commit f05b6e3
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Dec 16 11:53:38 2024 +0200

    Bump nanoid from 3.3.7 to 3.3.8 in /website (#2840)

    Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8.
    - [Release notes](https://github.com/ai/nanoid/releases)
    - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
    - [Commits](ai/nanoid@3.3.7...3.3.8)

    ---
    updated-dependencies:
    - dependency-name: nanoid
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 4baa44d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Dec 16 11:25:25 2024 +0200

    Bump nanoid from 3.3.7 to 3.3.8 (#2837)

    Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8.
    - [Release notes](https://github.com/ai/nanoid/releases)
    - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
    - [Commits](ai/nanoid@3.3.7...3.3.8)

    ---
    updated-dependencies:
    - dependency-name: nanoid
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit b09d7eb
Author: Sahit Tuntas Sadono <[email protected]>
Date:   Sat Dec 14 01:36:31 2024 +0700

    [Enhancement] support mapbox url protocol (#2693)

    Signed-off-by: Sahit Tuntas Sadono <[email protected]>

commit 2153836
Author: Igor Dykhta <[email protected]>
Date:   Wed Dec 11 16:21:57 2024 +0200

    [Feat] Redesign color range to use chormajs and d3 color function (#2835)

    - Replace default color ranges with color palette object, with .colors(step), .linear function to auto generate colors / ramps
    - Add more d3 color chroma palette
    - Add more color blind safe palette
    - Save and load color range from old config

    Signed-off-by: Ihor Dykhta <[email protected]>
    Co-authored-by: Ilya Boyandin <[email protected]>

commit bded7af
Author: Igor Dykhta <[email protected]>
Date:   Wed Dec 11 00:55:56 2024 +0200

    [Feat] handle layer color scale by field.domainQuantiles (#2829)

    * handle layer domain quantile
    * add threshold scale

    Signed-off-by: Ihor Dykhta <[email protected]>
    Co-authored-by: Ilya Boyandin <[email protected]>

commit 5f7c26b
Author: Igor Dykhta <[email protected]>
Date:   Tue Dec 10 19:55:46 2024 +0200

    [fix] Prevent duplicate legend in line and arc layers (#2830)

    Before the fix we were showing two identical color legends for each line and arc layer (when selecting "color based on field").
    This PR changes the following:
    - If color based on field, only show one color legend.
    - If single color is selected, continue to show both rectangle color swatch boxes, but put text next to each one indicating “source” and “target” instead of empty space.

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 639c7a5
Author: Igor Dykhta <[email protected]>
Date:   Tue Dec 10 18:49:29 2024 +0200

    [feat] Apply new legend style (#2831)

    - pass through `className` to legend
    - css updates to reflect new designs

    Signed-off-by: Ihor Dykhta <[email protected]>

commit f9c214d
Author: Igor Dykhta <[email protected]>
Date:   Tue Dec 10 18:03:39 2024 +0200

    [chore] getSelectedFeature (#2832)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit efdf2ea
Author: Igor Dykhta <[email protected]>
Date:   Tue Dec 10 05:55:45 2024 +0200

    [chore] ts fixes (#2827)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit beae954
Author: Xun Li <[email protected]>
Date:   Mon Dec 9 20:17:17 2024 -0700

    wip

commit 074d123
Author: Igor Dykhta <[email protected]>
Date:   Tue Dec 10 04:02:35 2024 +0200

    [Feat] Add display format setting for table/tooltip (#2826)

    - [Feat] Add display format setting for table/tooltip
    - ts changes

    Signed-off-by: Ihor Dykhta <[email protected]>

commit aec75d8
Author: Igor Dykhta <[email protected]>
Date:   Tue Dec 10 04:00:25 2024 +0200

    [Chore] Minor ts refactoring (#2825)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 1825b65
Author: Igor Dykhta <[email protected]>
Date:   Tue Dec 10 03:42:05 2024 +0200

    [fix] Expand legend (#2824)

    * Expand legend
    * Flex alignment
    * Only show collapse button when enableColorBy is true
    * Not subtracting size of 4 map control buttons when isExport
    * Using customizable actionIcons

    Signed-off-by: Ihor Dykhta <[email protected]>

commit bb6a376
Author: Igor Dykhta <[email protected]>
Date:   Tue Dec 10 03:22:23 2024 +0200

    [fix] adjust time range filter on value set (#2823)

    - additional type updates for filter types where we get rid of BaseFilter properties that we override in all the filter types

    Signed-off-by: Ihor Dykhta <[email protected]>

commit cef3faf
Author: Igor Dykhta <[email protected]>
Date:   Tue Dec 10 03:11:41 2024 +0200

    [Feat] add h3 typed column (#2822)

    Detect H3 column as a new h3-type column, like the existing geocolumn.

    Signed-off-by: Ihor Dykhta <[email protected]>

commit c5d42dd
Author: Igor Dykhta <[email protected]>
Date:   Tue Dec 10 02:10:07 2024 +0200

    [fix] Fix multiple field filtering in setFilterUpdater (#2821)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit c4d1cff
Author: Igor Dykhta <[email protected]>
Date:   Tue Dec 10 02:05:25 2024 +0200

    [FEAT] support domain.domainStops in layer color, render color legend based on zoom (#2815)

    * use layer.getColorScale in color legend
    * add zoom to attribute accessors
    * layer color legend by zoom and improve legend number format

    Signed-off-by: Ihor Dykhta <[email protected]>
    Co-authored-by: Ilya Boyandin <[email protected]>

commit 3a4feac
Author: Igor Dykhta <[email protected]>
Date:   Mon Dec 9 15:09:57 2024 +0200

    [fix] Line layer is not displayed for between hex ids (#2820)

    - fix Line layer is not displayed for between hex ID's
    - rename type ColumnModeConfig since ColumnModeConfig
    - export ColumnModeConfig

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 89411c8
Author: Igor Dykhta <[email protected]>
Date:   Mon Dec 9 14:35:02 2024 +0200

    [fix] Typescript 4.4 fixes (#2816)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 2402896
Author: Igor Dykhta <[email protected]>
Date:   Mon Dec 9 14:27:12 2024 +0200

    [feat] Show selected fields in the tooltip for aggregation layers (#2814)

    Signed-off-by: Ihor Dykhta <[email protected]>

commit 95c6ed1
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sun Dec 8 21:19:19 2024 +0200

    Bump elliptic from 6.5.7 to 6.6.1 in /bindings/kepler.gl-jupyter/js (#2818)

    Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.7 to 6.6.1.
    - [Commits](indutny/elliptic@v6.5.7...v6.6.1)

    ---
    updated-dependencies:
    - dependency-name: elliptic
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit fb3fa7b
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sun Dec 8 14:27:39 2024 +0200

    Bump cross-spawn from 6.0.5 to 6.0.6 in /website (#2817)

    Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 6.0.5 to 6.0.6.
    - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/v6.0.6/CHANGELOG.md)
    - [Commits](moxystudio/node-cross-spawn@v6.0.5...v6.0.6)

    ---
    updated-dependencies:
    - dependency-name: cross-spawn
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
lixun910 committed Jan 22, 2025
1 parent d5718c7 commit 532ac83
Show file tree
Hide file tree
Showing 408 changed files with 29,270 additions and 10,400 deletions.
6 changes: 6 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
dist/
.venv/
.conda/
node_modules/
__pycache__/
build/
11 changes: 11 additions & 0 deletions .env.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
mapboxApiAccessToken=...
mapboxAccessToken=...
MapboxAccessToken=...
MAPBOX_ACCESS_TOKEN=...
MapboxExportToken=...
DropboxClientId=...
CartoClientId=...
FoursquareClientId=...
FoursquareDomain=...
FoursquareAPIURL=...
FoursquareUserMapsURL=...
3 changes: 2 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ module.exports = {
'consistent-return': 0,
'comma-dangle': 1,
'enzyme-deprecation/no-shallow': 2,
'enzyme-deprecation/no-mount': 2
'enzyme-deprecation/no-mount': 2,
'no-constant-condition': ['error', {checkLoops: false}]
},
overrides: [
{
Expand Down
13 changes: 13 additions & 0 deletions .github/SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Security Policy

## Supported Versions

Security updates are applied only to the latest release.

## Reporting a Vulnerability

If you have discovered a security vulnerability in this project, please report it privately. **Do not disclose it as a public issue.** This gives us time to work with you to fix the issue before public exposure, reducing the chance that the exploit will be used before a patch is released.

Please disclose it at [security advisory](https://github.com/keplergl/kepler.gl/security/advisories/new).

This project is maintained by a team of volunteers on a reasonable-effort basis. As such, please give us at least 90 days to work on a fix before public exposure.
29 changes: 19 additions & 10 deletions .github/workflows/build-publish-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ on: push
jobs:
build_and_publish:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
permissions:
id-token: write

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -54,17 +55,15 @@ jobs:
- name: Check Release Tag
id: check-tag
run: |
if [[ ${{ github.event.ref }} =~ ^refs/tags/v[0-9]+\.[0-9]+\.[0-9]+-jupyter$ ]]; then
if [[ ${{ github.event.ref }} =~ ^refs/tags/v[0-9]+\.[0-9]+\.[0-9]+([a|b][0-9])?-jupyter$ ]]; then
echo ::set-output name=publish::true
fi
- name: Publish KeplerGL to Pypi
if: steps.check-tag.outputs.publish == 'true'
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.pypi_token }}
run: |
python -m twine upload bindings/kepler.gl-jupyter/dist/*.tar.gz
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: '18'
registry-url: 'https://registry.npmjs.org'

- name: Publish kepler-jupyter to NPM
if: steps.check-tag.outputs.publish == 'true'
Expand All @@ -74,4 +73,14 @@ jobs:
run: |
source venv/bin/activate
cd bindings/kepler.gl-jupyter/js
npm publish
echo "//registry.npmjs.org/:_authToken=${{ secrets.npm_token }}" > .npmrc
npm config set registry https://registry.npmjs.org/
npm whoami
npm config ls
npm publish --verbose --access public
- name: Publish KeplerGL to Pypi
if: steps.check-tag.outputs.publish == 'true'
uses: pypa/gh-action-pypi-publish@release/v1
with:
packages-dir: bindings/kepler.gl-jupyter/dist/
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,8 @@ npm-debug.log
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# Local Netlify folder
.netlify
meta.json
.env
101 changes: 101 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,107 @@ Each version should:
Ref: http://keepachangelog.com/en/0.3.0/
-->

## [3.1.0-alpha.5] - January 15 2025

- b117b08ab [fix] fix for exported html maps

## [3.1.0-alpha.4] - January 15 2025

- 933a91a2f [fix] check for geoarrow extension in geojson layer (#2916)
- 0abe9979d [fix] opening multiple examples breaks url (#2915)
- 49e7956e8 [fix] Don't show 0 when description is empty (#2913)
- cb5d4ed42 [fix] fix styled-components version in exported map (#2907)
- b1d243363 [fix] adjust tooltip style (#2910)
- f0c57a869 [fix] fix website commit section
- 2753321c5 [feat] Vector Tile layer fixes (#2899)
- 073c585e4 [Fix] add_data() function failed in keplergl-jupyter
- 6e425972e [feat] mapbox and maplibre simultaneous support (#2897)
- 22f9ba14d [Chore] Fix lint error for Register actions (#2896)
- ccfc2e2ad [fix] Image export legend positioning (#2895)
- cf02a3ca6 [chore] Upgrade styled components to v6 (#2894)
- 4c9ffe827 [fix] Prevent infinite useEffects loop in range-plot (#2892)
- 0b67c5409 [fix] fixed onOptionSelected handler when option is null (#2891)
- 40ba839e3 [fix] Add ellipsis in LayerTypeListItem (#2890)
- d0d31bdfa [fix] Handle selecting geojson polygon with missing properties (#2889)
- 79801bec0 [fix] Tippy tooltips in animation controls (#2888)
- 0ad53723a [feat] Adding setAnimationConfig action (#2887)
- 67b001980 [chore] export TimeFieldFilterProps (#2883)
- 603fde8d1 [fix] Fixed issue when mapstate latitude or langitude are out of bounds (#2882)
- 92c9e6abc [fix] Use floating-ui to deal with closing on click outside (#2886)
- 4bcf55bd6 [Feat] Custom color scale for categorical/ordinal field (#2880)
- 23f603428 [Bug] Prevent dragging legend component outside of container (#2885)
- d549fcd4e [fix] copy map config style (#2878)
- 34444fa54 [fix] check for allBins (#2876)
- 8335ba410 [fix] Custom Color Scale fixes (#2875)
- 141236513 [chore] Add several vis state mergers combineConfigs and improve TS (#2634)
- 9f3f08944 [Chore] Add composedReducerSchema to schema manager (#2633)
- e633177ef [chore] applyFilterConfig action (#2872)
- ceb930e2d [Fix] incorrect multi-dataset filter domain (#2871)
- 00dd00279 [fix] show scale options for Point Count in aggregation layers (#2870)
- a39fcf8c4 [fix] pass strings to color palette inputs (#2873)
- b89b19c6a [chore] Consolidate vis state tests (#2869)
- 77e785713 [feat] Support custom ordinal color scale on string field in layer config (#2868)
- cccc4be2b [feat] Free positioning of the legend (#2874)
- 2d1d8e5f5 [Fix] add_data() function in keplergl-jupyter (#2867)
- 3b46abd34 [feat] add LayerToggleVisibility for single splitMap (#2863)
- b2b6f10c8 [Release] Candidate Kepler-Jupyter v0.3.4 (#2588)
- 3bf006f41 [fix] Remove legend layer groups height capping (#2864)
- f1245d7e5 [chore] ts refactoring (#2861)
- a897715cc [Feat] Add custom color scale for aggregate layers (#2860)
- 6bc594602 [Feat] replaceDataInMap action - save colorsByDataId (#2859)
- be2f04e6d [chore] add fsq color palettes (#2862)
- c7d3777fc [fix] change process to globalThis.process (#2865)
- 5cb8a3431 [chore] Create SECURITY.md (#2845)

## [3.1.0-alpha.3] - December 25 2024

- 2cd7a859c [chore] fix missing dependencies in workspaces (#2856)

## [3.1.0-alpha.2] - December 24 2024

- f9b385a6e [fix] Fixed time filter bug where points located at the borders of the domains were not correctly displayed (#2854)
- 59abc6a19 [fix] fix for custom color scales with tile layer (#2853)
- 3a4bf667f [feat] histogram and point layer fixes (#2852)
- f9c52e538 [feat] color scale histogram (#2851)
- 3e7dc937a [fix] custom palette issues (#2850)
- d55797991 [docs] Replace yarn global add with yarn dlx for puppeteer installation (#2849)
- e106c1927 [feat] Plumbing for vector tile layer (#2839)
- a2abbf72d [fix] fix yarn cover regression (#2846)
- 6925bd429 [docs] update demo-app/README.md (#2847)
- f05b6e37d [chore] Bump nanoid from 3.3.7 to 3.3.8 in /website (#2840)
- 4baa44d9b [chore] Bump nanoid from 3.3.7 to 3.3.8 (#2837)
- b09d7eb95 [Enhancement] support mapbox url protocol (#2693)
- 215383661 [Feat] Redesign color range to use chormajs and d3 color function (#2835)
- bded7af76 [Feat] handle layer color scale by field.domainQuantiles (#2829)
- 5f7c26bd0 [fix] Prevent duplicate legend in line and arc layers (#2830)
- 639c7a5b9 [feat] Apply new legend style (#2831)
- f9c214dd5 [chore] getSelectedFeature (#2832)
- efdf2ea8d [chore] ts fixes (#2827)
- 074d123dd [Feat] Add display format setting for table/tooltip (#2826)
- aec75d819 [Chore] Minor ts refactoring (#2825)
- 1825b6572 [fix] Expand legend (#2824)
- bb6a376e8 [fix] adjust time range filter on value set (#2823)
- cef3faf19 [Feat] add h3 typed column (#2822)
- c5d42ddc9 [fix] Fix multiple field filtering in setFilterUpdater (#2821)
- c4d1cfff0 [FEAT] support domain.domainStops in layer color, render color legend based on zoom (#2815)
- 3a4feac59 [fix] Line layer is not displayed for between hex ids (#2820)
- 89411c820 [fix] Typescript 4.4 fixes (#2816)
- 240289603 [feat] Show selected fields in the tooltip for aggregation layers (#2814)
- 95c6ed14b [chore] Bump elliptic from 6.5.7 to 6.6.1 in /bindings/kepler.gl-jupyter/js (#2818)
- fb3fa7b58 [chore] Bump cross-spawn from 6.0.5 to 6.0.6 in /website (#2817)
- f476a1c4c [chore] Bump elliptic from 6.5.7 to 6.6.0 (#2720)
- c727356f7 [chore] Bump cross-spawn from 6.0.5 to 6.0.6 (#2772)
- 3950d73ab [chore] Fixes in README.md (#2810)
- 786aa36cf [Fix] Don't modify height for with fixed height enabled; Height UI unification (#2804)
- 2178d9057 [fix] show sync layer animations when there is one dataset (#2803)
- 6f35313f7 [chore] timeline refactoring (#2802)
- d50bbc831 [fix] Updated plot when changing cross filters (#2801)
- b4dfa2fce [fix] disable Share Map for FSQ provider (#2808)
- 86b5dda7e [Feat] AI Assistant [2] (#2777)
- 5a0cbca66 [Bug] Fix issue with React StrictMode causing Dataset table to not display (#2683)
- b147db8d5 [chore] Local Development Guide Update (#2806)
- 6223be939 [fix] Foursquare storage provider improvements (#2800)

## [3.1.0-alpha.1] - December 3 2024

- f6b37c6af [fix] fixes for exported maps
Expand Down
2 changes: 2 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ const PLUGINS = [
// We explicitly transpile this ESM library in scripts/fix-dependencies.js and consume the transpiled version here
// This may not be needed once switch to Jest is complete as it is handled by transformIgnorePatterns
'@mapbox/tiny-sdf': `${nodeModules}/@mapbox/tiny-sdf/index.cjs`,
// fix ERR_REQUIRE_ESM in yarn cover
'maplibregl-mapbox-request-transformer': `${nodeModules}/maplibregl-mapbox-request-transformer/src/index.cjs`,
// compile from @kepler.gl src
...RESOLVE_ALIASES,
// loaders.gl cjs bundle of polyfills is not transpiled properly, use esm instead
Expand Down
36 changes: 36 additions & 0 deletions bindings/kepler.gl-jupyter/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# NOTE: PLEASE run `yarn build` before running this dockerfile
FROM ubuntu:latest

# Install python3
RUN apt-get update && apt-get install -y python3 python3-pip python3-venv

# Install gdal
RUN apt-get install -y gdal-bin

# Fix: No such file or directory: 'gdal-config'
RUN apt-get install -y libgdal-dev

# Make the current directory the working directory
WORKDIR /kepler.gl

# The current directory is <Root>/bindings/kepler.gl-jupyter
# Copy the root directory contents into the working directory
COPY . .

# Create a virtual environment .venv
RUN python3 -m venv .venv

# Activate the virtual environment
RUN . .venv/bin/activate

# Install jupyter_packaging using pip
RUN .venv/bin/pip install jupyter_packaging


# Install keplergl-jupyter in the virtual environment from the current directory
RUN .venv/bin/pip install .

# Run jupyter notebook with token exposed in logs
CMD [".venv/bin/jupyter", "notebook", "--ip=0.0.0.0", "--port=8888", "--no-browser", "--allow-root", "--NotebookApp.log_level='INFO'"]

EXPOSE 8888
4 changes: 2 additions & 2 deletions bindings/kepler.gl-jupyter/RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ NOTE: __Version number of the js module **`kelergl-jupyter`** and the python mod

Update `version_info` in keplergl/_version.py in bindings/kepler.gl-jupyter folder.
Update `"version": "0.x.x"` to match the version info in js/package.json in bindings/kepler.gl-jupyter folder.
Update `EXTENSION_SPEC_VERSION` to match the js module version. Update `version` in js/package
Update `EXTENSION_SPEC_VERSION` to match the js module version.

```
git add keplergl/_version.py
Expand All @@ -25,7 +25,7 @@ Create a tag: `<version>-jupyter` e.g. v0.3.4-jupyter

```
git tag -a <version>-jupyter -m "<version>-jupyter"
git push origin master && git push origin <version>-jupyter
git push origin <version>-jupyter
```

The new tag will trigger the Github Action `build-publish-pypi.yml`: __"Build KeplerGL Python and NPM packages"__. The packages will be built and tested, then published to NPM and PyPI using the secret tokens.
Expand Down
2 changes: 1 addition & 1 deletion bindings/kepler.gl-jupyter/js/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# kperlgl-jupyter
# keplergl-jupyter

This is a simple jupyter widget for kepler.gl, an advanced geospatial visualization tool, to render large-scale interactive maps.

Expand Down
33 changes: 17 additions & 16 deletions bindings/kepler.gl-jupyter/js/lib/keplergl-plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,22 @@ import log from './log';

// When serialiazing the entire widget state for embedding, only values that
// differ from the defaults will be specified.

export const KeplerGlModal = widgets.DOMWidgetModel.extend({
defaults: {
...widgets.DOMWidgetModel.prototype.defaults(),
_model_name: 'KeplerGlModal',
_view_name: 'KeplerGlView',
_model_module: 'keplergl-jupyter',
_view_module: 'keplergl-jupyter',

data: {},
config: {}
// Note: in JavaScript, class.extend does not inherently inherit static functions.
export class KeplerGlModal extends widgets.DOMWidgetModel {
defaults() {
return {
...super.defaults(),
_model_name: 'KeplerGlModal',
_model_module: 'keplergl-jupyter',
_view_name: 'KeplerGlView',
_view_module: 'keplergl-jupyter',
data: {},
config: {}
};
}
});
}

export const KeplerGlView = widgets.DOMWidgetView.extend({
export class KeplerGlView extends widgets.DOMWidgetView {
render() {
log('KeplerGlModal start render');
this.keplergl = new KeplerGlJupyter();
Expand All @@ -46,17 +47,17 @@ export const KeplerGlView = widgets.DOMWidgetView.extend({
this.model.on('change:config', this.config_changed, this);

window.dom = this.el;
},
}

data_changed() {
log('KeplerGlModal start data_changed');

this.keplergl.onDataChange(this);
},
}

config_changed() {
log('KeplerGlModal start config_change');

this.keplergl.onConfigChange(this);
}
});
}
4 changes: 4 additions & 0 deletions bindings/kepler.gl-jupyter/js/lib/keplergl/components/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ function App() {
rel="stylesheet"
href="http://d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css"
/>
<link
rel="stylesheet"
href="http://api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css"
/>
<link
rel="stylesheet"
href="https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css"
Expand Down
6 changes: 3 additions & 3 deletions bindings/kepler.gl-jupyter/js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "keplergl-jupyter",
"version": "0.3.4a0",
"version": "0.3.6",
"description": "This is a simple jupyter widget for kepler.gl, an advanced geo-spatial visualization tool, to render large-scale interactive maps.",
"author": "Shan He",
"license": "MIT",
Expand Down Expand Up @@ -69,7 +69,7 @@
"webpack-stats-plugin": "^0.2.1"
},
"dependencies": {
"@jupyter-widgets/base": "^2 || ^3 || ^4.0.0",
"@jupyter-widgets/base": "^6",
"@jupyterlab/builder": "^4.0.0",
"@kepler.gl/actions": "^3.0.0",
"@kepler.gl/components": "^3.0.0",
Expand All @@ -92,7 +92,7 @@
"react-redux": "^8.0.5",
"redux": "^4.2.1",
"redux-actions": "^2.2.1",
"styled-components": "^4.1.3"
"styled-components": "6.1.8"
},
"resolutions": {
"@deck.gl/core": "^8.9.27",
Expand Down
3 changes: 2 additions & 1 deletion bindings/kepler.gl-jupyter/js/webpack/build-html.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ module.exports = (rules, plugins) => ({
inject: true,
links: [
'https://d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css',
'https://api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css',
'https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css'
],
scripts: [
Expand All @@ -89,7 +90,7 @@ module.exports = (rules, plugins) => ({
`https://unpkg.com/styled-components@${VERSIONS.styledComponents}/dist/styled-components.min.js`,

// load kepler.gl last
`https://unpkg.com/kepler.gl@${VERSIONS.keplergl}/umd/keplergl.min.js`
// `https://unpkg.com/kepler.gl@${VERSIONS.keplergl}/umd/keplergl.min.js`
],
title: 'Kepler.gl'
}),
Expand Down
Loading

0 comments on commit 532ac83

Please sign in to comment.