Ecoscope fork merge #613
Ecoscope fork merge #613
Conversation
…yers with the same bump
…oscope-fork # Conflicts: # package-lock.json # package.json # src/index.tsx # src/model/extension.ts # src/tooltip/index.ts
There was a problem hiding this comment.
This is generated code and should not be checked in.
There was a problem hiding this comment.
Ditto, this is also generated
| @@ -13,6 +14,7 @@ class MapKwargs(TypedDict, total=False): | |||
| _height: int | |||
| basemap_style: Union[str, CartoBasemap] | |||
| parameters: Dict[str, Any] | |||
| deck_widgets: List[BaseDeckWidget] | |||
There was a problem hiding this comment.
This should be Sequence (or maybe Iterable) instead of List
| @@ -17,6 +17,8 @@ | |||
| "framer-motion": "^11.3.30", | |||
| "lodash.debounce": "^4.0.8", | |||
| "lodash.throttle": "^4.1.1", | |||
| "@deck.gl/widgets": "^9.0.16", | |||
There was a problem hiding this comment.
Nit: can we alphabetically sort our dependencies? I'd like to visually keep track of deck.gl dependencies next to each other.
Also, all deck.gl libraries should have the same version constraint.
| import { CompassWidget, ZoomWidget, FullscreenWidget, LightTheme } from "@deck.gl/widgets"; | ||
| import { LegendWidget, NorthArrowWidget, TitleWidget, ScaleWidget, SaveImageWidget } from "./deck-widget.js"; | ||
|
|
||
| export abstract class BaseDeckWidgetModel extends BaseModel { |
There was a problem hiding this comment.
At first glance, I wouldn't think these should be models... do the widgets themselves need to be reactive on the Jupyter side?
| @@ -220,6 +220,48 @@ def viz( | |||
|
|
|||
| return Map(layers=layers, **map_kwargs) | |||
|
|
|||
| def viz_layer( | |||
There was a problem hiding this comment.
If we add viz_layer, then we should change viz() to use viz_layer under the hood, because it looks like it's entirely duplicated.
Separately, I want to think over this API a bit more.
This PR addresses issue #592. The aim is to integrate changes from the ecoscope fork of Lonboard and discuss their potential inclusion in the main project.
The fork was initiated in April 2024. While the front-end has evolved since then, the changes appear manageable for integration. Current commit resolves merge conflicts and includes a minor adjustment to ensure map component rendering.
Below is a summary of changes from the remote repository. Each item requires review before consideration for merging:
@kylebarron @batpad please let me know if you have comments.