Repository navigation
Release the map view and the controller when the map leaves the composition - #23
Merged
Merged
Conversation
The GeoView was paused, stopped and destroyed from customDisposableEffect, which only reached it once a holder existed. MapViewBase now does it, after the controller, also for a map that leaves before its holder is made.
The GeoView runs its touch flows in the given owner's lifecycleScope until that lifecycle ends, and the controller's collectors on those flows were never cancelled, so with the Activity's lifecycle every GeoView and its controller stayed until the Activity went. The GeoView now gets a MapViewLifecycleOwner, ended after onDestroy(), and the controller cancels its listener jobs in destroy().
The state kept its own controller field, set on attach and never cleared, so a state the app keeps held the destroyed controller and every overlay of the old map. It now reads the base's attached controller, which MapViewBase detaches when the map is torn down. clearController() goes: MapViewBase does the same for every provider now.
This was referenced Nov 8, 2026
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
なぜ
プロバイダを切り替えても GeoView とそのコントローラが残っていました。
customDisposableEffectで行っていて、holder ができる前に外れた地図には届きませんでした。何を変えたか
MapViewBaseのonDestroyMapViewに移しました。controller の後に、holder ができる前に外れた地図でも行います。MapViewLifecycleOwnerを渡し、onDestroy()の後に終わらせます。コントローラはdestroy()で listener の Job を cancel します。controllerフィールド(接続時に入れて二度と消さない)をやめ、基底の接続中のコントローラを読むようにしました。MapViewBaseが地図を破棄するときに外すので、アプリが持ち続ける state に古いコントローラとオーバーレイが残りません。clearController()(internal)を削除しました。同じことをMapViewBaseが全プロバイダについて行います。関連 PR(同じ修正の一式)
fix/mapview-teardownは次のリポジトリにまたがります。core → compose → 各プロバイダの順にマージしてください。プロバイダの変更は、core のMapViewState.detachControllerと、compose のMapViewBase(onDestroyMapView = …)/MapViewLifecycleOwnerを使います。検証
タブレット(HA26Z6JL)の example-app で確認しました。区画データ(約 10 万ポリゴン)はポリゴンのタイル描画が要るので、検証には、このブランチのコミットを
feat/polygon-tiling/feat/overlay-on-addedの上に一時的に cherry-pick したブランチ(test/teardown-on-tiling、push していません)を使っています。am dumpheap -gで GC させて、GC 後のヒープを測りました。MapLibreViewController/GoogleMapViewControllerが残り、それぞれ 98,843 件の PolygonEntity を抱えていました。testDebugUnitTestとapiCheckを流しました。新しく足したテストはすべて通っています。失敗は次の 5 つで、どれも develop の時点で同じ理由で落ちています。確認できていないもの: