Merge branch 'main' into map_design

KouTsukigase · web-flow · commit e61fe0fa6458 · 2025-08-26T22:50:55.000+09:00
diff --git a/mapconductor-core/src/main/java/com/mapconductor/core/map/MapViewBase.kt b/mapconductor-core/src/main/java/com/mapconductor/core/map/MapViewBase.kt
@@ -185,7 +185,7 @@ fun <
         }
     }
 
-    if (controller != null && bubbles.isNotEmpty()) {
+    if (controller != null && cameraPosition != null && bubbles.isNotEmpty()) {
         Box(
             modifier =
                 Modifier

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ fun <`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`
`188`		`- if (controller != null && bubbles.isNotEmpty()) {`
	`188`	`+ if (controller != null && cameraPosition != null && bubbles.isNotEmpty()) {`
`189`	`189`	`Box(`
`190`	`190`	`modifier =`
`191`	`191`	`Modifier`