Is it intentional that map.remove() doesn't call CustomLayerInterface.onRemove()?

[NotAdam]

I have a CustomLayerInterface impl that spins up a bunch of webgl buffers and etc., and I've noticed that when cleaning up the map with map.remove(), these resources don't get cleaned up correctly and CustomLayerInterface.onRemove doesn't get called.

The docs state:

Clean up and release all internal resources associated with this map.

But this doesn't seem to also include layers with side effects (which is probably a rare edge case, tbh). I've fixed this just with map.removeLayer(name) before calling map.remove(), but it's unclear to me if this is intentional (feels so based on internal resources) or a bug.

This is using maplibre-gl-js 5.9.0, doing the following:

map = new maplibregl.Map({
	// ...
});

map.on('load', () => {
	map!.addLayer(new AdsbWebGLLayer());
});

// ...
onDestroy(() => {
	// this is the only way onRemove is called on the CustomLayerInterface
	map?.removeLayer(AdsbWebGLLayer.LayerID);

	map?.remove();
	map = null;
});

[HarelM]

I don't think it is intentional.
I also think the following PR is trying to address some of the shortcomings of the cleanup that currently exists in the code:

• fix: contextRestored event not working #6398

I'm not sure if it address this issue completely or not, but I have seen a layer.onRemove added there...

[NotAdam]

Ah, nice! I haven't checked out the PR to see if it fixes it, but that looks like it would fix it as my layer would appear in style._layers so it probably would work for me