Skip to content

fix(google-maps): don't crash on a zero-width vector map #10848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Juice-de-Orange wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(google-maps): don't crash on a zero-width vector map #10848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 modules/google-maps/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ export function getViewPropsFromCoordinateTransformer(

// Match Google projection matrix
const fovy = 25;
const aspect = height ? width / height : 1;
const aspect = width > 0 && height > 0 ? width / height : 1;

// Match depth range (crucial for correct z-sorting)
const near = 0.75;
Expand Down
36 changes: 36 additions & 0 deletions test/modules/google-maps/google-maps-overlay.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,42 @@ test('GoogleMapsOverlay#style', () => {
overlay.finalize();
});

test('GoogleMapsOverlay#draw tolerates a zero-width vector map', async () => {
const map = new mapsApi.Map({
width: 0,
height: 600,
longitude: -122.45,
latitude: 37.78,
zoom: 13,
renderingType: mapsApi.RenderingType.VECTOR
});
let resolveDeviceInitialized = () => {};
const deviceInitialized = new Promise<void>(resolve => {
resolveDeviceInitialized = resolve;
});
const overlay = new GoogleMapsOverlay({
device,
interleaved: false,
onDeviceInitialized: () => resolveDeviceInitialized(),
layers: [
new ScatterplotLayer({
data: [{position: [-122.45, 37.78]}],
getPosition: datum => datum.position,
radiusMinPixels: 10
})
]
});

overlay.setMap(map);
await deviceInitialized;

try {
expect(() => map.draw()).not.toThrow();
} finally {
overlay.finalize();
}
});

function drawPickTest(renderingType) {
test(`GoogleMapsOverlay#draw, pick ${renderingType}`, () => {
const map = new mapsApi.Map({
Expand Down