Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ function App() {

// This condition is necessary to confirm that the viewState is
// of type MapViewState.
if ("latitude" in viewState) {
if (viewState && "latitude" in viewState) {
// TODO: ensure all view state types get updated on the JS side
setViewState(viewState);
}
Expand Down
16 changes: 15 additions & 1 deletion src/renderers/overlay.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { MapboxOverlay, MapboxOverlayProps } from "@deck.gl/mapbox";
import React from "react";
import Map, { useControl } from "react-map-gl/maplibre";
import Map, { useControl, ViewStateChangeEvent } from "react-map-gl/maplibre";

import type { MapRendererProps, OverlayRendererProps } from "./types";
import { isGlobeView } from "../util";
Expand Down Expand Up @@ -35,15 +35,29 @@ const OverlayRenderer: React.FC<MapRendererProps & OverlayRendererProps> = (
customAttribution,
initialViewState,
views,
onViewStateChange,
...deckProps
} = mapProps;
const onMoveEnd = onViewStateChange
? (evt: ViewStateChangeEvent) => {
const viewState = {
longitude: evt.viewState.longitude,
latitude: evt.viewState.latitude,
zoom: evt.viewState.zoom,
pitch: evt.viewState.pitch,
bearing: evt.viewState.bearing,
};
onViewStateChange({ viewId: "mapLibreId", viewState });
}
: undefined;
return (
<Map
reuseMaps
initialViewState={initialViewState}
mapStyle={mapStyle}
attributionControl={{ customAttribution }}
style={{ width: "100%", height: "100%" }}
onMoveEnd={onMoveEnd}
{...(isGlobeView(views) && { projection: "globe" })}
>
{controls.map((control) => control.renderMaplibre())}
Expand Down